projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add master device Host demo makefile.
[pub/USBasp.git]
/
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
8acaac7
..
dface2a
100644
(file)
--- 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)
\r
CDCInterfaceInfo->ControlLineState = USB_ControlRequest.wValue;
\r
\r
\r
CDCInterfaceInfo->ControlLineState = USB_ControlRequest.wValue;
\r
\r
- EVENT_USB_CDC_ControLineStateChanged();
\r
+ EVENT_USB_CDC_ControLineStateChanged(
CDCInterfaceInfo
);
\r
\r
while (!(Endpoint_IsINReady()));
\r
Endpoint_ClearIN();
\r
\r
while (!(Endpoint_IsINReady()));
\r
Endpoint_ClearIN();
\r
@@
-136,6
+136,9
@@
void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint1
\r
void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
\r
{
\r
\r
void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
\r
{
\r
+ if (!(USB_IsConnected))
\r
+ return;
\r
+
\r
Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);
\r
\r
if (!(Endpoint_IsReadWriteAllowed()))
\r
Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);
\r
\r
if (!(Endpoint_IsReadWriteAllowed()))
\r
@@
-166,7
+169,7
@@
uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
return DataByte;
\r
}
\r
\r
return DataByte;
\r
}
\r
\r
-void USB_CDC_SendSerialLineStateChange
d
(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)
\r
+void USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)
\r
{
\r
Endpoint_SelectEndpoint(CDCInterfaceInfo->NotificationEndpointNumber);
\r
\r
{
\r
Endpoint_SelectEndpoint(CDCInterfaceInfo->NotificationEndpointNumber);
\r
\r