Whitespace corrections.

[pub/USBasp.git] / Demos / Host / ClassDriver / JoystickHostWithParser / JoystickHostWithParser.c

diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
index 8f0b405..8420d05 100644 (file)
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/JoystickHostWithParser.c
@@ -148,16 +148,13 @@ int main(void)
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
                                                {
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&
                                                                 (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
                                                {

-                                                       int16_t DeltaMovement = (int16_t)(ReportItem->Value << (16 - ReportItem->Attributes.BitSize));
+                                                       int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);

                                                        
                                                        

-                                                       if (ReportItem->Attributes.Usage.Usage == USAGE_X)
+                                                       if (DeltaMovement)

                                                        {
                                                        {

-                                                               if (DeltaMovement)
+                                                               if (ReportItem->Attributes.Usage.Usage == USAGE_X)

                                                                  LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);
                                                                  LEDMask |= ((DeltaMovement > 0) ? LEDS_LED1 : LEDS_LED2);

-                                                       }
-                                                       else
-                                                       {
-                                                               if (DeltaMovement)
+                                                               else

                                                                  LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
                                                        }
                                                }
                                                                  LEDMask |= ((DeltaMovement > 0) ? LEDS_LED3 : LEDS_LED4);
                                                        }
                                                }


@@ -231,7 +228,8 @@ void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
  *  enumerating an attached USB device.
  */
 /** Event handler for the USB_DeviceEnumerationFailed event. This indicates that a problem occurred while
  *  enumerating an attached USB device.
  */

-void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8_t SubErrorCode)
+void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
+                                            const uint8_t SubErrorCode)

 {
        printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
                                 " -- Error Code %d\r\n"
 {
        printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
                                 " -- Error Code %d\r\n"


@@ -250,7 +248,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode, const uint8
  *
  *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded
  */
  *
  *  \return Boolean true if the item should be stored into the HID report structure, false if it should be discarded
  */

-bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)
+bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* const CurrentItem)

 {
        bool IsJoystick = false;
 
 {
        bool IsJoystick = false;