Rename reserved members of all structs so that they are uniformly named across all...

Added start of the Incomplete TMC demo's command parser code.

diff --git a/Demos/Device/Incomplete/Sideshow/Descriptors.h b/Demos/Device/Incomplete/Sideshow/Descriptors.h
index 4d672c0..f988a48 100644 (file)
--- a/Demos/Device/Incomplete/Sideshow/Descriptors.h
+++ b/Demos/Device/Incomplete/Sideshow/Descriptors.h
@@ -64,12 +64,12 @@
                {
                        uint8_t                                FirstInterfaceNumber;
 
                {
                        uint8_t                                FirstInterfaceNumber;
 

-                       uint8_t                                RESERVED;
+                       uint8_t                                Reserved;

                        
                        uint8_t                                CompatibleID[8];
                        uint8_t                                SubCompatibleID[8];                      
 
                        
                        uint8_t                                CompatibleID[8];
                        uint8_t                                SubCompatibleID[8];                      
 

-                       uint8_t                                RESERVED2[6];
+                       uint8_t                                Reserved2[6];

                } USB_OSCompatibleSection_t;
                
                typedef struct
                } USB_OSCompatibleSection_t;
                
                typedef struct


@@ -79,7 +79,7 @@
                        uint16_t                               Index;
                        uint8_t                                TotalSections;
                        
                        uint16_t                               Index;
                        uint8_t                                TotalSections;
                        

-                       uint8_t                                RESERVED[7];
+                       uint8_t                                Reserved[7];

                        
                        USB_OSCompatibleSection_t              SideshowCompatID;
                } USB_OSCompatibleIDDescriptor_t;
                        
                        USB_OSCompatibleSection_t              SideshowCompatID;
                } USB_OSCompatibleIDDescriptor_t;

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
index d529302..e002542 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.c
@@ -36,7 +36,7 @@
  */\r
 TMC_Capabilities_t Capabilities =\r
        {\r
  */\r
 TMC_Capabilities_t Capabilities =\r
        {\r

-               .Status     = TMC_REQUEST_STATUS_SUCCESS,\r
+               .Status     = TMC_STATUS_SUCCESS,\r

                .TMCVersion = VERSION_BCD(1.00),\r
                \r
                .Interface  =\r
                .TMCVersion = VERSION_BCD(1.00),\r
                \r
                .Interface  =\r


@@ -53,19 +53,16 @@ TMC_Capabilities_t Capabilities =
        };\r
 \r
 /** Current TMC control request that is being processed */\r
        };\r
 \r
 /** Current TMC control request that is being processed */\r

-uint8_t RequestInProgess = 0;\r
+uint8_t RequestInProgess   = 0;\r

 \r
 /** Stream callback abort flag for bulk IN data */\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
 \r
 /** Stream callback abort flag for bulk OUT data */\r

-bool IsTMCBulkOUTReset   = false;\r
+bool IsTMCBulkOUTReset     = false;\r

 \r
 \r

-/** Last used tag value for bulk IN transfers */\r
-uint8_t NextTransferINTag  = 0;\r
-\r
-/** Last used tag value for bulk IN transfers */\r
-uint8_t NextTransferOUTTag  = 0;\r
+/** Last used tag value for data transfers */\r
+uint8_t CurrentTransferTag = 0;\r

 \r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
 \r
 \r
 /** Main program entry point. This routine contains the overall program flow, including initial\r


@@ -145,7 +142,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
  */\r
 void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r
  */\r
 void EVENT_USB_Device_UnhandledControlRequest(void)\r
 {\r

-       uint8_t TMCRequestStatus = TMC_REQUEST_STATUS_SUCCESS;\r
+       uint8_t TMCRequestStatus = TMC_STATUS_SUCCESS;\r

 \r
        /* Process TMC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r
 \r
        /* Process TMC specific control requests */\r
        switch (USB_ControlRequest.bRequest)\r


@@ -155,14 +152,14 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r

-                               /* Check that no split transaction is already in progress and the data OUT transfer tag is valid */\r
+                               /* Check that no split transaction is already in progress and the data transfer tag is valid */\r

                                if (RequestInProgess != 0)\r
                                {\r
                                if (RequestInProgess != 0)\r
                                {\r

-                                       TMCRequestStatus = TMC_REQUEST_STATUS_SPLIT_IN_PROGRESS;\r
+                                       TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS;\r

                                }\r
                                }\r

-                               else if (USB_ControlRequest.wValue != NextTransferOUTTag)\r
+                               else if (USB_ControlRequest.wValue != CurrentTransferTag)\r

                                {\r
                                {\r

-                                       TMCRequestStatus = TMC_REQUEST_STATUS_TRANSFER_NOT_IN_PROGRESS;\r
+                                       TMCRequestStatus = TMC_STATUS_TRANSFER_NOT_IN_PROGRESS;\r

                                }\r
                                else\r
                                {\r
                                }\r
                                else\r
                                {\r


@@ -188,9 +185,9 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                \r
                                /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateAbortBulkOut)\r
                                \r
                                /* Check that an ABORT BULK OUT transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateAbortBulkOut)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r
+                                 TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r

                                else if (IsTMCBulkOUTReset)\r
                                else if (IsTMCBulkOUTReset)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_PENDING;\r
+                                 TMCRequestStatus = TMC_STATUS_PENDING;\r

                                else\r
                                  RequestInProgess = 0;                 \r
                                \r
                                else\r
                                  RequestInProgess = 0;                 \r
                                \r


@@ -209,14 +206,14 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r
                        {\r
                                Endpoint_ClearSETUP();\r
                                \r

-                               /* Check that no split transaction is already in progress and the data IN transfer tag is valid */\r
+                               /* Check that no split transaction is already in progress and the data transfer tag is valid */\r

                                if (RequestInProgess != 0)\r
                                {\r
                                if (RequestInProgess != 0)\r
                                {\r

-                                       TMCRequestStatus = TMC_REQUEST_STATUS_SPLIT_IN_PROGRESS;                                \r
+                                       TMCRequestStatus = TMC_STATUS_SPLIT_IN_PROGRESS;                                \r

                                }\r
                                }\r

-                               else if (USB_ControlRequest.wValue != NextTransferINTag)\r
+                               else if (USB_ControlRequest.wValue != CurrentTransferTag)\r

                                {\r
                                {\r

-                                       TMCRequestStatus = TMC_REQUEST_STATUS_TRANSFER_NOT_IN_PROGRESS;\r
+                                       TMCRequestStatus = TMC_STATUS_TRANSFER_NOT_IN_PROGRESS;\r

                                }\r
                                else\r
                                {\r
                                }\r
                                else\r
                                {\r


@@ -229,7 +226,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r
                                \r
                                /* Write the request response bytes */\r
                                Endpoint_Write_Byte(TMCRequestStatus);\r

-                               Endpoint_Write_Byte(NextTransferINTag);\r
+                               Endpoint_Write_Byte(CurrentTransferTag);\r

 \r
                                Endpoint_ClearIN();\r
                                Endpoint_ClearStatusStage();\r
 \r
                                Endpoint_ClearIN();\r
                                Endpoint_ClearStatusStage();\r


@@ -243,9 +240,9 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                \r
                                /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateAbortBulkIn)\r
                                \r
                                /* Check that an ABORT BULK IN transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateAbortBulkIn)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_SPLIT_NOT_IN_PROGRESS;\r
+                                 TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;\r

                                else if (IsTMCBulkINReset)\r
                                else if (IsTMCBulkINReset)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_PENDING;\r
+                                 TMCRequestStatus = TMC_STATUS_PENDING;\r

                                else\r
                                  RequestInProgess = 0;\r
                                \r
                                else\r
                                  RequestInProgess = 0;\r
                                \r


@@ -267,7 +264,7 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                /* Check that no split transaction is already in progress */\r
                                if (RequestInProgess != 0)\r
                                {\r
                                /* Check that no split transaction is already in progress */\r
                                if (RequestInProgess != 0)\r
                                {\r

-                                       Endpoint_Write_Byte(TMC_REQUEST_STATUS_SPLIT_IN_PROGRESS);                              \r
+                                       Endpoint_Write_Byte(TMC_STATUS_SPLIT_IN_PROGRESS);                              \r

                                }\r
                                else\r
                                {\r
                                }\r
                                else\r
                                {\r


@@ -294,9 +291,9 @@ void EVENT_USB_Device_UnhandledControlRequest(void)
                                \r
                                /* Check that a CLEAR transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateClear)\r
                                \r
                                /* Check that a CLEAR transaction has been requested and that the request has completed */\r
                                if (RequestInProgess != Req_InitiateClear)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r
+                                 TMCRequestStatus = TMC_STATUS_SPLIT_NOT_IN_PROGRESS;                          \r

                                else if (IsTMCBulkINReset || IsTMCBulkOUTReset)\r
                                else if (IsTMCBulkINReset || IsTMCBulkOUTReset)\r

-                                 TMCRequestStatus = TMC_REQUEST_STATUS_PENDING;\r
+                                 TMCRequestStatus = TMC_STATUS_PENDING;\r

                                else\r
                                  RequestInProgess = 0;\r
                                \r
                                else\r
                                  RequestInProgess = 0;\r
                                \r


@@ -337,8 +334,26 @@ void TMC_Task(void)
        \r
        if (Endpoint_IsOUTReceived())\r
        {\r
        \r
        if (Endpoint_IsOUTReceived())\r
        {\r

-               // TEMP - Indicate data received\r
-               LEDs_SetAllLEDs(LEDS_ALL_LEDS);\r
+               TMC_MessageHeader_t MessageHeader;\r
+               \r
+               Endpoint_Read_Stream_LE(&MessageHeader, sizeof(MessageHeader), StreamCallback_AbortOUTOnRequest);\r
+               CurrentTransferTag = MessageHeader.Tag;\r
+\r
+               switch (MessageHeader.MessageID)\r
+               {\r
+                       case TMC_MESSAGEID_DEV_DEP_MSG_OUT:\r
+\r
+                               break;\r
+                       case TMC_MESSAGEID_DEV_DEP_MSG_IN:\r
+\r
+                               break;\r
+                       case TMC_MESSAGEID_DEV_VENDOR_OUT:\r
+\r
+                               break;\r
+                       case TMC_MESSAGEID_DEV_VENDOR_IN:\r
+                               break;\r
+               }\r
+               \r

                Endpoint_ClearOUT();\r
        }\r
        \r
                Endpoint_ClearOUT();\r
        }\r
        \r

diff --git a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
index 53f65a1..2d5f82f 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/TestAndMeasurement.h
@@ -65,18 +65,23 @@
                #define Req_GetCapabilities                   0x07\r
                #define Req_IndicatorPulse                    0x40\r
                \r
                #define Req_GetCapabilities                   0x07\r
                #define Req_IndicatorPulse                    0x40\r
                \r

-               #define TMC_REQUEST_STATUS_SUCCESS                   0x01\r
-               #define TMC_REQUEST_STATUS_PENDING                   0x02\r
-               #define TMC_REQUEST_STATUS_FAILED                    0x80\r
-               #define TMC_REQUEST_STATUS_TRANSFER_NOT_IN_PROGRESS  0x81\r
-               #define TMC_REQUEST_STATUS_SPLIT_NOT_IN_PROGRESS     0x82\r
-               #define TMC_REQUEST_STATUS_SPLIT_IN_PROGRESS         0x83\r
+               #define TMC_STATUS_SUCCESS                    0x01\r
+               #define TMC_STATUS_PENDING                    0x02\r
+               #define TMC_STATUS_FAILED                     0x80\r
+               #define TMC_STATUS_TRANSFER_NOT_IN_PROGRESS   0x81\r
+               #define TMC_STATUS_SPLIT_NOT_IN_PROGRESS      0x82\r
+               #define TMC_STATUS_SPLIT_IN_PROGRESS          0x83\r
+               \r
+               #define TMC_MESSAGEID_DEV_DEP_MSG_OUT         0x01\r
+               #define TMC_MESSAGEID_DEV_DEP_MSG_IN          0x02\r
+               #define TMC_MESSAGEID_DEV_VENDOR_OUT          0x7E\r
+               #define TMC_MESSAGEID_DEV_VENDOR_IN           0x7F\r

 \r
        /* Type Defines */\r
                typedef struct\r
                {\r
                        uint8_t  Status;\r
 \r
        /* Type Defines */\r
                typedef struct\r
                {\r
                        uint8_t  Status;\r

-                       uint8_t  _RESERVED1;\r
+                       uint8_t  Reserved;\r

 \r
                        uint16_t TMCVersion;\r
                        \r
 \r
                        uint16_t TMCVersion;\r
                        \r


@@ -85,18 +90,26 @@
                                unsigned char ListenOnly             : 1;\r
                                unsigned char TalkOnly               : 1;\r
                                unsigned char PulseIndicateSupported : 1;\r
                                unsigned char ListenOnly             : 1;\r
                                unsigned char TalkOnly               : 1;\r
                                unsigned char PulseIndicateSupported : 1;\r

-                               unsigned char _RESERVED              : 5;\r
+                               unsigned char Reserved               : 5;\r

                        } Interface;\r
                        \r
                        struct\r
                        {\r
                                unsigned char SupportsAbortINOnMatch : 1;\r
                        } Interface;\r
                        \r
                        struct\r
                        {\r
                                unsigned char SupportsAbortINOnMatch : 1;\r

-                               unsigned char _RESERVED              : 7;\r
+                               unsigned char Reserved               : 7;\r

                        } Device;\r
                        \r
                        } Device;\r
                        \r

-                       uint8_t _RESERVED2[6];\r
-                       uint8_t _RESERVED3[12];                 \r
+                       uint8_t Reserved2[6];\r
+                       uint8_t Reserved3[12];                  \r

                } TMC_Capabilities_t;\r
                } TMC_Capabilities_t;\r

+\r
+               typedef struct\r
+               {\r
+                       uint8_t MessageID;\r
+                       uint8_t Tag;\r
+                       uint8_t InverseTag;\r
+                       uint8_t Reserved;\r
+               } TMC_MessageHeader_t;\r

                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r
                \r
        /* Function Prototypes: */\r
                void SetupHardware(void);\r

diff --git a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
index 17e8796..7bee2ad 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
+++ b/Demos/Device/LowLevel/MassStorage/Lib/SCSI.h
@@ -83,23 +83,23 @@
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        

-                       unsigned char _RESERVED1          : 7;
+                       unsigned char Reserved            : 7;

                        unsigned char Removable           : 1;
                        
                        uint8_t       Version;
                        
                        unsigned char ResponseDataFormat  : 4;
                        unsigned char Removable           : 1;
                        
                        uint8_t       Version;
                        
                        unsigned char ResponseDataFormat  : 4;

-                       unsigned char _RESERVED2          : 1;
+                       unsigned char Reserved2           : 1;

                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t       AdditionalLength;
                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t       AdditionalLength;

-                       uint8_t       _RESERVED3[2];
+                       uint8_t       Reserved3[2];

 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;
 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;

-                       unsigned char _RESERVED4          : 1;
+                       unsigned char Reserved4           : 1;

                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;
                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;


@@ -121,7 +121,7 @@
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;

-                       unsigned char _RESERVED1          : 1;
+                       unsigned char Reserved            : 1;

                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;
                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
index 6656ac2..838e013 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/TCP.h
@@ -219,7 +219,7 @@
                        uint32_t               SequenceNumber; /**< Data sequence number of the packet */
                        uint32_t               AcknowledgmentNumber; /**< Data acknowledgment number of the packet */
                        
                        uint32_t               SequenceNumber; /**< Data sequence number of the packet */
                        uint32_t               AcknowledgmentNumber; /**< Data acknowledgment number of the packet */
                        

-                       unsigned char          Reserved : 4; /**< Reserved, must be all 0 */
+                       unsigned char          Reserved   : 4; /**< Reserved, must be all 0 */

                        unsigned char          DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
                        uint8_t                Flags; /**< TCP packet flags */
                        uint16_t               WindowSize; /**< Current data window size (bytes remaining in reception buffer) */
                        unsigned char          DataOffset : 4; /**< Offset of the data from the start of the header, in 4 byte chunks */
                        uint8_t                Flags; /**< TCP packet flags */
                        uint16_t               WindowSize; /**< Current data window size (bytes remaining in reception buffer) */

diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
index b94bbca..0d8a231 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
+++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.c
@@ -465,7 +465,7 @@ uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex,
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address

-                                       0x00,                   // Unused (reserved)
+                                       0x00,                   // Reserved

                                        0x00,                   // MSB of Total Blocks to Read
                                        Blocks,                 // LSB of Total Blocks to Read
                                        0x00                    // Unused (control)
                                        0x00,                   // MSB of Total Blocks to Read
                                        Blocks,                 // LSB of Total Blocks to Read
                                        0x00                    // Unused (control)

diff --git a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
index 5c1e80b..d9e90a8 100644 (file)
--- a/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
+++ b/Demos/Host/LowLevel/MassStorageHost/Lib/MassStoreCommands.h
@@ -113,7 +113,7 @@
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;

-                       unsigned char _RESERVED1          : 1;
+                       unsigned char Reserved            : 1;

                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;
                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;


@@ -136,23 +136,23 @@
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        

-                       unsigned char _RESERVED1          : 7;
+                       unsigned char Reserved            : 7;

                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;
                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;

-                       unsigned char _RESERVED2          : 1;
+                       unsigned char Reserved2           : 1;

                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;
                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;

-                       uint8_t      _RESERVED3[2];
+                       uint8_t      Reserved3[2];

 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;
 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;

-                       unsigned char _RESERVED4          : 1;
+                       unsigned char Reserved4           : 1;

                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;
                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;

diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorage.h
index ade71a2..dd2da2f 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorage.h
@@ -246,7 +246,7 @@
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;
                        uint8_t       SegmentNumber;
                        
                        unsigned char SenseKey            : 4;

-                       unsigned char _RESERVED1          : 1;
+                       unsigned char Reserved            : 1;

                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;
                        unsigned char ILI                 : 1;
                        unsigned char EOM                 : 1;
                        unsigned char FileMark            : 1;


@@ -273,23 +273,23 @@
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        
                        unsigned char DeviceType          : 5;
                        unsigned char PeripheralQualifier : 3;
                        

-                       unsigned char _RESERVED1          : 7;
+                       unsigned char Reserved            : 7;

                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;
                        unsigned char Removable           : 1;
                        
                        uint8_t      Version;
                        
                        unsigned char ResponseDataFormat  : 4;

-                       unsigned char _RESERVED2          : 1;
+                       unsigned char Reserved2           : 1;

                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;
                        unsigned char NormACA             : 1;
                        unsigned char TrmTsk              : 1;
                        unsigned char AERC                : 1;
 
                        uint8_t      AdditionalLength;

-                       uint8_t      _RESERVED3[2];
+                       uint8_t      Reserved3[2];

 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;
 
                        unsigned char SoftReset           : 1;
                        unsigned char CmdQue              : 1;

-                       unsigned char _RESERVED4          : 1;
+                       unsigned char Reserved4           : 1;

                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;
                        unsigned char Linked              : 1;
                        unsigned char Sync                : 1;
                        unsigned char WideBus16Bit        : 1;

diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorage.c
index 82746cd..14b7741 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorage.c
@@ -546,7 +546,7 @@ uint8_t MS_Host_ReadDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address

-                                       0x00,                   // Unused (reserved)
+                                       0x00,                   // Reserved

                                        0x00,                   // MSB of Total Blocks to Read
                                        Blocks,                 // LSB of Total Blocks to Read
                                        0x00                    // Unused (control)
                                        0x00,                   // MSB of Total Blocks to Read
                                        Blocks,                 // LSB of Total Blocks to Read
                                        0x00                    // Unused (control)


@@ -590,7 +590,7 @@ uint8_t MS_Host_WriteDeviceBlocks(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address
                                        (BlockAddress >> 16),
                                        (BlockAddress >> 8),
                                        (BlockAddress & 0xFF),  // LSB of Block Address

-                                       0x00,                   // Unused (reserved)
+                                       0x00,                   // Reserved

                                        0x00,                   // MSB of Total Blocks to Write
                                        Blocks,                 // LSB of Total Blocks to Write
                                        0x00                    // Unused (control)
                                        0x00,                   // MSB of Total Blocks to Write
                                        Blocks,                 // LSB of Total Blocks to Write
                                        0x00                    // Unused (control)

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 9cb7ea9..020779b 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -25,7 +25,7 @@
   *      -# Multiple-Report HID device
   *      -# Device/Host USB bridge
   *      -# Alternative (USB-IF endorsed) USB-CDC Ethernet Class
   *      -# Multiple-Report HID device
   *      -# Device/Host USB bridge
   *      -# Alternative (USB-IF endorsed) USB-CDC Ethernet Class

-  *      -# USB Test and Measurement Class
+  *      -# Finish Test and Measurement Class demo

   *      -# Finish BluetoothHost demo
   *      -# Finish SideShow demo
   *      -# Finish StandaloneProgrammer project
   *      -# Finish BluetoothHost demo
   *      -# Finish SideShow demo
   *      -# Finish StandaloneProgrammer project

diff --git a/Projects/TempDataLogger/Lib/DS1307.h b/Projects/TempDataLogger/Lib/DS1307.h
index d07bff4..c9fe43c 100644 (file)
--- a/Projects/TempDataLogger/Lib/DS1307.h
+++ b/Projects/TempDataLogger/Lib/DS1307.h
@@ -34,7 +34,7 @@
                                {
                                        unsigned int Min            : 4;
                                        unsigned int TenMin         : 3;
                                {
                                        unsigned int Min            : 4;
                                        unsigned int TenMin         : 3;

-                                       unsigned int _RESERVED      : 1;
+                                       unsigned int Reserved       : 1;

                                } Fields;
                                
                                uint8_t IntVal;
                                } Fields;
                                
                                uint8_t IntVal;


@@ -47,7 +47,7 @@
                                        unsigned int Hour            : 4;
                                        unsigned int TenHour         : 2;
                                        unsigned int TwelveHourMode  : 1;
                                        unsigned int Hour            : 4;
                                        unsigned int TenHour         : 2;
                                        unsigned int TwelveHourMode  : 1;

-                                       unsigned int _RESERVED       : 1;
+                                       unsigned int Reserved        : 1;

                                } Fields;
                                
                                uint8_t IntVal;
                                } Fields;
                                
                                uint8_t IntVal;


@@ -62,7 +62,7 @@
                                {
                                        unsigned int Day             : 4;
                                        unsigned int TenDay          : 2;
                                {
                                        unsigned int Day             : 4;
                                        unsigned int TenDay          : 2;

-                                       unsigned int _RESERVED       : 2;
+                                       unsigned int Reserved        : 2;

                                } Fields;
                        
                                uint8_t IntVal;
                                } Fields;
                        
                                uint8_t IntVal;


@@ -74,7 +74,7 @@
                                {
                                        unsigned int Month           : 4;
                                        unsigned int TenMonth        : 1;
                                {
                                        unsigned int Month           : 4;
                                        unsigned int TenMonth        : 1;

-                                       unsigned int _RESERVED       : 3;
+                                       unsigned int Reserved        : 3;

                                } Fields;
                                
                                uint8_t IntVal;
                                } Fields;
                                
                                uint8_t IntVal;