Seperate out XMEGA and TINY NVM routines into seperate files.

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

diff --git a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
index c60f08f..9bd9268 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -37,15 +37,15 @@
  \r
 #include "KeyboardMouse.h"\r
 \r
  \r
 #include "KeyboardMouse.h"\r
 \r

-/* Global Variables */\r

 /** Global structure to hold the current keyboard interface HID report, for transmission to the host */\r
 USB_KeyboardReport_Data_t KeyboardReportData;\r
 \r
 /** Global structure to hold the current mouse interface HID report, for transmission to the host */\r
 USB_MouseReport_Data_t    MouseReportData;\r
 \r
 /** Global structure to hold the current keyboard interface HID report, for transmission to the host */\r
 USB_KeyboardReport_Data_t KeyboardReportData;\r
 \r
 /** Global structure to hold the current mouse interface HID report, for transmission to the host */\r
 USB_MouseReport_Data_t    MouseReportData;\r
 \r

+\r

 /** Main program entry point. This routine configures the hardware required by the application, then\r
 /** Main program entry point. This routine configures the hardware required by the application, then\r

- *  starts the scheduler to run the USB management task.\r
+ *  enters a loop to run the application tasks in sequence.\r

  */\r
 int main(void)\r
 {\r
  */\r
 int main(void)\r
 {\r


@@ -80,7 +80,7 @@ void SetupHardware(void)
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
  *  starts the library USB task to begin the enumeration and USB management process.\r
  */\r

-void EVENT_USB_Connect(void)\r
+void EVENT_USB_Device_Connect(void)\r

 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 {\r
        /* Indicate USB enumerating */\r
        LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r


@@ -89,7 +89,7 @@ void EVENT_USB_Connect(void)
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops the USB management task.\r
  */\r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops the USB management task.\r
  */\r

-void EVENT_USB_Disconnect(void)\r
+void EVENT_USB_Device_Disconnect(void)\r

 {\r
        /* Indicate USB not ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 {\r
        /* Indicate USB not ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r


@@ -98,7 +98,7 @@ void EVENT_USB_Disconnect(void)
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration, and configures the keyboard and mouse device endpoints.\r
  */\r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host sets the current configuration\r
  *  of the USB device after enumeration, and configures the keyboard and mouse device endpoints.\r
  */\r

-void EVENT_USB_ConfigurationChanged(void)\r
+void EVENT_USB_Device_ConfigurationChanged(void)\r

 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 {\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r


@@ -132,7 +132,7 @@ void EVENT_USB_ConfigurationChanged(void)
  *  control requests that are not handled internally by the USB library (including the HID commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r
  *  control requests that are not handled internally by the USB library (including the HID commands, which are\r
  *  all issued via the control endpoint), so that they can be handled appropriately for the application.\r
  */\r

-void EVENT_USB_UnhandledControlPacket(void)\r
+void EVENT_USB_Device_UnhandledControlRequest(void)\r

 {\r
        uint8_t* ReportData;\r
        uint8_t  ReportSize;\r
 {\r
        uint8_t* ReportData;\r
        uint8_t  ReportSize;\r


@@ -174,7 +174,11 @@ void EVENT_USB_UnhandledControlPacket(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Wait until the LED report has been sent by the host */\r
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Wait until the LED report has been sent by the host */\r

-                               while (!(Endpoint_IsOUTReceived()));\r
+                               while (!(Endpoint_IsOUTReceived()))\r
+                               {\r
+                                       if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                                         return;\r
+                               }\r

 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r
 \r
                                /* Read in the LED report from the host */\r
                                uint8_t LEDStatus = Endpoint_Read_Byte();\r


@@ -195,9 +199,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                /* Clear the endpoint data */\r
                                Endpoint_ClearOUT();\r
 \r
                                /* Clear the endpoint data */\r
                                Endpoint_ClearOUT();\r
 \r

-                               /* Acknowledge status stage */\r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -213,7 +215,7 @@ void Keyboard_HID_Task(void)
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
        /* Device must be connected and configured for the task to run */\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
        /* Device must be connected and configured for the task to run */\r

-       if (!(USB_IsConnected) || !(USB_ConfigurationNumber))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r

          return;\r
 \r
        /* Check if board button is not pressed, if so mouse mode enabled */\r
          return;\r
 \r
        /* Check if board button is not pressed, if so mouse mode enabled */\r


@@ -284,7 +286,7 @@ void Mouse_HID_Task(void)
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
        /* Device must be connected and configured for the task to run */\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
        /* Device must be connected and configured for the task to run */\r

-       if (!(USB_IsConnected) || !(USB_ConfigurationNumber))\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r

          return;\r
 \r
        /* Check if board button is pressed, if so mouse mode enabled */\r
          return;\r
 \r
        /* Check if board button is pressed, if so mouse mode enabled */\r