Skip to content

Commit

Permalink
FIX: use const initializers
Browse files Browse the repository at this point in the history
  • Loading branch information
@r2axz
r2axz committed Apr 26, 2022
1 parent aa23894 commit c82d7f2
Showing 1 changed file with 20 additions and 16 deletions.
36 changes: 20 additions & 16 deletions usb_descriptors.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
#define USB_CDC_DATA_ENDPOINT_SIZE_SMALL 32
#define USB_CDC_DATA_ENDPOINT_SIZE_LARGE 64

#define USB_CDC_DATA_0_ENDPOINT_SIZE USB_CDC_DATA_ENDPOINT_SIZE_SMALL
#define USB_CDC_DATA_1_ENDPOINT_SIZE USB_CDC_DATA_ENDPOINT_SIZE_LARGE
#define USB_CDC_DATA_2_ENDPOINT_SIZE USB_CDC_DATA_ENDPOINT_SIZE_LARGE

#define USB_CDC_INTERRUPT_ENDPOINT_POLLING_INTERVAL 20

const usb_endpoint_t usb_endpoints[usb_endpoint_address_last] = {
Expand All @@ -34,8 +38,8 @@ const usb_endpoint_t usb_endpoints[usb_endpoint_address_last] = {
/* CDC 0 Data Endpoint */
{
.type = usb_endpoint_type_bulk,
.rx_size = USB_CDC_DATA_ENDPOINT_SIZE_SMALL,
.tx_size = USB_CDC_DATA_ENDPOINT_SIZE_SMALL,
.rx_size = USB_CDC_DATA_0_ENDPOINT_SIZE,
.tx_size = USB_CDC_DATA_0_ENDPOINT_SIZE,
.event_handler = usb_cdc_data_endpoint_event_handler,
},
/* CDC 1 Interrupt Endpoint */
Expand All @@ -48,8 +52,8 @@ const usb_endpoint_t usb_endpoints[usb_endpoint_address_last] = {
/* CDC 1 Data Endpoint */
{
.type = usb_endpoint_type_bulk,
.rx_size = USB_CDC_DATA_ENDPOINT_SIZE_LARGE,
.tx_size = USB_CDC_DATA_ENDPOINT_SIZE_LARGE,
.rx_size = USB_CDC_DATA_1_ENDPOINT_SIZE,
.tx_size = USB_CDC_DATA_1_ENDPOINT_SIZE,
.event_handler = usb_cdc_data_endpoint_event_handler,
},
/* CDC 2 Interrupt Endpoint */
Expand All @@ -62,8 +66,8 @@ const usb_endpoint_t usb_endpoints[usb_endpoint_address_last] = {
/* CDC 2 Data Endpoint */
{
.type = usb_endpoint_type_bulk,
.rx_size = USB_CDC_DATA_ENDPOINT_SIZE_LARGE,
.tx_size = USB_CDC_DATA_ENDPOINT_SIZE_LARGE,
.rx_size = USB_CDC_DATA_2_ENDPOINT_SIZE,
.tx_size = USB_CDC_DATA_2_ENDPOINT_SIZE,
.event_handler = usb_cdc_data_endpoint_event_handler,
},
};
Expand Down Expand Up @@ -93,7 +97,7 @@ const usb_device_descriptor_t usb_device_descriptor = {
.bDeviceClass = usb_device_class_misc,
.bDeviceSubClass = usb_device_subclass_iad,
.bDeviceProtocol = usb_device_protocol_iad,
.bMaxPacketSize = usb_endpoints[usb_endpoint_address_control].rx_size,
.bMaxPacketSize = USB_CONTROL_ENDPOINT_SIZE,
.idVendor = USB_ID_VENDOR,
.idProduct = USB_ID_PRODUCT,
.bcdDevice = USB_BCD_VERSION(DEVICE_VERSION_MAJOR, DEVICE_VERSION_MINOR, DEVICE_VERSION_REVISION),
Expand Down Expand Up @@ -166,7 +170,7 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_0_interrupt,
.bmAttributes = usb_endpoint_type_interrupt,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_0_interrupt].tx_size,
.wMaxPacketSize = USB_CDC_INTERRUPT_ENDPOINT_SIZE,
.bInterval = USB_CDC_INTERRUPT_ENDPOINT_POLLING_INTERVAL,
},
.data_0 = {
Expand All @@ -185,15 +189,15 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_out | usb_endpoint_address_cdc_0_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_0_data].rx_size,
.wMaxPacketSize = USB_CDC_DATA_0_ENDPOINT_SIZE,
.bInterval = 0,
},
.data_eptx_0 = {
.bLength = sizeof(usb_configuration_descriptor.data_eptx_0),
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_0_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_0_data].tx_size,
.wMaxPacketSize = USB_CDC_DATA_0_ENDPOINT_SIZE,
.bInterval = 0,
},
.comm_iad_1 = {
Expand Down Expand Up @@ -248,7 +252,7 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_1_interrupt,
.bmAttributes = usb_endpoint_type_interrupt,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_1_interrupt].tx_size,
.wMaxPacketSize = USB_CDC_INTERRUPT_ENDPOINT_SIZE,
.bInterval = USB_CDC_INTERRUPT_ENDPOINT_POLLING_INTERVAL,
},
.data_1 = {
Expand All @@ -267,15 +271,15 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_out | usb_endpoint_address_cdc_1_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_1_data].rx_size,
.wMaxPacketSize = USB_CDC_DATA_1_ENDPOINT_SIZE,
.bInterval = 0,
},
.data_eptx_1 = {
.bLength = sizeof(usb_configuration_descriptor.data_eptx_1),
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_1_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_1_data].tx_size,
.wMaxPacketSize = USB_CDC_DATA_1_ENDPOINT_SIZE,
.bInterval = 0,
},
.comm_iad_2 = {
Expand Down Expand Up @@ -330,7 +334,7 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_2_interrupt,
.bmAttributes = usb_endpoint_type_interrupt,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_0_interrupt].tx_size,
.wMaxPacketSize = USB_CDC_INTERRUPT_ENDPOINT_SIZE,
.bInterval = USB_CDC_INTERRUPT_ENDPOINT_POLLING_INTERVAL,
},
.data_2 = {
Expand All @@ -349,15 +353,15 @@ const usb_device_configuration_descriptor_t usb_configuration_descriptor = {
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_out | usb_endpoint_address_cdc_2_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_2_data].rx_size,
.wMaxPacketSize = USB_CDC_DATA_2_ENDPOINT_SIZE,
.bInterval = 0,
},
.data_eptx_2 = {
.bLength = sizeof(usb_configuration_descriptor.data_eptx_2),
.bDescriptorType = usb_descriptor_type_endpoint,
.bEndpointAddress = usb_endpoint_direction_in | usb_endpoint_address_cdc_2_data,
.bmAttributes = usb_endpoint_type_bulk,
.wMaxPacketSize = usb_endpoints[usb_endpoint_address_cdc_2_data].tx_size,
.wMaxPacketSize = USB_CDC_DATA_2_ENDPOINT_SIZE,
.bInterval = 0,
},

Expand Down

0 comments on commit c82d7f2

Please sign in to comment.