Clean up RNDIS demo type define names.

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c
index c5202bc..8bbc9f2 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.c
@@ -82,7 +82,7 @@ static const uint32_t PROGMEM AdapterSupportedOIDList[]  =
  *  Supported OID list, plus the response header. The buffer is half-duplex, and is written to as it is read to save on SRAM - for this\r
  *  reason, care must be taken when constructing RNDIS responses that unread data is not overwritten when writing in responses.\r
  */\r
-uint8_t                 RNDISMessageBuffer[sizeof(AdapterSupportedOIDList) + sizeof(RNDIS_QUERY_CMPLT_t)];\r
+uint8_t                 RNDISMessageBuffer[sizeof(AdapterSupportedOIDList) + sizeof(RNDIS_Query_Complete_t)];\r
 \r
 /** Pointer to the RNDIS message header at the top of the RNDIS message buffer, for convenience. */\r
 RNDIS_Message_Header_t* MessageHeader = (RNDIS_Message_Header_t*)&RNDISMessageBuffer;\r
@@ -112,11 +112,11 @@ void ProcessRNDISControlMessage(void)
 \r
                        ResponseReady = true;\r
                        \r
-                       RNDIS_INITIALIZE_MSG_t*   INITIALIZE_Message  = (RNDIS_INITIALIZE_MSG_t*)&RNDISMessageBuffer;\r
-                       RNDIS_INITIALIZE_CMPLT_t* INITIALIZE_Response = (RNDIS_INITIALIZE_CMPLT_t*)&RNDISMessageBuffer;\r
+                       RNDIS_Initialize_Message_t*   INITIALIZE_Message  = (RNDIS_Initialize_Message_t*)&RNDISMessageBuffer;\r
+                       RNDIS_Initialize_Complete_t* INITIALIZE_Response = (RNDIS_Initialize_Complete_t*)&RNDISMessageBuffer;\r
                        \r
                        INITIALIZE_Response->MessageType           = REMOTE_NDIS_INITIALIZE_CMPLT;\r
-                       INITIALIZE_Response->MessageLength         = sizeof(RNDIS_INITIALIZE_CMPLT_t);\r
+                       INITIALIZE_Response->MessageLength         = sizeof(RNDIS_Initialize_Complete_t);\r
                        INITIALIZE_Response->RequestId             = INITIALIZE_Message->RequestId;\r
                        INITIALIZE_Response->Status                = REMOTE_NDIS_STATUS_SUCCESS;\r
                        \r
@@ -125,7 +125,7 @@ void ProcessRNDISControlMessage(void)
                        INITIALIZE_Response->DeviceFlags           = REMOTE_NDIS_DF_CONNECTIONLESS;\r
                        INITIALIZE_Response->Medium                = REMOTE_NDIS_MEDIUM_802_3;\r
                        INITIALIZE_Response->MaxPacketsPerTransfer = 1;\r
-                       INITIALIZE_Response->MaxTransferSize       = (sizeof(RNDIS_PACKET_MSG_t) + ETHERNET_FRAME_SIZE_MAX);\r
+                       INITIALIZE_Response->MaxTransferSize       = (sizeof(RNDIS_Packet_Message_t) + ETHERNET_FRAME_SIZE_MAX);\r
                        INITIALIZE_Response->PacketAlignmentFactor = 0;\r
                        INITIALIZE_Response->AFListOffset          = 0;\r
                        INITIALIZE_Response->AFListSize            = 0;\r
@@ -147,17 +147,17 @@ void ProcessRNDISControlMessage(void)
 \r
                        ResponseReady = true;\r
                                                \r
-                       RNDIS_QUERY_MSG_t*   QUERY_Message  = (RNDIS_QUERY_MSG_t*)&RNDISMessageBuffer;\r
-                       RNDIS_QUERY_CMPLT_t* QUERY_Response = (RNDIS_QUERY_CMPLT_t*)&RNDISMessageBuffer;\r
-                       uint32_t             Query_Oid      = QUERY_Message->Oid;\r
+                       RNDIS_Query_Message_t*  QUERY_Message  = (RNDIS_Query_Message_t*)&RNDISMessageBuffer;\r
+                       RNDIS_Query_Complete_t* QUERY_Response = (RNDIS_Query_Complete_t*)&RNDISMessageBuffer;\r
+                       uint32_t                Query_Oid      = QUERY_Message->Oid;\r
                                                \r
                        void*     QueryData                 = &RNDISMessageBuffer[sizeof(RNDIS_Message_Header_t) +\r
                                                                                  QUERY_Message->InformationBufferOffset];\r
-                       void*     ResponseData              = &RNDISMessageBuffer[sizeof(RNDIS_QUERY_CMPLT_t)];         \r
+                       void*     ResponseData              = &RNDISMessageBuffer[sizeof(RNDIS_Query_Complete_t)];              \r
                        uint16_t  ResponseSize;\r
 \r
                        QUERY_Response->MessageType         = REMOTE_NDIS_QUERY_CMPLT;\r
-                       QUERY_Response->MessageLength       = sizeof(RNDIS_QUERY_CMPLT_t);\r
+                       QUERY_Response->MessageLength       = sizeof(RNDIS_Query_Complete_t);\r
                                                \r
                        if (ProcessNDISQuery(Query_Oid, QueryData, QUERY_Message->InformationBufferLength,\r
                                             ResponseData, &ResponseSize))\r
@@ -166,7 +166,7 @@ void ProcessRNDISControlMessage(void)
                                QUERY_Response->MessageLength          += ResponseSize;\r
                                                        \r
                                QUERY_Response->InformationBufferLength = ResponseSize;\r
-                               QUERY_Response->InformationBufferOffset = (sizeof(RNDIS_QUERY_CMPLT_t) - sizeof(RNDIS_Message_Header_t));\r
+                               QUERY_Response->InformationBufferOffset = (sizeof(RNDIS_Query_Complete_t) - sizeof(RNDIS_Message_Header_t));\r
                        }\r
                        else\r
                        {                               \r
@@ -182,12 +182,12 @@ void ProcessRNDISControlMessage(void)
                \r
                        ResponseReady = true;\r
                        \r
-                       RNDIS_SET_MSG_t*   SET_Message  = (RNDIS_SET_MSG_t*)&RNDISMessageBuffer;\r
-                       RNDIS_SET_CMPLT_t* SET_Response = (RNDIS_SET_CMPLT_t*)&RNDISMessageBuffer;\r
-                       uint32_t           SET_Oid      = SET_Message->Oid;\r
+                       RNDIS_Set_Message_t*  SET_Message  = (RNDIS_Set_Message_t*)&RNDISMessageBuffer;\r
+                       RNDIS_Set_Complete_t* SET_Response = (RNDIS_Set_Complete_t*)&RNDISMessageBuffer;\r
+                       uint32_t              SET_Oid      = SET_Message->Oid;\r
 \r
                        SET_Response->MessageType       = REMOTE_NDIS_SET_CMPLT;\r
-                       SET_Response->MessageLength     = sizeof(RNDIS_SET_CMPLT_t);\r
+                       SET_Response->MessageLength     = sizeof(RNDIS_Set_Complete_t);\r
                        SET_Response->RequestId         = SET_Message->RequestId;\r
 \r
                        void* SetData                   = &RNDISMessageBuffer[sizeof(RNDIS_Message_Header_t) +\r
@@ -204,10 +204,10 @@ void ProcessRNDISControlMessage(void)
                \r
                        ResponseReady = true;\r
                        \r
-                       RNDIS_RESET_CMPLT_t* RESET_Response = (RNDIS_RESET_CMPLT_t*)&RNDISMessageBuffer;\r
+                       RNDIS_Reset_Complete_t* RESET_Response = (RNDIS_Reset_Complete_t*)&RNDISMessageBuffer;\r
 \r
                        RESET_Response->MessageType         = REMOTE_NDIS_RESET_CMPLT;\r
-                       RESET_Response->MessageLength       = sizeof(RNDIS_RESET_CMPLT_t);\r
+                       RESET_Response->MessageLength       = sizeof(RNDIS_Reset_Complete_t);\r
                        RESET_Response->Status              = REMOTE_NDIS_STATUS_SUCCESS;\r
                        RESET_Response->AddressingReset     = 0;\r
 \r
@@ -217,11 +217,11 @@ void ProcessRNDISControlMessage(void)
                \r
                        ResponseReady = true;\r
                        \r
-                       RNDIS_KEEPALIVE_MSG_t*   KEEPALIVE_Message  = (RNDIS_KEEPALIVE_MSG_t*)&RNDISMessageBuffer;\r
-                       RNDIS_KEEPALIVE_CMPLT_t* KEEPALIVE_Response = (RNDIS_KEEPALIVE_CMPLT_t*)&RNDISMessageBuffer;\r
+                       RNDIS_KeepAlive_Message_t*  KEEPALIVE_Message  = (RNDIS_KeepAlive_Message_t*)&RNDISMessageBuffer;\r
+                       RNDIS_KeepAlive_Complete_t* KEEPALIVE_Response = (RNDIS_KeepAlive_Complete_t*)&RNDISMessageBuffer;\r
 \r
                        KEEPALIVE_Response->MessageType     = REMOTE_NDIS_KEEPALIVE_CMPLT;\r
-                       KEEPALIVE_Response->MessageLength   = sizeof(RNDIS_KEEPALIVE_CMPLT_t);\r
+                       KEEPALIVE_Response->MessageLength   = sizeof(RNDIS_KeepAlive_Complete_t);\r
                        KEEPALIVE_Response->RequestId       = KEEPALIVE_Message->RequestId;\r
                        KEEPALIVE_Response->Status          = REMOTE_NDIS_STATUS_SUCCESS;\r
                        \r

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
index 88c9a9e..104cac7 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
@@ -101,7 +101,7 @@
                        uint32_t PerPacketInfoLength;\r
                        uint32_t VcHandle;\r
                        uint32_t Reserved;\r
-               } RNDIS_PACKET_MSG_t;\r
+               } RNDIS_Packet_Message_t;\r
        \r
                /** Type define for a RNDIS Initialize command message */\r
                typedef struct\r
@@ -113,7 +113,7 @@
                        uint32_t MajorVersion;\r
                        uint32_t MinorVersion;\r
                        uint32_t MaxTransferSize;\r
-               } RNDIS_INITIALIZE_MSG_t;\r
+               } RNDIS_Initialize_Message_t;\r
                \r
                /** Type define for a RNDIS Initialize complete response message */\r
                typedef struct\r
@@ -132,7 +132,7 @@
                        uint32_t PacketAlignmentFactor;\r
                        uint32_t AFListOffset;\r
                        uint32_t AFListSize;\r
-               } RNDIS_INITIALIZE_CMPLT_t;\r
+               } RNDIS_Initialize_Complete_t;\r
                \r
                /** Type define for a RNDIS Keepalive command message */\r
                typedef struct\r
@@ -140,7 +140,7 @@
                        uint32_t MessageType;\r
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
-               } RNDIS_KEEPALIVE_MSG_t;\r
+               } RNDIS_KeepAlive_Message_t;\r
 \r
                /** Type define for a RNDIS Keepalive complete message */\r
                typedef struct\r
@@ -149,7 +149,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
-               } RNDIS_KEEPALIVE_CMPLT_t;\r
+               } RNDIS_KeepAlive_Complete_t;\r
 \r
                /** Type define for a RNDIS Reset complete message */\r
                typedef struct\r
@@ -159,7 +159,7 @@
                        uint32_t Status;\r
 \r
                        uint32_t AddressingReset;\r
-               } RNDIS_RESET_CMPLT_t;\r
+               } RNDIS_Reset_Complete_t;\r
                \r
                /** Type define for a RNDIS Set command message */\r
                typedef struct\r
@@ -172,7 +172,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
-               } RNDIS_SET_MSG_t;\r
+               } RNDIS_Set_Message_t;\r
 \r
                /** Type define for a RNDIS Set complete response message */\r
                typedef struct\r
@@ -181,7 +181,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
-               } RNDIS_SET_CMPLT_t;\r
+               } RNDIS_Set_Complete_t;\r
                \r
                /** Type define for a RNDIS Query command message */\r
                typedef struct\r
@@ -194,7 +194,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
-               } RNDIS_QUERY_MSG_t;\r
+               } RNDIS_Query_Message_t;\r
                \r
                /** Type define for a RNDIS Query complete response message */\r
                typedef struct\r
@@ -206,7 +206,7 @@
                        \r
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
-               } RNDIS_QUERY_CMPLT_t;\r
+               } RNDIS_Query_Complete_t;\r
                \r
        /* External Variables: */\r
                extern uint8_t                 RNDISMessageBuffer[];\r

diff --git a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
index 84fc5b4..d77d25b 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.c
@@ -214,7 +214,7 @@ void RNDIS_Task(void)
        if ((CurrRNDISState == RNDIS_Data_Initialized) && !(MessageHeader->MessageLength))\r
        {\r
                /* Create a new packet header for reading/writing */\r
-               RNDIS_PACKET_MSG_t RNDISPacketHeader;\r
+               RNDIS_Packet_Message_t RNDISPacketHeader;\r
 \r
                /* Select the data OUT endpoint */\r
                Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
@@ -223,7 +223,7 @@ void RNDIS_Task(void)
                if (Endpoint_IsOUTReceived() && !(FrameIN.FrameInBuffer))\r
                {\r
                        /* Read in the packet message header */\r
-                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r
+                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t));\r
 \r
                        /* Stall the request if the data is too large */\r
                        if (RNDISPacketHeader.DataLength > ETHERNET_FRAME_SIZE_MAX)\r
@@ -252,16 +252,16 @@ void RNDIS_Task(void)
                if (Endpoint_IsINReady() && FrameOUT.FrameInBuffer)\r
                {\r
                        /* Clear the packet header with all 0s so that the relevant fields can be filled */\r
-                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_PACKET_MSG_t));\r
+                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_Packet_Message_t));\r
 \r
                        /* Construct the required packet header fields in the buffer */\r
                        RNDISPacketHeader.MessageType   = REMOTE_NDIS_PACKET_MSG;\r
-                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_PACKET_MSG_t) + FrameOUT.FrameLength);\r
-                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_PACKET_MSG_t) - sizeof(RNDIS_Message_Header_t));\r
+                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_Packet_Message_t) + FrameOUT.FrameLength);\r
+                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t));\r
                        RNDISPacketHeader.DataLength    = FrameOUT.FrameLength;\r
 \r
                        /* Send the packet header to the host */\r
-                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t));\r
+                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t));\r
 \r
                        /* Send the Ethernet frame data to the host */\r
                        Endpoint_Write_Stream_LE(FrameOUT.FrameData, RNDISPacketHeader.DataLength);\r

diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDC.h
index ccc3268..5138032 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/CDC.h
+++ b/LUFA/Drivers/USB/Class/Common/CDC.h
@@ -123,7 +123,7 @@
 \r
        /* Enums: */\r
                /** Enum for the possible line encoding formats of a virtual serial port. */\r
-               enum CDCDevice_CDC_LineCodingFormats_t\r
+               enum CDC_LineCodingFormats_t\r
                {\r
                        CDC_LINEENCODING_OneStopBit          = 0, /**< Each frame contains one stop bit */\r
                        CDC_LINEENCODING_OneAndAHalfStopBits = 1, /**< Each frame contains one and a half stop bits */\r
@@ -131,7 +131,7 @@
                };\r
                \r
                /** Enum for the possible line encoding parity settings of a virtual serial port. */\r
-               enum CDCDevice_LineCodingParity_t\r
+               enum CDC_LineCodingParity_t\r
                {\r
                        CDC_PARITY_None    = 0, /**< No parity bit mode on each frame */\r
                        CDC_PARITY_Odd     = 1, /**< Odd parity bit mode on each frame */\r

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
index 157fff3..c169fa4 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -122,7 +122,7 @@
                        uint32_t PerPacketInfoLength;\r
                        uint32_t VcHandle;\r
                        uint32_t Reserved;\r
-               } RNDIS_PACKET_MSG_t;\r
+               } RNDIS_Packet_Message_t;\r
 \r
                /** Type define for a RNDIS Initialize command message */\r
                typedef struct\r
@@ -134,7 +134,7 @@
                        uint32_t MajorVersion;\r
                        uint32_t MinorVersion;\r
                        uint32_t MaxTransferSize;\r
-               } RNDIS_INITIALIZE_MSG_t;\r
+               } RNDIS_Initialize_Message_t;\r
                \r
                /** Type define for a RNDIS Initialize complete response message */\r
                typedef struct\r
@@ -153,7 +153,7 @@
                        uint32_t PacketAlignmentFactor;\r
                        uint32_t AFListOffset;\r
                        uint32_t AFListSize;\r
-               } RNDIS_INITIALIZE_CMPLT_t;\r
+               } RNDIS_Initialize_Complete_t;\r
                \r
                /** Type define for a RNDIS Keepalive command message */\r
                typedef struct\r
@@ -161,7 +161,7 @@
                        uint32_t MessageType;\r
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
-               } RNDIS_KEEPALIVE_MSG_t;\r
+               } RNDIS_KeepAlive_Message_t;\r
 \r
                /** Type define for a RNDIS Keepalive complete message */\r
                typedef struct\r
@@ -170,7 +170,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
-               } RNDIS_KEEPALIVE_CMPLT_t;\r
+               } RNDIS_KeepAlive_Complete_t;\r
 \r
                /** Type define for a RNDIS Reset complete message */\r
                typedef struct\r
@@ -180,7 +180,7 @@
                        uint32_t Status;\r
 \r
                        uint32_t AddressingReset;\r
-               } RNDIS_RESET_CMPLT_t;\r
+               } RNDIS_Reset_Complete_t;\r
                \r
                /** Type define for a RNDIS Set command message */\r
                typedef struct\r
@@ -193,7 +193,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
-               } RNDIS_SET_MSG_t;\r
+               } RNDIS_Set_Message_t;\r
 \r
                /** Type define for a RNDIS Set complete response message */\r
                typedef struct\r
@@ -202,7 +202,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
-               } RNDIS_SET_CMPLT_t;\r
+               } RNDIS_Set_Complete_t;\r
                \r
                /** Type define for a RNDIS Query command message */\r
                typedef struct\r
@@ -215,7 +215,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
-               } RNDIS_QUERY_MSG_t;\r
+               } RNDIS_Query_Message_t;\r
                \r
                /** Type define for a RNDIS Query complete response message */\r
                typedef struct\r
@@ -227,7 +227,7 @@
                        \r
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
-               } RNDIS_QUERY_CMPLT_t;\r
+               } RNDIS_Query_Complete_t;\r
                                \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HID.h
index b4c400f..00d73a9 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HID.h
@@ -71,7 +71,8 @@
                        {\r
                                bool     UsingReportProtocol; /**< Indicates if the HID interface is set to Boot or Report protocol mode */\r
                                uint16_t IdleCount; /**< Report idle period, in ms, set by the host */\r
-                               uint16_t IdleMSRemaining; /**< Total number of ms remaining before the idle period elapses */                   \r
+                               uint16_t IdleMSRemaining; /**< Total number of ms remaining before the idle period elapsed - this should be\r
+                                                          *   decremented by the user application if non-zero each millisecond */                      \r
                        } USB_ClassInfo_HID_Device_State_t;\r
 \r
                        /** Class state structure. An instance of this structure should be made for each HID interface\r

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDI.h
index e2e06b6..2cadeaf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.h
@@ -69,7 +69,7 @@
                        /** Current State information structure for \ref USB_ClassInfo_MIDI_Device_t MIDI device interface structures. */\r
                        typedef struct\r
                        {\r
-                       \r
+                               // No state information for this class yet\r
                        } USB_ClassInfo_MIDI_Device_State_t;\r
        \r
                        /** Class state structure. An instance of this structure should be made for each MIDI interface\r

diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorage.h
index 2616bd8..53eb7ab 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Device/MassStorage.h
@@ -70,11 +70,11 @@
                        /** Current State information structure for \ref USB_ClassInfo_MS_Device_t Mass Storage device interface structures. */\r
                        typedef struct\r
                        {\r
-                               CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, used internally\r
-                                                                                                         *   by the class driver\r
+                               CommandBlockWrapper_t  CommandBlock; /**< Mass Storage class command block structure, stores the received SCSI\r
+                                                                     *   command from the host which is to be processed\r
                                                                                                          */\r
-                               CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, used internally\r
-                                                                                                          *   by the class driver\r
+                               CommandStatusWrapper_t CommandStatus; /**< Mass Storage class command status structure, set elements to indicate\r
+                                                                                                          *   the issued command's success or failure to the host\r
                                                                                                           */\r
 \r
                                bool IsMassStoreReset; /**< Flag indicating that the host has requested that the Mass Storage interface be reset\r

diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDIS.c
index 7ac8470..bf753bf 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Device/RNDIS.c
@@ -165,13 +165,13 @@ void RNDIS_Device_USBTask(USB_ClassInfo_RNDIS_Device_t* RNDISInterfaceInfo)
        \r
        if ((RNDISInterfaceInfo->State.CurrRNDISState == RNDIS_Data_Initialized) && !(MessageHeader->MessageLength))\r
        {\r
-               RNDIS_PACKET_MSG_t RNDISPacketHeader;\r
+               RNDIS_Packet_Message_t RNDISPacketHeader;\r
 \r
                Endpoint_SelectEndpoint(RNDISInterfaceInfo->Config.DataOUTEndpointNumber);\r
 \r
                if (Endpoint_IsOUTReceived() && !(RNDISInterfaceInfo->State.FrameIN.FrameInBuffer))\r
                {\r
-                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t), NO_STREAM_CALLBACK);\r
+                       Endpoint_Read_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NO_STREAM_CALLBACK);\r
 \r
                        if (RNDISPacketHeader.DataLength > ETHERNET_FRAME_SIZE_MAX)\r
                        {\r
@@ -192,14 +192,14 @@ void RNDIS_Device_USBTask(USB_ClassInfo_RNDIS_Device_t* RNDISInterfaceInfo)
                \r
                if (Endpoint_IsINReady() && RNDISInterfaceInfo->State.FrameOUT.FrameInBuffer)\r
                {\r
-                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_PACKET_MSG_t));\r
+                       memset(&RNDISPacketHeader, 0, sizeof(RNDIS_Packet_Message_t));\r
 \r
                        RNDISPacketHeader.MessageType   = REMOTE_NDIS_PACKET_MSG;\r
-                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_PACKET_MSG_t) + RNDISInterfaceInfo->State.FrameOUT.FrameLength);\r
-                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_PACKET_MSG_t) - sizeof(RNDIS_Message_Header_t));\r
+                       RNDISPacketHeader.MessageLength = (sizeof(RNDIS_Packet_Message_t) + RNDISInterfaceInfo->State.FrameOUT.FrameLength);\r
+                       RNDISPacketHeader.DataOffset    = (sizeof(RNDIS_Packet_Message_t) - sizeof(RNDIS_Message_Header_t));\r
                        RNDISPacketHeader.DataLength    = RNDISInterfaceInfo->State.FrameOUT.FrameLength;\r
 \r
-                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_PACKET_MSG_t), NO_STREAM_CALLBACK);\r
+                       Endpoint_Write_Stream_LE(&RNDISPacketHeader, sizeof(RNDIS_Packet_Message_t), NO_STREAM_CALLBACK);\r
                        Endpoint_Write_Stream_LE(RNDISInterfaceInfo->State.FrameOUT.FrameData, RNDISPacketHeader.DataLength, NO_STREAM_CALLBACK);\r
                        Endpoint_ClearIN();\r
                        \r
@@ -220,11 +220,13 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                case REMOTE_NDIS_INITIALIZE_MSG:\r
                        RNDISInterfaceInfo->State.ResponseReady = true;\r
                        \r
-                       RNDIS_INITIALIZE_MSG_t*   INITIALIZE_Message  = (RNDIS_INITIALIZE_MSG_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       RNDIS_INITIALIZE_CMPLT_t* INITIALIZE_Response = (RNDIS_INITIALIZE_CMPLT_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_Initialize_Message_t*  INITIALIZE_Message  =\r
+                                      (RNDIS_Initialize_Message_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_Initialize_Complete_t* INITIALIZE_Response =\r
+                                      (RNDIS_Initialize_Complete_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
                        \r
                        INITIALIZE_Response->MessageType           = REMOTE_NDIS_INITIALIZE_CMPLT;\r
-                       INITIALIZE_Response->MessageLength         = sizeof(RNDIS_INITIALIZE_CMPLT_t);\r
+                       INITIALIZE_Response->MessageLength         = sizeof(RNDIS_Initialize_Complete_t);\r
                        INITIALIZE_Response->RequestId             = INITIALIZE_Message->RequestId;\r
                        INITIALIZE_Response->Status                = REMOTE_NDIS_STATUS_SUCCESS;\r
                        \r
@@ -233,7 +235,7 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                        INITIALIZE_Response->DeviceFlags           = REMOTE_NDIS_DF_CONNECTIONLESS;\r
                        INITIALIZE_Response->Medium                = REMOTE_NDIS_MEDIUM_802_3;\r
                        INITIALIZE_Response->MaxPacketsPerTransfer = 1;\r
-                       INITIALIZE_Response->MaxTransferSize       = (sizeof(RNDIS_PACKET_MSG_t) + ETHERNET_FRAME_SIZE_MAX);\r
+                       INITIALIZE_Response->MaxTransferSize       = (sizeof(RNDIS_Packet_Message_t) + ETHERNET_FRAME_SIZE_MAX);\r
                        INITIALIZE_Response->PacketAlignmentFactor = 0;\r
                        INITIALIZE_Response->AFListOffset          = 0;\r
                        INITIALIZE_Response->AFListSize            = 0;\r
@@ -251,17 +253,17 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                case REMOTE_NDIS_QUERY_MSG:\r
                        RNDISInterfaceInfo->State.ResponseReady = true;\r
                                                \r
-                       RNDIS_QUERY_MSG_t*   QUERY_Message  = (RNDIS_QUERY_MSG_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       RNDIS_QUERY_CMPLT_t* QUERY_Response = (RNDIS_QUERY_CMPLT_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       uint32_t             Query_Oid      = QUERY_Message->Oid;\r
+                       RNDIS_Query_Message_t*  QUERY_Message  = (RNDIS_Query_Message_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_Query_Complete_t* QUERY_Response = (RNDIS_Query_Complete_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       uint32_t                Query_Oid      = QUERY_Message->Oid;\r
                                                \r
                        void*     QueryData                 = &RNDISInterfaceInfo->State.RNDISMessageBuffer[sizeof(RNDIS_Message_Header_t) +\r
                                                                                                      QUERY_Message->InformationBufferOffset];\r
-                       void*     ResponseData              = &RNDISInterfaceInfo->State.RNDISMessageBuffer[sizeof(RNDIS_QUERY_CMPLT_t)];               \r
+                       void*     ResponseData              = &RNDISInterfaceInfo->State.RNDISMessageBuffer[sizeof(RNDIS_Query_Complete_t)];            \r
                        uint16_t  ResponseSize;\r
 \r
                        QUERY_Response->MessageType         = REMOTE_NDIS_QUERY_CMPLT;\r
-                       QUERY_Response->MessageLength       = sizeof(RNDIS_QUERY_CMPLT_t);\r
+                       QUERY_Response->MessageLength       = sizeof(RNDIS_Query_Complete_t);\r
                                                \r
                        if (RNDIS_Device_ProcessNDISQuery(RNDISInterfaceInfo, Query_Oid, QueryData, QUERY_Message->InformationBufferLength,\r
                                                          ResponseData, &ResponseSize))\r
@@ -270,7 +272,7 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                                QUERY_Response->MessageLength          += ResponseSize;\r
                                                        \r
                                QUERY_Response->InformationBufferLength = ResponseSize;\r
-                               QUERY_Response->InformationBufferOffset = (sizeof(RNDIS_QUERY_CMPLT_t) - sizeof(RNDIS_Message_Header_t));\r
+                               QUERY_Response->InformationBufferOffset = (sizeof(RNDIS_Query_Complete_t) - sizeof(RNDIS_Message_Header_t));\r
                        }\r
                        else\r
                        {                               \r
@@ -284,12 +286,12 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                case REMOTE_NDIS_SET_MSG:\r
                        RNDISInterfaceInfo->State.ResponseReady = true;\r
                        \r
-                       RNDIS_SET_MSG_t*   SET_Message  = (RNDIS_SET_MSG_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       RNDIS_SET_CMPLT_t* SET_Response = (RNDIS_SET_CMPLT_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       uint32_t           SET_Oid      = SET_Message->Oid;\r
+                       RNDIS_Set_Message_t*  SET_Message  = (RNDIS_Set_Message_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_Set_Complete_t* SET_Response = (RNDIS_Set_Complete_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       uint32_t              SET_Oid      = SET_Message->Oid;\r
 \r
                        SET_Response->MessageType       = REMOTE_NDIS_SET_CMPLT;\r
-                       SET_Response->MessageLength     = sizeof(RNDIS_SET_CMPLT_t);\r
+                       SET_Response->MessageLength     = sizeof(RNDIS_Set_Complete_t);\r
                        SET_Response->RequestId         = SET_Message->RequestId;\r
 \r
                        void* SetData                   = &RNDISInterfaceInfo->State.RNDISMessageBuffer[sizeof(RNDIS_Message_Header_t) +\r
@@ -304,10 +306,10 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                case REMOTE_NDIS_RESET_MSG:\r
                        RNDISInterfaceInfo->State.ResponseReady = true;\r
                        \r
-                       RNDIS_RESET_CMPLT_t* RESET_Response = (RNDIS_RESET_CMPLT_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_Reset_Complete_t* RESET_Response = (RNDIS_Reset_Complete_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
 \r
                        RESET_Response->MessageType         = REMOTE_NDIS_RESET_CMPLT;\r
-                       RESET_Response->MessageLength       = sizeof(RNDIS_RESET_CMPLT_t);\r
+                       RESET_Response->MessageLength       = sizeof(RNDIS_Reset_Complete_t);\r
                        RESET_Response->Status              = REMOTE_NDIS_STATUS_SUCCESS;\r
                        RESET_Response->AddressingReset     = 0;\r
 \r
@@ -315,11 +317,13 @@ void RNDIS_Device_ProcessRNDISControlMessage(USB_ClassInfo_RNDIS_Device_t* RNDIS
                case REMOTE_NDIS_KEEPALIVE_MSG:\r
                        RNDISInterfaceInfo->State.ResponseReady = true;\r
                        \r
-                       RNDIS_KEEPALIVE_MSG_t*   KEEPALIVE_Message  = (RNDIS_KEEPALIVE_MSG_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
-                       RNDIS_KEEPALIVE_CMPLT_t* KEEPALIVE_Response = (RNDIS_KEEPALIVE_CMPLT_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_KeepAlive_Message_t*  KEEPALIVE_Message  =\r
+                                       (RNDIS_KeepAlive_Message_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
+                       RNDIS_KeepAlive_Complete_t* KEEPALIVE_Response =\r
+                                       (RNDIS_KeepAlive_Complete_t*)&RNDISInterfaceInfo->State.RNDISMessageBuffer;\r
 \r
                        KEEPALIVE_Response->MessageType     = REMOTE_NDIS_KEEPALIVE_CMPLT;\r
-                       KEEPALIVE_Response->MessageLength   = sizeof(RNDIS_KEEPALIVE_CMPLT_t);\r
+                       KEEPALIVE_Response->MessageLength   = sizeof(RNDIS_KeepAlive_Complete_t);\r
                        KEEPALIVE_Response->RequestId       = KEEPALIVE_Message->RequestId;\r
                        KEEPALIVE_Response->Status          = REMOTE_NDIS_STATUS_SUCCESS;\r
                        \r