* current encoding options, including baud rate, character format, parity mode and total number of \r
* bits in each data chunk.\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
/** Current address counter. This stores the current address of the FLASH or EEPROM as set by the host,\r
* and is used when reading or writing to the AVRs memory (either FLASH or EEPROM depending on the issued\r
Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
\r
/* Wait until any pending transmissions have completed before shutting down */\r
- while (!(Endpoint_ReadWriteAllowed()));\r
+ while (!(Endpoint_IsINReady()));\r
\r
/* Shut down the USB subsystem */\r
USB_ShutDown();\r
/** Event handler for the USB_Disconnect event. This indicates that the bootloader should exit and the user\r
* application started.\r
*/\r
-EVENT_HANDLER(USB_Disconnect)\r
+void EVENT_USB_Disconnect(void)\r
{\r
/* Upon disconnection, run user application */\r
RunBootloader = false;\r
/** Event handler for the USB_ConfigurationChanged event. This configures the device's endpoints ready\r
* to relay data to and from the attached USB host.\r
*/\r
-EVENT_HANDLER(USB_ConfigurationChanged)\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
* control requests that are not handled internally by the USB library, so that they can be handled appropriately\r
* for the application.\r
*/\r
-EVENT_HANDLER(USB_UnhandledControlPacket)\r
+void EVENT_USB_UnhandledControlPacket(void)\r
{\r
uint8_t* LineCodingData = (uint8_t*)&LineCoding;\r
\r
- Endpoint_Discard_Word();\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
- Endpoint_ClearSetupReceived();\r
+ Endpoint_ClearSETUP();\r
\r
for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
Endpoint_Write_Byte(*(LineCodingData++)); \r
\r
- Endpoint_ClearSetupIN();\r
+ Endpoint_ClearIN();\r
\r
/* Acknowledge status stage */\r
- while (!(Endpoint_IsSetupOUTReceived()));\r
- Endpoint_ClearSetupOUT();\r
+ while (!(Endpoint_IsOUTReceived()));\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
- Endpoint_ClearSetupReceived();\r
+ Endpoint_ClearSETUP();\r
\r
- while (!(Endpoint_IsSetupOUTReceived()));\r
+ while (!(Endpoint_IsOUTReceived()));\r
\r
for (uint8_t i = 0; i < sizeof(LineCoding); i++)\r
*(LineCodingData++) = Endpoint_Read_Byte();\r
\r
- Endpoint_ClearSetupOUT();\r
+ Endpoint_ClearOUT();\r
\r
/* Acknowledge status stage */\r
- while (!(Endpoint_IsSetupINReady()));\r
- Endpoint_ClearSetupIN();\r
+ while (!(Endpoint_IsINReady()));\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
- 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_SelectEndpoint(CDC_RX_EPNUM);\r
\r
/* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
- if (!(Endpoint_ReadWriteAllowed()))\r
+ while (!(Endpoint_IsReadWriteAllowed()))\r
{\r
- Endpoint_ClearCurrentBank();\r
- while (!(Endpoint_ReadWriteAllowed()));\r
+ Endpoint_ClearOUT();\r
+ while (!(Endpoint_IsOUTReceived()));\r
}\r
\r
/* Fetch the next byte from the OUT endpoint */\r
/* Select the IN endpoint so that the next data byte can be written */\r
Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
\r
- /* If OUT endpoint empty, clear it and wait for the next packet from the host */\r
- if (!(Endpoint_ReadWriteAllowed()))\r
+ /* If IN endpoint full, clear it and wait util ready for the next packet to the host */\r
+ if (!(Endpoint_IsReadWriteAllowed()))\r
{\r
- Endpoint_ClearCurrentBank();\r
- while (!(Endpoint_ReadWriteAllowed()));\r
+ Endpoint_ClearIN();\r
+ while (!(Endpoint_IsINReady()));\r
}\r
\r
/* Write the next byte to the OUT endpoint */\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
\r
/* Check if endpoint has a command in it sent from the host */\r
- if (Endpoint_ReadWriteAllowed())\r
+ if (Endpoint_IsOUTReceived())\r
{\r
/* Read in the bootloader command (first byte sent from host) */\r
uint8_t Command = FetchNextCommandByte();\r
}\r
else if (Command == 's')\r
{\r
- WriteNextResponseByte(SIGNATURE_0);\r
- WriteNextResponseByte(SIGNATURE_1);\r
WriteNextResponseByte(SIGNATURE_2); \r
+ WriteNextResponseByte(SIGNATURE_1);\r
+ WriteNextResponseByte(SIGNATURE_0);\r
}\r
else if (Command == 'b')\r
{\r
Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
\r
/* Remember if the endpoint is completely full before clearing it */\r
- bool IsEndpointFull = !(Endpoint_ReadWriteAllowed());\r
+ bool IsEndpointFull = !(Endpoint_IsReadWriteAllowed());\r
\r
/* Send the endpoint data to the host */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearIN();\r
\r
/* If a full endpoint's worth of data was sent, we need to send an empty packet afterwards to signal end of transfer */\r
if (IsEndpointFull)\r
{\r
- while (!(Endpoint_ReadWriteAllowed()));\r
- Endpoint_ClearCurrentBank();\r
+ while (!(Endpoint_IsINReady()));\r
+ Endpoint_ClearIN();\r
}\r
\r
/* Select the OUT endpoint */\r
Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
\r
/* Acknowledge the command from the host */\r
- Endpoint_ClearCurrentBank();\r
+ Endpoint_ClearOUT();\r
}\r
}\r
projects / pub / USBasp.git / blobdiff