\r
#include "USBtoSerial.h"\r
\r
-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName, "LUFA USB RS232 App");\r
-BUTTLOADTAG(BuildTime, __TIME__);\r
-BUTTLOADTAG(BuildDate, __DATE__);\r
-BUTTLOADTAG(LUFAVersion, "LUFA V" LUFA_VERSION_STRING);\r
-\r
/* Scheduler Task List */\r
TASK_LIST\r
{\r
- { Task: USB_USBTask , TaskStatus: TASK_STOP },\r
- { Task: CDC_Task , TaskStatus: TASK_STOP },\r
+ { .Task = USB_USBTask , .TaskStatus = TASK_STOP },\r
+ { .Task = CDC_Task , .TaskStatus = TASK_STOP },\r
};\r
\r
/* Globals: */\r
* These values are set by the host via a class-specific request, and the physical USART should be reconfigured to match the\r
* new settings each time they are changed by the host.\r
*/\r
-CDC_Line_Coding_t LineCoding = { BaudRateBPS: 9600,\r
- CharFormat: OneStopBit,\r
- ParityType: Parity_None,\r
- DataBits: 8 };\r
+CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,\r
+ .CharFormat = OneStopBit,\r
+ .ParityType = Parity_None,\r
+ .DataBits = 8 };\r
\r
/** Ring (circular) buffer to hold the RX data - data from the host to the attached device on the serial port. */\r
RingBuff_t Rx_Buffer;\r
LEDs_Init();\r
ReconfigureUSART();\r
\r
- /* Ringbuffer Initialization */\r
+ /* Ring buffer Initialization */\r
Buffer_Initialize(&Rx_Buffer);\r
Buffer_Initialize(&Tx_Buffer);\r
\r
uint8_t* LineCodingData = (uint8_t*)&LineCoding;\r
\r
/* Process CDC specific control requests */\r
- switch (bRequest)\r
+ switch (USB_ControlRequest.bRequest)\r
{\r
case REQ_GetLineEncoding:\r
- if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
{ \r
/* Acknowledge the SETUP packet, ready for data transfer */\r
- Endpoint_ClearSetupReceived();\r
+ Endpoint_ClearSETUP();\r
\r
/* Write the line coding data to the control endpoint */\r
Endpoint_Write_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
\r
/* Finalize the stream transfer to send the last packet or clear the host abort */\r
- Endpoint_ClearSetupOUT();\r
+ Endpoint_ClearOUT();\r
}\r
\r
break;\r
case REQ_SetLineEncoding:\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
{\r
/* Acknowledge the SETUP packet, ready for data transfer */\r
- Endpoint_ClearSetupReceived();\r
+ Endpoint_ClearSETUP();\r
\r
/* Read the line coding data in from the host into the global struct */\r
Endpoint_Read_Control_Stream_LE(LineCodingData, sizeof(LineCoding));\r
\r
/* Finalize the stream transfer to clear the last packet from the host */\r
- Endpoint_ClearSetupIN();\r
+ Endpoint_ClearIN();\r
\r
/* Reconfigure the USART with the new settings */\r
ReconfigureUSART();\r
\r
break;\r
case REQ_SetControlLineState:\r
- if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
- {\r
-#if 0\r
+ if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
+ { \r
+ /* Acknowledge the SETUP packet, ready for data transfer */\r
+ Endpoint_ClearSETUP();\r
+ \r
/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake\r
- lines. The mask is read in from the wValue parameter, and can be masked against the CONTROL_LINE_OUT_* masks\r
- to determine the RTS and DTR line states using the following code:\r
+ lines. The mask is read in from the wValue parameter in USB_ControlRequest, and can be masked against the\r
+ CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
*/\r
\r
- uint16_t wIndex = Endpoint_Read_Word_LE();\r
- \r
- // Do something with the given line states in wIndex\r
-#endif\r
- \r
- /* Acknowledge the SETUP packet, ready for data transfer */\r
- Endpoint_ClearSetupReceived();\r
- \r
/* Acknowledge status stage */\r
- while (!(Endpoint_IsSetupINReady()));\r
- Endpoint_ClearSetupIN();\r
+ while (!(Endpoint_IsINReady()));\r
+ Endpoint_ClearIN();\r
}\r
\r
break;\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
+ .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
Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask));\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
#endif\r
\r
/* Select the Serial Rx Endpoint */\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
\r
- if (Endpoint_ReadWriteAllowed())\r
+ /* Check to see if a packet has been received from the host */\r
+ if (Endpoint_IsOUTReceived())\r
{\r
- /* Read the received data endpoint into the transmission buffer */\r
- while (Endpoint_BytesInEndpoint())\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
- /* Wait until the buffer has space for a new character */\r
- while (!((BUFF_STATICSIZE - Rx_Buffer.Elements)));\r
- \r
/* Store each character from the endpoint */\r
Buffer_StoreElement(&Rx_Buffer, Endpoint_Read_Byte());\r
}\r
\r
- /* Clear the endpoint buffer */\r
- Endpoint_ClearCurrentBank();\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 */\r
if (Tx_Buffer.Elements)\r
{\r
/* Wait until Serial Tx Endpoint Ready for Read/Write */\r
- while (!(Endpoint_ReadWriteAllowed()));\r
- \r
- /* Check before sending the data if the endpoint is completely full */\r
- bool IsFull = (Endpoint_BytesInEndpoint() == CDC_TXRX_EPSIZE);\r
+ while (!(Endpoint_IsReadWriteAllowed()));\r
\r
- /* Write the transmission buffer contents to the received data endpoint */\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
- Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\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_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
\r
- /* If a full endpoint was sent, we need to send an empty packet afterwards to terminate the transfer */\r
- if (IsFull)\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_ReadWriteAllowed()));\r
+ while (!(Endpoint_IsReadWriteAllowed()));\r
\r
/* Send an empty packet to terminate the transfer */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
}\r
}\r
}\r
projects / pub / USBasp.git / blobdiff