Fixed GenericHIDHost demo report write routine incorrect for control type requests...

[pub/USBasp.git] / Demos / Device / USBtoSerial / USBtoSerial.c

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c
index a9f0434..87d531c 100644 (file)
--- a/Demos/Device/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/USBtoSerial/USBtoSerial.c
@@ -30,12 +30,6 @@
 \r
 #include "USBtoSerial.h"\r
 \r
 \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
 /* Scheduler Task List */\r
 TASK_LIST\r
 {\r


@@ -165,13 +159,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {       \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\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
 \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_ClearControlOUT();\r

                        }\r
                        \r
                        break;\r
                        }\r
                        \r
                        break;\r


@@ -179,13 +173,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
                        if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\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
 \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_ClearControlIN();\r

                                \r
                                /* Reconfigure the USART with the new settings */\r
                                ReconfigureUSART();\r
                                \r
                                /* Reconfigure the USART with the new settings */\r
                                ReconfigureUSART();\r


@@ -207,11 +201,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r
 #endif\r
                                \r
                                /* Acknowledge the SETUP packet, ready for data transfer */\r

-                               Endpoint_ClearSetupReceived();\r
+                               Endpoint_ClearControlSETUP();\r

                                \r
                                /* Acknowledge status stage */\r
                                \r
                                /* Acknowledge status stage */\r

-                               while (!(Endpoint_IsSetupINReady()));\r
-                               Endpoint_ClearSetupIN();\r
+                               while (!(Endpoint_IsINReady()));\r
+                               Endpoint_ClearControlIN();\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -244,13 +238,13 @@ TASK(CDC_Task)
                Endpoint_SelectEndpoint(CDC_NOTIFICATION_EPNUM);\r
                Endpoint_Write_Stream_LE(&Notification, sizeof(Notification));\r
                Endpoint_Write_Stream_LE(&LineStateMask, sizeof(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
 #endif\r
 \r
                /* Select the Serial Rx Endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
                \r

-               if (Endpoint_ReadWriteAllowed())\r
+               if (Endpoint_IsOUTReceived())\r

                {\r
                        /* Read the received data endpoint into the transmission buffer */\r
                        while (Endpoint_BytesInEndpoint())\r
                {\r
                        /* Read the received data endpoint into the transmission buffer */\r
                        while (Endpoint_BytesInEndpoint())\r


@@ -263,7 +257,7 @@ TASK(CDC_Task)
                        }\r
                        \r
                        /* Clear the endpoint buffer */\r
                        }\r
                        \r
                        /* Clear the endpoint buffer */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearOUT();\r

                }\r
                \r
                /* Check if Rx buffer contains data */\r
                }\r
                \r
                /* Check if Rx buffer contains data */\r


@@ -284,27 +278,20 @@ TASK(CDC_Task)
                if (Tx_Buffer.Elements)\r
                {\r
                        /* Wait until Serial Tx Endpoint Ready for Read/Write */\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
                        while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
                          Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
                        \r
                        /* Send the data */\r
                        \r
                        /* Write the transmission buffer contents to the received data endpoint */\r
                        while (Tx_Buffer.Elements && (Endpoint_BytesInEndpoint() < CDC_TXRX_EPSIZE))\r
                          Endpoint_Write_Byte(Buffer_GetElement(&Tx_Buffer));\r
                        \r
                        /* Send the data */\r

-                       Endpoint_ClearCurrentBank();\r
+                       Endpoint_ClearIN();\r

 \r
 \r

-                       /* If a full endpoint was sent, we need to send an empty packet afterwards to terminate the transfer */\r
-                       if (IsFull)\r
-                       {\r
-                               /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
-                               while (!(Endpoint_ReadWriteAllowed()));\r
+                       /* Wait until Serial Tx Endpoint Ready for Read/Write */\r
+                       while (!(Endpoint_IsReadWriteAllowed()));\r

 \r
 \r

-                               /* Send an empty packet to terminate the transfer */\r
-                               Endpoint_ClearCurrentBank();\r
-                       }\r
+                       /* Send an empty packet to terminate the transfer */\r
+                       Endpoint_ClearIN();\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r