\r
#include "DualCDC.h"\r
\r
-/* Project Tags, for reading out using the ButtLoad project */\r
-BUTTLOADTAG(ProjName, "LUFA DualCDC 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: CDC1_Task , TaskStatus: TASK_STOP },\r
- { Task: CDC2_Task , TaskStatus: TASK_STOP },\r
+ { .Task = USB_USBTask , .TaskStatus = TASK_STOP },\r
+ { .Task = CDC1_Task , .TaskStatus = TASK_STOP },\r
+ { .Task = CDC2_Task , .TaskStatus = TASK_STOP },\r
};\r
\r
/* Globals: */\r
*\r
* These values are set by the host via a class-specific request, however they are not required to be used accurately.\r
* It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical\r
- * serial link characteristics and instead sends and recieves data in endpoint streams.\r
+ * serial link characteristics and instead sends and receives data in endpoint streams.\r
*/\r
-CDC_Line_Coding_t LineCoding1 = { BaudRateBPS: 9600,\r
- CharFormat: OneStopBit,\r
- ParityType: Parity_None,\r
- DataBits: 8 };\r
+CDC_Line_Coding_t LineCoding1 = { .BaudRateBPS = 9600,\r
+ .CharFormat = OneStopBit,\r
+ .ParityType = Parity_None,\r
+ .DataBits = 8 };\r
\r
/** Contains the current baud rate and other settings of the second virtual serial port. While this demo does not use\r
* the physical USART and thus does not use these settings, they must still be retained and returned to the host\r
*\r
* These values are set by the host via a class-specific request, however they are not required to be used accurately.\r
* It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical\r
- * serial link characteristics and instead sends and recieves data in endpoint streams.\r
+ * serial link characteristics and instead sends and receives data in endpoint streams.\r
*/\r
-CDC_Line_Coding_t LineCoding2 = { BaudRateBPS: 9600,\r
- CharFormat: OneStopBit,\r
- ParityType: Parity_None,\r
- DataBits: 8 };\r
+CDC_Line_Coding_t LineCoding2 = { .BaudRateBPS = 9600,\r
+ .CharFormat = OneStopBit,\r
+ .ParityType = Parity_None,\r
+ .DataBits = 8 };\r
\r
/** String to print through the first virtual serial port when the joystick is pressed upwards. */\r
char JoystickUpString[] = "Joystick Up\r\n";\r
\r
-/** String to print through the first virtual serial port when the joystick is pressed downwards. */\r
+/** String to print through the first virtual serial port when the joystick is pressed downward. */\r
char JoystickDownString[] = "Joystick Down\r\n";\r
\r
/** String to print through the first virtual serial port when the joystick is pressed left. */\r
uint8_t* LineCodingData;\r
\r
/* Discard the unused wValue parameter */\r
- Endpoint_Ignore_Word();\r
+ Endpoint_Discard_Word();\r
\r
/* wIndex indicates the interface being controlled */\r
uint16_t wIndex = Endpoint_Read_Word_LE();\r
LineCodingData = (wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;\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(CDC_Line_Coding_t));\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(CDC_Line_Coding_t));\r
\r
/* Finalize the stream transfer to clear the last packet from the host */\r
- Endpoint_ClearSetupIN();\r
+ Endpoint_ClearIN();\r
}\r
\r
break;\r
case REQ_SetControlLineState:\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
/* Acknowledge status stage */\r
- while (!(Endpoint_IsSetupINReady()));\r
- Endpoint_ClearSetupIN();\r
+ while (!(Endpoint_IsINReady()));\r
+ Endpoint_ClearIN();\r
}\r
\r
break;\r
Endpoint_Write_Stream_LE(ReportString, strlen(ReportString));\r
\r
/* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
+\r
+ /* Wait until the endpoint is ready for another packet */\r
+ while (!(Endpoint_IsINReady()));\r
+ \r
+ /* Send an empty packet to ensure that the host does not buffer data sent to it */\r
+ Endpoint_ClearIN();\r
}\r
\r
/* Select the Serial Rx Endpoint */\r
Endpoint_SelectEndpoint(CDC1_RX_EPNUM);\r
\r
/* Throw away any received data from the host */\r
- if (Endpoint_ReadWriteAllowed())\r
- Endpoint_ClearCurrentBank();\r
+ if (Endpoint_IsOUTReceived())\r
+ Endpoint_ClearOUT();\r
}\r
\r
-/** Function to manage CDC data transmission and reception to and from the host for the second CDC interface, which echos back\r
+/** Function to manage CDC data transmission and reception to and from the host for the second CDC interface, which echoes back\r
* all data sent to it from the host.\r
*/\r
TASK(CDC2_Task)\r
Endpoint_SelectEndpoint(CDC2_RX_EPNUM);\r
\r
/* Check to see if any data has been received */\r
- if (Endpoint_ReadWriteAllowed())\r
+ if (Endpoint_IsOUTReceived())\r
{\r
- /* Create a temp buffer big enough to hold the incomming endpoint packet */\r
+ /* Create a temp buffer big enough to hold the incoming endpoint packet */\r
uint8_t Buffer[Endpoint_BytesInEndpoint()];\r
\r
- /* Remember how large the incomming packet is */\r
+ /* Remember how large the incoming packet is */\r
uint16_t DataLength = Endpoint_BytesInEndpoint();\r
\r
- /* Read in the incomming packet into the buffer */\r
+ /* Read in the incoming packet into the buffer */\r
Endpoint_Read_Stream_LE(&Buffer, DataLength);\r
\r
/* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearOUT();\r
\r
/* Select the Serial Tx Endpoint */\r
Endpoint_SelectEndpoint(CDC2_TX_EPNUM);\r
Endpoint_Write_Stream_LE(&Buffer, DataLength);\r
\r
/* Finalize the stream transfer to send the last packet */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
+\r
+ /* Wait until the endpoint is ready for the next packet */\r
+ while (!(Endpoint_IsINReady()));\r
+\r
+ /* Send an empty packet to prevent host buffering */\r
+ Endpoint_ClearIN();\r
}\r
}\r
projects / pub / USBasp.git / blobdiff