File tree Expand file tree Collapse file tree 5 files changed +10
-0
lines changed
atmel-samd/asf/common/services/usb Expand file tree Collapse file tree 5 files changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -90,12 +90,14 @@ void udi_cdc_data_disable(void);
90
90
bool udi_cdc_data_setup (void );
91
91
uint8_t udi_cdc_getsetting (void );
92
92
void udi_cdc_data_sof_notify (void );
93
+ COMPILER_WORD_ALIGNED
93
94
UDC_DESC_STORAGE udi_api_t udi_api_cdc_comm = {
94
95
.enable = udi_cdc_comm_enable ,
95
96
.disable = udi_cdc_comm_disable ,
96
97
.setup = udi_cdc_comm_setup ,
97
98
.getsetting = udi_cdc_getsetting ,
98
99
};
100
+ COMPILER_WORD_ALIGNED
99
101
UDC_DESC_STORAGE udi_api_t udi_api_cdc_data = {
100
102
.enable = udi_cdc_data_enable ,
101
103
.disable = udi_cdc_data_disable ,
Original file line number Diff line number Diff line change @@ -154,6 +154,7 @@ UDC_DESC_STORAGE udc_config_speed_t udc_config_fshs[1] = { {
154
154
}};
155
155
156
156
//! Add all information about USB Device in global structure for UDC
157
+ COMPILER_WORD_ALIGNED
157
158
UDC_DESC_STORAGE udc_config_t udc_config = {
158
159
.confdev_lsfs = & udc_device_desc ,
159
160
.conf_lsfs = udc_config_fshs ,
Original file line number Diff line number Diff line change @@ -67,6 +67,8 @@ bool udi_hid_kbd_setup(void);
67
67
uint8_t udi_hid_kbd_getsetting (void );
68
68
69
69
//! Global structure which contains standard UDI interface for UDC
70
+ // CircuitPython fix: UDC_DESC_STORAGE must be COMPILER_WORD_ALIGNED
71
+ COMPILER_WORD_ALIGNED
70
72
UDC_DESC_STORAGE udi_api_t udi_api_hid_kbd = {
71
73
.enable = (bool (* )(void ))udi_hid_kbd_enable ,
72
74
.disable = (void (* )(void ))udi_hid_kbd_disable ,
@@ -117,6 +119,8 @@ COMPILER_WORD_ALIGNED
117
119
//@}
118
120
119
121
//! HID report descriptor for standard HID keyboard
122
+ // CircuitPython fix: UDC_DESC_STORAGE must be COMPILER_WORD_ALIGNED
123
+ COMPILER_WORD_ALIGNED
120
124
UDC_DESC_STORAGE udi_hid_kbd_report_desc_t udi_hid_kbd_report_desc = {
121
125
{
122
126
0x05 , 0x01 , /* Usage Page (Generic Desktop) */
Original file line number Diff line number Diff line change @@ -66,6 +66,7 @@ bool udi_hid_mouse_setup(void);
66
66
uint8_t udi_hid_mouse_getsetting (void );
67
67
68
68
//! Global structure which contains standard UDI interface for UDC
69
+ COMPILER_WORD_ALIGNED
69
70
UDC_DESC_STORAGE udi_api_t udi_api_hid_mouse = {
70
71
.enable = (bool (* )(void ))udi_hid_mouse_enable ,
71
72
.disable = (void (* )(void ))udi_hid_mouse_disable ,
Original file line number Diff line number Diff line change @@ -134,13 +134,15 @@ struct udc_string_desc_t {
134
134
le16_t string [Max (Max (USB_DEVICE_MANUFACTURE_NAME_SIZE , \
135
135
USB_DEVICE_PRODUCT_NAME_SIZE ), USB_DEVICE_SERIAL_NAME_SIZE )];
136
136
};
137
+ COMPILER_WORD_ALIGNED
137
138
static UDC_DESC_STORAGE struct udc_string_desc_t udc_string_desc = {
138
139
.header .bDescriptorType = USB_DT_STRING
139
140
};
140
141
141
142
/**
142
143
* \brief Language ID of USB device (US ID by default)
143
144
*/
145
+ COMPILER_WORD_ALIGNED
144
146
static UDC_DESC_STORAGE usb_str_lgid_desc_t udc_string_desc_languageid = {
145
147
.desc .bLength = sizeof (usb_str_lgid_desc_t ),
146
148
.desc .bDescriptorType = USB_DT_STRING ,
You can’t perform that action at this time.
0 commit comments