X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f896c00c48f04fb9273555ab8d9b1af99f865d25..ecd82778cf9a53e34f13d9ce6dcd7e1a4cf76b70:/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 157fff359..88ee04f47 100644
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDIS.h
@@ -37,6 +37,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
+		#include "CDC.h"
 		
 		#include <string.h>
 	
@@ -93,13 +94,6 @@
 			uint8_t       Octets[6]; /**< Individual bytes of a MAC address */
 		} MAC_Address_t;
 
-		/** Type define for a RNDIS message header, sent before RNDIS messages */
-		typedef struct
-		{
-			uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */
-			uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */
-		} RNDIS_Message_Header_t;
-
 		/** Type define for an Ethernet frame buffer. */
 		typedef struct
 		{
@@ -108,6 +102,13 @@
 			bool          FrameInBuffer; /**< Indicates if a frame is currently stored in the buffer */
 		} Ethernet_Frame_Info_t;
 
+		/** Type define for a RNDIS message header, sent before RNDIS messages */
+		typedef struct
+		{
+			uint32_t MessageType; /**< RNDIS message type, a REMOTE_NDIS_*_MSG constant */
+			uint32_t MessageLength; /**< Total length of the RNDIS message, in bytes */
+		} RNDIS_Message_Header_t;
+
 		/** Type define for a RNDIS packet message, used to encapsulate Ethernet packets sent to and from the adapter */
 		typedef struct
 		{
@@ -122,7 +123,7 @@
 			uint32_t PerPacketInfoLength;
 			uint32_t VcHandle;
 			uint32_t Reserved;
-		} RNDIS_PACKET_MSG_t;
+		} RNDIS_Packet_Message_t;
 
 		/** Type define for a RNDIS Initialize command message */
 		typedef struct
@@ -134,7 +135,7 @@
 			uint32_t MajorVersion;
 			uint32_t MinorVersion;
 			uint32_t MaxTransferSize;
-		} RNDIS_INITIALIZE_MSG_t;
+		} RNDIS_Initialize_Message_t;
 		
 		/** Type define for a RNDIS Initialize complete response message */
 		typedef struct
@@ -153,7 +154,7 @@
 			uint32_t PacketAlignmentFactor;
 			uint32_t AFListOffset;
 			uint32_t AFListSize;
-		} RNDIS_INITIALIZE_CMPLT_t;
+		} RNDIS_Initialize_Complete_t;
 		
 		/** Type define for a RNDIS Keepalive command message */
 		typedef struct
@@ -161,7 +162,7 @@
 			uint32_t MessageType;
 			uint32_t MessageLength;
 			uint32_t RequestId;
-		} RNDIS_KEEPALIVE_MSG_t;
+		} RNDIS_KeepAlive_Message_t;
 
 		/** Type define for a RNDIS Keepalive complete message */
 		typedef struct
@@ -170,7 +171,7 @@
 			uint32_t MessageLength;
 			uint32_t RequestId;
 			uint32_t Status;
-		} RNDIS_KEEPALIVE_CMPLT_t;
+		} RNDIS_KeepAlive_Complete_t;
 
 		/** Type define for a RNDIS Reset complete message */
 		typedef struct
@@ -180,7 +181,7 @@
 			uint32_t Status;
 
 			uint32_t AddressingReset;
-		} RNDIS_RESET_CMPLT_t;
+		} RNDIS_Reset_Complete_t;
 		
 		/** Type define for a RNDIS Set command message */
 		typedef struct
@@ -193,7 +194,7 @@
 			uint32_t InformationBufferLength;
 			uint32_t InformationBufferOffset;
 			uint32_t DeviceVcHandle;
-		} RNDIS_SET_MSG_t;
+		} RNDIS_Set_Message_t;
 
 		/** Type define for a RNDIS Set complete response message */
 		typedef struct
@@ -202,7 +203,7 @@
 			uint32_t MessageLength;
 			uint32_t RequestId;
 			uint32_t Status;
-		} RNDIS_SET_CMPLT_t;
+		} RNDIS_Set_Complete_t;
 		
 		/** Type define for a RNDIS Query command message */
 		typedef struct
@@ -215,7 +216,7 @@
 			uint32_t InformationBufferLength;
 			uint32_t InformationBufferOffset;
 			uint32_t DeviceVcHandle;
-		} RNDIS_QUERY_MSG_t;
+		} RNDIS_Query_Message_t;
 		
 		/** Type define for a RNDIS Query complete response message */
 		typedef struct
@@ -227,7 +228,7 @@
 			
 			uint32_t InformationBufferLength;
 			uint32_t InformationBufferOffset;
-		} RNDIS_QUERY_CMPLT_t;
+		} RNDIS_Query_Complete_t;
 				
 	/* Disable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)