X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/1daa5e16f9a395fb2943906a715adb35b8106988..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/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 a196f53dd..da880abd8 100644 --- a/LUFA/Drivers/USB/Class/Device/CDC.c +++ b/LUFA/Drivers/USB/Class/Device/CDC.c @@ -37,11 +37,6 @@ #define __INCLUDE_FROM_CDC_DEVICE_C #include "CDC.h" -void CDC_Device_Event_Stub(void) -{ - -} - void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo) { if (!(Endpoint_IsSETUPReceived())) @@ -193,7 +188,7 @@ uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, return ErrorCode; } - Endpoint_Write_Byte(Data); + Endpoint_Write_8(Data); return ENDPOINT_READYWAIT_NoError; } @@ -261,7 +256,7 @@ int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInf if (Endpoint_IsOUTReceived()) { if (Endpoint_BytesInEndpoint()) - ReceivedByte = Endpoint_Read_Byte(); + ReceivedByte = Endpoint_Read_8(); if (!(Endpoint_BytesInEndpoint())) Endpoint_ClearOUT(); @@ -281,9 +276,9 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC { .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), .bRequest = CDC_NOTIF_SerialState, - .wValue = 0, - .wIndex = 0, - .wLength = sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost), + .wValue = CPU_TO_LE16(0), + .wIndex = CPU_TO_LE16(0), + .wLength = CPU_TO_LE16(sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost)), }; Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NULL); @@ -293,6 +288,7 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC Endpoint_ClearIN(); } +#if defined(FDEV_SETUP_STREAM) void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, FILE* const Stream) { @@ -338,6 +334,12 @@ static int CDC_Device_getchar_Blocking(FILE* Stream) return ReceivedByte; } +#endif + +void CDC_Device_Event_Stub(void) +{ + +} #endif