Converted device mode low-level demos to schedulerless.

3 files changed, 45 insertions, 79 deletions

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
index 7cef56560..ee4208f19 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.c
@@ -30,13 +30,6 @@
 

 #include "USBtoSerial.h"

 

-/* Scheduler Task List */

-TASK_LIST

-{

-	{ .Task = USB_USBTask          , .TaskStatus = TASK_STOP },

-	{ .Task = CDC_Task             , .TaskStatus = TASK_STOP },

-};

-

 /* Globals: */

 /** Contains the current baud rate and other settings of the virtual serial port.

  *

@@ -62,6 +55,24 @@ volatile bool Transmitting = false;
  */

 int main(void)

 {

+	SetupHardware();

+

+	/* Ring buffer Initialization */

+	Buffer_Initialize(&Rx_Buffer);

+	Buffer_Initialize(&Tx_Buffer);

+

+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

+	

+	for (;;)

+	{

+		CDC_Task();

+		USB_USBTask();

+	}

+}

+

+/** Configures the board hardware and chip peripherals for the demo's functionality. */

+void SetupHardware(void)

+{

 	/* Disable watchdog if enabled by bootloader/fuses */

 	MCUSR &= ~(1 << WDRF);

 	wdt_disable();

@@ -72,22 +83,7 @@ int main(void)
 	/* Hardware Initialization */

 	LEDs_Init();

 	ReconfigureUSART();

-	

-	/* Ring buffer Initialization */

-	Buffer_Initialize(&Rx_Buffer);

-	Buffer_Initialize(&Tx_Buffer);

-	

-	/* Indicate USB not ready */

-	UpdateStatus(Status_USBNotReady);

-	

-	/* Initialize Scheduler so that it can be used */

-	Scheduler_Init();

-

-	/* Initialize USB Subsystem */

-	USB_Init();

-

-	/* Scheduling - routine never returns, so put this last in the main function */

-	Scheduler_Start();

+	USB_Init();	

 }

 

 /** Event handler for the USB_Connect event. This indicates that the device is enumerating via the status LEDs and

@@ -95,28 +91,21 @@ int main(void)
  */

 void EVENT_USB_Connect(void)

 {

-	/* Start USB management task */

-	Scheduler_SetTaskMode(USB_USBTask, TASK_RUN);

-

 	/* Indicate USB enumerating */

-	UpdateStatus(Status_USBEnumerating);

+	LEDs_SetAllLEDs(LEDMASK_USB_ENUMERATING);

 }

 

 /** Event handler for the USB_Disconnect event. This indicates that the device is no longer connected to a host via

  *  the status LEDs and stops the USB management and CDC management tasks.

  */

 void EVENT_USB_Disconnect(void)

-{

-	/* Stop running CDC and USB management tasks */

-	Scheduler_SetTaskMode(CDC_Task, TASK_STOP);

-	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

-	

+{	

 	/* Reset Tx and Rx buffers, device disconnected */

 	Buffer_Initialize(&Rx_Buffer);

 	Buffer_Initialize(&Tx_Buffer);

 

 	/* Indicate USB not ready */

-	UpdateStatus(Status_USBNotReady);

+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

 }

 

 /** Event handler for the USB_ConfigurationChanged event. This is fired when the host set the current configuration

@@ -138,10 +127,7 @@ void EVENT_USB_ConfigurationChanged(void)
 	                           ENDPOINT_BANK_SINGLE);

 

 	/* Indicate USB connected and ready */

-	UpdateStatus(Status_USBReady);

-

-	/* Start CDC task */

-	Scheduler_SetTaskMode(CDC_Task, TASK_RUN);

+	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

 

 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific

@@ -207,7 +193,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 }

 

 /** Task to manage CDC data transmission and reception to and from the host, from and to the physical USART. */

-TASK(CDC_Task)

+void CDC_Task(void)

 {

 	if (USB_IsConnected)

 	{

@@ -309,33 +295,6 @@ ISR(USART1_RX_vect, ISR_BLOCK)
 	}

 }

 

-/** Function to manage status updates to the user. This is done via LEDs on the given board, if available, but may be changed to

- *  log to a serial port, or anything else that is suitable for status updates.

- *

- *  \param CurrentStatus  Current status of the system, from the USBtoSerial_StatusCodes_t enum

- */

-void UpdateStatus(uint8_t CurrentStatus)

-{

-	uint8_t LEDMask = LEDS_NO_LEDS;

-	

-	/* Set the LED mask to the appropriate LED mask based on the given status code */

-	switch (CurrentStatus)

-	{

-		case Status_USBNotReady:

-			LEDMask = (LEDS_LED1);

-			break;

-		case Status_USBEnumerating:

-			LEDMask = (LEDS_LED1 | LEDS_LED2);

-			break;

-		case Status_USBReady:

-			LEDMask = (LEDS_LED2 | LEDS_LED4);

-			break;

-	}

-	

-	/* Set the board LEDs to the new LED mask */

-	LEDs_SetAllLEDs(LEDMask);

-}

-

 /** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */

 void ReconfigureUSART(void)

 {

diff --git a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
index 8e7e8aed8..1a4a1cb67 100644
--- a/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
+++ b/Demos/Device/LowLevel/USBtoSerial/USBtoSerial.h
@@ -46,11 +46,10 @@
 

 		#include "Lib/RingBuff.h"

 

-		#include <LUFA/Version.h>                         // Library Version Information

-		#include <LUFA/Drivers/USB/USB.h>                 // USB Functionality

-		#include <LUFA/Drivers/Peripheral/Serial.h>       // USART driver

-		#include <LUFA/Drivers/Board/LEDs.h>              // LEDs driver

-		#include <LUFA/Scheduler/Scheduler.h>             // Simple scheduler for task management

+		#include <LUFA/Version.h>

+		#include <LUFA/Drivers/USB/USB.h>

+		#include <LUFA/Drivers/Peripheral/Serial.h>

+		#include <LUFA/Drivers/Board/LEDs.h>
 

 	/* Macros: */

 		/** CDC Class specific request to get the current virtual serial port configuration settings. */

@@ -112,6 +111,18 @@
 		 *  to indicate that a data overrun error has occurred on the virtual serial port.

 		 */

 		#define CONTROL_LINE_IN_OVERRUNERROR (1 << 6)

+

+		/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */

+		#define LEDMASK_USB_NOTREADY      LEDS_LED1

+

+		/** LED mask for the library LED driver, to indicate that the USB interface is enumerating. */

+		#define LEDMASK_USB_ENUMERATING  (LEDS_LED2 | LEDS_LED3)

+

+		/** LED mask for the library LED driver, to indicate that the USB interface is ready. */

+		#define LEDMASK_USB_READY        (LEDS_LED2 | LEDS_LED4)

+

+		/** LED mask for the library LED driver, to indicate that an error has occurred in the USB interface. */

+		#define LEDMASK_USB_ERROR        (LEDS_LED1 | LEDS_LED3)

 		

 	/* Type Defines: */

 		/** Type define for the virtual serial port line encoding settings, for storing the current USART configuration

@@ -170,16 +181,14 @@
 			Status_USBReady       = 2, /**< USB interface is connected and ready */

 		};

 		

-	/* Tasks: */

-		TASK(CDC_Task);

-

 	/* Function Prototypes: */

+		void SetupHardware(void);

+		void CDC_Task(void);

+		void ReconfigureUSART(void);

+	

 		void EVENT_USB_Connect(void);

 		void EVENT_USB_Disconnect(void);

 		void EVENT_USB_ConfigurationChanged(void);

 		void EVENT_USB_UnhandledControlPacket(void);

 

-		void ReconfigureUSART(void);

-		void UpdateStatus(uint8_t CurrentStatus);

-

 #endif

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index 708e87246..f1491a52a 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -119,14 +119,13 @@ OBJDIR = .
 

 

 # Path to the LUFA library

-LUFA_PATH = ../../..

+LUFA_PATH = ../../../..

 

 

 # List C source files here. (C dependencies are automatically generated.)

 SRC = $(TARGET).c                                                 \

 	  Descriptors.c                                               \

 	  Lib/RingBuff.c                                              \

-	  $(LUFA_PATH)/LUFA/Scheduler/Scheduler.c                     \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \

@@ -137,7 +136,6 @@ SRC = $(TARGET).c                                                 \
 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBInterrupt.c      \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/USBTask.c           \

 	  $(LUFA_PATH)/LUFA/Drivers/USB/HighLevel/ConfigDescriptor.c  \

-	  $(LUFA_PATH)/LUFA/Drivers/USB/Class/HIDParser.c             \

 

 

 # List C++ source files here. (C dependencies are automatically generated.)