More updates to remove architecture-specific comments from the documentation, alter...

[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 96c430a..8b30c46 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/KeyboardMouse.c
@@ -1,21 +1,21 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

   dean [at] fourwalledcubicle [dot] com
   dean [at] fourwalledcubicle [dot] com

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

 */
 
 /*
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
-         
-  Permission to use, copy, modify, distribute, and sell this 
+  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
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -37,10 +37,10 @@
 #include "KeyboardMouse.h"
 
 /** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */
 #include "KeyboardMouse.h"
 
 /** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */

-uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];
+static uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)];

 
 /** Buffer to hold the previously generated Mouse HID report, for comparison purposes inside the HID class driver. */
 
 /** Buffer to hold the previously generated Mouse HID report, for comparison purposes inside the HID class driver. */

-uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)];
+static uint8_t PrevMouseHIDReportBuffer[sizeof(USB_MouseReport_Data_t)];

 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class
 
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class


@@ -61,7 +61,7 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface =
                                .PrevReportINBufferSize       = sizeof(PrevKeyboardHIDReportBuffer),
                        },
        };
                                .PrevReportINBufferSize       = sizeof(PrevKeyboardHIDReportBuffer),
                        },
        };

-       
+

 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another. This is for the mouse HID
 /** LUFA HID Class driver interface configuration and state information. This structure is
  *  passed to all HID Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another. This is for the mouse HID


@@ -78,9 +78,10 @@ USB_ClassInfo_HID_Device_t Mouse_HID_Interface =
 
                                .PrevReportINBuffer           = PrevMouseHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevMouseHIDReportBuffer),
 
                                .PrevReportINBuffer           = PrevMouseHIDReportBuffer,
                                .PrevReportINBufferSize       = sizeof(PrevMouseHIDReportBuffer),

-                       },              
+                       },

        };
 
        };
 

+

 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */
 /** Main program entry point. This routine contains the overall program flow, including initial
  *  setup of all components and the main program loop.
  */


@@ -140,8 +141,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);
 }
 
        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);
 {
        HID_Device_ProcessControlRequest(&Keyboard_HID_Interface);
        HID_Device_ProcessControlRequest(&Mouse_HID_Interface);


@@ -157,7 +158,7 @@ void EVENT_USB_Device_StartOfFrame(void)
 /** HID class driver callback function for the creation of HID reports to the host.
  *
  *  \param[in]     HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced
 /** HID class driver callback function for the creation of HID reports to the host.
  *
  *  \param[in]     HIDInterfaceInfo  Pointer to the HID class interface configuration structure being referenced

- *  \param[in,out] ReportID  Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID
+ *  \param[in,out] ReportID    Report ID requested by the host if non-zero, otherwise callback should set to the generated report ID

  *  \param[in]     ReportType  Type of the report to create, either HID_REPORT_ITEM_In or HID_REPORT_ITEM_Feature
  *  \param[out]    ReportData  Pointer to a buffer where the created report should be stored
  *  \param[out]    ReportSize  Number of bytes written in the report (or zero if no report is to be sent
  *  \param[in]     ReportType  Type of the report to create, either HID_REPORT_ITEM_In or HID_REPORT_ITEM_Feature
  *  \param[out]    ReportData  Pointer to a buffer where the created report should be stored
  *  \param[out]    ReportSize  Number of bytes written in the report (or zero if no report is to be sent


@@ -177,26 +178,26 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)
        {
                USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;
        if (HIDInterfaceInfo == &Keyboard_HID_Interface)
        {
                USB_KeyboardReport_Data_t* KeyboardReport = (USB_KeyboardReport_Data_t*)ReportData;

-               
+

                /* If first board button not being held down, no keyboard report */
                if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
                  return 0;
                /* If first board button not being held down, no keyboard report */
                if (!(ButtonStatus_LCL & BUTTONS_BUTTON1))
                  return 0;

-               
+

                KeyboardReport->Modifier = HID_KEYBOARD_MODIFER_LEFTSHIFT;
 
                if (JoyStatus_LCL & JOY_UP)
                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)
                else if (JoyStatus_LCL & JOY_DOWN)

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

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

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

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

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

 
                if (JoyStatus_LCL & JOY_PRESS)
 
                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;
        }
                *ReportSize = sizeof(USB_KeyboardReport_Data_t);
                return false;
        }


@@ -207,7 +208,7 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
                /* If first board button being held down, no mouse report */
                if (ButtonStatus_LCL & BUTTONS_BUTTON1)
                  return 0;
                /* If first board button being held down, no mouse report */
                if (ButtonStatus_LCL & BUTTONS_BUTTON1)
                  return 0;

-                 
+

                if (JoyStatus_LCL & JOY_UP)
                  MouseReport->Y = -1;
                else if (JoyStatus_LCL & JOY_DOWN)
                if (JoyStatus_LCL & JOY_UP)
                  MouseReport->Y = -1;
                else if (JoyStatus_LCL & JOY_DOWN)


@@ -220,9 +221,9 @@ bool CALLBACK_HID_Device_CreateHIDReport(USB_ClassInfo_HID_Device_t* const HIDIn
 
                if (JoyStatus_LCL & JOY_PRESS)
                  MouseReport->Button |= (1 << 0);
 
                if (JoyStatus_LCL & JOY_PRESS)
                  MouseReport->Button |= (1 << 0);

-               
+

                *ReportSize = sizeof(USB_MouseReport_Data_t);
                *ReportSize = sizeof(USB_MouseReport_Data_t);

-               return true;            
+               return true;

        }
 }
 
        }
 }
 


@@ -247,13 +248,13 @@ void CALLBACK_HID_Device_ProcessHIDReport(USB_ClassInfo_HID_Device_t* const HIDI
 
                if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)
                  LEDMask |= LEDS_LED1;
 
                if (*LEDReport & HID_KEYBOARD_LED_NUMLOCK)
                  LEDMask |= LEDS_LED1;

-               
+

                if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)
                  LEDMask |= LEDS_LED3;
 
                if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)
                  LEDMask |= LEDS_LED4;
                if (*LEDReport & HID_KEYBOARD_LED_CAPSLOCK)
                  LEDMask |= LEDS_LED3;
 
                if (*LEDReport & HID_KEYBOARD_LED_SCROLLLOCK)
                  LEDMask |= LEDS_LED4;

-                 
+

                LEDs_SetAllLEDs(LEDMask);
        }
                LEDs_SetAllLEDs(LEDMask);
        }

-}
\ No newline at end of file
+}