X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d1e52660368d34d693131f6aff3c8fd8584162e5..462fb500d76a352409886adb188246dcc6e06680:/LUFA/Drivers/USB/Class/Device/CDC.c

diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDC.c
index 8acaac7a1..c551fb769 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -73,7 +73,7 @@ void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
 				
 				CDCInterfaceInfo->ControlLineState = USB_ControlRequest.wValue;
 				
-				EVENT_USB_CDC_ControLineStateChanged();
+				EVENT_USB_CDC_ControLineStateChanged(CDCInterfaceInfo);
 
 				while (!(Endpoint_IsINReady()));
 				Endpoint_ClearIN();
@@ -130,12 +130,18 @@ void USB_CDC_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
 
 void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length)
 {
+	if (!(USB_IsConnected))
+	  return;
+
 	Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);
 	Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);
 }
 
 void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
 {
+	if (!(USB_IsConnected))
+	  return;
+
 	Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);
 
 	if (!(Endpoint_IsReadWriteAllowed()))
@@ -156,6 +162,9 @@ uint16_t USB_CDC_BytesReceived(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
 
 uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
 {
+	if (!(USB_IsConnected))
+	  return 0;
+
 	Endpoint_SelectEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber);
 	
 	uint8_t DataByte = Endpoint_Read_Byte();
@@ -166,8 +175,11 @@ uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
 	return DataByte;
 }
 
-void USB_CDC_SendSerialLineStateChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)
+void USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)
 {
+	if (!(USB_IsConnected))
+	  return;
+
 	Endpoint_SelectEndpoint(CDCInterfaceInfo->NotificationEndpointNumber);
 	
 	USB_Request_Header_t Notification = (USB_Request_Header_t)