Completion of initial CDC host mode class driver.

Adjustments to the CDC and MIDI device class drivers to use sizeof() on the actual variable being transmitted or received rather than its datatype to reduce possible mistakes.

2 files changed, 6 insertions, 4 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 47290ceb6..a6e5e2689 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -195,11 +195,13 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC
 			.bRequest      = NOTIF_SerialState,

 			.wValue        = 0,

 			.wIndex        = 0,

-			.wLength       = sizeof(uint16_t),

+			.wLength       = sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),

 		};

 

 	Endpoint_Write_Stream_LE(&Notification, sizeof(Notification), NO_STREAM_CALLBACK);

-	Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost, sizeof(uint8_t), NO_STREAM_CALLBACK);

+	Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,

+	                         sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),

+	                         NO_STREAM_CALLBACK);

 	Endpoint_ClearIN();

 }

 

diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDI.c
index a74e7a619..76583b173 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDI.c
@@ -79,7 +79,7 @@ void MIDI_Device_SendEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInterfac
 

 	if (Endpoint_IsReadWriteAllowed());

 	{

-		Endpoint_Write_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);

+		Endpoint_Write_Stream_LE(Event, sizeof(Event), NO_STREAM_CALLBACK);

 		Endpoint_ClearIN();

 	}

 }

@@ -94,7 +94,7 @@ bool MIDI_Device_ReceiveEventPacket(USB_ClassInfo_MIDI_Device_t* const MIDIInter
 	if (!(Endpoint_IsReadWriteAllowed()))

 	  return false;

 

-	Endpoint_Read_Stream_LE(Event, sizeof(MIDI_EventPacket_t), NO_STREAM_CALLBACK);

+	Endpoint_Read_Stream_LE(Event, sizeof(Event), NO_STREAM_CALLBACK);

 	Endpoint_ClearOUT();

 	

 	return true;