Changed to new device mode Class Driver function name prefixes to make way for simila...

[pub/lufa.git] / Demos / Device / ClassDriver / DualCDC / DualCDC.c

diff --git a/Demos/Device/ClassDriver/DualCDC/DualCDC.c b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
index 216902c..ca33f10 100644 (file)
--- a/Demos/Device/ClassDriver/DualCDC/DualCDC.c
+++ b/Demos/Device/ClassDriver/DualCDC/DualCDC.c
@@ -88,17 +88,17 @@ int main(void)
                CheckJoystickMovement();\r
 \r
                /* Discard all received data on the first CDC interface */\r
                CheckJoystickMovement();\r
 \r
                /* Discard all received data on the first CDC interface */\r

-               uint16_t BytesToDiscard = USB_CDC_BytesReceived(&VirtualSerial1_CDC_Interface);\r
+               uint16_t BytesToDiscard = CDC_Device_BytesReceived(&VirtualSerial1_CDC_Interface);\r

                while (BytesToDiscard--)\r
                while (BytesToDiscard--)\r

-                 USB_CDC_ReceiveByte(&VirtualSerial1_CDC_Interface);\r
+                 CDC_Device_ReceiveByte(&VirtualSerial1_CDC_Interface);\r

 \r
                /* Echo all received data on the second CDC interface */\r
 \r
                /* Echo all received data on the second CDC interface */\r

-               uint16_t BytesToEcho = USB_CDC_BytesReceived(&VirtualSerial2_CDC_Interface);\r
+               uint16_t BytesToEcho = CDC_Device_BytesReceived(&VirtualSerial2_CDC_Interface);\r

                while (BytesToEcho--)\r
                while (BytesToEcho--)\r

-                 USB_CDC_SendByte(&VirtualSerial2_CDC_Interface, USB_CDC_ReceiveByte(&VirtualSerial2_CDC_Interface));\r
+                 CDC_Device_SendByte(&VirtualSerial2_CDC_Interface, CDC_Device_ReceiveByte(&VirtualSerial2_CDC_Interface));\r

                  \r
                  \r

-               USB_CDC_USBTask(&VirtualSerial1_CDC_Interface);\r
-               USB_CDC_USBTask(&VirtualSerial2_CDC_Interface);\r
+               CDC_Device_USBTask(&VirtualSerial1_CDC_Interface);\r
+               CDC_Device_USBTask(&VirtualSerial2_CDC_Interface);\r

                USB_USBTask();\r
        }\r
 }\r
                USB_USBTask();\r
        }\r
 }\r


@@ -154,7 +154,7 @@ void CheckJoystickMovement(void)
        {\r
                ActionSent = true;\r
                \r
        {\r
                ActionSent = true;\r
                \r

-               USB_CDC_SendString(&VirtualSerial1_CDC_Interface, ReportString, strlen(ReportString));          \r
+               CDC_Device_SendString(&VirtualSerial1_CDC_Interface, ReportString, strlen(ReportString));               \r

        }\r
 }\r
 \r
        }\r
 }\r
 \r


@@ -175,16 +175,16 @@ void EVENT_USB_ConfigurationChanged(void)
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r
 {\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
 \r

-       if (!(USB_CDC_ConfigureEndpoints(&VirtualSerial1_CDC_Interface)))\r
+       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial1_CDC_Interface)))\r

          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 \r

-       if (!(USB_CDC_ConfigureEndpoints(&VirtualSerial2_CDC_Interface)))\r
+       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial2_CDC_Interface)))\r

          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r
          LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
 }\r
 \r
 /** Event handler for the library USB Unhandled Control Packet event. */\r
 void EVENT_USB_UnhandledControlPacket(void)\r
 {\r

-       USB_CDC_ProcessControlPacket(&VirtualSerial1_CDC_Interface);\r
-       USB_CDC_ProcessControlPacket(&VirtualSerial2_CDC_Interface);\r
+       CDC_Device_ProcessControlPacket(&VirtualSerial1_CDC_Interface);\r
+       CDC_Device_ProcessControlPacket(&VirtualSerial2_CDC_Interface);\r

 }\r
 }\r