Renamed the the TotalHIDReports element of the HID descriptor structure in the HID class demos to TotalReportDescriptors, to be more accurate of the element's function (thanks to Brian Dickman).

pull/1469/head
Dean Camera 16 years ago
parent c7aceb2c7f
commit 1f83abe6f4

@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalHIDDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(HIDReport) .HIDReportLength = sizeof(HIDReport)
}, },

@ -50,7 +50,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalHIDDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(GenericReport) .HIDReportLength = sizeof(GenericReport)
}, },

@ -52,7 +52,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalReportDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(JoystickReport) .HIDReportLength = sizeof(JoystickReport)
}, },

@ -52,7 +52,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalReportDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -151,7 +151,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport) .HIDReportLength = sizeof(KeyboardReport)
}, },

@ -53,7 +53,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalReportDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -184,7 +184,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport) .HIDReportLength = sizeof(KeyboardReport)
}, },
@ -231,7 +231,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(MouseReport) .HIDReportLength = sizeof(MouseReport)
}, },

@ -53,7 +53,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalReportDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(MouseReport) .HIDReportLength = sizeof(MouseReport)
}, },

@ -52,7 +52,7 @@
uint16_t HIDSpec; uint16_t HIDSpec;
uint8_t CountryCode; uint8_t CountryCode;
uint8_t TotalHIDReports; uint8_t TotalReportDescriptors;
uint8_t HIDReportType; uint8_t HIDReportType;
uint16_t HIDReportLength; uint16_t HIDReportLength;

@ -63,7 +63,7 @@
uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */ uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
uint8_t CountryCode; /**< Country code value for localized hardware */ uint8_t CountryCode; /**< Country code value for localized hardware */
uint8_t TotalHIDReports; /**< Total number of HID report descriptors in the current interface */ uint8_t TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
uint8_t HIDReportType; /**< HID report type of the first HID report descriptor */ uint8_t HIDReportType; /**< HID report type of the first HID report descriptor */
uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */ uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */

@ -72,7 +72,7 @@
uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */ uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
uint8_t CountryCode; /**< Country code value for localized hardware */ uint8_t CountryCode; /**< Country code value for localized hardware */
uint8_t TotalHIDReports; /**< Total number of HID report descriptors in the current interface */ uint8_t TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */
uint8_t HIDReportType; /**< HID report type of the first HID report descriptor */ uint8_t HIDReportType; /**< HID report type of the first HID report descriptor */
uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */ uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */

@ -142,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11), .HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00, .CountryCode = 0x00,
.TotalHIDReports = 0x01, .TotalHIDDescriptors = 1,
.HIDReportType = DTYPE_Report, .HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport) .HIDReportLength = sizeof(KeyboardReport)
}, },

@ -54,7 +54,7 @@
uint16_t HIDSpec; /**< HID specification implemented by the device, in BCD form */ uint16_t HIDSpec; /**< HID specification implemented by the device, in BCD form */
uint8_t CountryCode; /**< Country code for the country the HID device is localised for */ uint8_t CountryCode; /**< Country code for the country the HID device is localised for */
uint8_t TotalHIDReports; /**< Total number of HID reports linked to this HID interface */ uint8_t TotalHIDDescriptors; /**< Total number of HID reports linked to this HID interface */
uint8_t HIDReportType; /**< Type of the first HID report descriptor */ uint8_t HIDReportType; /**< Type of the first HID report descriptor */
uint16_t HIDReportLength; /**< Length of the first HID report descriptor */ uint16_t HIDReportLength; /**< Length of the first HID report descriptor */

Loading…
Cancel
Save