Changed all Device mode LowLevel demos and Device Class drivers so that the control...

[pub/USBasp.git] / Demos / Device / Incomplete / TestAndMeasurement / TestAndMeasurement.c

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index 94b8687..55e17bc 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -146,8 +146,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_InitiateAbortBulkOut:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that no split transaction is already in progress and the data transfer tag is valid */\r
                                if (RequestInProgress != 0)\r
                                {\r
@@ -165,6 +163,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        /* Save the split request for later checking when a new request is received */\r
                                        RequestInProgress = Req_InitiateAbortBulkOut;\r
                                }\r
+\r
+                               Endpoint_ClearSETUP();\r
                                \r
                                /* Write the request response byte */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -177,16 +177,16 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_CheckAbortBulkOutStatus:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */\r
                                if (RequestInProgress != Req_InitiateAbortBulkOut)\r
                                  TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r
                                else if (IsTMCBulkOUTReset)\r
                                  TMCRequestStatus = TMC_STATUS_PENDING;\r
                                else\r
-                                 RequestInProgress = 0;                        \r
-                               \r
+                                 RequestInProgress = 0;        \r
+\r
+                               Endpoint_ClearSETUP();\r
+                                                               \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
                                Endpoint_Write_Word_LE(0);\r
@@ -200,8 +200,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_InitiateAbortBulkIn:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that no split transaction is already in progress and the data transfer tag is valid */\r
                                if (RequestInProgress != 0)\r
                                {\r
@@ -219,6 +217,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        /* Save the split request for later checking when a new request is received */\r
                                        RequestInProgress = Req_InitiateAbortBulkIn;\r
                                }\r
+\r
+                               Endpoint_ClearSETUP();\r
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -232,8 +232,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_CheckAbortBulkInStatus:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_ENDPOINT))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */\r
                                if (RequestInProgress != Req_InitiateAbortBulkIn)\r
                                  TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;\r
@@ -241,7 +239,9 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                  TMCRequestStatus = TMC_STATUS_PENDING;\r
                                else\r
                                  RequestInProgress = 0;\r
-                               \r
+\r
+                               Endpoint_ClearSETUP();\r
+                                                               \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
                                Endpoint_Write_Word_LE(0);\r
@@ -255,8 +255,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_InitiateClear:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that no split transaction is already in progress */\r
                                if (RequestInProgress != 0)\r
                                {\r
@@ -271,6 +269,8 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        /* Save the split request for later checking when a new request is received */\r
                                        RequestInProgress = Req_InitiateClear;\r
                                }\r
+\r
+                               Endpoint_ClearSETUP();\r
                                \r
                                /* Write the request response byte */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -283,8 +283,6 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_CheckClearStatus:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
-                               Endpoint_ClearSETUP();\r
-                               \r
                                /* Check that a CLEAR transaction has been requested and that the request has completed */\r
                                if (RequestInProgress != Req_InitiateClear)\r
                                  TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r
@@ -292,7 +290,9 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                  TMCRequestStatus = TMC_STATUS_PENDING;\r
                                else\r
                                  RequestInProgress = 0;\r
-                               \r
+\r
+                               Endpoint_ClearSETUP();\r
+\r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
                                Endpoint_Write_Byte(0);\r
@@ -305,13 +305,10 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                case Req_GetCapabilities:\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
-                               /* Acknowledge the SETUP packet, ready for data transfer */\r
                                Endpoint_ClearSETUP();\r
                                        \r
                                /* Write the device capabilities to the control endpoint */\r
-                               Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t));\r
-                               \r
-                               /* Finalize the stream transfer to send the last packet or clear the host abort */\r
+                               Endpoint_Write_Control_Stream_LE(&Capabilities, sizeof(TMC_Capabilities_t));                            \r
                                Endpoint_ClearOUT();\r
                        }\r
                        \r