Fixed broken HIDReportParser.c.

[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 c551fb7..2cc0f94 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -28,15 +28,18 @@
   this software.\r
 */\r
 \r
-#define  INCLUDE_FROM_CDC_CLASS_C\r
+#include "../../HighLevel/USBMode.h"\r
+#if defined(USB_CAN_BE_DEVICE)\r
+\r
+#define  INCLUDE_FROM_CDC_CLASS_DEVICE_C\r
 #include "CDC.h"\r
 \r
-void USB_CDC_Event_Stub(void)\r
+void CDC_Device_Event_Stub(void)\r
 {\r
 \r
 }\r
 \r
-void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
@@ -62,7 +65,7 @@ void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                                Endpoint_Read_Control_Stream_LE(&CDCInterfaceInfo->LineEncoding, sizeof(CDCInterfaceInfo->LineEncoding));\r
                                Endpoint_ClearIN();\r
 \r
-                               EVENT_USB_CDC_LineEncodingChanged(CDCInterfaceInfo);\r
+                               EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);\r
                        }\r
        \r
                        break;\r
@@ -73,7 +76,7 @@ void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                                \r
                                CDCInterfaceInfo->ControlLineState = USB_ControlRequest.wValue;\r
                                \r
-                               EVENT_USB_CDC_ControLineStateChanged(CDCInterfaceInfo);\r
+                               EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);\r
 \r
                                while (!(Endpoint_IsINReady()));\r
                                Endpoint_ClearIN();\r
@@ -83,7 +86,7 @@ void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        }\r
 }\r
 \r
-bool USB_CDC_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
 {\r
        if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
                                                                 ENDPOINT_DIR_IN, CDCInterfaceInfo->DataINEndpointSize,\r
@@ -109,7 +112,7 @@ bool USB_CDC_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return true;\r
 }\r
 \r
-void USB_CDC_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void CDC_Device_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
@@ -128,7 +131,7 @@ void USB_CDC_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        Endpoint_ClearIN();\r
 }\r
 \r
-void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
+void CDC_Device_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
@@ -137,7 +140,7 @@ void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint1
        Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r
 }\r
 \r
-void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
+void CDC_Device_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
@@ -153,14 +156,14 @@ void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
        Endpoint_Write_Byte(Data);      \r
 }\r
 \r
-uint16_t USB_CDC_BytesReceived(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
 {\r
        Endpoint_SelectEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber);\r
 \r
        return Endpoint_BytesInEndpoint();\r
 }\r
 \r
-uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
 {\r
        if (!(USB_IsConnected))\r
          return 0;\r
@@ -175,7 +178,7 @@ uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return DataByte;\r
 }\r
 \r
-void USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)\r
+void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)\r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
@@ -195,3 +198,5 @@ void USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, ui
        Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask), NO_STREAM_CALLBACK);\r
        Endpoint_ClearIN();\r
 }\r
+\r
+#endif\r