Move over message ID specific header data to unions inside the standard TMC header...

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

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index e002542..ab98411 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -218,7 +218,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                else\r
                                {\r
                                        /* Indicate that all in-progress/pending data IN requests should be aborted */\r
                                else\r
                                {\r
                                        /* Indicate that all in-progress/pending data IN requests should be aborted */\r

-                                       IsTMCBulkINReset  = true;\r
+                                       IsTMCBulkINReset = true;\r

                                        \r
                                        /* Save the split request for later checking when a new request is received */\r
                                        RequestInProgess = Req_InitiateAbortBulkIn;\r
                                        \r
                                        /* Save the split request for later checking when a new request is received */\r
                                        RequestInProgess = Req_InitiateAbortBulkIn;\r


@@ -338,7 +338,7 @@ void TMC_Task(void)
                \r
                Endpoint_Read_Stream_LE(&MessageHeader, sizeof(MessageHeader), StreamCallback_AbortOUTOnRequest);\r
                CurrentTransferTag = MessageHeader.Tag;\r
                \r
                Endpoint_Read_Stream_LE(&MessageHeader, sizeof(MessageHeader), StreamCallback_AbortOUTOnRequest);\r
                CurrentTransferTag = MessageHeader.Tag;\r

-\r
+               \r

                switch (MessageHeader.MessageID)\r
                {\r
                        case TMC_MESSAGEID_DEV_DEP_MSG_OUT:\r
                switch (MessageHeader.MessageID)\r
                {\r
                        case TMC_MESSAGEID_DEV_DEP_MSG_OUT:\r


@@ -351,6 +351,10 @@ void TMC_Task(void)
 \r
                                break;\r
                        case TMC_MESSAGEID_DEV_VENDOR_IN:\r
 \r
                                break;\r
                        case TMC_MESSAGEID_DEV_VENDOR_IN:\r

+\r
+                               break;\r
+                       default:\r
+                               Endpoint_StallTransaction();\r

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