Fix flip-ee DFU build target accidentally erasing the target FLASH memory space.

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

diff --git a/Demos/Device/LowLevel/GenericHID/GenericHID.c b/Demos/Device/LowLevel/GenericHID/GenericHID.c
index 69c4176..bcb90b9 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/GenericHID.c
+++ b/Demos/Device/LowLevel/GenericHID/GenericHID.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

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


@@ -45,7 +45,7 @@ int main(void)
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        SetupHardware();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

-       sei();
+       GlobalInterruptEnable();

 
        for (;;)
        {
 
        for (;;)
        {


@@ -95,10 +95,8 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        bool ConfigSuccess = true;
 
        /* Setup HID Report Endpoints */
        bool ConfigSuccess = true;
 
        /* Setup HID Report Endpoints */

-       ConfigSuccess &= Endpoint_ConfigureEndpoint(GENERIC_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
-                                                   GENERIC_EPSIZE, ENDPOINT_BANK_SINGLE);
-       ConfigSuccess &= Endpoint_ConfigureEndpoint(GENERIC_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT,
-                                                   GENERIC_EPSIZE, ENDPOINT_BANK_SINGLE);
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(GENERIC_IN_EPADDR, EP_TYPE_INTERRUPT, GENERIC_EPSIZE, 1);
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(GENERIC_OUT_EPADDR, EP_TYPE_INTERRUPT, GENERIC_EPSIZE, 1);

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


@@ -157,7 +155,7 @@ void ProcessGenericHIDReport(uint8_t* DataArray)
                holding the report sent from the host.
        */
 
                holding the report sent from the host.
        */
 

-       uint8_t NewLEDMask = LEDS_NO_LEDS;      
+       uint8_t NewLEDMask = LEDS_NO_LEDS;

 
        if (DataArray[0])
          NewLEDMask |= LEDS_LED1;
 
        if (DataArray[0])
          NewLEDMask |= LEDS_LED1;


@@ -170,7 +168,7 @@ void ProcessGenericHIDReport(uint8_t* DataArray)
 
        if (DataArray[3])
          NewLEDMask |= LEDS_LED1;
 
        if (DataArray[3])
          NewLEDMask |= LEDS_LED1;

-         
+

        LEDs_SetAllLEDs(NewLEDMask);
 }
 
        LEDs_SetAllLEDs(NewLEDMask);
 }
 


@@ -187,7 +185,7 @@ void CreateGenericHIDReport(uint8_t* DataArray)
        */
 
        uint8_t CurrLEDMask = LEDs_GetLEDs();
        */
 
        uint8_t CurrLEDMask = LEDs_GetLEDs();

-               
+

        DataArray[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
        DataArray[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0);
        DataArray[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);
        DataArray[0] = ((CurrLEDMask & LEDS_LED1) ? 1 : 0);
        DataArray[1] = ((CurrLEDMask & LEDS_LED2) ? 1 : 0);
        DataArray[2] = ((CurrLEDMask & LEDS_LED3) ? 1 : 0);


@@ -200,7 +198,7 @@ void HID_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 

-       Endpoint_SelectEndpoint(GENERIC_OUT_EPNUM);
+       Endpoint_SelectEndpoint(GENERIC_OUT_EPADDR);

 
        /* Check to see if a packet has been sent from the host */
        if (Endpoint_IsOUTReceived())
 
        /* Check to see if a packet has been sent from the host */
        if (Endpoint_IsOUTReceived())


@@ -222,7 +220,7 @@ void HID_Task(void)
                Endpoint_ClearOUT();
        }
 
                Endpoint_ClearOUT();
        }
 

-       Endpoint_SelectEndpoint(GENERIC_IN_EPNUM);
+       Endpoint_SelectEndpoint(GENERIC_IN_EPADDR);

 
        /* Check to see if the host is ready to accept another packet */
        if (Endpoint_IsINReady())
 
        /* Check to see if the host is ready to accept another packet */
        if (Endpoint_IsINReady())