projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update UC3 platform driver support to use the bitmasks defined in the header files...
[pub/USBasp.git] / Demos / DualRole / ClassDriver / MouseHostDevice / HostFunctions.c
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
index dfd67ae..246ff35 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.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 @@
  *  Host Mode USB Mouse functionality for the MouseHostDevice demo. This file contains the Host mode
  *  USB Mouse related code of the demo and is responsible for all the Host mode Mouse functionality.
  */
  *  Host Mode USB Mouse functionality for the MouseHostDevice demo. This file contains the Host mode
  *  USB Mouse related code of the demo and is responsible for all the Host mode Mouse functionality.
  */
- 
+
 #include "HostFunctions.h"
 
 /** LUFA HID Class driver interface configuration and state information. This structure is
 #include "HostFunctions.h"
 
 /** LUFA HID Class driver interface configuration and state information. This structure is
@@ -46,8 +46,8 @@ USB_ClassInfo_HID_Host_t Mouse_HID_Host_Interface =
                        {
                                .DataINPipeNumber       = 1,
                                .DataOUTPipeNumber      = 2,
                        {
                                .DataINPipeNumber       = 1,
                                .DataOUTPipeNumber      = 2,
-                               
-                               .HIDInterfaceProtocol   = HID_BOOT_MOUSE_PROTOCOL,
+
+                               .HIDInterfaceProtocol   = HID_CSCP_MouseBootProtocol,
                        },
        };
 
                        },
        };
 
@@ -74,14 +74,50 @@ void EVENT_USB_Host_DeviceUnattached(void)
  *  enumerated by the host and is now ready to be used by the application.
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
  *  enumerated by the host and is now ready to be used by the application.
  */
 void EVENT_USB_Host_DeviceEnumerationComplete(void)
-{
+{      
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
+
+       uint16_t ConfigDescriptorSize;
+       uint8_t  ConfigDescriptorData[512];
+
+       if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
+                                              sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
+       {
+               printf("Error Retrieving Configuration Descriptor.\r\n");
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       if (HID_Host_ConfigurePipes(&Mouse_HID_Host_Interface,
+                                   ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
+       {
+               printf("Attached Device Not a Valid Mouse.\r\n");
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
+       {
+               printf("Error Setting Device Configuration.\r\n");
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != HOST_SENDCONTROL_Successful)
+       {
+               printf("Could not Set Boot Protocol Mode.\r\n");
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
+               return;
+       }
+
+       printf("Mouse Enumerated.\r\n");
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** 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)
 {
        LEDs_SetAllLEDs(LEDMASK_USB_READY);
 }
 
 /** 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);
@@ -100,87 +136,42 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
                                 " -- Error Code %d\r\n"
                                 " -- Sub Error Code %d\r\n"
                                 " -- In State %d\r\n" ESC_FG_WHITE), ErrorCode, SubErrorCode, USB_HostState);
                                 " -- 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);
 }
 
-/** Host state machine task. This task handles the enumeration and control of USB Mice while in USB Host mode,
+/** Host USB management task. This task handles the control of USB Mice while in USB Host mode,
  *  setting up the appropriate data pipes and processing reports from the attached device.
  */
  *  setting up the appropriate data pipes and processing reports from the attached device.
  */
-void MouseHostTask(void)
+void MouseHost_Task(void)
 {
 {
-       switch (USB_HostState)
+       if (USB_HostState != HOST_STATE_Configured)
+         return;
+
+       if (HID_Host_IsReportReceived(&Mouse_HID_Host_Interface))
        {
        {
-               case HOST_STATE_Addressed:
-                       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);
-               
-                       uint16_t ConfigDescriptorSize;
-                       uint8_t  ConfigDescriptorData[512];
-
-                       if (USB_Host_GetDeviceConfigDescriptor(1, &ConfigDescriptorSize, ConfigDescriptorData,
-                                                              sizeof(ConfigDescriptorData)) != HOST_GETCONFIG_Successful)
-                       {
-                               printf("Error Retrieving Configuration Descriptor.\r\n");
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-
-                       if (HID_Host_ConfigurePipes(&Mouse_HID_Host_Interface,
-                                                   ConfigDescriptorSize, ConfigDescriptorData) != HID_ENUMERROR_NoError)
-                       {
-                               printf("Attached Device Not a Valid Mouse.\r\n");
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-                               
-                       if (USB_Host_SetDeviceConfiguration(1) != HOST_SENDCONTROL_Successful)
-                       {
-                               printf("Error Setting Device Configuration.\r\n");
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
+               uint8_t LEDMask  = LEDS_NO_LEDS;
 
 
-                       if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != HOST_SENDCONTROL_Successful)
-                       {
-                               printf("Could not Set Boot Protocol Mode.\r\n");
-                               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
-                               USB_HostState = HOST_STATE_WaitForDeviceRemoval;
-                               break;
-                       }
-                               
-                       printf("Mouse Enumerated.\r\n");
-                       USB_HostState = HOST_STATE_Configured;
-                       break;
-               case HOST_STATE_Configured:
-                       if (HID_Host_IsReportReceived(&Mouse_HID_Host_Interface))
-                       {       
-                               uint8_t LEDMask  = LEDS_NO_LEDS;
-                                       
-                               USB_MouseReport_Data_t MouseReport;
-                               HID_Host_ReceiveReport(&Mouse_HID_Host_Interface, &MouseReport);
-                                               
-                               printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,
-                                                                                                                         MouseReport.Y,
-                                                                                                                         MouseReport.Button);
-                               if (MouseReport.X > 0)
-                                 LEDMask |= LEDS_LED1;
-                               else if (MouseReport.X < 0)
-                                 LEDMask |= LEDS_LED2;
-                                                       
-                               if (MouseReport.Y > 0)
-                                 LEDMask |= LEDS_LED3;
-                               else if (MouseReport.Y < 0)
-                                 LEDMask |= LEDS_LED4;
-
-                               if (MouseReport.Button)
-                                 LEDMask  = LEDS_ALL_LEDS;
-
-                               LEDs_SetAllLEDs(LEDMask);
-                       }
-
-                       break;
+               USB_MouseReport_Data_t MouseReport;
+               HID_Host_ReceiveReport(&Mouse_HID_Host_Interface, &MouseReport);
+
+               printf_P(PSTR("dX:%2d dY:%2d Button:%d\r\n"), MouseReport.X,
+                                                             MouseReport.Y,
+                                                             MouseReport.Button);
+               if (MouseReport.X > 0)
+                 LEDMask |= LEDS_LED1;
+               else if (MouseReport.X < 0)
+                 LEDMask |= LEDS_LED2;
+
+               if (MouseReport.Y > 0)
+                 LEDMask |= LEDS_LED3;
+               else if (MouseReport.Y < 0)
+                 LEDMask |= LEDS_LED4;
+
+               if (MouseReport.Button)
+                 LEDMask  = LEDS_ALL_LEDS;
+
+               LEDs_SetAllLEDs(LEDMask);
        }
 }
        }
 }
+
USB isp AVR programmer