USB_IsConnected is now cleared before the USB_Disconnect() event is fired in response...

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

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index a85a378..25d633e 100644 (file)
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -84,7 +84,7 @@ int main(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(USB_Connect)\r
+void EVENT_USB_Connect(void)\r
 {\r
        /* Start USB management task */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
@@ -96,7 +96,7 @@ EVENT_HANDLER(USB_Connect)
 /** 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(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r
 {\r
        /* Stop running HID reporting and USB management tasks */\r
        Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
@@ -108,7 +108,7 @@ EVENT_HANDLER(USB_Disconnect)
 /** 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(USB_ConfigurationChanged)\r
+void EVENT_USB_ConfigurationChanged(void)\r
 {\r
        /* Setup Keyboard Report Endpoint */\r
        Endpoint_ConfigureEndpoint(KEYBOARD_IN_EPNUM, EP_TYPE_INTERRUPT,\r
@@ -133,7 +133,7 @@ EVENT_HANDLER(USB_ConfigurationChanged)
  *  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
-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
        uint8_t* ReportData;\r
        uint8_t  ReportSize;\r
@@ -144,6 +144,8 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                case REQ_GetReport:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
+                               Endpoint_ClearSETUP();\r
+       \r
                                /* Determine if it is the mouse or the keyboard data that is being requested */\r
                                if (!(USB_ControlRequest.wIndex))\r
                                {\r
@@ -156,8 +158,6 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                                        ReportSize = sizeof(MouseReportData);\r
                                }\r
 \r
-                               Endpoint_ClearSETUP();\r
-       \r
                                /* Write the report data to the control endpoint */\r
                                Endpoint_Write_Control_Stream_LE(ReportData, ReportSize);\r
 \r
@@ -240,8 +240,8 @@ TASK(USB_Keyboard)
 {\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
-       /* Check if HWB is not pressed, if so mouse mode enabled */\r
-       if (!(HWB_GetStatus()))\r
+       /* Check if board button is not pressed, if so mouse mode enabled */\r
+       if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))\r
        {\r
                if (JoyStatus_LCL & JOY_UP)\r
                  KeyboardReportData.KeyCode[0] = 0x04; // A\r
@@ -311,8 +311,8 @@ TASK(USB_Mouse)
 {\r
        uint8_t JoyStatus_LCL = Joystick_GetStatus();\r
 \r
-       /* Check if HWB is pressed, if so mouse mode enabled */\r
-       if (HWB_GetStatus())\r
+       /* Check if board button is pressed, if so mouse mode enabled */\r
+       if (Buttons_GetStatus() & BUTTONS_BUTTON1)\r
        {\r
                if (JoyStatus_LCL & JOY_UP)\r
                  MouseReportData.Y =  1;\r