Fix up the StaticAnalysis build test so that it does not report invalid configurations.

[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 ff3249d..c36c33f 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, 2010.
+     Copyright (C) Dean Camera, 2012.

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

-  Copyright 2010  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


@@ -36,9 +36,6 @@
 
 #include "GenericHID.h"
 
 
 #include "GenericHID.h"
 

-/** Static buffer to hold the last received report from the host, so that it can be echoed back in the next sent report */
-static uint8_t LastReceived[GENERIC_REPORT_SIZE];
-

 
 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.
 
 /** Main program entry point. This routine configures the hardware required by the application, then
  *  enters a loop to run the application tasks in sequence.


@@ -98,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);


@@ -139,7 +134,7 @@ void EVENT_USB_Device_ControlRequest(void)
 
                                /* Read the report data from the control endpoint */
                                Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));
 
                                /* Read the report data from the control endpoint */
                                Endpoint_Read_Control_Stream_LE(&GenericData, sizeof(GenericData));

-                               Endpoint_ClearOUT();
+                               Endpoint_ClearIN();

 
                                ProcessGenericHIDReport(GenericData);
                        }
 
                                ProcessGenericHIDReport(GenericData);
                        }


@@ -148,20 +143,33 @@ void EVENT_USB_Device_ControlRequest(void)
        }
 }
 
        }
 }
 

-/** Function to process the lest received report from the host.
+/** Function to process the last received report from the host.

  *
  *

- *  \param[in] DataArray  Pointer to a buffer where the last report data is stored
+ *  \param[in] DataArray  Pointer to a buffer where the last received report has been stored

  */
 void ProcessGenericHIDReport(uint8_t* DataArray)
 {
        /*
  */
 void ProcessGenericHIDReport(uint8_t* DataArray)
 {
        /*

-               This is where you need to process the reports being sent from the host to the device.
-               DataArray is an array holding the last report from the host. This function is called
-               each time the host has sent a report to the device.
+               This is where you need to process reports sent from the host to the device. This
+               function is called each time the host has sent a new report. DataArray is an array
+               holding the report sent from the host.

        */
 
        */
 

-       for (uint8_t i = 0; i < GENERIC_REPORT_SIZE; i++)
-         LastReceived[i] = DataArray[i];
+       uint8_t NewLEDMask = LEDS_NO_LEDS;
+
+       if (DataArray[0])
+         NewLEDMask |= LEDS_LED1;
+
+       if (DataArray[1])
+         NewLEDMask |= LEDS_LED1;
+
+       if (DataArray[2])
+         NewLEDMask |= LEDS_LED1;
+
+       if (DataArray[3])
+         NewLEDMask |= LEDS_LED1;
+
+       LEDs_SetAllLEDs(NewLEDMask);

 }
 
 /** Function to create the next report to send back to the host at the next reporting interval.
 }
 
 /** Function to create the next report to send back to the host at the next reporting interval.


@@ -176,8 +184,12 @@ void CreateGenericHIDReport(uint8_t* DataArray)
                an array to hold the report to the host.
        */
 
                an array to hold the report to the host.
        */
 

-       for (uint8_t i = 0; i < GENERIC_REPORT_SIZE; i++)
-         DataArray[i] = LastReceived[i];
+       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[3] = ((CurrLEDMask & LEDS_LED4) ? 1 : 0);

 }
 
 void HID_Task(void)
 }
 
 void HID_Task(void)


@@ -186,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())


@@ -198,7 +210,7 @@ void HID_Task(void)
                        uint8_t GenericData[GENERIC_REPORT_SIZE];
 
                        /* Read Generic Report Data */
                        uint8_t GenericData[GENERIC_REPORT_SIZE];
 
                        /* Read Generic Report Data */

-                       Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData));
+                       Endpoint_Read_Stream_LE(&GenericData, sizeof(GenericData), NULL);

 
                        /* Process Generic Report Data */
                        ProcessGenericHIDReport(GenericData);
 
                        /* Process Generic Report Data */
                        ProcessGenericHIDReport(GenericData);


@@ -208,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())


@@ -220,7 +232,7 @@ void HID_Task(void)
                CreateGenericHIDReport(GenericData);
 
                /* Write Generic Report Data */
                CreateGenericHIDReport(GenericData);
 
                /* Write Generic Report Data */

-               Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData));
+               Endpoint_Write_Stream_LE(&GenericData, sizeof(GenericData), NULL);

 
                /* Finalize the stream transfer to send the last packet */
                Endpoint_ClearIN();
 
                /* Finalize the stream transfer to send the last packet */
                Endpoint_ClearIN();