From cde26680a8895368cb0487c961ac559b0a8ece8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Tue, 7 Mar 2017 23:16:04 +0100 Subject: [PATCH] Reindent the section comments of the configuration descriptor to resemble the style of other descriptors. --- .../usb_descriptor_configuration.c | 51 +++++++------------ .../usb_descriptors/usb_descriptor_device.h | 2 +- 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/right/src/usb_descriptors/usb_descriptor_configuration.c b/right/src/usb_descriptors/usb_descriptor_configuration.c index f1367e4..91017b6 100644 --- a/right/src/usb_descriptors/usb_descriptor_configuration.c +++ b/right/src/usb_descriptors/usb_descriptor_configuration.c @@ -5,8 +5,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = { -// Configuration descriptor - + // Configuration descriptor USB_DESCRIPTOR_LENGTH_CONFIGURE, USB_DESCRIPTOR_TYPE_CONFIGURE, USB_SHORT_GET_LOW(USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH), @@ -19,8 +18,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = (USB_DEVICE_CONFIG_REMOTE_WAKEUP << USB_DESCRIPTOR_CONFIGURE_ATTRIBUTE_REMOTE_WAKEUP_SHIFT), USB_DEVICE_MAX_POWER, -// Generic HID interface descriptor - + // Generic HID interface descriptor USB_DESCRIPTOR_LENGTH_INTERFACE, USB_DESCRIPTOR_TYPE_INTERFACE, USB_GENERIC_HID_INTERFACE_INDEX, @@ -31,8 +29,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_HID_PROTOCOL_NONE, USB_STRING_DESCRIPTOR_NONE, -// Generic HID descriptor - + // Generic HID descriptor USB_DESCRIPTOR_LENGTH_HID, USB_DESCRIPTOR_TYPE_HID, USB_SHORT_GET_LOW(USB_HID_VERSION), @@ -43,8 +40,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_LOW(USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH), USB_SHORT_GET_HIGH(USB_GENERIC_HID_REPORT_DESCRIPTOR_LENGTH), -// Generic HID IN endpoint descriptor - + // Generic HID IN endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_GENERIC_HID_ENDPOINT_IN_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -53,8 +49,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_HIGH(USB_GENERIC_HID_INTERRUPT_IN_PACKET_SIZE), USB_GENERIC_HID_INTERRUPT_IN_INTERVAL, -// Generic HID OUT endpoint descriptor - + // Generic HID OUT endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_GENERIC_HID_ENDPOINT_OUT_INDEX | (USB_OUT << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -63,8 +58,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_HIGH(USB_GENERIC_HID_INTERRUPT_OUT_PACKET_SIZE), USB_GENERIC_HID_INTERRUPT_IN_INTERVAL, -// Basic keyboard interface descriptor - + // Basic keyboard interface descriptor USB_DESCRIPTOR_LENGTH_INTERFACE, USB_DESCRIPTOR_TYPE_INTERFACE, USB_BASIC_KEYBOARD_INTERFACE_INDEX, @@ -75,8 +69,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_HID_PROTOCOL_KEYBOARD, USB_STRING_DESCRIPTOR_NONE, -// Basic keyboard HID descriptor - + // Basic keyboard HID descriptor USB_DESCRIPTOR_LENGTH_HID, USB_DESCRIPTOR_TYPE_HID, USB_SHORT_GET_LOW(USB_HID_VERSION), @@ -87,8 +80,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_LOW(USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), USB_SHORT_GET_HIGH(USB_BASIC_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), -// Basic keyboard endpoint descriptor - + // Basic keyboard endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_BASIC_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -97,8 +89,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_HIGH(USB_BASIC_KEYBOARD_INTERRUPT_IN_PACKET_SIZE), USB_BASIC_KEYBOARD_INTERRUPT_IN_INTERVAL, -// Mouse interface descriptor - + // Mouse interface descriptor USB_DESCRIPTOR_LENGTH_INTERFACE, USB_DESCRIPTOR_TYPE_INTERFACE, USB_MOUSE_INTERFACE_INDEX, @@ -109,8 +100,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_HID_PROTOCOL_MOUSE, USB_STRING_DESCRIPTOR_NONE, -// Mouse HID descriptor - + // Mouse HID descriptor USB_DESCRIPTOR_LENGTH_HID, USB_DESCRIPTOR_TYPE_HID, USB_SHORT_GET_LOW(USB_HID_VERSION), @@ -121,8 +111,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_LOW(USB_MOUSE_REPORT_DESCRIPTOR_LENGTH), USB_SHORT_GET_HIGH(USB_MOUSE_REPORT_DESCRIPTOR_LENGTH), -// Mouse endpoint descriptor - + // Mouse endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_MOUSE_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -131,8 +120,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_HIGH(USB_MOUSE_INTERRUPT_IN_PACKET_SIZE), USB_MOUSE_INTERRUPT_IN_INTERVAL, -// Media keyboard interface descriptor - + // Media keyboard interface descriptor USB_DESCRIPTOR_LENGTH_INTERFACE, USB_DESCRIPTOR_TYPE_INTERFACE, USB_MEDIA_KEYBOARD_INTERFACE_INDEX, @@ -143,8 +131,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_HID_PROTOCOL_NONE, USB_STRING_DESCRIPTOR_NONE, -// Media keyboard HID descriptor - + // Media keyboard HID descriptor USB_DESCRIPTOR_LENGTH_HID, USB_DESCRIPTOR_TYPE_HID, USB_SHORT_GET_LOW(USB_HID_VERSION), @@ -155,8 +142,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_LOW(USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), USB_SHORT_GET_HIGH(USB_MEDIA_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), -// Media keyboard endpoint descriptor - + // Media keyboard endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_MEDIA_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), @@ -165,8 +151,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_HIGH(USB_MEDIA_KEYBOARD_INTERRUPT_IN_PACKET_SIZE), USB_MEDIA_KEYBOARD_INTERRUPT_IN_INTERVAL, -// System keyboard interface descriptor - + // System keyboard interface descriptor USB_DESCRIPTOR_LENGTH_INTERFACE, USB_DESCRIPTOR_TYPE_INTERFACE, USB_SYSTEM_KEYBOARD_INTERFACE_INDEX, @@ -177,8 +162,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_HID_PROTOCOL_NONE, USB_STRING_DESCRIPTOR_NONE, -// System keyboard HID descriptor - + // System keyboard HID descriptor USB_DESCRIPTOR_LENGTH_HID, USB_DESCRIPTOR_TYPE_HID, USB_SHORT_GET_LOW(USB_HID_VERSION), @@ -189,8 +173,7 @@ uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = USB_SHORT_GET_LOW(USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), USB_SHORT_GET_HIGH(USB_SYSTEM_KEYBOARD_REPORT_DESCRIPTOR_LENGTH), -// System keyboard endpoint descriptor - + // System keyboard endpoint descriptor USB_DESCRIPTOR_LENGTH_ENDPOINT, USB_DESCRIPTOR_TYPE_ENDPOINT, USB_SYSTEM_KEYBOARD_ENDPOINT_INDEX | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT), diff --git a/right/src/usb_descriptors/usb_descriptor_device.h b/right/src/usb_descriptors/usb_descriptor_device.h index 2bf833f..594cd0c 100644 --- a/right/src/usb_descriptors/usb_descriptor_device.h +++ b/right/src/usb_descriptors/usb_descriptor_device.h @@ -3,7 +3,7 @@ // Macros: - #define USB_DEVICE_VENDOR_ID 0x16D3 // TODO: Change this to 15D0 for the final prototype. + #define USB_DEVICE_VENDOR_ID 0x16D3 // TODO: Change this for the final prototype. #define USB_DEVICE_PRODUCT_ID 0x05EA #define USB_DEVICE_RELEASE_NUMBER 0x0101