\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
*/\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
/* 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
*/\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
*/\r
void EVENT_USB_ConfigurationChanged(void)\r
{\r
- /* Setup CDC Notification, Rx and Tx Endpoints */\r
- Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
- ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
- ENDPOINT_BANK_SINGLE);\r
-\r
- Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
- ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
- ENDPOINT_BANK_SINGLE);\r
-\r
- Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
- ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
- ENDPOINT_BANK_SINGLE);\r
-\r
/* Indicate USB connected and ready */\r
- UpdateStatus(Status_USBReady);\r
+ LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
+\r
+ /* Setup CDC Notification, Rx and Tx Endpoints */\r
+ if (!(Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
+ ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
+ ENDPOINT_BANK_SINGLE)))\r
+ {\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ }\r
+ \r
+ if (!(Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
+ ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
+ ENDPOINT_BANK_SINGLE)))\r
+ {\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ } \r
\r
- /* Start CDC task */\r
- Scheduler_SetTaskMode(CDC_Task, TASK_RUN);\r
+ if (!(Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
+ ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
+ ENDPOINT_BANK_SINGLE)))\r
+ {\r
+ LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+ }\r
}\r
\r
/** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
*/\r
\r
- /* Acknowledge status stage */\r
- while (!(Endpoint_IsINReady()));\r
- Endpoint_ClearIN();\r
+ Endpoint_ClearStatusStage();\r
}\r
\r
break;\r
}\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
+ /* Device must be connected and configured for the task to run */\r
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
+ return;\r
+ \r
#if 0\r
- /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r
- handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
- */\r
+ /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r
+ handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
+ */\r
\r
- USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
- {\r
- .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
- .Notification = NOTIF_SerialState,\r
- .wValue = 0,\r
- .wIndex = 0,\r
- .wLength = sizeof(uint16_t),\r
- };\r
- \r
- uint16_t LineStateMask;\r
- \r
- // Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host\r
+ USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
+ {\r
+ .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
+ .Notification = NOTIF_SerialState,\r
+ .wValue = 0,\r
+ .wIndex = 0,\r
+ .wLength = sizeof(uint16_t),\r
+ };\r
\r
- Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
- Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
- Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
- Endpoint_ClearIN();\r
+ uint16_t LineStateMask;\r
+ \r
+ // Set LineStateMask here to a mask of CONTROL_LINE_IN_* masks to set the input handshake line states to send to the host\r
+ \r
+ Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
+ Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
+ Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
+ Endpoint_ClearIN();\r
#endif\r
\r
- /* Select the Serial Rx Endpoint */\r
- Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
- \r
- /* Check to see if a packet has been received from the host */\r
- if (Endpoint_IsOUTReceived())\r
+ /* Select the Serial Rx Endpoint */\r
+ Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
+ \r
+ /* Check to see if a packet has been received from the host */\r
+ if (Endpoint_IsOUTReceived())\r
+ {\r
+ /* Read the bytes in from the endpoint into the buffer while space is available */\r
+ while (Endpoint_BytesInEndpoint() && (Rx_Buffer.Elements != BUFF_STATICSIZE))\r
{\r
- /* Read the bytes in from the endpoint into the buffer while space is available */\r
- while (Endpoint_BytesInEndpoint() && (BUFF_STATICSIZE - Rx_Buffer.Elements))\r
- {\r
- /* Store each character from the endpoint */\r
- Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());\r
- }\r
- \r
- /* Check to see if all bytes in the current packet have been read */\r
- if (!(Endpoint_BytesInEndpoint()))\r
- {\r
- /* Clear the endpoint buffer */\r
- Endpoint_ClearOUT();\r
- }\r
+ /* Store each character from the endpoint */\r
+ Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());\r
}\r
\r
- /* Check if Rx buffer contains data - if so, send it */\r
- if (Rx_Buffer.Elements)\r
- Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r
+ /* Check to see if all bytes in the current packet have been read */\r
+ if (!(Endpoint_BytesInEndpoint()))\r
+ {\r
+ /* Clear the endpoint buffer */\r
+ Endpoint_ClearOUT();\r
+ }\r
+ }\r
+ \r
+ /* Check if Rx buffer contains data - if so, send it */\r
+ if (Rx_Buffer.Elements)\r
+ Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r
+\r
+ /* Select the Serial Tx Endpoint */\r
+ Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
\r
- /* Select the Serial Tx Endpoint */\r
- Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
+ /* Check if the Tx buffer contains anything to be sent to the host */\r
+ if (Tx_Buffer.Elements)\r
+ {\r
+ /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
+ while (!(Endpoint_IsReadWriteAllowed()))\r
+ {\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return;\r
+ }\r
+ \r
+ /* Write the bytes from the buffer to the endpoint while space is available */\r
+ while (Tx_Buffer.Elements && Endpoint_IsReadWriteAllowed())\r
+ {\r
+ /* Write each byte retreived from the buffer to the endpoint */\r
+ Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
+ }\r
+ \r
+ /* Remember if the packet to send completely fills the endpoint */\r
+ bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
+ \r
+ /* Send the data */\r
+ Endpoint_ClearIN();\r
\r
- /* Check if the Tx buffer contains anything to be sent to the host */\r
- if (Tx_Buffer.Elements)\r
+ /* If no more data to send and the last packet filled the endpoint, send an empty packet to release\r
+ * the buffer on the receiver (otherwise all data will be cached until a non-full packet is received) */\r
+ if (IsFull && !(Tx_Buffer.Elements))\r
{\r
/* Wait until Serial Tx Endpoint Ready for Read/Write */\r
- while (!(Endpoint_IsReadWriteAllowed()));\r
- \r
- /* Write the bytes from the buffer to the endpoint while space is available */\r
- while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
+ while (!(Endpoint_IsReadWriteAllowed()))\r
{\r
- /* Write each byte retreived from the buffer to the endpoint */\r
- Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
+ if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+ return;\r
}\r
- \r
- /* Remember if the packet to send completely fills the endpoint */\r
- bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
- \r
- /* Send the data */\r
+ \r
+ /* Send an empty packet to terminate the transfer */\r
Endpoint_ClearIN();\r
-\r
- /* If no more data to send and the last packet filled the endpoint, send an empty packet to release\r
- * the buffer on the receiver (otherwise all data will be cached until a non-full packet is received) */\r
- if (IsFull && !(Tx_Buffer.Elements))\r
- {\r
- /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
- while (!(Endpoint_IsReadWriteAllowed()));\r
-\r
- /* Send an empty packet to terminate the transfer */\r
- Endpoint_ClearIN();\r
- }\r
}\r
}\r
}\r
ISR(USART1_RX_vect, ISR_BLOCK)\r
{\r
/* Only store received characters if the USB interface is connected */\r
- if (USB_IsConnected)\r
- {\r
- /* Character received, store it into the buffer */\r
- Buffer_StoreElement(&Tx_Buffer, UDR1);\r
- }\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
+ if (USB_DeviceState != DEVICE_STATE_Configured)\r
+ Buffer_StoreElement(&Tx_Buffer, UDR1);\r
}\r
\r
/** Reconfigures the USART to match the current serial port settings issued by the host as closely as possible. */\r
projects / pub / USBasp.git / blobdiff