Partial commit: Rename USBFOO LED driver to fix capitalisation of file name, which...

[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 838bd71..7398ce6 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -29,18 +29,14 @@
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER
 */
 
 #define  __INCLUDE_FROM_USB_DRIVER

-#include "../../HighLevel/USBMode.h"
+#include "../../Core/USBMode.h"
+

 #if defined(USB_CAN_BE_DEVICE)
 
 #define  __INCLUDE_FROM_CDC_DRIVER
 #define  __INCLUDE_FROM_CDC_DEVICE_C
 #include "CDC.h"
 
 #if defined(USB_CAN_BE_DEVICE)
 
 #define  __INCLUDE_FROM_CDC_DRIVER
 #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()))
 void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
        if (!(Endpoint_IsSETUPReceived()))


@@ -192,7 +188,7 @@ uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
                  return ErrorCode;
        }
 
                  return ErrorCode;
        }
 

-       Endpoint_Write_Byte(Data);
+       Endpoint_Write_8(Data);

        return ENDPOINT_READYWAIT_NoError;
 }
 
        return ENDPOINT_READYWAIT_NoError;
 }
 


@@ -260,7 +256,7 @@ int16_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInf
        if (Endpoint_IsOUTReceived())
        {
                if (Endpoint_BytesInEndpoint())
        if (Endpoint_IsOUTReceived())
        {
                if (Endpoint_BytesInEndpoint())

-                 ReceivedByte = Endpoint_Read_Byte();
+                 ReceivedByte = Endpoint_Read_8();

 
                if (!(Endpoint_BytesInEndpoint()))
                  Endpoint_ClearOUT();
 
                if (!(Endpoint_BytesInEndpoint()))
                  Endpoint_ClearOUT();


@@ -292,6 +288,7 @@ void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* const CDC
        Endpoint_ClearIN();
 }
 
        Endpoint_ClearIN();
 }
 

+#if defined(FDEV_SETUP_STREAM)

 void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
                              FILE* const Stream)
 {
 void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo,
                              FILE* const Stream)
 {


@@ -337,6 +334,12 @@ static int CDC_Device_getchar_Blocking(FILE* Stream)
 
        return ReceivedByte;
 }
 
        return ReceivedByte;
 }

+#endif
+
+void CDC_Device_Event_Stub(void)
+{
+
+}

 
 #endif
 
 
 #endif