Added standard stream example to the ClassDriver CDC device demo.

[pub/USBasp.git] / LUFA / Drivers / USB / Class / Common / RNDIS.h

diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDIS.h
index 157fff3..5c875b7 100644 (file)
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -93,13 +93,6 @@
                        uint8_t       Octets[6]; /**< Individual bytes of a MAC address */\r
                } MAC_Address_t;\r
 \r
                        uint8_t       Octets[6]; /**< Individual bytes of a MAC address */\r
                } MAC_Address_t;\r
 \r

-               /** Type define for a RNDIS message header, sent before RNDIS messages */\r
-               typedef struct\r
-               {\r
-                       uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */\r
-                       uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */\r
-               } RNDIS_Message_Header_t;\r
-\r

                /** Type define for an Ethernet frame buffer. */\r
                typedef struct\r
                {\r
                /** Type define for an Ethernet frame buffer. */\r
                typedef struct\r
                {\r


@@ -108,6 +101,13 @@
                        bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */\r
                } Ethernet_Frame_Info_t;\r
 \r
                        bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */\r
                } Ethernet_Frame_Info_t;\r
 \r

+               /** Type define for a RNDIS message header, sent before RNDIS messages */\r
+               typedef struct\r
+               {\r
+                       uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */\r
+                       uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */\r
+               } RNDIS_Message_Header_t;\r
+\r

                /** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */\r
                typedef struct\r
                {\r
                /** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */\r
                typedef struct\r
                {\r


@@ -122,7 +122,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


@@ -134,7 +134,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


@@ -153,7 +153,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


@@ -161,7 +161,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


@@ -170,7 +170,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


@@ -180,7 +180,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


@@ -193,7 +193,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


@@ -202,7 +202,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


@@ -215,7 +215,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


@@ -227,7 +227,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
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r
                                \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r