Altered all endpoint/pipe stream transfers so that the new BytesProcessed parameter...

[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 245bf07..c198c0d 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   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)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -140,8 +140,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
-/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the library USB Control Request reception event. */
+void EVENT_USB_Device_ControlRequest(void)
 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
        HID_Device_ProcessControlRequest(&Mouse_HID_Interface);
@@ -185,17 +185,17 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
                if (JoyStatus_LCL & JOY_UP)
-                 KeyboardReport->KeyCode[0] = 0x04; // A
+                 KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_A;
                else if (JoyStatus_LCL & JOY_DOWN)
-                 KeyboardReport->KeyCode[0] = 0x05; // B
+                 KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_B;
 
                if (JoyStatus_LCL & JOY_LEFT)
-                 KeyboardReport->KeyCode[0] = 0x06; // C
+                 KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_C;
                else if (JoyStatus_LCL & JOY_RIGHT)
-                 KeyboardReport->KeyCode[0] = 0x07; // D
+                 KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_D;
 
                if (JoyStatus_LCL & JOY_PRESS)
-                 KeyboardReport->KeyCode[0] = 0x08; // E
+                 KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_E;
 
                *ReportSize = sizeof(USB_KeyboardReport_Data_t);
                return false;