Converted device mode low-level demos to schedulerless.

3 files changed, 48 insertions, 88 deletions

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
index 40e376b52..7a9c6eca0 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.c
@@ -36,40 +36,38 @@
  

 #include "AudioOutput.h"

 

-/* Scheduler Task List */

-TASK_LIST

-{

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

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

-};

-

+/** Flag to indicate if the streaming audio alternative interface has been selected by the host. */

+bool StreamingAudioInterfaceSelected = false;

 

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

+	{

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

 

 	/* Disable clock division */

 	clock_prescale_set(clock_div_1);

-

+	

 	/* Hardware Initialization */

 	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

@@ -77,11 +75,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);

 	

 	/* Sample reload timer initialization */

 	OCR0A   = (F_CPU / AUDIO_SAMPLE_FREQUENCY) - 1;

@@ -129,12 +124,11 @@ void EVENT_USB_Disconnect(void)
 	PORTC  = 0x00;

 #endif

 

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

-	Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP);

-	Scheduler_SetTaskMode(USB_USBTask, TASK_STOP);

+	/* Indicate streaming audio interface not selected */

+	StreamingAudioInterfaceSelected = false;

 

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

@@ -148,7 +142,7 @@ void EVENT_USB_ConfigurationChanged(void)
 	                           ENDPOINT_BANK_DOUBLE);

 

 	/* Indicate USB connected and ready */

-	UpdateStatus(Status_USBReady);

+	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

 

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

@@ -167,16 +161,7 @@ void EVENT_USB_UnhandledControlPacket(void)
 				Endpoint_ClearSETUP();

 				

 				/* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */

-				if (USB_ControlRequest.wValue)

-				{

-					/* Start audio task */

-					Scheduler_SetTaskMode(USB_Audio_Task, TASK_RUN);

-				}

-				else

-				{

-					/* Stop audio task */

-					Scheduler_SetTaskMode(USB_Audio_Task, TASK_STOP);				

-				}

+				StreamingAudioInterfaceSelected = ((USB_ControlRequest.wValue) != 0);

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

@@ -187,38 +172,15 @@ 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 AudioOutput_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);

-}

-

 /** Task to manage the Audio interface, reading in audio samples from the host, and outputting them to the speakers/LEDs as

  *  desired.

  */

-TASK(USB_Audio_Task)

+void USB_Audio_Task(void)

 {

+	/* Check to see if the streaming interface is selected, if not the host is not receiving audio */

+	if (!(StreamingAudioInterfaceSelected))

+	  return;	

+

 	/* Select the audio stream endpoint */

 	Endpoint_SelectEndpoint(AUDIO_STREAM_EPNUM);

 	

diff --git a/Demos/Device/LowLevel/AudioOutput/AudioOutput.h b/Demos/Device/LowLevel/AudioOutput/AudioOutput.h
index d8725a07b..d722d535b 100644
--- a/Demos/Device/LowLevel/AudioOutput/AudioOutput.h
+++ b/Demos/Device/LowLevel/AudioOutput/AudioOutput.h
@@ -43,10 +43,9 @@
 

 		#include "Descriptors.h"

 		

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

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

-		#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/LEDs.h>
 	

 	/* Macros: */

 		#if defined(USB_FULL_CONTROLLER) || defined(USB_MODIFIED_FULL_CONTROLLER)

@@ -96,24 +95,25 @@
 			#define CSx0            CS10

 		#endif

 		

-	/* Enums: */

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

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

-		};

-

-	/* Task Definitions: */

-		TASK(USB_Audio_Task);

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

 	

 	/* Function Prototypes: */

+		void SetupHardware(void);

+		void USB_Audio_Task(void);

+

 		void EVENT_USB_Connect(void);

 		void EVENT_USB_Disconnect(void);

 		void EVENT_USB_ConfigurationChanged(void);

 		void EVENT_USB_UnhandledControlPacket(void);

-		

-		void UpdateStatus(uint8_t CurrentStatus);

 

 #endif

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 28f038f49..2ef97b567 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/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.)