Converted device mode low-level demos to schedulerless.

[pub/USBasp.git] / Demos / Device / LowLevel / USBtoSerial / USBtoSerial.c

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index 7cef565..ee4208f 100644 (file)
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -30,13 +30,6 @@
 \r
 #include "USBtoSerial.h"\r
 \r
-/* Scheduler Task List */\r
-TASK_LIST\r
-{\r
-       { .Task = USB_USBTask          , .TaskStatus = TASK_STOP },\r
-       { .Task = CDC_Task             , .TaskStatus = TASK_STOP },\r
-};\r
-\r
 /* Globals: */\r
 /** Contains the current baud rate and other settings of the virtual serial port.\r
  *\r
@@ -62,6 +55,24 @@ volatile bool Transmitting = false;
  */\r
 int main(void)\r
 {\r
+       SetupHardware();\r
+\r
+       /* Ring buffer Initialization */\r
+       Buffer_Initialize(&Rx_Buffer);\r
+       Buffer_Initialize(&Tx_Buffer);\r
+\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
+       \r
+       for (;;)\r
+       {\r
+               CDC_Task();\r
+               USB_USBTask();\r
+       }\r
+}\r
+\r
+/** Configures the board hardware and chip peripherals for the demo's functionality. */\r
+void SetupHardware(void)\r
+{\r
        /* Disable watchdog if enabled by bootloader/fuses */\r
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
@@ -72,22 +83,7 @@ int main(void)
        /* Hardware Initialization */\r
        LEDs_Init();\r
        ReconfigureUSART();\r
-       \r
-       /* Ring buffer Initialization */\r
-       Buffer_Initialize(&Rx_Buffer);\r
-       Buffer_Initialize(&Tx_Buffer);\r
-       \r
-       /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
-       \r
-       /* Initialize Scheduler so that it can be used */\r
-       Scheduler_Init();\r
-\r
-       /* Initialize USB Subsystem */\r
-       USB_Init();\r
-\r
-       /* Scheduling - routine never returns, so put this last in the main function */\r
-       Scheduler_Start();\r
+       USB_Init();     \r
 }\r
 \r
 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and\r
@@ -95,28 +91,21 @@ int main(void)
  */\r
 void EVENT_USB_Connect(void)\r
 {\r
-       /* Start USB management task */\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);\r
-\r
        /* Indicate USB enumerating */\r
-       UpdateStatus(Status_USBEnumerating);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);\r
 }\r
 \r
 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via\r
  *  the status LEDs and stops the USB management and CDC management tasks.\r
  */\r
 void EVENT_USB_Disconnect(void)\r
-{\r
-       /* Stop running CDC and USB management tasks */\r
-       Scheduler_SetTaskMode(CDC_Task, TASK_STOP);\r
-       Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);\r
-       \r
+{      \r
        /* Reset Tx and Rx buffers, device disconnected */\r
        Buffer_Initialize(&Rx_Buffer);\r
        Buffer_Initialize(&Tx_Buffer);\r
 \r
        /* Indicate USB not ready */\r
-       UpdateStatus(Status_USBNotReady);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);\r
 }\r
 \r
 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration\r
@@ -138,10 +127,7 @@ void EVENT_USB_ConfigurationChanged(void)
                                   ENDPOINT_BANK_SINGLE);\r
 \r
        /* Indicate USB connected and ready */\r
-       UpdateStatus(Status_USBReady);\r
-\r
-       /* Start CDC task */\r
-       Scheduler_SetTaskMode(CDC_Task, TASK_RUN);\r
+       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
@@ -207,7 +193,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 }\r
 \r
 /** Task to manage CDC data transmission and reception to and from the host, from and to the physical USART. */\r
-TASK(CDC_Task)\r
+void CDC_Task(void)\r
 {\r
        if (USB_IsConnected)\r
        {\r
@@ -309,33 +295,6 @@ ISR(USART1_RX_vect, ISR_BLOCK)
        }\r
 }\r
 \r
-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to\r
- *  log to a serial port, or anything else that is suitable for status updates.\r
- *\r
- *  \param CurrentStatus  Current status of the system, from the USBtoSerial_StatusCodes_t enum\r
- */\r
-void UpdateStatus(uint8_t CurrentStatus)\r
-{\r
-       uint8_t LEDMask = LEDS_NO_LEDS;\r
-       \r
-       /* Set the LED mask to the appropriate LED mask based on the given status code */\r
-       switch (CurrentStatus)\r
-       {\r
-               case Status_USBNotReady:\r
-                       LEDMask = (LEDS_LED1);\r
-                       break;\r
-               case Status_USBEnumerating:\r
-                       LEDMask = (LEDS_LED1 | LEDS_LED2);\r
-                       break;\r
-               case Status_USBReady:\r
-                       LEDMask = (LEDS_LED2 | LEDS_LED4);\r
-                       break;\r
-       }\r
-       \r
-       /* Set the board LEDs to the new LED mask */\r
-       LEDs_SetAllLEDs(LEDMask);\r
-}\r
-\r
 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */\r
 void ReconfigureUSART(void)\r
 {\r