USB_HostRequest renamed to USB_ControlRequest, entire control request header is now read into USB_ControlRequest in Device mode rather than having the library pass only partially read header data to the application.

The USB_UnhandledControlPacket event has had its parameters removed, in favour of accessing the new USB_ControlRequest structure.

The Endpoint control stream functions now correctly send a ZLP to the host when less data than requested is sent.

12 files changed, 59 insertions, 141 deletions

diff --git a/Demos/Device/AudioInput/AudioInput.c b/Demos/Device/AudioInput/AudioInput.c
index 45b9971f8..05094c2b8 100644
--- a/Demos/Device/AudioInput/AudioInput.c
+++ b/Demos/Device/AudioInput/AudioInput.c
@@ -131,18 +131,16 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Process General and Audio specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_SetInterface:

 			/* Set Interface is not handled by the library, as its function is application-specific */

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE))

 			{

-				uint16_t wValue = Endpoint_Read_Word_LE();

-				

 				Endpoint_ClearSETUP();

 				

 				/* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */

-				if (wValue)

+				if (USB_ControlRequest.wValue)

 				{

 					/* Start audio task */

 					Scheduler_SetTaskMode(USB_Audio_Task, TASK_RUN);

diff --git a/Demos/Device/AudioOutput/AudioOutput.c b/Demos/Device/AudioOutput/AudioOutput.c
index ba9a499a4..640462da1 100644
--- a/Demos/Device/AudioOutput/AudioOutput.c
+++ b/Demos/Device/AudioOutput/AudioOutput.c
@@ -158,18 +158,16 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Process General and Audio specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_SetInterface:

 			/* Set Interface is not handled by the library, as its function is application-specific */

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_INTERFACE))

 			{

-				uint16_t wValue = Endpoint_Read_Word_LE();

-				

 				Endpoint_ClearSETUP();

 				

 				/* Check if the host is enabling the audio interface (setting AlternateSetting to 1) */

-				if (wValue)

+				if (USB_ControlRequest.wValue)

 				{

 					/* Start audio task */

 					Scheduler_SetTaskMode(USB_Audio_Task, TASK_RUN);

diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c
index fb7d74b07..28bce1ebc 100644
--- a/Demos/Device/CDC/CDC.c
+++ b/Demos/Device/CDC/CDC.c
@@ -160,10 +160,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	uint8_t* LineCodingData = (uint8_t*)&LineCoding;

 

 	/* Process CDC specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetLineEncoding:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{	

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -177,7 +177,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetLineEncoding:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -191,18 +191,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	

 			break;

 		case REQ_SetControlLineState:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-#if 0

 				/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake

-				         lines. The mask is read in from the wValue parameter, and can be masked against the CONTROL_LINE_OUT_* masks

-				         to determine the RTS and DTR line states using the following code:

+				         lines. The mask is read in from the wValue parameter in USB_ControlRequest, and can be masked against the

+						 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:

 				*/

-

-				uint16_t wIndex = Endpoint_Read_Word_LE();

-					

-				// Do something with the given line states in wIndex

-#endif

 				

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

diff --git a/Demos/Device/DualCDC/DualCDC.c b/Demos/Device/DualCDC/DualCDC.c
index bbcbecc3d..4185a76bd 100644
--- a/Demos/Device/DualCDC/DualCDC.c
+++ b/Demos/Device/DualCDC/DualCDC.c
@@ -198,10 +198,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	LineCodingData = (wIndex == 0) ? (uint8_t*)&LineCoding1 : (uint8_t*)&LineCoding2;

 

 	/* Process CDC specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetLineEncoding:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{	

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -215,7 +215,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetLineEncoding:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -229,7 +229,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	

 			break;

 		case REQ_SetControlLineState:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

diff --git a/Demos/Device/GenericHID/GenericHID.c b/Demos/Device/GenericHID/GenericHID.c
index 207f63c26..245ddaafc 100644
--- a/Demos/Device/GenericHID/GenericHID.c
+++ b/Demos/Device/GenericHID/GenericHID.c
@@ -160,10 +160,10 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Handle HID Class specific requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetReport:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 	

@@ -180,7 +180,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		

 			break;

 		case REQ_SetReport:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 				

diff --git a/Demos/Device/Joystick/Joystick.c b/Demos/Device/Joystick/Joystick.c
index e5d23bd6d..ee4bc6ad0 100644
--- a/Demos/Device/Joystick/Joystick.c
+++ b/Demos/Device/Joystick/Joystick.c
@@ -122,33 +122,20 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Handle HID Class specific requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetReport:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				USB_JoystickReport_Data_t JoystickReportData;

 				

 				/* Create the next HID report to send to the host */				

 				GetNextReport(&JoystickReportData);

-

-				/* Ignore report type and ID number value */

-				Endpoint_Discard_Word();

-				

-				/* Ignore unused Interface number value */

-				Endpoint_Discard_Word();

-

-				/* Read in the number of bytes in the report to send to the host */

-				uint16_t wLength = Endpoint_Read_Word_LE();

 				

-				/* If trying to send more bytes than exist to the host, clamp the value at the report size */

-				if (wLength > sizeof(JoystickReportData))

-				  wLength = sizeof(JoystickReportData);

-

 				Endpoint_ClearSETUP();

 	

 				/* Write the report data to the control endpoint */

-				Endpoint_Write_Control_Stream_LE(&JoystickReportData, wLength);

+				Endpoint_Write_Control_Stream_LE(&JoystickReportData, sizeof(JoystickReportData));

 				

 				/* Finalize the stream transfer to send the last packet or clear the host abort */

 				Endpoint_ClearOUT();

diff --git a/Demos/Device/Keyboard/Keyboard.c b/Demos/Device/Keyboard/Keyboard.c
index 6d7ee3fcd..088943bce 100644
--- a/Demos/Device/Keyboard/Keyboard.c
+++ b/Demos/Device/Keyboard/Keyboard.c
@@ -193,33 +193,20 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Handle HID Class specific requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetReport:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				USB_KeyboardReport_Data_t KeyboardReportData;

 

 				/* Create the next keyboard report for transmission to the host */

 				CreateKeyboardReport(&KeyboardReportData);

 

-				/* Ignore report type and ID number value */

-				Endpoint_Discard_Word();

-				

-				/* Ignore unused Interface number value */

-				Endpoint_Discard_Word();

-

-				/* Read in the number of bytes in the report to send to the host */

-				uint16_t wLength = Endpoint_Read_Word_LE();

-				

-				/* If trying to send more bytes than exist to the host, clamp the value at the report size */

-				if (wLength > sizeof(KeyboardReportData))

-				  wLength = sizeof(KeyboardReportData);

-

 				Endpoint_ClearSETUP();

 	

 				/* Write the report data to the control endpoint */

-				Endpoint_Write_Control_Stream_LE(&KeyboardReportData, wLength);

+				Endpoint_Write_Control_Stream_LE(&KeyboardReportData, sizeof(KeyboardReportData));

 				

 				/* Finalize the stream transfer to send the last packet or clear the host abort */

 				Endpoint_ClearOUT();

@@ -227,7 +214,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		

 			break;

 		case REQ_SetReport:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 				

@@ -250,7 +237,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_GetProtocol:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 				

@@ -267,15 +254,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetProtocol:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				/* Read in the wValue parameter containing the new protocol mode */

-				uint16_t wValue = Endpoint_Read_Word_LE();

-								

 				Endpoint_ClearSETUP();

 

 				/* Set or clear the flag depending on what the host indicates that the current Protocol should be */

-				UsingReportProtocol = (wValue != 0x0000);

+				UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);

 

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

@@ -284,15 +268,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetIdle:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				/* Read in the wValue parameter containing the idle period */

-				uint16_t wValue = Endpoint_Read_Word_LE();

-				

 				Endpoint_ClearSETUP();

 				

 				/* Get idle period in MSB */

-				IdleCount = (wValue >> 8);

+				IdleCount = (USB_ControlRequest.wValue >> 8);

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

@@ -301,7 +282,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_GetIdle:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{		

 				Endpoint_ClearSETUP();

 				

diff --git a/Demos/Device/KeyboardMouse/KeyboardMouse.c b/Demos/Device/KeyboardMouse/KeyboardMouse.c
index 9cae69a5e..a85a3786d 100644
--- a/Demos/Device/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/Device/KeyboardMouse/KeyboardMouse.c
@@ -139,17 +139,13 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	uint8_t  ReportSize;

 

 	/* Handle HID Class specific requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetReport:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				Endpoint_Discard_Word();

-			

-				uint16_t wIndex = Endpoint_Read_Word_LE();

-				

 				/* Determine if it is the mouse or the keyboard data that is being requested */

-				if (!(wIndex))

+				if (!(USB_ControlRequest.wIndex))

 				{

 					ReportData = (uint8_t*)&KeyboardReportData;

 					ReportSize = sizeof(KeyboardReportData);

@@ -160,17 +156,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 					ReportSize = sizeof(MouseReportData);

 				}

 

-				/* Read in the number of bytes in the report to send to the host */

-				uint16_t wLength = Endpoint_Read_Word_LE();

-				

-				/* If trying to send more bytes than exist to the host, clamp the value at the report size */

-				if (wLength > ReportSize)

-				  wLength = ReportSize;

-

 				Endpoint_ClearSETUP();

 	

 				/* Write the report data to the control endpoint */

-				Endpoint_Write_Control_Stream_LE(ReportData, wLength);

+				Endpoint_Write_Control_Stream_LE(ReportData, ReportSize);

 

 				/* Clear the report data afterwards */

 				memset(ReportData, 0, ReportSize);

@@ -181,7 +170,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		

 			break;

 		case REQ_SetReport:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 				

diff --git a/Demos/Device/MassStorage/MassStorage.c b/Demos/Device/MassStorage/MassStorage.c
index 8c7db9322..e2c242499 100644
--- a/Demos/Device/MassStorage/MassStorage.c
+++ b/Demos/Device/MassStorage/MassStorage.c
@@ -148,10 +148,10 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Process UFI specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_MassStorageReset:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 

@@ -165,7 +165,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 

 			break;

 		case REQ_GetMaxLUN:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 

diff --git a/Demos/Device/Mouse/Mouse.c b/Demos/Device/Mouse/Mouse.c
index 0959a4a12..2e5f05b42 100644
--- a/Demos/Device/Mouse/Mouse.c
+++ b/Demos/Device/Mouse/Mouse.c
@@ -183,33 +183,20 @@ EVENT_HANDLER(USB_ConfigurationChanged)
 EVENT_HANDLER(USB_UnhandledControlPacket)

 {

 	/* Handle HID Class specific requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetReport:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				USB_MouseReport_Data_t MouseReportData;

 

 				/* Create the next mouse report for transmission to the host */

 				CreateMouseReport(&MouseReportData);

 

-				/* Ignore report type and ID number value */

-				Endpoint_Discard_Word();

-				

-				/* Ignore unused Interface number value */

-				Endpoint_Discard_Word();

-

-				/* Read in the number of bytes in the report to send to the host */

-				uint16_t wLength = Endpoint_Read_Word_LE();

-				

-				/* If trying to send more bytes than exist to the host, clamp the value at the report size */

-				if (wLength > sizeof(MouseReportData))

-				  wLength = sizeof(MouseReportData);

-

 				Endpoint_ClearSETUP();

 	

 				/* Write the report data to the control endpoint */

-				Endpoint_Write_Control_Stream_LE(&MouseReportData, wLength);

+				Endpoint_Write_Control_Stream_LE(&MouseReportData, sizeof(MouseReportData));

 				

 				/* Clear the report data afterwards */

 				memset(&MouseReportData, 0, sizeof(MouseReportData));

@@ -220,7 +207,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 		

 			break;

 		case REQ_GetProtocol:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				Endpoint_ClearSETUP();

 				

@@ -237,15 +224,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetProtocol:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				/* Read in the wValue parameter containing the new protocol mode */

-				uint16_t wValue = Endpoint_Read_Word_LE();

-				

 				Endpoint_ClearSETUP();

 				

 				/* Set or clear the flag depending on what the host indicates that the current Protocol should be */

-				UsingReportProtocol = (wValue != 0x0000);

+				UsingReportProtocol = (USB_ControlRequest.wValue != 0x0000);

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

@@ -254,15 +238,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetIdle:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-				/* Read in the wValue parameter containing the idle period */

-				uint16_t wValue = Endpoint_Read_Word_LE();

-				

 				Endpoint_ClearSETUP();

 				

 				/* Get idle period in MSB */

-				IdleCount = (wValue >> 8);

+				IdleCount = (USB_ControlRequest.wValue >> 8);

 				

 				/* Acknowledge status stage */

 				while (!(Endpoint_IsINReady()));

@@ -271,7 +252,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_GetIdle:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{		

 				Endpoint_ClearSETUP();

 				

diff --git a/Demos/Device/RNDISEthernet/RNDISEthernet.c b/Demos/Device/RNDISEthernet/RNDISEthernet.c
index ec8eb7b87..7b81ad85f 100644
--- a/Demos/Device/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/Device/RNDISEthernet/RNDISEthernet.c
@@ -150,10 +150,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	uint16_t wLength = Endpoint_Read_Word_LE();

 

 	/* Process RNDIS class commands */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_SendEncapsulatedCommand:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Clear the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -170,7 +170,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_GetEncapsulatedResponse:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Check if a response to the last message is ready */

 				if (!(MessageHeader->MessageLength))

@@ -180,15 +180,11 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 					MessageHeader->MessageLength = 1;

 				}

 

-				/* Check if less than the requested number of bytes to transfer */

-				if (MessageHeader->MessageLength < wLength)

-				  wLength = MessageHeader->MessageLength;

-

 				/* Clear the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

 				

 				/* Write the message response data to the endpoint */

-				Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, wLength);

+				Endpoint_Write_Control_Stream_LE(RNDISMessageBuffer, MessageHeader->MessageLength);

 				

 				/* Finalize the stream transfer to send the last packet or clear the host abort */

 				Endpoint_ClearOUT();

diff --git a/Demos/Device/USBtoSerial/USBtoSerial.c b/Demos/Device/USBtoSerial/USBtoSerial.c
index e1c22fc13..dbf4b1b0d 100644
--- a/Demos/Device/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/USBtoSerial/USBtoSerial.c
@@ -153,10 +153,10 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	uint8_t* LineCodingData = (uint8_t*)&LineCoding;

 

 	/* Process CDC specific control requests */

-	switch (bRequest)

+	switch (USB_ControlRequest.bRequest)

 	{

 		case REQ_GetLineEncoding:

-			if (bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))

 			{	

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -170,7 +170,7 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 			

 			break;

 		case REQ_SetLineEncoding:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();

@@ -187,18 +187,12 @@ EVENT_HANDLER(USB_UnhandledControlPacket)
 	

 			break;

 		case REQ_SetControlLineState:

-			if (bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

+			if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))

 			{

-#if 0

 				/* NOTE: Here you can read in the line state mask from the host, to get the current state of the output handshake

-				         lines. The mask is read in from the wValue parameter, and can be masked against the CONTROL_LINE_OUT_* masks

-				         to determine the RTS and DTR line states using the following code:

+				         lines. The mask is read in from the wValue parameter in USB_ControlRequest, and can be masked against the

+						 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:

 				*/

-

-				uint16_t wIndex = Endpoint_Read_Word_LE();

-					

-				// Do something with the given line states in wIndex

-#endif

 				

 				/* Acknowledge the SETUP packet, ready for data transfer */

 				Endpoint_ClearSETUP();