Skip to content

Commit be7b2b0

Browse files
dhalbertdhalbert
committed
uncrustify with newer version of uncrustify
1 parent cc95b71 commit be7b2b0

File tree

12 files changed

+88
-90
lines changed

12 files changed

+88
-90
lines changed

‎ports/atmel-samd/common-hal/audiobusio/PDMIn.c.uncrustify‎

Whitespace-only changes.

‎shared-bindings/usb_hid/Device.c‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
6565
{ MP_QSTR_report_descriptor, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_OBJ },
6666
{ MP_QSTR_usage_page, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
6767
{ MP_QSTR_usage, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
68-
{ MP_QSTR_in_report_length, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT } ,
68+
{ MP_QSTR_in_report_length, MP_ARG_KW_ONLY | MP_ARG_REQUIRED | MP_ARG_INT },
6969
{ MP_QSTR_out_report_length, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
7070
{ MP_QSTR_report_id_index, MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none } },
7171
};
@@ -98,21 +98,19 @@ STATIC mp_obj_t usb_hid_device_make_new(const mp_obj_type_t *type, size_t n_args
9898
const mp_obj_t out_report_length_arg = args[ARG_out_report_length].u_obj;
9999
if (out_report_length_arg == mp_const_none) {
100100
self->out_report_length = 0;
101-
}
102-
else if (!mp_obj_is_small_int(out_report_length_arg) ||
103-
MP_OBJ_SMALL_INT_VALUE(out_report_length_arg) <= 0 ||
104-
MP_OBJ_SMALL_INT_VALUE(out_report_length_arg) > 255) {
101+
} else if (!mp_obj_is_small_int(out_report_length_arg) ||
102+
MP_OBJ_SMALL_INT_VALUE(out_report_length_arg) <= 0 ||
103+
MP_OBJ_SMALL_INT_VALUE(out_report_length_arg) > 255) {
105104
mp_raise_ValueError_varg(translate("%q must be None or 1-255"), MP_QSTR_out_report_length);
106105
}
107106
uint8_t out_report_length = MP_OBJ_SMALL_INT_VALUE(out_report_length_arg);
108107

109108
const mp_obj_t report_id_index_arg = args[ARG_report_id_index].u_obj;
110109
if (report_id_index_arg == mp_const_none) {
111110
self->report_id_index = 0;
112-
}
113-
else if (!mp_obj_is_small_int(report_id_index_arg) ||
114-
MP_OBJ_SMALL_INT_VALUE(report_id_index_arg) <= 0 ||
115-
MP_OBJ_SMALL_INT_VALUE(report_id_index_arg) > 255 ) {
111+
} else if (!mp_obj_is_small_int(report_id_index_arg) ||
112+
MP_OBJ_SMALL_INT_VALUE(report_id_index_arg) <= 0 ||
113+
MP_OBJ_SMALL_INT_VALUE(report_id_index_arg) > 255) {
116114
mp_raise_ValueError_varg(translate("%q must be None or 1-255"), MP_QSTR_report_id_index);
117115
}
118116
uint8_t report_id_index = MP_OBJ_SMALL_INT_VALUE(report_id_index_arg);

‎shared-module/storage/__init__.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ size_t storage_usb_descriptor_length(void) {
9191
return sizeof(usb_msc_descriptor_template);
9292
}
9393

94-
static const char storage_interface_name[] = USB_INTERFACE_NAME " Mass Storage";
94+
static const char storage_interface_name[] = USB_INTERFACE_NAME " Mass Storage";
9595

96-
size_t storage_usb_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string) {
96+
size_t storage_usb_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string) {
9797
memcpy(descriptor_buf, usb_msc_descriptor_template, sizeof(usb_msc_descriptor_template));
9898
descriptor_buf[MSC_INTERFACE_INDEX] = *current_interface;
9999
(*current_interface)++;

‎shared-module/storage/__init__.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
bool storage_usb_enabled(void);
3434
void storage_usb_set_defaults(void);
3535
size_t storage_usb_descriptor_length(void);
36-
size_t storage_usb_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string);
36+
size_t storage_usb_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string);
3737
#endif
3838

3939
#endif // SHARED_MODULE_STORAGE___INIT___H

‎shared-module/usb_cdc/__init__.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ size_t usb_cdc_descriptor_length(void) {
173173
return sizeof(usb_cdc_descriptor_template);
174174
}
175175

176-
size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string, bool repl) {
176+
size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string, bool repl) {
177177
memcpy(descriptor_buf, usb_cdc_descriptor_template, sizeof(usb_cdc_descriptor_template));
178178

179179
// Store comm interface number.
@@ -206,12 +206,12 @@ size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interfac
206206
(*current_endpoint)++;
207207

208208
usb_add_interface_string(*current_interface_string,
209-
repl ? repl_cdc_comm_interface_name : data_cdc_comm_interface_name);
209+
repl ? repl_cdc_comm_interface_name : data_cdc_comm_interface_name);
210210
descriptor_buf[CDC_COMM_INTERFACE_STRING_INDEX] = *current_interface_string;
211211
(*current_interface_string)++;
212212

213213
usb_add_interface_string(*current_interface_string,
214-
repl ? repl_cdc_data_interface_name : data_cdc_data_interface_name);
214+
repl ? repl_cdc_data_interface_name : data_cdc_data_interface_name);
215215
descriptor_buf[CDC_DATA_INTERFACE_STRING_INDEX] = *current_interface_string;
216216
(*current_interface_string)++;
217217

‎shared-module/usb_cdc/__init__.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ bool usb_cdc_data_enabled(void);
3636
void usb_cdc_set_defaults(void);
3737

3838
size_t usb_cdc_descriptor_length(void);
39-
size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string, bool repl);
39+
size_t usb_cdc_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string, bool repl);
4040

4141
#endif /* SHARED_MODULE_USB_CDC___INIT___H */

‎shared-module/usb_hid/Device.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -36,38 +36,38 @@
3636
#include "tusb.h"
3737

3838
static const uint8_t keyboard_report_descriptor[] = {
39-
0x05, 0x01, // 0,1 Usage Page (Generic Desktop Ctrls)
40-
0x09, 0x06, // 2,3 Usage (Keyboard)
41-
0xA1, 0x01, // 4,5 Collection (Application)
42-
0x85, 0xFF, // 6,7 Report ID [SET AT RUNTIME]
39+
0x05, 0x01, // 0,1 Usage Page (Generic Desktop Ctrls)
40+
0x09, 0x06, // 2,3 Usage (Keyboard)
41+
0xA1, 0x01, // 4,5 Collection (Application)
42+
0x85, 0xFF, // 6,7 Report ID [SET AT RUNTIME]
4343
#define KEYBOARD_REPORT_ID_INDEX (7)
44-
0x05, 0x07, // Usage Page (Kbrd/Keypad)
45-
0x19, 0xE0, // Usage Minimum (0xE0)
46-
0x29, 0xE7, // Usage Maximum (0xE7)
47-
0x15, 0x00, // Logical Minimum (0)
48-
0x25, 0x01, // Logical Maximum (1)
49-
0x75, 0x01, // Report Size (1)
50-
0x95, 0x08, // Report Count (8)
51-
0x81, 0x02, // Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
52-
0x81, 0x01, // Input (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
53-
0x19, 0x00, // Usage Minimum (0x00)
54-
0x29, 0xDD, // Usage Maximum (0xDD)
55-
0x15, 0x00, // Logical Minimum (0)
56-
0x25, 0xDD, // Logical Maximum (-35)
57-
0x75, 0x08, // Report Size (8)
58-
0x95, 0x06, // Report Count (6)
59-
0x81, 0x00, // Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
60-
0x05, 0x08, // Usage Page (LEDs)
61-
0x19, 0x01, // Usage Minimum (Num Lock)
62-
0x29, 0x05, // Usage Maximum (Kana)
63-
0x15, 0x00, // Logical Minimum (0)
64-
0x25, 0x01, // Logical Maximum (1)
65-
0x75, 0x01, // Report Size (1)
66-
0x95, 0x05, // Report Count (5)
67-
0x91, 0x02, // Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
68-
0x95, 0x03, // Report Count (3)
69-
0x91, 0x01, // Output (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
70-
0xC0, // End Collection
44+
0x05, 0x07, // Usage Page (Kbrd/Keypad)
45+
0x19, 0xE0, // Usage Minimum (0xE0)
46+
0x29, 0xE7, // Usage Maximum (0xE7)
47+
0x15, 0x00, // Logical Minimum (0)
48+
0x25, 0x01, // Logical Maximum (1)
49+
0x75, 0x01, // Report Size (1)
50+
0x95, 0x08, // Report Count (8)
51+
0x81, 0x02, // Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
52+
0x81, 0x01, // Input (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
53+
0x19, 0x00, // Usage Minimum (0x00)
54+
0x29, 0xDD, // Usage Maximum (0xDD)
55+
0x15, 0x00, // Logical Minimum (0)
56+
0x25, 0xDD, // Logical Maximum (-35)
57+
0x75, 0x08, // Report Size (8)
58+
0x95, 0x06, // Report Count (6)
59+
0x81, 0x00, // Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
60+
0x05, 0x08, // Usage Page (LEDs)
61+
0x19, 0x01, // Usage Minimum (Num Lock)
62+
0x29, 0x05, // Usage Maximum (Kana)
63+
0x15, 0x00, // Logical Minimum (0)
64+
0x25, 0x01, // Logical Maximum (1)
65+
0x75, 0x01, // Report Size (1)
66+
0x95, 0x05, // Report Count (5)
67+
0x91, 0x02, // Output (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
68+
0x95, 0x03, // Report Count (3)
69+
0x91, 0x01, // Output (Const,Array,Abs,No Wrap,Linear,Preferred State,No Null Position,Non-volatile)
70+
0xC0, // End Collection
7171
};
7272

7373
const usb_hid_device_obj_t usb_hid_device_keyboard_obj = {

‎shared-module/usb_hid/__init__.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,10 @@ size_t usb_hid_descriptor_length(void) {
112112
return sizeof(usb_hid_descriptor_template);
113113
}
114114

115-
static const char usb_hid_interface_name[] = USB_INTERFACE_NAME " HID";
115+
static const char usb_hid_interface_name[] = USB_INTERFACE_NAME " HID";
116116

117117
// This is the interface descriptor, not the report descriptor.
118-
size_t usb_hid_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string, uint16_t report_descriptor_length) {
118+
size_t usb_hid_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string, uint16_t report_descriptor_length) {
119119
memcpy(descriptor_buf, usb_hid_descriptor_template, sizeof(usb_hid_descriptor_template));
120120

121121
descriptor_buf[HID_DESCRIPTOR_INTERFACE_INDEX] = *current_interface;
@@ -176,7 +176,7 @@ bool common_hal_usb_hid_configure_usb(const mp_obj_t devices) {
176176
void usb_hid_setup_devices(void) {
177177
usb_hid_set_devices_from_hid_devices();
178178

179-
// Create report buffers on the heap.
179+
// Create report buffers on the heap.
180180
for (mp_int_t i = 0; i < hid_devices_num; i++) {
181181
usb_hid_device_create_report_buffers(&hid_devices[i]);
182182
}
@@ -197,7 +197,7 @@ size_t usb_hid_report_descriptor_length(void) {
197197
}
198198

199199
// Build the combined HID report descriptor in the given space.
200-
void usb_hid_build_report_descriptor(uint8_t* report_descriptor_space, size_t report_descriptor_length) {
200+
void usb_hid_build_report_descriptor(uint8_t *report_descriptor_space, size_t report_descriptor_length) {
201201
uint8_t *report_descriptor_start = report_descriptor_space;
202202

203203
for (mp_int_t i = 0; i < hid_devices_num; i++) {
@@ -209,7 +209,7 @@ void usb_hid_build_report_descriptor(uint8_t* report_descriptor_space, size_t re
209209
memcpy(report_descriptor_start, device->report_descriptor, device->report_id_index - 1);
210210
report_descriptor_start += device->report_id_index - 1;
211211
memcpy(report_descriptor_start, device->report_descriptor + device->report_id_index + 1,
212-
device->report_descriptor_length - device->report_id_index - 1);
212+
device->report_descriptor_length - device->report_id_index - 1);
213213
} else {
214214
// Copy the whole descriptor and fill in the report id.
215215
memcpy(report_descriptor_start, device->report_descriptor, device->report_descriptor_length);
@@ -236,8 +236,8 @@ void usb_hid_save_report_descriptor(uint8_t *report_descriptor_space, size_t rep
236236
// will leave between VM instantiations.
237237
hid_report_descriptor_allocation =
238238
allocate_memory(align32_size(report_descriptor_length),
239-
/*high_address*/ false, /*movable*/ false);
240-
memcpy((uint8_t *) hid_report_descriptor_allocation->ptr, report_descriptor_space, report_descriptor_length);
239+
/*high_address*/ false, /*movable*/ false);
240+
memcpy((uint8_t *)hid_report_descriptor_allocation->ptr, report_descriptor_space, report_descriptor_length);
241241
}
242242

243243
void usb_hid_gc_collect(void) {
@@ -263,5 +263,5 @@ usb_hid_device_obj_t *usb_hid_get_device_with_report_id(uint8_t report_id) {
263263
// Application return pointer to descriptor
264264
// Descriptor contents must exist long enough for transfer to complete
265265
uint8_t const *tud_hid_descriptor_report_cb(uint8_t itf) {
266-
return (uint8_t *) hid_report_descriptor_allocation->ptr;
266+
return (uint8_t *)hid_report_descriptor_allocation->ptr;
267267
}

‎shared-module/usb_hid/__init__.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ extern usb_hid_device_obj_t usb_hid_devices[];
3434
bool usb_hid_enabled(void);
3535
void usb_hid_set_defaults(void);
3636

37-
size_t usb_hid_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string, uint16_t report_descriptor_length);
37+
size_t usb_hid_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string, uint16_t report_descriptor_length);
3838
size_t usb_hid_descriptor_length(void);
3939
size_t usb_hid_report_descriptor_length(void);
4040

4141
void usb_hid_setup_devices(void);
4242
size_t usb_hid_report_descriptor_length(void);
43-
void usb_hid_build_report_descriptor(uint8_t* report_descriptor_space, size_t report_descriptor_length);
43+
void usb_hid_build_report_descriptor(uint8_t *report_descriptor_space, size_t report_descriptor_length);
4444
void usb_hid_save_report_descriptor(uint8_t *report_descriptor_space, size_t report_descriptor_length);
4545

4646
usb_hid_device_obj_t *usb_hid_get_device_with_report_id(uint8_t report_id);

‎shared-module/usb_midi/__init__.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,12 @@ size_t usb_midi_descriptor_length(void) {
170170
return sizeof(usb_midi_descriptor_template);
171171
}
172172

173-
static const char midi_streaming_interface_name[] = USB_INTERFACE_NAME " MIDI";
173+
static const char midi_streaming_interface_name[] = USB_INTERFACE_NAME " MIDI";
174174
static const char midi_audio_control_interface_name[] = USB_INTERFACE_NAME " Audio";
175-
static const char midi_in_jack_name[] = USB_INTERFACE_NAME " usb_midi.ports[0]";
176-
static const char midi_out_jack_name[] = USB_INTERFACE_NAME " usb_midi.ports[0]";
175+
static const char midi_in_jack_name[] = USB_INTERFACE_NAME " usb_midi.ports[0]";
176+
static const char midi_out_jack_name[] = USB_INTERFACE_NAME " usb_midi.ports[0]";
177177

178-
size_t usb_midi_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t* current_interface_string) {
178+
size_t usb_midi_add_descriptor(uint8_t *descriptor_buf, uint8_t *current_interface, uint8_t *current_endpoint, uint8_t *current_interface_string) {
179179
memcpy(descriptor_buf, usb_midi_descriptor_template, sizeof(usb_midi_descriptor_template));
180180

181181
descriptor_buf[MIDI_AUDIO_CONTROL_INTERFACE_NUMBER_INDEX] = *current_interface;

0 commit comments

Comments
 (0)