Remove incorrect Abstract Call Management class specific descriptor from the CDC...

[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 b8a673f..ade2a1b 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -28,10 +28,12 @@
   this software.\r
 */\r
 \r
   this software.\r
 */\r
 \r

+#define  __INCLUDE_FROM_USB_DRIVER\r

 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r
 #include "../../HighLevel/USBMode.h"\r
 #if defined(USB_CAN_BE_DEVICE)\r
 \r

-#define  INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
+#define  __INCLUDE_FROM_CDC_DRIVER\r

 #include "CDC.h"\r
 \r
 void CDC_Device_Event_Stub(void)\r
 #include "CDC.h"\r
 \r
 void CDC_Device_Event_Stub(void)\r


@@ -193,9 +195,14 @@ uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* const CDCInterface
        if (Endpoint_IsOUTReceived())\r
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r
        if (Endpoint_IsOUTReceived())\r
        {\r
                if (!(Endpoint_BytesInEndpoint()))\r

-                 Endpoint_ClearOUT();\r
-\r
-               return Endpoint_BytesInEndpoint();\r
+               {\r
+                       Endpoint_ClearOUT();\r
+                       return 0;\r
+               }\r
+               else\r
+               {\r
+                       return Endpoint_BytesInEndpoint();\r
+               }\r

        }\r
        else\r
        {\r
        }\r
        else\r
        {\r