Added new Pipe_GetBusyBanks(), Endpoint_GetBusyBanks() and Endpoint_AbortPendingIN...

[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 6789573..c54bb15 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/KeyboardMouse.c
@@ -3,7 +3,7 @@
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com
      Copyright (C) Dean Camera, 2010.
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com
+           www.lufa-lib.org

 */
 
 /*
 */
 
 /*


@@ -129,7 +129,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
        /* Handle HID Class specific requests */
        switch (USB_ControlRequest.bRequest)
        {
        /* Handle HID Class specific requests */
        switch (USB_ControlRequest.bRequest)
        {

-               case REQ_GetReport:
+               case HID_REQ_GetReport:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();


@@ -155,7 +155,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                        }
 
                        break;
                        }
 
                        break;

-               case REQ_SetReport:
+               case HID_REQ_SetReport:

                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))
                        {
                                Endpoint_ClearSETUP();


@@ -190,13 +190,13 @@ void Keyboard_ProcessLEDReport(const uint8_t LEDStatus)
 {
        uint8_t LEDMask = LEDS_LED2;
 
 {
        uint8_t LEDMask = LEDS_LED2;
 

-       if (LEDStatus & KEYBOARD_LED_NUMLOCK)
+       if (LEDStatus & HID_KEYBOARD_LED_NUMLOCK)

          LEDMask |= LEDS_LED1;
 
          LEDMask |= LEDS_LED1;
 

-       if (LEDStatus & KEYBOARD_LED_CAPSLOCK)
+       if (LEDStatus & HID_KEYBOARD_LED_CAPSLOCK)

          LEDMask |= LEDS_LED3;
 
          LEDMask |= LEDS_LED3;
 

-       if (LEDStatus & KEYBOARD_LED_SCROLLLOCK)
+       if (LEDStatus & HID_KEYBOARD_LED_SCROLLLOCK)

          LEDMask |= LEDS_LED4;
 
        /* Set the status LEDs to the current Keyboard LED status */
          LEDMask |= LEDS_LED4;
 
        /* Set the status LEDs to the current Keyboard LED status */


@@ -219,20 +219,20 @@ void Keyboard_HID_Task(void)
        if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
        {
                /* Make sent key uppercase by indicating that the left shift key is pressed */
        if (!(Buttons_GetStatus() & BUTTONS_BUTTON1))
        {
                /* Make sent key uppercase by indicating that the left shift key is pressed */

-               KeyboardReportData.Modifier = KEYBOARD_MODIFER_LEFTSHIFT;
+               KeyboardReportData.Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;

 
                if (JoyStatus_LCL & JOY_UP)
 
                if (JoyStatus_LCL & JOY_UP)

-                 KeyboardReportData.KeyCode[0] = 0x04; // A
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_A;

                else if (JoyStatus_LCL & JOY_DOWN)
                else if (JoyStatus_LCL & JOY_DOWN)

-                 KeyboardReportData.KeyCode[0] = 0x05; // B
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_B;

 
                if (JoyStatus_LCL & JOY_LEFT)
 
                if (JoyStatus_LCL & JOY_LEFT)

-                 KeyboardReportData.KeyCode[0] = 0x06; // C
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_C;

                else if (JoyStatus_LCL & JOY_RIGHT)
                else if (JoyStatus_LCL & JOY_RIGHT)

-                 KeyboardReportData.KeyCode[0] = 0x07; // D
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_D;

 
                if (JoyStatus_LCL & JOY_PRESS)
 
                if (JoyStatus_LCL & JOY_PRESS)

-                 KeyboardReportData.KeyCode[0] = 0x08; // E
+                 KeyboardReportData.KeyCode[0] = HID_KEYBOARD_SC_E;

        }
 
        /* Select the Keyboard Report Endpoint */
        }
 
        /* Select the Keyboard Report Endpoint */