Fix broken Pipe stream function templates due to mixed const/no const use in prototypes.

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
index 859845d..5c33eeb 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -42,16 +42,22 @@
  *  within a device can be differentiated from one another. This is for the keyboard HID\r
  *  interface within the device.\r
  */\r
  *  within a device can be differentiated from one another. This is for the keyboard HID\r
  *  interface within the device.\r
  */\r

-USB_ClassInfo_HID_t Keyboard_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =\r

        {\r
        {\r

-               .InterfaceNumber         = 0,\r
-\r
-               .ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,\r
-               .ReportINEndpointSize    = HID_EPSIZE,\r
-               \r
-               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
-\r
-               .IdleCount               = 500,\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber         = 0,\r
+\r
+                               .ReportINEndpointNumber  = KEYBOARD_IN_EPNUM,\r
+                               .ReportINEndpointSize    = HID_EPSIZE,\r
+                               \r
+                               .ReportINBufferSize      = sizeof(USB_KeyboardReport_Data_t),\r
+                       },\r
+\r
+               .State =\r
+                       {\r
+                               .IdleCount               = 500,\r
+                       }\r

        };\r
        \r
 /** LUFA HID Class driver interface configuration and state information. This structure is\r
        };\r
        \r
 /** LUFA HID Class driver interface configuration and state information. This structure is\r


@@ -59,14 +65,22 @@ USB_ClassInfo_HID_t Keyboard_HID_Interface =
  *  within a device can be differentiated from one another. This is for the mouse HID\r
  *  interface within the device.\r
  */\r
  *  within a device can be differentiated from one another. This is for the mouse HID\r
  *  interface within the device.\r
  */\r

-USB_ClassInfo_HID_t Mouse_HID_Interface =\r
+USB_ClassInfo_HID_Device_t Mouse_HID_Interface =\r

        {\r
        {\r

-               .InterfaceNumber         = 0,\r
-\r
-               .ReportINEndpointNumber  = MOUSE_IN_EPNUM,\r
-               .ReportINEndpointSize    = HID_EPSIZE,\r
-\r
-               .ReportINBufferSize      = sizeof(USB_MouseReport_Data_t),\r
+               .Config =\r
+                       {\r
+                               .InterfaceNumber         = 0,\r
+\r
+                               .ReportINEndpointNumber  = MOUSE_IN_EPNUM,\r
+                               .ReportINEndpointSize    = HID_EPSIZE,\r
+\r
+                               .ReportINBufferSize      = sizeof(USB_MouseReport_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


@@ -142,21 +156,22 @@ 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 (Keyboard_HID_Interface.IdleMSRemaining)\r
-         Keyboard_HID_Interface.IdleMSRemaining--;\r
+       if (Keyboard_HID_Interface.State.IdleMSRemaining)\r
+         Keyboard_HID_Interface.State.IdleMSRemaining--;\r

 \r
 \r

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

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

- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
- *  \param ReportData  Pointer to a buffer where the created report should be stored\r
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
+ *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID\r
+ *  \param[out] ReportData  Pointer to a buffer where the created report should be stored\r

  *\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* const HIDInterfaceInfo, uint8_t* const ReportID, void* ReportData)\r

 {\r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r
 {\r
        uint8_t JoyStatus_LCL    = Joystick_GetStatus();\r
        uint8_t ButtonStatus_LCL = Buttons_GetStatus();\r


@@ -211,12 +226,13 @@ uint16_t CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_t* HIDInterfaceIn
 \r
 /** HID class driver callback function for the processing of HID reports from the host.\r
  *\r
 \r
 /** HID class driver callback function for the processing of HID reports from the host.\r
  *\r

- *  \param HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\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
+ *  \param[in] HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced\r
+ *  \param[in] ReportID  Report ID of the received report from the host\r
+ *  \param[in] ReportData  Pointer to a buffer where the created report has been stored\r
+ *  \param[in] ReportSize  Size in bytes of the received HID report\r

  */\r
  */\r

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

 {\r
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
        {\r
 {\r
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)\r
        {\r