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

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

diff --git a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
index 85826c2..dbe21c2 100644 (file)
--- a/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
+++ b/Demos/Device/ClassDriver/USBtoSerial/USBtoSerial.c
@@ -74,21 +74,24 @@ int main(void)
 \r
        for (;;)\r
        {\r
 \r
        for (;;)\r
        {\r

-               for (uint8_t DataBytesRem = USB_CDC_BytesReceived(&VirtualSerial_CDC_Interface); DataBytesRem != 0; DataBytesRem--)\r
+               /* Read bytes from the USB OUT endpoint into the USART transmit buffer */\r
+               for (uint8_t DataBytesRem = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); DataBytesRem != 0; DataBytesRem--)\r

                {\r
                        if (!(BUFF_STATICSIZE - Rx_Buffer.Elements))\r
                          break;\r
                          \r
                {\r
                        if (!(BUFF_STATICSIZE - Rx_Buffer.Elements))\r
                          break;\r
                          \r

-                       Buffer_StoreElement(&Rx_Buffer, USB_CDC_ReceiveByte(&VirtualSerial_CDC_Interface));\r
+                       Buffer_StoreElement(&Rx_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));\r

                }\r
                \r
                }\r
                \r

+               /* Read bytes from the USART receive buffer into the USB IN endpoint */\r

                if (Tx_Buffer.Elements)\r
                if (Tx_Buffer.Elements)\r

-                 USB_CDC_SendByte(&VirtualSerial_CDC_Interface, Buffer_GetElement(&Rx_Buffer));\r
-                 \r
+                 CDC_Device_SendByte(&VirtualSerial_CDC_Interface, Buffer_GetElement(&Tx_Buffer));\r
+               \r
+               /* Read bytes from the USART transmit buffer into the USART */\r

                if (Rx_Buffer.Elements)\r
                  Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r
                \r
                if (Rx_Buffer.Elements)\r
                  Serial_TxByte(Buffer_GetElement(&Rx_Buffer));\r
                \r

-               USB_CDC_USBTask(&VirtualSerial_CDC_Interface);\r
+               CDC_Device_USBTask(&VirtualSerial_CDC_Interface);\r

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


@@ -126,14 +129,14 @@ 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(&VirtualSerial_CDC_Interface)))\r
+       if (!(CDC_Device_ConfigureEndpoints(&VirtualSerial_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(&VirtualSerial_CDC_Interface);\r
+       CDC_Device_ProcessControlPacket(&VirtualSerial_CDC_Interface);\r

 }\r
 \r
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer\r
 }\r
 \r
 /** ISR to manage the reception of data from the serial port, placing received bytes into a circular buffer\r


@@ -149,7 +152,7 @@ ISR(USART1_RX_vect, ISR_BLOCK)
  *\r
  *  \param CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced\r
  */\r
  *\r
  *  \param CDCInterfaceInfo  Pointer to the CDC class interface configuration structure being referenced\r
  */\r

-void EVENT_USB_CDC_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r

 {\r
        uint8_t ConfigMask = 0;\r
 \r
 {\r
        uint8_t ConfigMask = 0;\r
 \r