Update UC3 platform driver support to use the bitmasks defined in the header files...

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

diff --git a/Demos/Device/LowLevel/Keyboard/Keyboard.c b/Demos/Device/LowLevel/Keyboard/Keyboard.c
index e490f51..2d5e366 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Keyboard.c
+++ b/Demos/Device/LowLevel/Keyboard/Keyboard.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   Copyright 2010  Denver Gingerich (denver [at] ossguy [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this


@@ -40,18 +40,18 @@
 /** Indicates what report mode the host has requested, true for normal HID reporting mode, false for special boot
  *  protocol reporting mode.
  */
 /** Indicates what report mode the host has requested, true for normal HID reporting mode, false for special boot
  *  protocol reporting mode.
  */

-bool UsingReportProtocol = true;
+static bool UsingReportProtocol = true;

 
 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports
  *  for either the entire idle duration, or until the report status changes (e.g. the user presses a key).
  */
 
 /** Current Idle period. This is set by the host via a Set Idle HID class request to silence the device's reports
  *  for either the entire idle duration, or until the report status changes (e.g. the user presses a key).
  */

-uint16_t IdleCount = 500;
+static uint16_t IdleCount = 500;

 
 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle
  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request
  *  the current idle period via a Get Idle HID class request, thus its value must be preserved.
  */
 
 /** Current Idle period remaining. When the IdleCount value is set, this tracks the remaining number of idle
  *  milliseconds. This is separate to the IdleCount timer and is incremented and compared as the host may request
  *  the current idle period via a Get Idle HID class request, thus its value must be preserved.
  */

-uint16_t IdleMSRemaining = 0;
+static uint16_t IdleMSRemaining = 0;

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


@@ -122,18 +122,18 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT,
                                                    KEYBOARD_EPSIZE, ENDPOINT_BANK_SINGLE);
 
        ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT,
                                                    KEYBOARD_EPSIZE, ENDPOINT_BANK_SINGLE);
 

-       /* Turn on Start-of-Frame events for tracking HID report period exiry */
+       /* Turn on Start-of-Frame events for tracking HID report period expiry */

        USB_Device_EnableSOFEvents();
 
        /* Indicate endpoint configuration success or failure */
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
        USB_Device_EnableSOFEvents();
 
        /* Indicate endpoint configuration success or failure */
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 

-/** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific
- *  control requests that are not handled internally by the USB library (including the HID commands, which are
- *  all issued via the control endpoint), so that they can be handled appropriately for the application.
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ *  the device from the USB host before passing along unhandled control requests to the library for processing
+ *  internally.

  */
  */

-void EVENT_USB_Device_UnhandledControlRequest(void)
+void EVENT_USB_Device_ControlRequest(void)

 {
        /* Handle HID Class specific requests */
        switch (USB_ControlRequest.bRequest)
 {
        /* Handle HID Class specific requests */
        switch (USB_ControlRequest.bRequest)


@@ -167,7 +167,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                }
 
                                /* Read in the LED report from the host */
                                }
 
                                /* Read in the LED report from the host */

-                               uint8_t LEDStatus = Endpoint_Read_Byte();
+                               uint8_t LEDStatus = Endpoint_Read_8();

 
                                Endpoint_ClearOUT();
                                Endpoint_ClearStatusStage();
 
                                Endpoint_ClearOUT();
                                Endpoint_ClearStatusStage();


@@ -183,7 +183,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();
 
                                /* Write the current protocol flag to the host */
                                Endpoint_ClearSETUP();
 
                                /* Write the current protocol flag to the host */

-                               Endpoint_Write_Byte(UsingReportProtocol);
+                               Endpoint_Write_8(UsingReportProtocol);

 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();
 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();


@@ -218,7 +218,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();
 
                                /* Write the current idle duration to the host, must be divided by 4 before sent to host */
                                Endpoint_ClearSETUP();
 
                                /* Write the current idle duration to the host, must be divided by 4 before sent to host */

-                               Endpoint_Write_Byte(IdleCount >> 2);
+                               Endpoint_Write_8(IdleCount >> 2);

 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();
 
                                Endpoint_ClearIN();
                                Endpoint_ClearStatusStage();


@@ -254,20 +254,20 @@ void CreateKeyboardReport(USB_KeyboardReport_Data_t* const ReportData)
        ReportData->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
        if (JoyStatus_LCL & JOY_UP)
        ReportData->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
        if (JoyStatus_LCL & JOY_UP)

-         ReportData->KeyCode[UsedKeyCodes++] = 0x04; // A
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_A;

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

-         ReportData->KeyCode[UsedKeyCodes++] = 0x05; // B
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_B;

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

-         ReportData->KeyCode[UsedKeyCodes++] = 0x06; // C
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_C;

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

-         ReportData->KeyCode[UsedKeyCodes++] = 0x07; // D
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_D;

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

-         ReportData->KeyCode[UsedKeyCodes++] = 0x08; // E
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_E;

 
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)
 
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)

-         ReportData->KeyCode[UsedKeyCodes++] = 0x09; // F
+         ReportData->KeyCode[UsedKeyCodes++] = HID_KEYBOARD_SC_F;

 }
 
 /** Processes a received LED report, and updates the board LEDs states to match.
 }
 
 /** Processes a received LED report, and updates the board LEDs states to match.


@@ -324,7 +324,7 @@ void SendNextReport(void)
                PrevKeyboardReportData = KeyboardReportData;
 
                /* Write Keyboard Report Data */
                PrevKeyboardReportData = KeyboardReportData;
 
                /* Write Keyboard Report Data */

-               Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));
+               Endpoint_Write_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData), NULL);

 
                /* Finalize the stream transfer to send the last packet */
                Endpoint_ClearIN();
 
                /* Finalize the stream transfer to send the last packet */
                Endpoint_ClearIN();


@@ -344,7 +344,7 @@ void ReceiveNextReport(void)
                if (Endpoint_IsReadWriteAllowed())
                {
                        /* Read in the LED report from the host */
                if (Endpoint_IsReadWriteAllowed())
                {
                        /* Read in the LED report from the host */

-                       uint8_t LEDReport = Endpoint_Read_Byte();
+                       uint8_t LEDReport = Endpoint_Read_8();

 
                        /* Process the read LED report from the host */
                        ProcessLEDReport(LEDReport);
 
                        /* Process the read LED report from the host */
                        ProcessLEDReport(LEDReport);