Fixed MassStorage based demos and projects resetting the SCSI sense values before...

[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 711ca3f..94b8687 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -53,13 +53,13 @@ TMC_Capabilities_t Capabilities =
        };\r
 \r
 /** Current TMC control request that is being processed */\r
-uint8_t RequestInProgess   = 0;\r
+uint8_t RequestInProgress = 0;\r
 \r
 /** Stream callback abort flag for bulk IN data */\r
-bool IsTMCBulkINReset      = false;\r
+bool IsTMCBulkINReset = false;\r
 \r
 /** Stream callback abort flag for bulk OUT data */\r
-bool IsTMCBulkOUTReset     = false;\r
+bool IsTMCBulkOUTReset = false;\r
 \r
 /** Last used tag value for data transfers */\r
 uint8_t CurrentTransferTag = 0;\r
@@ -118,22 +118,18 @@ void EVENT_USB_Device_Disconnect(void)
  */\r
 void EVENT_USB_Device_ConfigurationChanged(void)\r
 {\r
-       LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
-\r
-       /* Setup TMC In and Out Endpoints */\r
-       if (!(Endpoint_ConfigureEndpoint(TMC_IN_EPNUM, EP_TYPE_BULK,\r
-                                            ENDPOINT_DIR_IN, TMC_IO_EPSIZE,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
-       {\r
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-       }\r
-\r
-       if (!(Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK,\r
-                                            ENDPOINT_DIR_OUT, TMC_IO_EPSIZE,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
-       {\r
-               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
-       }\r
+       bool ConfigSuccess = true;\r
+\r
+       /* Setup TMC In, Out and Notification Endpoints */\r
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_IN_EPNUM,  EP_TYPE_BULK, ENDPOINT_DIR_IN,\r
+                                                   TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_OUT_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_OUT,\r
+                                                   TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+       ConfigSuccess &= Endpoint_ConfigureEndpoint(TMC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,\r
+                                                   TMC_IO_EPSIZE, ENDPOINT_BANK_SINGLE);\r
+\r
+       /* Indicate endpoint configuration success or failure */\r
+       LEDs_SetAllLEDs(ConfigSuccess ? LEDMASK_USB_READY : LEDMASK_USB_ERROR);\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlRequest event. This is used to catch standard and class specific\r
@@ -153,7 +149,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that no split transaction is already in progress and the data transfer tag is valid */\r
-                               if (RequestInProgess != 0)\r
+                               if (RequestInProgress != 0)\r
                                {\r
                                        TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS;\r
                                }\r
@@ -167,7 +163,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        IsTMCBulkOUTReset = true;\r
                                        \r
                                        /* Save the split request for later checking when a new request is received */\r
-                                       RequestInProgess = Req_InitiateAbortBulkOut;\r
+                                       RequestInProgress = Req_InitiateAbortBulkOut;\r
                                }\r
                                \r
                                /* Write the request response byte */\r
@@ -184,12 +180,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */\r
-                               if (RequestInProgess != Req_InitiateAbortBulkOut)\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
-                                 RequestInProgess = 0;                 \r
+                                 RequestInProgress = 0;                        \r
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -207,7 +203,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that no split transaction is already in progress and the data transfer tag is valid */\r
-                               if (RequestInProgess != 0)\r
+                               if (RequestInProgress != 0)\r
                                {\r
                                        TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS;                                \r
                                }\r
@@ -221,7 +217,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        IsTMCBulkINReset = true;\r
                                        \r
                                        /* Save the split request for later checking when a new request is received */\r
-                                       RequestInProgess = Req_InitiateAbortBulkIn;\r
+                                       RequestInProgress = Req_InitiateAbortBulkIn;\r
                                }\r
                                \r
                                /* Write the request response bytes */\r
@@ -239,12 +235,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */\r
-                               if (RequestInProgess != Req_InitiateAbortBulkIn)\r
+                               if (RequestInProgress != Req_InitiateAbortBulkIn)\r
                                  TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;\r
                                else if (IsTMCBulkINReset)\r
                                  TMCRequestStatus = TMC_STATUS_PENDING;\r
                                else\r
-                                 RequestInProgess = 0;\r
+                                 RequestInProgress = 0;\r
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -262,7 +258,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that no split transaction is already in progress */\r
-                               if (RequestInProgess != 0)\r
+                               if (RequestInProgress != 0)\r
                                {\r
                                        Endpoint_Write_Byte(TMC_STATUS_SPLIT_IN_PROGRESS);                              \r
                                }\r
@@ -273,7 +269,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                        IsTMCBulkOUTReset = true;\r
                                        \r
                                        /* Save the split request for later checking when a new request is received */\r
-                                       RequestInProgess = Req_InitiateClear;\r
+                                       RequestInProgress = Req_InitiateClear;\r
                                }\r
                                \r
                                /* Write the request response byte */\r
@@ -290,12 +286,12 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                Endpoint_ClearSETUP();\r
                                \r
                                /* Check that a CLEAR transaction has been requested and that the request has completed */\r
-                               if (RequestInProgess != Req_InitiateClear)\r
+                               if (RequestInProgress != Req_InitiateClear)\r
                                  TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r
                                else if (IsTMCBulkINReset || IsTMCBulkOUTReset)\r
                                  TMCRequestStatus = TMC_STATUS_PENDING;\r
                                else\r
-                                 RequestInProgess = 0;\r
+                                 RequestInProgress = 0;\r
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
@@ -332,7 +328,7 @@ void TMC_Task(void)
        \r
        TMC_MessageHeader_t MessageHeader;\r
        \r
-       /* Check if a TMC packet has been received */\r
+       /* Try to read in a TMC message from the interface, process if one is available */\r
        if (ReadTMCHeader(&MessageHeader))\r
        {\r
                /* Indicate busy */\r
@@ -366,6 +362,12 @@ void TMC_Task(void)
        IsTMCBulkOUTReset = false;\r
 }\r
 \r
+/** Attempts to read in the TMC message header from the TMC interface.\r
+ *\r
+ *  \param[out] MessageHeader  Pointer to a location where the read header (if any) should be stored\r
+ *\r
+ *  \return Boolean true if a header was read, false otherwise\r
+ */\r
 bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader)\r
 {\r
        /* Select the Data Out endpoint */\r
@@ -382,7 +384,7 @@ bool ReadTMCHeader(TMC_MessageHeader_t* const MessageHeader)
        CurrentTransferTag = MessageHeader->Tag;\r
        \r
        /* Indicate if the command has been aborted or not */\r
-       return !IsTMCBulkOUTReset;\r
+       return !(IsTMCBulkOUTReset);\r
 }\r
 \r
 bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader)\r
@@ -402,7 +404,7 @@ bool WriteTMCHeader(TMC_MessageHeader_t* const MessageHeader)
        Endpoint_Write_Stream_LE(MessageHeader, sizeof(TMC_MessageHeader_t), StreamCallback_AbortINOnRequest);\r
 \r
        /* Indicate if the command has been aborted or not */\r
-       return !IsTMCBulkINReset;\r
+       return !(IsTMCBulkINReset);\r
 }\r
 \r
 /** Stream callback function for the Endpoint stream write functions. This callback will abort the current stream transfer\r