projects / pub / USBasp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7aceb2)
Renamed the the TotalHIDReports element of the HID descriptor structure in the HID...
authorDean Camera <dean@fourwalledcubicle.com>
Thu, 7 May 2009 22:33:36 +0000 (22:33 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Thu, 7 May 2009 22:33:36 +0000 (22:33 +0000)
16 files changed:
Bootloaders/TeensyHID/Descriptors.c patch | blob | blame | history
Bootloaders/TeensyHID/Descriptors.h patch | blob | blame | history
Demos/Device/GenericHID/Descriptors.c patch | blob | blame | history
Demos/Device/GenericHID/Descriptors.h patch | blob | blame | history
Demos/Device/Joystick/Descriptors.c patch | blob | blame | history
Demos/Device/Joystick/Descriptors.h patch | blob | blame | history
Demos/Device/Keyboard/Descriptors.c patch | blob | blame | history
Demos/Device/Keyboard/Descriptors.h patch | blob | blame | history
Demos/Device/KeyboardMouse/Descriptors.c patch | blob | blame | history
Demos/Device/KeyboardMouse/Descriptors.h patch | blob | blame | history
Demos/Device/Mouse/Descriptors.c patch | blob | blame | history
Demos/Device/Mouse/Descriptors.h patch | blob | blame | history
Demos/Host/KeyboardHostWithParser/HIDReport.h patch | blob | blame | history
Demos/Host/MouseHostWithParser/HIDReport.h patch | blob | blame | history
Projects/Magstripe/Descriptors.c patch | blob | blame | history
Projects/Magstripe/Descriptors.h patch | blob | blame | history

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index fc7f51c..b1642f1 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalHIDDescriptors    = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r
diff --git a/Bootloaders/TeensyHID/Descriptors.h b/Bootloaders/TeensyHID/Descriptors.h
index 24a0cda..2b84734 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.h
+++ b/Bootloaders/TeensyHID/Descriptors.h
@@ -50,7 +50,7 @@
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
-                       uint8_t                 TotalHIDReports;\r
+                       uint8_t                 TotalHIDDescriptors;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
diff --git a/Demos/Device/GenericHID/Descriptors.c b/Demos/Device/GenericHID/Descriptors.c
index a14fc50..612450c 100644 (file)
--- a/Demos/Device/GenericHID/Descriptors.c
+++ b/Demos/Device/GenericHID/Descriptors.c
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(GenericReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(GenericReport)\r
                },\r
diff --git a/Demos/Device/GenericHID/Descriptors.h b/Demos/Device/GenericHID/Descriptors.h
index 720ddd0..590cea6 100644 (file)
--- a/Demos/Device/GenericHID/Descriptors.h
+++ b/Demos/Device/GenericHID/Descriptors.h
@@ -52,7 +52,7 @@
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
-                       uint8_t                               TotalHIDReports;\r
+                       uint8_t                               TotalReportDescriptors;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
diff --git a/Demos/Device/Joystick/Descriptors.c b/Demos/Device/Joystick/Descriptors.c
index f1cf8d5..1bdce1c 100644 (file)
--- a/Demos/Device/Joystick/Descriptors.c
+++ b/Demos/Device/Joystick/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(JoystickReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(JoystickReport)\r
                },\r
diff --git a/Demos/Device/Joystick/Descriptors.h b/Demos/Device/Joystick/Descriptors.h
index 3463d96..3d56997 100644 (file)
--- a/Demos/Device/Joystick/Descriptors.h
+++ b/Demos/Device/Joystick/Descriptors.h
@@ -52,7 +52,7 @@
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
-                       uint8_t                               TotalHIDReports;\r
+                       uint8_t                               TotalReportDescriptors;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
diff --git a/Demos/Device/Keyboard/Descriptors.c b/Demos/Device/Keyboard/Descriptors.c
index 69300eb..02a5b7c 100644 (file)
--- a/Demos/Device/Keyboard/Descriptors.c
+++ b/Demos/Device/Keyboard/Descriptors.c
@@ -151,7 +151,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
diff --git a/Demos/Device/Keyboard/Descriptors.h b/Demos/Device/Keyboard/Descriptors.h
index aa1bf05..9983797 100644 (file)
--- a/Demos/Device/Keyboard/Descriptors.h
+++ b/Demos/Device/Keyboard/Descriptors.h
@@ -53,7 +53,7 @@
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
-                       uint8_t                 TotalHIDReports;\r
+                       uint8_t                 TotalReportDescriptors;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
diff --git a/Demos/Device/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c
index bcb0bf9..2eb2c6e 100644 (file)
--- a/Demos/Device/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/KeyboardMouse/Descriptors.c
@@ -184,7 +184,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
@@ -231,7 +231,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
diff --git a/Demos/Device/KeyboardMouse/Descriptors.h b/Demos/Device/KeyboardMouse/Descriptors.h
index 5949542..5540f4a 100644 (file)
--- a/Demos/Device/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/KeyboardMouse/Descriptors.h
@@ -53,7 +53,7 @@
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
                        uint16_t                              HIDSpec;\r
                        uint8_t                               CountryCode;\r
                \r
-                       uint8_t                               TotalHIDReports;\r
+                       uint8_t                               TotalReportDescriptors;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
 \r
                        uint8_t                               HIDReportType;\r
                        uint16_t                              HIDReportLength;\r
diff --git a/Demos/Device/Mouse/Descriptors.c b/Demos/Device/Mouse/Descriptors.c
index e58e997..1a2b22a 100644 (file)
--- a/Demos/Device/Mouse/Descriptors.c
+++ b/Demos/Device/Mouse/Descriptors.c
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                                                                         \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalReportDescriptors = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(MouseReport)\r
                },\r
diff --git a/Demos/Device/Mouse/Descriptors.h b/Demos/Device/Mouse/Descriptors.h
index 1fcee72..6385145 100644 (file)
--- a/Demos/Device/Mouse/Descriptors.h
+++ b/Demos/Device/Mouse/Descriptors.h
@@ -52,7 +52,7 @@
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
                        uint16_t                HIDSpec;\r
                        uint8_t                 CountryCode;\r
                \r
-                       uint8_t                 TotalHIDReports;\r
+                       uint8_t                 TotalReportDescriptors;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
 \r
                        uint8_t                 HIDReportType;\r
                        uint16_t                HIDReportLength;\r
diff --git a/Demos/Host/KeyboardHostWithParser/HIDReport.h b/Demos/Host/KeyboardHostWithParser/HIDReport.h
index a128b8e..2096887 100644 (file)
--- 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 */\r
                        uint8_t                  CountryCode; /**< Country code value for localized hardware */\r
                \r
                        uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */\r
                        uint8_t                  CountryCode; /**< Country code value for localized hardware */\r
                \r
-                       uint8_t                  TotalHIDReports; /**< Total number of HID report descriptors in the current interface */\r
+                       uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */\r
 \r
                        uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */\r
                        uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */\r
 \r
                        uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */\r
                        uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */\r
diff --git a/Demos/Host/MouseHostWithParser/HIDReport.h b/Demos/Host/MouseHostWithParser/HIDReport.h
index a4fc76f..b248855 100644 (file)
--- 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 */\r
                        uint8_t                  CountryCode; /**< Country code value for localized hardware */\r
                \r
                        uint16_t                 HIDSpec; /**< Implemented HID class specification, in BCD encoded format */\r
                        uint8_t                  CountryCode; /**< Country code value for localized hardware */\r
                \r
-                       uint8_t                  TotalHIDReports; /**< Total number of HID report descriptors in the current interface */\r
+                       uint8_t                  TotalHIDDescriptors; /**< Total number of HID report descriptors in the current interface */\r
 \r
                        uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */\r
                        uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */\r
 \r
                        uint8_t                  HIDReportType; /**< HID report type of the first HID report descriptor */\r
                        uint16_t                 HIDReportLength; /**< Total size in bytes of the first HID report descriptor */\r
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 1397893..dd6b3fb 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -142,7 +142,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
-                       .TotalHIDReports        = 0x01,\r
+                       .TotalHIDDescriptors    = 1,\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(KeyboardReport)\r
                },\r
diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h
index 2f58545..16299bb 100644 (file)
--- 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 */\r
                        uint8_t                 CountryCode; /**< Country code for the country the HID device is localised for */\r
                \r
                        uint16_t                HIDSpec; /**< HID specification implemented by the device, in BCD form */\r
                        uint8_t                 CountryCode; /**< Country code for the country the HID device is localised for */\r
                \r
-                       uint8_t                 TotalHIDReports; /**< Total number of HID reports linked to this HID interface */\r
+                       uint8_t                 TotalHIDDescriptors; /**< Total number of HID reports linked to this HID interface */\r
 \r
                        uint8_t                 HIDReportType; /**< Type of the first HID report descriptor */\r
                        uint16_t                HIDReportLength; /**< Length of the first HID report descriptor */\r
 \r
                        uint8_t                 HIDReportType; /**< Type of the first HID report descriptor */\r
                        uint16_t                HIDReportLength; /**< Length of the first HID report descriptor */\r
USB isp AVR programmer