Converted device mode low-level demos to schedulerless.

3 files changed, 54 insertions, 100 deletions

diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/CDC/CDC.c
index d7ebb9e6b..3db4c1e55 100644
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -36,13 +36,6 @@
 

 #include "CDC.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. While this demo does not use

  *  the physical USART and thus does not use these settings, they must still be retained and returned to the host

@@ -57,26 +50,25 @@ CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
                                  .ParityType  = Parity_None,

                                  .DataBits    = 8            };

 

-/** String to print through the virtual serial port when the joystick is pressed upwards. */

-char JoystickUpString[]      = "Joystick Up\r\n";

-

-/** String to print through the virtual serial port when the joystick is pressed downward. */

-char JoystickDownString[]    = "Joystick Down\r\n";

-

-/** String to print through the virtual serial port when the joystick is pressed left. */

-char JoystickLeftString[]    = "Joystick Left\r\n";

-

-/** String to print through the virtual serial port when the joystick is pressed right. */

-char JoystickRightString[]   = "Joystick Right\r\n";

-

-/** String to print through the virtual serial port when the joystick is pressed inwards. */

-char JoystickPressedString[] = "Joystick Pressed\r\n";

-

-/** Main program entry point. This routine configures the hardware required by the application, then

- *  starts the scheduler to run the application tasks.

+/** Main program entry point. This routine contains the overall program flow, including initial

+ *  setup of all components and the main program loop.

  */

 int main(void)

 {

+	SetupHardware();

+	

+	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();

@@ -87,18 +79,7 @@ int main(void)
 	/* Hardware Initialization */

 	Joystick_Init();

 	LEDs_Init();

-	

-	/* 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();

 }

 

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

@@ -106,11 +87,8 @@ 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

@@ -118,12 +96,8 @@ void EVENT_USB_Connect(void)
  */

 void EVENT_USB_Disconnect(void)

 {

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

-	Scheduler_SetTaskMode(CDC_Task, TASK_STOP);

-	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

-

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

@@ -145,10 +119,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

@@ -210,39 +181,21 @@ void EVENT_USB_UnhandledControlPacket(void)
 	}

 }

 

-/** 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 CDC_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);

-}

-

 /** Function to manage CDC data transmission and reception to and from the host. */

-TASK(CDC_Task)

+void CDC_Task(void)

 {

 	char*       ReportString    = NULL;

 	uint8_t     JoyStatus_LCL   = Joystick_GetStatus();

 	static bool ActionSent      = false;

+

+	char* JoystickStrings[] =

+		{

+			"Joystick Up\r\n",

+			"Joystick Down\r\n",

+			"Joystick Left\r\n",

+			"Joystick Right\r\n",

+			"Joystick Pressed\r\n",

+		};

 	

 #if 0

 	/* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232

@@ -269,15 +222,15 @@ TASK(CDC_Task)
 

 	/* Determine if a joystick action has occurred */

 	if (JoyStatus_LCL & JOY_UP)

-	  ReportString = JoystickUpString;

+	  ReportString = JoystickStrings[0];

 	else if (JoyStatus_LCL & JOY_DOWN)

-	  ReportString = JoystickDownString;

+	  ReportString = JoystickStrings[1];

 	else if (JoyStatus_LCL & JOY_LEFT)

-	  ReportString = JoystickLeftString;

+	  ReportString = JoystickStrings[2];

 	else if (JoyStatus_LCL & JOY_RIGHT)

-	  ReportString = JoystickRightString;

+	  ReportString = JoystickStrings[3];

 	else if (JoyStatus_LCL & JOY_PRESS)

-	  ReportString = JoystickPressedString;

+	  ReportString = JoystickStrings[4];

 

 	/* Flag management - Only allow one string to be sent per action */

 	if (ReportString == NULL)

diff --git a/Demos/Device/LowLevel/CDC/CDC.h b/Demos/Device/LowLevel/CDC/CDC.h
index 4c4ca74d5..821ba8f96 100644
--- a/Demos/Device/LowLevel/CDC/CDC.h
+++ b/Demos/Device/LowLevel/CDC/CDC.h
@@ -44,11 +44,10 @@
 

 		#include "Descriptors.h"

 

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

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

-		#include <LUFA/Drivers/Board/Joystick.h>         // Joystick 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/Board/Joystick.h>

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

 	/* Macros: */

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

@@ -111,6 +110,18 @@
 		 */

 		#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

 		 *  as set by the host via a class specific request.

@@ -159,19 +170,11 @@
 			Parity_Mark         = 3, /**< Mark parity bit mode on each frame */

 			Parity_Space        = 4, /**< Space parity bit mode on each frame */

 		};

-

-		/** Enum for the possible status codes for passing to the UpdateStatus() function. */

-		enum CDC_StatusCodes_t

-		{

-			Status_USBNotReady    = 0, /**< USB is not ready (disconnected from a USB host) */

-			Status_USBEnumerating = 1, /**< USB interface is enumerating */

-			Status_USBReady       = 2, /**< USB interface is connected and ready */

-		};

 		

-	/* Tasks: */

-		TASK(CDC_Task);

-

 	/* Function Prototypes: */

+		void SetupHardware(void);

+		void CDC_Task(void);

+		

 		void EVENT_USB_Connect(void);

 		void EVENT_USB_Disconnect(void);

 		void EVENT_USB_ConfigurationChanged(void);

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index bc22be5c0..c8e8798d6 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -119,13 +119,12 @@ 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                                               \

-	  $(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               \

@@ -136,7 +135,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.)