Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[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..2c55196 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, 2013.

 
   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 2013  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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


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

-       sei();
+       GlobalInterruptEnable();

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


@@ -57,12 +57,24 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {

+#if (ARCH == ARCH_AVR8)

        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
        /* Disable watchdog if enabled by bootloader/fuses */
        MCUSR &= ~(1 << WDRF);
        wdt_disable();
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

+#elif (ARCH == ARCH_XMEGA)
+       /* Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it */
+       XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, F_CPU);
+       XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL);
+
+       /* Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference */
+       XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
+       XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, F_USB);
+
+       PMIC.CTRL = PMIC_LOLVLEN_bm | PMIC_MEDLVLEN_bm | PMIC_HILVLEN_bm;
+#endif

 
        /* Hardware Initialization */
        LEDs_Init();
 
        /* Hardware Initialization */
        LEDs_Init();


@@ -95,10 +107,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,20 +167,20 @@ 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[1])
 
        if (DataArray[0])
          NewLEDMask |= LEDS_LED1;
 
        if (DataArray[1])

-         NewLEDMask |= LEDS_LED1;
+         NewLEDMask |= LEDS_LED2;

 
        if (DataArray[2])
 
        if (DataArray[2])

-         NewLEDMask |= LEDS_LED1;
+         NewLEDMask |= LEDS_LED3;

 
        if (DataArray[3])
 
        if (DataArray[3])

-         NewLEDMask |= LEDS_LED1;
-         
+         NewLEDMask |= LEDS_LED4;
+

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


@@ -187,7 +197,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 +210,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 +232,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())