Fixed swapped paremeters in the HID state memory copy call while processing a HID PUSH item in the HID report parser.

Fixed memory corruption HID report parser when too many COLLECTION or PUSH items were processed.

Make RNDIS device class driver include the CDC device class driver header, so that it can inherrit the required CDC functional descriptor macro.

Make HID host class driver include the HID report parser.

1 files changed, 2 insertions, 16 deletions

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
index 28b801f1a..961a4f461 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
@@ -38,25 +38,11 @@
 

 	/* Includes: */

 		#include <LUFA/Drivers/USB/USB.h>

-

+		#include <LUFA/Drivers/USB/Class/RNDIS.h>

+		

 		#include <avr/pgmspace.h>

 

 	/* Macros: */

-		/** Macro to define a CDC class-specific functional descriptor. CDC functional descriptors have a

-		 *  uniform structure but variable sized data payloads, thus cannot be represented accurately by

-		 *  a single typedef struct. A macro is used instead so that functional descriptors can be created

-		 *  easily by specifying the size of the payload. This allows sizeof() to work correctly.

-		 *

-		 *  \param[in] DataSize  Size in bytes of the CDC functional descriptor's data payload

-		 */		

-		#define CDC_FUNCTIONAL_DESCRIPTOR(DataSize)        \

-		     struct                                        \

-		     {                                             \

-		          USB_Descriptor_Header_t Header;          \

-			      uint8_t                 SubType;         \

-		          uint8_t                 Data[DataSize];  \

-		     }

-

 		/** Endpoint number of the CDC device-to-host notification IN endpoint. */

 		#define CDC_NOTIFICATION_EPNUM         3