Added multiple Report ID support to the HID class driver. Removed OUT endpoint support from HID driver (all OUT reports are now processed through control requests) as a seperate endpoint had issues with determining the exact output report length.

1 files changed, 23 insertions, 7 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDC.h
index 3e67b1b6b..ee9e3767d 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDC.h
@@ -167,7 +167,7 @@
 			uint8_t  NotificationEndpointNumber; /**< Endpoint number of the CDC interface's IN notification endpoint, if used */

 			uint16_t NotificationEndpointSize;  /**< Size in bytes of the CDC interface's IN notification endpoint, if used */

 

-			uint8_t  ControlLineState; /**< Current control line state, as set by the host */

+			uint8_t  ControlLineState; /**< Current control line states, as set by the host */

 

 			struct

 			{

@@ -195,7 +195,7 @@
 		 *  \ref EVENT_USB_ConfigurationChanged() event so that the endpoints are configured when the configuration containing the

 		 *  given CDC interface is selected.

 		 *

-		 *  \param CDCInterfaceInfo  Pointer to a structure containing an CDC Class configuration and state.

+		 *  \param CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.

 		 *

 		 *  \return Boolean true if the endpoints were sucessfully configured, false otherwise

 		 */

@@ -204,25 +204,41 @@
 		/** Processes incomming control requests from the host, that are directed to the given CDC class interface. This should be

 		 *  linked to the library \ref EVENT_USB_UnhandledControlPacket() event.

 		 *

-		 *  \param CDCInterfaceInfo  Pointer to a structure containing an CDC Class configuration and state.

+		 *  \param CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.

 		 */

 		void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

 

 		/** General management task for a given CDC class interface, required for the correct operation of the interface. This should

 		 *  be called frequently in the main program loop, before the master USB management task \ref USB_USBTask().

 		 *

-		 *  \param CDCInterfaceInfo  Pointer to a structure containing an CDC Class configuration and state.

+		 *  \param CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.

 		 */

 		void USB_CDC_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

 

-		void     EVENT_USB_CDC_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

-		void     EVENT_USB_CDC_ControLineStateChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

+		/** CDC class driver event for a line encoding change on a CDC interface. This event fires each time the host requests a

+		 *  line encoding change (containing the serial parity, baud and other configuration information) and may be hooked in the

+		 *  user program by declaring a handler function with the same name and parameters listed here. The new line encoding

+		 *  settings are available in the LineEncoding structure inside the CDC interface structure passed as a parameter.

+		 *

+		 *  \param CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.

+		 */

+		void EVENT_USB_CDC_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

+		

+		/** CDC class driver event for a control line state change on a CDC interface. This event fires each time the host requests a

+		 *  control line state change (containing the virtual serial control line states, such as DTR) and may be hooked in the

+		 *  user program by declaring a handler function with the same name and parameters listed here. The new control line states

+		 *  are available in the ControlLineState value inside the CDC interface structure passed as a parameter, set as a mask of

+		 *  CDC_CONTROL_LINE_OUT_* masks.

+		 *

+		 *  \param CDCInterfaceInfo  Pointer to a structure containing a CDC Class configuration and state.

+		 */		

+		void EVENT_USB_CDC_ControLineStateChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

 

 		void     USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length);

 		void     USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data);

 		uint16_t USB_CDC_BytesReceived(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

 		uint8_t  USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo);

-		void USB_CDC_SendSerialLineStateChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask);

+		void     USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask);

 

 	/* Disable C linkage for C++ Compilers: */

 		#if defined(__cplusplus)