Add new Audio Class Driver Host demos.

[pub/USBasp.git] / Demos / Host / LowLevel / MouseHost / MouseHost.c

diff --git a/Demos/Host/LowLevel/MouseHost/MouseHost.c b/Demos/Host/LowLevel/MouseHost/MouseHost.c
index bf20bca..c2c900a 100644 (file)
--- a/Demos/Host/LowLevel/MouseHost/MouseHost.c
+++ b/Demos/Host/LowLevel/MouseHost/MouseHost.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,7 +33,7 @@
  *  Main source file for the MouseHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */
  *  Main source file for the MouseHost demo. This file contains the main tasks of
  *  the demo and is responsible for the initial application hardware configuration.
  */

- 
+

 #include "MouseHost.h"
 
 /** Main program entry point. This routine configures the hardware required by the application, then
 #include "MouseHost.h"
 
 /** Main program entry point. This routine configures the hardware required by the application, then


@@ -64,11 +64,14 @@ void SetupHardware(void)
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);
 
        /* Disable clock division */
        clock_prescale_set(clock_div_1);

-       
+

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


@@ -100,7 +103,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);


@@ -132,9 +135,9 @@ void ReadNextReport(void)
        uint8_t                LEDMask = LEDS_NO_LEDS;
 
        /* Select mouse data pipe */
        uint8_t                LEDMask = LEDS_NO_LEDS;
 
        /* Select mouse data pipe */

-       Pipe_SelectPipe(MOUSE_DATAPIPE);        
+       Pipe_SelectPipe(MOUSE_DATA_IN_PIPE);

 
 

-       /* Unfreeze keyboard data pipe */
+       /* Unfreeze mouse data pipe */

        Pipe_Unfreeze();
 
        /* Check to see if a packet has been received */
        Pipe_Unfreeze();
 
        /* Check to see if a packet has been received */


@@ -142,10 +145,10 @@ void ReadNextReport(void)
        {
                /* No packet received (no movement), turn off LEDs */
                LEDs_SetAllLEDs(LEDS_NO_LEDS);
        {
                /* No packet received (no movement), turn off LEDs */
                LEDs_SetAllLEDs(LEDS_NO_LEDS);

-       
+

                /* Refreeze HID data IN pipe */
                Pipe_Freeze();
                /* Refreeze HID data IN pipe */
                Pipe_Freeze();

-                       
+

                return;
        }
 
                return;
        }
 


@@ -153,14 +156,14 @@ void ReadNextReport(void)
        if (Pipe_IsReadWriteAllowed())
        {
                /* Read in mouse report data */
        if (Pipe_IsReadWriteAllowed())
        {
                /* Read in mouse report data */

-               Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport));                         
+               Pipe_Read_Stream_LE(&MouseReport, sizeof(MouseReport), NULL);

 
                /* Alter status LEDs according to mouse X movement */
                if (MouseReport.X > 0)
                  LEDMask |= LEDS_LED1;
                else if (MouseReport.X < 0)
                  LEDMask |= LEDS_LED2;
 
                /* Alter status LEDs according to mouse X movement */
                if (MouseReport.X > 0)
                  LEDMask |= LEDS_LED1;
                else if (MouseReport.X < 0)
                  LEDMask |= LEDS_LED2;

-                       
+

                /* Alter status LEDs according to mouse Y movement */
                if (MouseReport.Y > 0)
                  LEDMask |= LEDS_LED3;
                /* Alter status LEDs according to mouse Y movement */
                if (MouseReport.Y > 0)
                  LEDMask |= LEDS_LED3;


@@ -170,9 +173,9 @@ void ReadNextReport(void)
                /* Alter status LEDs according to mouse button position */
                if (MouseReport.Button)
                  LEDMask  = LEDS_ALL_LEDS;
                /* Alter status LEDs according to mouse button position */
                if (MouseReport.Button)
                  LEDMask  = LEDS_ALL_LEDS;

-               
+

                LEDs_SetAllLEDs(LEDMask);
                LEDs_SetAllLEDs(LEDMask);

-               
+

                /* Print mouse report data through the serial port */
                printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,
                                                                                                          MouseReport.Y,
                /* Print mouse report data through the serial port */
                printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,
                                                                                                          MouseReport.Y,


@@ -198,7 +201,7 @@ void Mouse_HID_Task(void)
        {
                case HOST_STATE_Addressed:
                        puts_P(PSTR("Getting Config Data.\r\n"));
        {
                case HOST_STATE_Addressed:
                        puts_P(PSTR("Getting Config Data.\r\n"));

-               
+

                        /* Get and process the configuration descriptor data */
                        if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
                        {
                        /* Get and process the configuration descriptor data */
                        if ((ErrorCode = ProcessConfigurationDescriptor()) != SuccessfulConfigRead)
                        {


@@ -208,7 +211,7 @@ void Mouse_HID_Task(void)
                                  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
                                printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);
                                  puts_P(PSTR(ESC_FG_RED "Invalid Device.\r\n"));
 
                                printf_P(PSTR(" -- Error Code: %d\r\n" ESC_FG_WHITE), ErrorCode);

-                               
+

                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 


@@ -225,17 +228,17 @@ void Mouse_HID_Task(void)
 
                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-                               
+

                                /* Wait until USB device disconnected */
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;
                        }
                                /* Wait until USB device disconnected */
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;
                        }

-                       
+

                        /* HID class request to set the mouse protocol to the Boot Protocol */
                        USB_ControlRequest = (USB_Request_Header_t)
                                {
                                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),
                        /* HID class request to set the mouse protocol to the Boot Protocol */
                        USB_ControlRequest = (USB_Request_Header_t)
                                {
                                        .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE),

-                                       .bRequest      = REQ_SetProtocol,
+                                       .bRequest      = HID_REQ_SetProtocol,

                                        .wValue        = 0,
                                        .wIndex        = 0,
                                        .wLength       = 0,
                                        .wValue        = 0,
                                        .wIndex        = 0,
                                        .wLength       = 0,


@@ -252,7 +255,7 @@ void Mouse_HID_Task(void)
 
                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
 
                                /* Indicate error status */
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);

-                               
+

                                /* Wait until USB device disconnected */
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;
                                /* Wait until USB device disconnected */
                                USB_HostState = HOST_STATE_WaitForDeviceRemoval;
                                break;


@@ -269,3 +272,4 @@ void Mouse_HID_Task(void)
                        break;
        }
 }
                        break;
        }
 }

+