diff options
Diffstat (limited to 'Bootloaders')
| -rw-r--r-- | Bootloaders/CDC/Descriptors.c | 10 | ||||
| -rw-r--r-- | Bootloaders/CDC/Descriptors.h | 10 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.c | 4 | ||||
| -rw-r--r-- | Bootloaders/DFU/Descriptors.h | 4 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/Descriptors.c | 8 | ||||
| -rw-r--r-- | Bootloaders/TeensyHID/Descriptors.h | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index 38906cfb4..fdaba8322 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .CCI_Interface =
+ .CDC_CCI_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .Data = {0x00, 0x01}
},
- .ManagementEndpoint =
+ .CDC_ManagementEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .PollingIntervalMS = 0x02
},
- .DCI_Interface =
+ .CDC_DCI_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -160,7 +160,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR
},
- .DataOutEndpoint =
+ .CDC_DataOutEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@@ -170,7 +170,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .PollingIntervalMS = 0x00
},
- .DataInEndpoint =
+ .CDC_DataInEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h index ac02ff652..f12347746 100644 --- a/Bootloaders/CDC/Descriptors.h +++ b/Bootloaders/CDC/Descriptors.h @@ -129,15 +129,15 @@ typedef struct
{
USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t CCI_Interface;
+ USB_Descriptor_Interface_t CDC_CCI_Interface;
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_IntHeader;
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_CallManagement;
CDC_FUNCTIONAL_DESCRIPTOR(1) CDC_Functional_AbstractControlManagement;
CDC_FUNCTIONAL_DESCRIPTOR(2) CDC_Functional_Union;
- USB_Descriptor_Endpoint_t ManagementEndpoint;
- USB_Descriptor_Interface_t DCI_Interface;
- USB_Descriptor_Endpoint_t DataOutEndpoint;
- USB_Descriptor_Endpoint_t DataInEndpoint;
+ USB_Descriptor_Endpoint_t CDC_ManagementEndpoint;
+ USB_Descriptor_Interface_t CDC_DCI_Interface;
+ USB_Descriptor_Endpoint_t CDC_DataOutEndpoint;
+ USB_Descriptor_Endpoint_t CDC_DataInEndpoint;
} USB_Descriptor_Configuration_t;
/* Function Prototypes: */
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index f20fbeb97..510a29fb4 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/Descriptors.c @@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .DFUInterface =
+ .DFU_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -102,7 +102,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR
},
- .DFUFunctional =
+ .DFU_Functional =
{
.Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional},
diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h index 32d58285b..961e480e7 100644 --- a/Bootloaders/DFU/Descriptors.h +++ b/Bootloaders/DFU/Descriptors.h @@ -161,8 +161,8 @@ typedef struct
{
USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t DFUInterface;
- USB_DFU_Functional_Descriptor_t DFUFunctional;
+ USB_Descriptor_Interface_t DFU_Interface;
+ USB_DFU_Functional_Descriptor_t DFU_Functional;
} USB_Descriptor_Configuration_t;
/* Function Prototypes: */
diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c index 596ed6eef..2832ec393 100644 --- a/Bootloaders/TeensyHID/Descriptors.c +++ b/Bootloaders/TeensyHID/Descriptors.c @@ -106,7 +106,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- .Interface =
+ .HID_Interface =
{
.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .InterfaceStrIndex = NO_DESCRIPTOR
},
- .HIDDescriptor =
+ .HID_VendorHID =
{
.Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
@@ -133,7 +133,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = .HIDReportLength = sizeof(HIDReport)
},
- .HIDEndpoint =
+ .HID_ReportINEndpoint =
{
.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
@@ -168,7 +168,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, Size = sizeof(USB_Descriptor_Configuration_t);
break;
case DTYPE_HID:
- Address = (void*)&ConfigurationDescriptor.HIDDescriptor;
+ Address = (void*)&ConfigurationDescriptor.HID_VendorHID;
Size = sizeof(USB_Descriptor_HID_t);
break;
case DTYPE_Report:
diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h index 233c5ab4d..0ea7f3935 100644 --- a/Bootloaders/TeensyHID/Descriptors.h +++ b/Bootloaders/TeensyHID/Descriptors.h @@ -66,9 +66,9 @@ typedef struct
{
USB_Descriptor_Configuration_Header_t Config;
- USB_Descriptor_Interface_t Interface;
- USB_Descriptor_HID_t HIDDescriptor;
- USB_Descriptor_Endpoint_t HIDEndpoint;
+ USB_Descriptor_Interface_t HID_Interface;
+ USB_Descriptor_HID_t HID_VendorHID;
+ USB_Descriptor_Endpoint_t HID_ReportINEndpoint;
} USB_Descriptor_Configuration_t;
/* Macros: */
|