Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Demos / Device / ClassDriver / MassStorageKeyboard / MassStorageKeyboard.c

diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
index a81b4d9..3336b22 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.c
@@ -138,16 +138,16 @@ void EVENT_USB_Device_ConfigurationChanged(void)
 {
        bool ConfigSuccess = true;
 
-       ConfigSuccess &= MS_Device_ConfigureEndpoints(&Disk_MS_Interface);
        ConfigSuccess &= HID_Device_ConfigureEndpoints(&Keyboard_HID_Interface);
+       ConfigSuccess &= MS_Device_ConfigureEndpoints(&Disk_MS_Interface);
 
        USB_Device_EnableSOFEvents();
 
        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)
 {
        MS_Device_ProcessControlRequest(&Disk_MS_Interface);
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
@@ -198,20 +198,20 @@ 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;
 
        if (ButtonStatus_LCL & BUTTONS_BUTTON1)
-         KeyboardReport->KeyCode[0] = 0x09; // F
+         KeyboardReport->KeyCode[0] = HID_KEYBOARD_SC_F;
 
        *ReportSize = sizeof(USB_KeyboardReport_Data_t);
        return false;