Converted device mode low-level demos to schedulerless.

1 files changed, 29 insertions, 77 deletions

diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
index b046f7870..e651a1b12 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
@@ -36,20 +36,33 @@
 

 #include "RNDISEthernet.h"

 

-/* Scheduler Task List */

-TASK_LIST

-{

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

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

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

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

-};

-

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

  *  starts the scheduler to run the USB management task.

  */

 int main(void)

 {

+	SetupHardware();

+

+	/* Webserver Initialization */

+	TCP_Init();

+	Webserver_Init();

+

+	printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));

+

+	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);

+	

+	for (;;)

+	{

+		Ethernet_Task();

+		TCP_Task();

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

@@ -60,24 +73,7 @@ int main(void)
 	/* Hardware Initialization */

 	LEDs_Init();

 	SerialStream_Init(9600, false);

-	

-	/* Webserver Initialization */

-	TCP_Init();

-	Webserver_Init();

-

-	printf_P(PSTR("\r\n\r\n****** RNDIS Demo running. ******\r\n"));

-

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

@@ -85,11 +81,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

@@ -97,14 +90,8 @@ void EVENT_USB_Connect(void)
  */

 void EVENT_USB_Disconnect(void)

 {

-	/* Stop running TCP/IP and USB management tasks */

-	Scheduler_SetTaskMode(RNDIS_Task, TASK_STOP);

-	Scheduler_SetTaskMode(Ethernet_Task, TASK_STOP);

-	Scheduler_SetTaskMode(TCP_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 sets the current configuration

@@ -126,12 +113,7 @@ void EVENT_USB_ConfigurationChanged(void)
 	                           ENDPOINT_BANK_SINGLE);

 

 	/* Indicate USB connected and ready */

-	UpdateStatus(Status_USBReady);

-

-	/* Start TCP/IP tasks */

-	Scheduler_SetTaskMode(RNDIS_Task, TASK_RUN);

-	Scheduler_SetTaskMode(Ethernet_Task, TASK_RUN);

-	Scheduler_SetTaskMode(TCP_Task, TASK_RUN);

+	LEDs_SetAllLEDs(LEDMASK_USB_READY);

 }

 

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

@@ -188,41 +170,11 @@ 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 RNDISEthernet_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;

-		case Status_ProcessingEthernetFrame:

-			LEDMask = (LEDS_LED2 | LEDS_LED3);

-			break;		

-	}

-	

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

-	LEDs_SetAllLEDs(LEDMask);

-}

-

 /** Task to manage the sending and receiving of encapsulated RNDIS data and notifications. This removes the RNDIS

  *  wrapper from received Ethernet frames and places them in the FrameIN global buffer, or adds the RNDIS wrapper

  *  to a frame in the FrameOUT global before sending the buffer contents to the host.

  */

-TASK(RNDIS_Task)

+void RNDIS_Task(void)

 {

 	/* Select the notification endpoint */

 	Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);

@@ -317,7 +269,7 @@ TASK(RNDIS_Task)
 /** Ethernet frame processing task. This task checks to see if a frame has been received, and if so hands off the processing

  *  of the frame to the Ethernet processing routines.

  */

-TASK(Ethernet_Task)

+void Ethernet_Task(void)

 {

 	/* Task for Ethernet processing. Incoming ethernet frames are loaded into the FrameIN structure, and

 	   outgoing frames should be loaded into the FrameOUT structure. Both structures can only hold a single

@@ -327,12 +279,12 @@ TASK(Ethernet_Task)
 	if (FrameIN.FrameInBuffer)

 	{

 		/* Indicate packet processing started */

-		UpdateStatus(Status_ProcessingEthernetFrame);

+		LEDs_SetAllLEDs(LEDMASK_USB_BUSY);

 

 		/* Process the ethernet frame - replace this with your own Ethernet handler code as desired */

 		Ethernet_ProcessPacket();

 

 		/* Indicate packet processing complete */

-		UpdateStatus(Status_USBReady);

+		LEDs_SetAllLEDs(LEDMASK_USB_READY);

 	}

 }