Fixed GenericHID demo not starting USB and HID management tasks when not using interr...

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index 2d98699..3b5f972 100644 (file)
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -103,6 +103,11 @@ EVENT_HANDLER(USB_Reset)
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r
  */\r
 EVENT_HANDLER(USB_Connect)\r
 {\r

+       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
+       /* Start USB management task */\r
+       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
+       #endif\r
+\r

        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
 }\r
        /* Indicate USB enumerating */\r
        UpdateStatus(Status_USBEnumerating);\r
 }\r


@@ -112,6 +117,15 @@ EVENT_HANDLER(USB_Connect)
  */\r
 EVENT_HANDLER(USB_Disconnect)\r
 {\r
  */\r
 EVENT_HANDLER(USB_Disconnect)\r
 {\r

+       /* Stop running HID reporting and USB management tasks */\r
+       #if !defined(INTERRUPT_DATA_ENDPOINT)\r
+       Scheduler_SetTaskMode(USB_HID_Report, TASK_STOP);\r
+       #endif\r
+\r
+       #if !defined(INTERRUPT_CONTROL_ENDPOINT)\r
+       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
+       #endif\r
+\r

        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 }\r
        /* Indicate USB not ready */\r
        UpdateStatus(Status_USBNotReady);\r
 }\r

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index c429768..076ac5b 100644 (file)
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -145,7 +145,7 @@ EVENT_HANDLER(USB_Reset)
  */\r
 EVENT_HANDLER(USB_Disconnect)\r
 {\r
  */\r
 EVENT_HANDLER(USB_Disconnect)\r
 {\r

-       /* Stop running keyboard reporting and USB management tasks */\r
+       /* Stop running mouse reporting and USB management tasks */\r

        #if !defined(INTERRUPT_DATA_ENDPOINT)\r
        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);\r
        #endif\r
        #if !defined(INTERRUPT_DATA_ENDPOINT)\r
        Scheduler_SetTaskMode(USB_Mouse_Report, TASK_STOP);\r
        #endif\r

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 04b0e97..64182b0 100644 (file)
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -26,6 +26,7 @@
   *    outdated avr-libc versions.\r
   *  - Added support to the CDCHost demo for devices with mutiple CDC interfaces which are not the correct ACM type preceeding the desired\r
   *    ACM CDC interface\r
   *    outdated avr-libc versions.\r
   *  - Added support to the CDCHost demo for devices with mutiple CDC interfaces which are not the correct ACM type preceeding the desired\r
   *    ACM CDC interface\r

+  *  - Fixed GenericHID demo not starting USB and HID management tasks when not using interrupt driven modes (thanks to Carl Kjeldsen)\r

   *\r
   *  \section Sec_ChangeLog090401 Version 090401\r
   *\r
   *\r
   *  \section Sec_ChangeLog090401 Version 090401\r
   *\r