projects
/
pub
/
USBasp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added stdio.h stream examples for the virtual CDC UART in the CDC host demos.
[pub/USBasp.git]
/
LUFA
/
Drivers
/
USB
/
Class
/
Host
/
CDC.c
diff --git
a/LUFA/Drivers/USB/Class/Host/CDC.c
b/LUFA/Drivers/USB/Class/Host/CDC.c
index
4a4d884
..
adb9320
100644
(file)
--- a/
LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/
LUFA/Drivers/USB/Class/Host/CDC.c
@@
-34,7
+34,7
@@
#define INCLUDE_FROM_CDC_CLASS_HOST_C
\r
#include "CDC.h"
\r
\r
#define INCLUDE_FROM_CDC_CLASS_HOST_C
\r
#include "CDC.h"
\r
\r
-uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint16_t ConfigDescriptorSize,
\r
+uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo, uint16_t ConfigDescriptorSize,
\r
uint8_t* ConfigDescriptorData)
\r
{
\r
uint8_t FoundEndpoints = 0;
\r
uint8_t* ConfigDescriptorData)
\r
{
\r
uint8_t FoundEndpoints = 0;
\r
@@
-126,6
+126,8
@@
uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint
}
\r
}
\r
\r
}
\r
}
\r
\r
+ CDCInterfaceInfo->State.ControlLineStates.HostToDevice = (CDC_CONTROL_LINE_OUT_RTS | CDC_CONTROL_LINE_OUT_DTR);
\r
+ CDCInterfaceInfo->State.ControlLineStates.DeviceToHost = (CDC_CONTROL_LINE_IN_DCD | CDC_CONTROL_LINE_IN_DSR);
\r
CDCInterfaceInfo->State.IsActive = true;
\r
return CDC_ENUMERROR_NoError;
\r
}
\r
CDCInterfaceInfo->State.IsActive = true;
\r
return CDC_ENUMERROR_NoError;
\r
}
\r
@@
-189,7
+191,7
@@
static uint8_t DComp_CDC_Host_NextCDCInterfaceEndpoint(void* CurrentDescriptor)
return DESCRIPTOR_SEARCH_NotFound;
\r
}
\r
\r
return DESCRIPTOR_SEARCH_NotFound;
\r
}
\r
\r
-void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
\r
+void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo)
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return;
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return;
\r
@@
-200,7
+202,7
@@
void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
if (Pipe_IsINReceived())
\r
{
\r
USB_Request_Header_t Notification;
\r
if (Pipe_IsINReceived())
\r
{
\r
USB_Request_Header_t Notification;
\r
- Pipe_Read_Stream_LE(&Notification, sizeof(
Notification
), NO_STREAM_CALLBACK);
\r
+ Pipe_Read_Stream_LE(&Notification, sizeof(
USB_Request_Header_t
), NO_STREAM_CALLBACK);
\r
\r
if ((Notification.bRequest == NOTIF_SerialState) &&
\r
(Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))
\r
\r
if ((Notification.bRequest == NOTIF_SerialState) &&
\r
(Notification.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE)))
\r
@@
-219,7
+221,7
@@
void CDC_Host_USBTask(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
Pipe_Freeze();
\r
}
\r
\r
Pipe_Freeze();
\r
}
\r
\r
-uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
\r
+uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo)
\r
{
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r
{
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r
@@
-235,7
+237,7
@@
uint8_t CDC_Host_SetLineEncoding(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
return USB_Host_SendControlRequest(&CDCInterfaceInfo->State.LineEncoding);
\r
}
\r
\r
return USB_Host_SendControlRequest(&CDCInterfaceInfo->State.LineEncoding);
\r
}
\r
\r
-uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
\r
+uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo)
\r
{
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r
{
\r
USB_ControlRequest = (USB_Request_Header_t)
\r
{
\r
@@
-251,7
+253,7
@@
uint8_t CDC_Host_SendControlLineStateChange(USB_ClassInfo_CDC_Host_t* CDCInterfa
return USB_Host_SendControlRequest(NULL);
\r
}
\r
\r
return USB_Host_SendControlRequest(NULL);
\r
}
\r
\r
-uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t*
CDCInterfaceInfo, char* Data,
uint16_t Length)
\r
+uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t*
const CDCInterfaceInfo, char* Data, const
uint16_t Length)
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return PIPE_READYWAIT_NoError;
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return PIPE_READYWAIT_NoError;
\r
@@
-266,7
+268,7
@@
uint8_t CDC_Host_SendString(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, char* Da
return ErrorCode;
\r
}
\r
\r
return ErrorCode;
\r
}
\r
\r
-uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t*
CDCInterfaceInfo,
uint8_t Data)
\r
+uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t*
const CDCInterfaceInfo, const
uint8_t Data)
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return PIPE_READYWAIT_NoError;;
\r
{
\r
if ((USB_HostState != HOST_STATE_Configured) || !(CDCInterfaceInfo->State.IsActive))
\r
return PIPE_READYWAIT_NoError;;
\r
@@
-290,7
+292,7
@@
uint8_t CDC_Host_SendByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo, uint8_t Da
return PIPE_READYWAIT_NoError;
\r
}
\r
\r
return PIPE_READYWAIT_NoError;
\r
}
\r
\r
-uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
\r
+uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo)
\r
{
\r
uint16_t BytesInPipe = 0;
\r
\r
{
\r
uint16_t BytesInPipe = 0;
\r
\r
@@
-309,7
+311,7
@@
uint16_t CDC_Host_BytesReceived(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
return BytesInPipe;
\r
}
\r
\r
return BytesInPipe;
\r
}
\r
\r
-uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t* CDCInterfaceInfo)
\r
+uint8_t CDC_Host_ReceiveByte(USB_ClassInfo_CDC_Host_t*
const
CDCInterfaceInfo)
\r
{
\r
uint8_t ReceivedByte = 0;
\r
\r
{
\r
uint8_t ReceivedByte = 0;
\r
\r
projects / pub / USBasp.git / blobdiff