Fix incorrect macro guard in the UC3 EndpointStream header file.

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

diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
index ef7835e..8fd49f2 100644 (file)
--- a/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/MouseHostWithParser.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)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  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


@@ -33,11 +33,11 @@
  *  Main source file for the MouseHostWithParser demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  *  Main source file for the MouseHostWithParser demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */

- 
+

 #include "MouseHostWithParser.h"
 
 /** Processed HID report descriptor items structure, containing information on each HID report element */
 #include "MouseHostWithParser.h"
 
 /** Processed HID report descriptor items structure, containing information on each HID report element */

-HID_ReportInfo_t HIDReportInfo;
+static HID_ReportInfo_t HIDReportInfo;

 
 /** 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


@@ -52,14 +52,14 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Interface =
 
                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,
 
                                .DataOUTPipeNumber      = 2,
                                .DataOUTPipeDoubleBank  = false,

-                               
-                               .HIDInterfaceProtocol   = HID_NON_BOOT_PROTOCOL,
-                               
+
+                               .HIDInterfaceProtocol   = HID_CSCP_NonBootProtocol,
+

                                .HIDParserData          = &HIDReportInfo
                        },
        };
 
                                .HIDParserData          = &HIDReportInfo
                        },
        };
 

-       
+

 /** 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.
  */


@@ -78,7 +78,7 @@ int main(void)
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
                {
                        case HOST_STATE_Addressed:
                                LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

-                       
+

                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 
                                uint16_t ConfigDescriptorSize;
                                uint8_t  ConfigDescriptorData[512];
 


@@ -99,7 +99,7 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }

-                               
+

                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));
                                if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
                                {
                                        puts_P(PSTR("Error Setting Device Configuration.\r\n"));


@@ -115,7 +115,7 @@ int main(void)
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }
                                        USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                        break;
                                }

-                               
+

                                puts_P(PSTR("Mouse Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;
                                puts_P(PSTR("Mouse Enumerated.\r\n"));
                                LEDs_SetAllLEDs(LEDMASK_USB_READY);
                                USB_HostState = HOST_STATE_Configured;


@@ -131,53 +131,50 @@ int main(void)
                                        for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)
                                        {
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];
                                        for (uint8_t ReportNumber = 0; ReportNumber < HIDReportInfo.TotalReportItems; ReportNumber++)
                                        {
                                                HID_ReportItem_t* ReportItem = &HIDReportInfo.ReportItems[ReportNumber];

-                                               
+

                                                /* Update the report item value if it is contained within the current report */
                                                if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
                                                  continue;
                                                /* Update the report item value if it is contained within the current report */
                                                if (!(USB_GetHIDReportItemInfo(MouseReport, ReportItem)))
                                                  continue;

-                                               
+

                                                /* Determine what report item is being tested, process updated value as needed */
                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&
                                                /* Determine what report item is being tested, process updated value as needed */
                                                if ((ReportItem->Attributes.Usage.Page        == USAGE_PAGE_BUTTON) &&

-                                                       (ReportItem->ItemType                     == REPORT_ITEM_TYPE_In))
+                                                       (ReportItem->ItemType                     == HID_REPORT_ITEM_In))

                                                {
                                                        if (ReportItem->Value)
                                                          LEDMask = LEDS_ALL_LEDS;
                                                }
                                                else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
                                                                 (ReportItem->Attributes.Usage.Usage  == USAGE_SCROLL_WHEEL)       &&
                                                {
                                                        if (ReportItem->Value)
                                                          LEDMask = LEDS_ALL_LEDS;
                                                }
                                                else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
                                                                 (ReportItem->Attributes.Usage.Usage  == USAGE_SCROLL_WHEEL)       &&

-                                                                (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
+                                                                (ReportItem->ItemType                == HID_REPORT_ITEM_In))

                                                {
                                                        int16_t WheelDelta = HID_ALIGN_DATA(ReportItem, int16_t);
                                                {
                                                        int16_t WheelDelta = HID_ALIGN_DATA(ReportItem, int16_t);

-                                                       
+

                                                        if (WheelDelta)
                                                          LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));
                                                }
                                                else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
                                                                 ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&
                                                        if (WheelDelta)
                                                          LEDMask = (LEDS_LED1 | LEDS_LED2 | ((WheelDelta > 0) ? LEDS_LED3 : LEDS_LED4));
                                                }
                                                else if ((ReportItem->Attributes.Usage.Page   == USAGE_PAGE_GENERIC_DCTRL) &&
                                                                 ((ReportItem->Attributes.Usage.Usage == USAGE_X)                  ||
                                                                  (ReportItem->Attributes.Usage.Usage == USAGE_Y))                 &&

-                                                                (ReportItem->ItemType                == REPORT_ITEM_TYPE_In))
+                                                                (ReportItem->ItemType                == HID_REPORT_ITEM_In))

                                                {
                                                        int16_t DeltaMovement = HID_ALIGN_DATA(ReportItem, int16_t);
                                                {
                                                        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);
                                                        }
                                                }
                                        }

-                                       
+

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

-                               
+

                                break;
                }
                                break;
                }

-       
+

                HID_Host_USBTask(&Mouse_HID_Interface);
                USB_USBTask();
        }
                HID_Host_USBTask(&Mouse_HID_Interface);
                USB_USBTask();
        }


@@ -194,9 +191,12 @@ void SetupHardware(void)
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */
        clock_prescale_set(clock_div_1);
 
        /* Hardware Initialization */

-       SerialStream_Init(9600, false);
+       Serial_Init(9600, false);

        LEDs_Init();
        USB_Init();
        LEDs_Init();
        USB_Init();

+
+       /* Create a stdio stream for the serial port for stdin and stdout */
+       Serial_CreateStream(NULL);

 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and
 }
 
 /** Event handler for the USB_DeviceAttached event. This indicates that a device has been attached to the host, and


@@ -228,7 +228,7 @@ void EVENT_USB_Host_DeviceEnumerationComplete(void)
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {
 /** Event handler for the USB_HostError event. This indicates that a hardware error occurred while in host mode. */
 void EVENT_USB_Host_HostError(const uint8_t ErrorCode)
 {

-       USB_ShutDown();
+       USB_Disable();

 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);
 
        printf_P(PSTR(ESC_FG_RED "Host Mode Error\r\n"
                                 " -- Error Code %d\r\n" ESC_FG_WHITE), ErrorCode);


@@ -240,13 +240,14 @@ 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"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
 {
        printf_P(PSTR(ESC_FG_RED "Dev Enum Error\r\n"
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);

-       
+

        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 
        LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 }
 


@@ -259,7 +260,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 IsMouse = false;
 
 {
        bool IsMouse = false;
 


@@ -288,3 +289,4 @@ bool CALLBACK_HIDParser_FilterHIDReportItem(HID_ReportItem_t* CurrentItem)
        return ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||
                (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));
 }
        return ((CurrentItem->Attributes.Usage.Page == USAGE_PAGE_BUTTON) ||
                (CurrentItem->Attributes.Usage.Page == USAGE_PAGE_GENERIC_DCTRL));
 }

+