aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2009-05-07 22:33:36 +0000
committerDean <Dean@d5102386-fcda-11dd-9fdb-3debd5008f28>2009-05-07 22:33:36 +0000
commit46038bac9ddfbab3c52dc6d5dd22bbf8bb1c902a (patch)
tree0d649b5dd7d86880dfc82dd1c1199e66e6933e46
parent31d5ad5d6f72079fec0e601af252550c7f11bf64 (diff)
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).
git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@541 d5102386-fcda-11dd-9fdb-3debd5008f28
-rw-r--r--Bootloaders/TeensyHID/Descriptors.c2
-rw-r--r--Bootloaders/TeensyHID/Descriptors.h2
-rw-r--r--Demos/Device/GenericHID/Descriptors.c2
-rw-r--r--Demos/Device/GenericHID/Descriptors.h2
-rw-r--r--Demos/Device/Joystick/Descriptors.c2
-rw-r--r--Demos/Device/Joystick/Descriptors.h2
-rw-r--r--Demos/Device/Keyboard/Descriptors.c2
-rw-r--r--Demos/Device/Keyboard/Descriptors.h2
-rw-r--r--Demos/Device/KeyboardMouse/Descriptors.c4
-rw-r--r--Demos/Device/KeyboardMouse/Descriptors.h2
-rw-r--r--Demos/Device/Mouse/Descriptors.c2
-rw-r--r--Demos/Device/Mouse/Descriptors.h2
-rw-r--r--Demos/Host/KeyboardHostWithParser/HIDReport.h2
-rw-r--r--Demos/Host/MouseHostWithParser/HIDReport.h2
-rw-r--r--Projects/Magstripe/Descriptors.c2
-rw-r--r--Projects/Magstripe/Descriptors.h2
16 files changed, 17 insertions, 17 deletions
diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index fc7f51c6..b1642f16 100644
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalHIDDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(HIDReport)
},
diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h
index 24a0cdaa..2b84734c 100644
--- a/Bootloaders/TeensyHID/Descriptors.h
+++ b/Bootloaders/TeensyHID/Descriptors.h
@@ -50,7 +50,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalHIDDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Device/GenericHID/Descriptors.c b/Demos/Device/GenericHID/Descriptors.c
index a14fc505..612450ca 100644
--- a/Demos/Device/GenericHID/Descriptors.c
+++ b/Demos/Device/GenericHID/Descriptors.c
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(GenericReport)
},
diff --git a/Demos/Device/GenericHID/Descriptors.h b/Demos/Device/GenericHID/Descriptors.h
index 720ddd01..590cea6a 100644
--- a/Demos/Device/GenericHID/Descriptors.h
+++ b/Demos/Device/GenericHID/Descriptors.h
@@ -52,7 +52,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalReportDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Device/Joystick/Descriptors.c b/Demos/Device/Joystick/Descriptors.c
index f1cf8d5c..1bdce1c0 100644
--- a/Demos/Device/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(JoystickReport)
},
diff --git a/Demos/Device/Joystick/Descriptors.h b/Demos/Device/Joystick/Descriptors.h
index 3463d962..3d569978 100644
--- a/Demos/Device/Joystick/Descriptors.h
+++ b/Demos/Device/Joystick/Descriptors.h
@@ -52,7 +52,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalReportDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Device/Keyboard/Descriptors.c b/Demos/Device/Keyboard/Descriptors.c
index 69300eb9..02a5b7c3 100644
--- a/Demos/Device/Keyboard/Descriptors.c
+++ b/Demos/Device/Keyboard/Descriptors.c
@@ -151,7 +151,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport)
},
diff --git a/Demos/Device/Keyboard/Descriptors.h b/Demos/Device/Keyboard/Descriptors.h
index aa1bf05b..99837972 100644
--- a/Demos/Device/Keyboard/Descriptors.h
+++ b/Demos/Device/Keyboard/Descriptors.h
@@ -53,7 +53,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalReportDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Device/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c
index bcb0bf93..2eb2c6e2 100644
--- a/Demos/Device/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/KeyboardMouse/Descriptors.c
@@ -184,7 +184,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport)
},
@@ -231,7 +231,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(MouseReport)
},
diff --git a/Demos/Device/KeyboardMouse/Descriptors.h b/Demos/Device/KeyboardMouse/Descriptors.h
index 59495425..5540f4af 100644
--- a/Demos/Device/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/KeyboardMouse/Descriptors.h
@@ -53,7 +53,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalReportDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Device/Mouse/Descriptors.c b/Demos/Device/Mouse/Descriptors.c
index e58e9978..1a2b22ab 100644
--- a/Demos/Device/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalReportDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(MouseReport)
},
diff --git a/Demos/Device/Mouse/Descriptors.h b/Demos/Device/Mouse/Descriptors.h
index 1fcee721..6385145c 100644
--- a/Demos/Device/Mouse/Descriptors.h
+++ b/Demos/Device/Mouse/Descriptors.h
@@ -52,7 +52,7 @@
uint16_t HIDSpec;
uint8_t CountryCode;
- uint8_t TotalHIDReports;
+ uint8_t TotalReportDescriptors;
uint8_t HIDReportType;
uint16_t HIDReportLength;
diff --git a/Demos/Host/KeyboardHostWithParser/HIDReport.h b/Demos/Host/KeyboardHostWithParser/HIDReport.h
index a128b8e9..20968872 100644
--- a/Demos/Host/KeyboardHostWithParser/HIDReport.h
+++ b/Demos/Host/KeyboardHostWithParser/HIDReport.h
@@ -63,7 +63,7 @@
uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
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 */
uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
diff --git a/Demos/Host/MouseHostWithParser/HIDReport.h b/Demos/Host/MouseHostWithParser/HIDReport.h
index a4fc76fa..b2488554 100644
--- a/Demos/Host/MouseHostWithParser/HIDReport.h
+++ b/Demos/Host/MouseHostWithParser/HIDReport.h
@@ -72,7 +72,7 @@
uint16_t HIDSpec; /**< Implemented HID class specification, in BCD encoded format */
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 */
uint16_t HIDReportLength; /**< Total size in bytes of the first HID report descriptor */
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 13978935..dd6b3fb6 100644
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -142,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
.HIDSpec = VERSION_BCD(01.11),
.CountryCode = 0x00,
- .TotalHIDReports = 0x01,
+ .TotalHIDDescriptors = 1,
.HIDReportType = DTYPE_Report,
.HIDReportLength = sizeof(KeyboardReport)
},
diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 2f585452..16299bbf 100644
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -54,7 +54,7 @@
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 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 */
uint16_t HIDReportLength; /**< Length of the first HID report descriptor */