Break device mode class driver interfaces into seperate config and state structs...

[pub/USBasp.git] / Demos / Device / ClassDriver / Joystick / Joystick.c

diff --git a/Demos/Device/ClassDriver/Joystick/Joystick.c b/Demos/Device/ClassDriver/Joystick/Joystick.c
index 85f670e..0a1d380 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Joystick.c
+++ b/Demos/Device/ClassDriver/Joystick/Joystick.c
@@ -40,16 +40,22 @@
  *  passed to all HID Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r
  *  passed to all HID Class driver functions, so that multiple instances of the same class\r
  *  within a device can be differentiated from one another.\r
  */\r

-USB_ClassInfo_HID_t Joystick_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Joystick_HID_Interface =\r

        {\r
        {\r

-               .InterfaceNumber         = 0,\r
-\r
-               .ReportINEndpointNumber  = JOYSTICK_EPNUM,\r
-               .ReportINEndpointSize    = JOYSTICK_EPSIZE,\r
-               \r
-               .ReportINBufferSize      = sizeof(USB_JoystickReport_Data_t),\r
-\r
-               .UsingReportProtocol     = true,\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber         = 0,\r
+\r
+                               .ReportINEndpointNumber  = JOYSTICK_EPNUM,\r
+                               .ReportINEndpointSize    = JOYSTICK_EPSIZE,\r
+                               \r
+                               .ReportINBufferSize      = sizeof(USB_JoystickReport_Data_t),\r
+                       },\r
+       \r
+               .State =\r
+                       {\r
+                               // Leave all state values to their defaults\r
+                       }\r

        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
        };\r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -121,8 +127,8 @@ void EVENT_USB_UnhandledControlPacket(void)
 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */\r
 ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
 {\r
 /** ISR to keep track of each millisecond interrupt, for determining the HID class idle period remaining when set. */\r
 ISR(TIMER0_COMPA_vect, ISR_BLOCK)\r
 {\r

-       if (Joystick_HID_Interface.IdleMSRemaining)\r
-         Joystick_HID_Interface.IdleMSRemaining--;\r
+       if (Joystick_HID_Interface.State.IdleMSRemaining)\r
+         Joystick_HID_Interface.State.IdleMSRemaining--;\r

 }\r
 \r
 /** HID class driver callback function for the creation of HID reports to the host.\r
 }\r
 \r
 /** HID class driver callback function for the creation of HID reports to the host.\r


@@ -133,7 +139,7 @@ ISR(TIMER0_COMPA_vect, ISR_BLOCK)
  *\r
  *  \return Number of bytes written in the report (or zero if no report is to be sent\r
  */\r
  *\r
  *  \return Number of bytes written in the report (or zero if no report is to be sent\r
  */\r

-uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r
+uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo, uint8_t* ReportID, void* ReportData)\r

 {\r
        USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;\r
        \r
 {\r
        USB_JoystickReport_Data_t* JoystickReport = (USB_JoystickReport_Data_t*)ReportData;\r
        \r


@@ -166,7 +172,7 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceIn
  *  \param ReportData  Pointer to a buffer where the created report has been stored\r
  *  \param ReportSize  Size in bytes of the received HID report\r
  */\r
  *  \param ReportData  Pointer to a buffer where the created report has been stored\r
  *  \param ReportSize  Size in bytes of the received HID report\r
  */\r

-void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_t* HIDInterfaceInfo, uint8_t ReportID,\r
+void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* HIDInterfaceInfo, uint8_t ReportID,\r

                                           void* ReportData, uint16_t ReportSize)\r
 {\r
        // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r
                                           void* ReportData, uint16_t ReportSize)\r
 {\r
        // Unused (but mandatory for the HID class driver) in this demo, since there are no Host->Device reports\r