Cleanups to the MassStorage Device demos, and the MassStorage Device Class driver.

[pub/USBasp.git] / Demos / Device / LowLevel / RNDISEthernet / Lib / RNDIS.h

diff --git a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
index 88c9a9e..72f9f5f 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Lib/RNDIS.h
@@ -45,9 +45,6 @@
                #include "Ethernet.h"\r
 \r
        /* Macros: */\r
                #include "Ethernet.h"\r
 \r
        /* Macros: */\r

-               /** Physical MAC Address of the USB network adapter */\r
-               #define ADAPTER_MAC_ADDRESS                   {0x02, 0x00, 0x02, 0x00, 0x02, 0x00}\r
-       \r

                /** Implemented RNDIS Version Major */\r
                #define REMOTE_NDIS_VERSION_MAJOR             0x01\r
 \r
                /** Implemented RNDIS Version Major */\r
                #define REMOTE_NDIS_VERSION_MAJOR             0x01\r
 \r


@@ -101,7 +98,7 @@
                        uint32_t PerPacketInfoLength;\r
                        uint32_t VcHandle;\r
                        uint32_t Reserved;\r
                        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
        \r
                /** Type define for a RNDIS Initialize command message */\r
                typedef struct\r


@@ -113,7 +110,7 @@
                        uint32_t MajorVersion;\r
                        uint32_t MinorVersion;\r
                        uint32_t MaxTransferSize;\r
                        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
                \r
                /** Type define for a RNDIS Initialize complete response message */\r
                typedef struct\r


@@ -132,7 +129,7 @@
                        uint32_t PacketAlignmentFactor;\r
                        uint32_t AFListOffset;\r
                        uint32_t AFListSize;\r
                        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
                \r
                /** Type define for a RNDIS Keepalive command message */\r
                typedef struct\r


@@ -140,7 +137,7 @@
                        uint32_t MessageType;\r
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        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
 \r
                /** Type define for a RNDIS Keepalive complete message */\r
                typedef struct\r


@@ -149,7 +146,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
                        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
 \r
                /** Type define for a RNDIS Reset complete message */\r
                typedef struct\r


@@ -159,7 +156,7 @@
                        uint32_t Status;\r
 \r
                        uint32_t AddressingReset;\r
                        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
                \r
                /** Type define for a RNDIS Set command message */\r
                typedef struct\r


@@ -172,7 +169,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
                        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
 \r
                /** Type define for a RNDIS Set complete response message */\r
                typedef struct\r


@@ -181,7 +178,7 @@
                        uint32_t MessageLength;\r
                        uint32_t RequestId;\r
                        uint32_t Status;\r
                        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
                \r
                /** Type define for a RNDIS Query command message */\r
                typedef struct\r


@@ -194,7 +191,7 @@
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        uint32_t DeviceVcHandle;\r
                        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
                \r
                /** Type define for a RNDIS Query complete response message */\r
                typedef struct\r


@@ -206,7 +203,7 @@
                        \r
                        uint32_t InformationBufferLength;\r
                        uint32_t InformationBufferOffset;\r
                        \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
                \r
        /* External Variables: */\r
                extern uint8_t                 RNDISMessageBuffer[];\r