Update UC3 platform driver support to use the bitmasks defined in the header files...

[pub/USBasp.git] / Demos / DualRole / ClassDriver / MouseHostDevice / MouseHostDevice.c

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.c b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.c
index 1b905b1..59c94df 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/MouseHostDevice.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,9 +33,9 @@
  *  Main source file for the MouseHostDevice demo. This file contains the main tasks of
  *  the demo and is responsible for the overall control flow of the demo.
  */
  *  Main source file for the MouseHostDevice demo. This file contains the main tasks of
  *  the demo and is responsible for the overall control flow of the demo.
  */

- 
+

 #include "MouseHostDevice.h"
 #include "MouseHostDevice.h"

-       
+

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


@@ -51,9 +51,9 @@ int main(void)
        for (;;)
        {
                /* Determine which USB mode we are currently in */
        for (;;)
        {
                /* Determine which USB mode we are currently in */

-               if (USB_CurrentMode == USB_MODE_HOST)
+               if (USB_CurrentMode == USB_MODE_Host)

                {
                {

-                       MouseHostTask();
+                       MouseHost_Task();

                        HID_Host_USBTask(&Mouse_HID_Host_Interface);
                }
                else
                        HID_Host_USBTask(&Mouse_HID_Host_Interface);
                }
                else


@@ -76,18 +76,22 @@ 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();
        Joystick_Init();
        Buttons_Init();
        USB_Init(USB_MODE_UID);
        LEDs_Init();
        Joystick_Init();
        Buttons_Init();
        USB_Init(USB_MODE_UID);

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

 }
 
 /** Event handler for the library USB mode change event. */
 void EVENT_USB_UIDChange(void)
 {
        printf_P(PSTR(ESC_FG_YELLOW "UID Change to %S mode\r\n" ESC_FG_WHITE),
 }
 
 /** Event handler for the library USB mode change event. */
 void EVENT_USB_UIDChange(void)
 {
        printf_P(PSTR(ESC_FG_YELLOW "UID Change to %S mode\r\n" ESC_FG_WHITE),

-                (USB_CurrentMode == USB_MODE_DEVICE) ? PSTR("Device") : PSTR("Host"));
-                        
+                (USB_CurrentMode == USB_MODE_Device) ? PSTR("Device") : PSTR("Host"));
+

        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 }

+