Break device mode class driver interfaces into seperate config and state structs...

[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 2cc0f94..cc8161e 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -39,12 +39,12 @@ void CDC_Device_Event_Stub(void)
 \r
 }\r
 \r
 \r
 }\r
 \r

-void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)\r

 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r
 {\r
        if (!(Endpoint_IsSETUPReceived()))\r
          return;\r
          \r

-       if (USB_ControlRequest.wIndex != CDCInterfaceInfo->ControlInterfaceNumber)\r
+       if (USB_ControlRequest.wIndex != CDCInterfaceInfo->Config.ControlInterfaceNumber)\r

          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r
          return;\r
 \r
        switch (USB_ControlRequest.bRequest)\r


@@ -53,7 +53,7 @@ void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r

-                               Endpoint_Write_Control_Stream_LE(&CDCInterfaceInfo->LineEncoding, sizeof(CDCInterfaceInfo->LineEncoding));\r
+                               Endpoint_Write_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));\r

                                Endpoint_ClearOUT();\r
                        }\r
                        \r
                                Endpoint_ClearOUT();\r
                        }\r
                        \r


@@ -62,7 +62,7 @@ void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r
                        if (USB_ControlRequest.bmRequestType == (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE))\r
                        {\r
                                Endpoint_ClearSETUP();\r

-                               Endpoint_Read_Control_Stream_LE(&CDCInterfaceInfo->LineEncoding, sizeof(CDCInterfaceInfo->LineEncoding));\r
+                               Endpoint_Read_Control_Stream_LE(&CDCInterfaceInfo->State.LineEncoding, sizeof(CDCInterfaceInfo->State.LineEncoding));\r

                                Endpoint_ClearIN();\r
 \r
                                EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);\r
                                Endpoint_ClearIN();\r
 \r
                                EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);\r


@@ -74,7 +74,7 @@ void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                        {                               \r
                                Endpoint_ClearSETUP();\r
                                \r
                        {                               \r
                                Endpoint_ClearSETUP();\r
                                \r

-                               CDCInterfaceInfo->ControlLineState = USB_ControlRequest.wValue;\r
+                               CDCInterfaceInfo->State.ControlLineState = USB_ControlRequest.wValue;\r

                                \r
                                EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);\r
 \r
                                \r
                                EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);\r
 \r


@@ -86,24 +86,24 @@ void CDC_Device_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        }\r
 }\r
 \r
        }\r
 }\r
 \r

-bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)\r

 {\r
 {\r

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->DataINEndpointNumber, EP_TYPE_BULK,\r
-                                                                ENDPOINT_DIR_IN, CDCInterfaceInfo->DataINEndpointSize,\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.DataINEndpointSize,\r

                                                                 ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r
                                                                 ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                        ENDPOINT_DIR_OUT, CDCInterfaceInfo->DataOUTEndpointSize,\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                        ENDPOINT_DIR_OUT, CDCInterfaceInfo->Config.DataOUTEndpointSize,\r

                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
        }\r
 \r

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->NotificationEndpointNumber, EP_TYPE_INTERRUPT,\r
-                                        ENDPOINT_DIR_IN, CDCInterfaceInfo->NotificationEndpointSize,\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber, EP_TYPE_INTERRUPT,\r
+                                        ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.NotificationEndpointSize,\r

                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r
                                         ENDPOINT_BANK_SINGLE)))\r
        {\r
                return false;\r


@@ -112,12 +112,12 @@ bool CDC_Device_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

-void CDC_Device_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void CDC_Device_USBTask(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)\r

 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r

 \r
        if (!(Endpoint_BytesInEndpoint()))\r
          return;\r
 \r
        if (!(Endpoint_BytesInEndpoint()))\r
          return;\r


@@ -131,21 +131,21 @@ void CDC_Device_USBTask(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        Endpoint_ClearIN();\r
 }\r
 \r
        Endpoint_ClearIN();\r
 }\r
 \r

-void CDC_Device_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
+void CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r

 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r

        Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r
 }\r
 \r
        Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r
 }\r
 \r

-void CDC_Device_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
+void CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo, uint8_t Data)\r

 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r

 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
        {\r
 \r
        if (!(Endpoint_IsReadWriteAllowed()))\r
        {\r


@@ -156,19 +156,19 @@ void CDC_Device_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)
        Endpoint_Write_Byte(Data);      \r
 }\r
 \r
        Endpoint_Write_Byte(Data);      \r
 }\r
 \r

-uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+uint16_t CDC_Device_BytesReceived(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)\r

 {\r
 {\r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);\r

 \r
        return Endpoint_BytesInEndpoint();\r
 }\r
 \r
 \r
        return Endpoint_BytesInEndpoint();\r
 }\r
 \r

-uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo)\r

 {\r
        if (!(USB_IsConnected))\r
          return 0;\r
 \r
 {\r
        if (!(USB_IsConnected))\r
          return 0;\r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);\r

        \r
        uint8_t DataByte = Endpoint_Read_Byte();\r
        \r
        \r
        uint8_t DataByte = Endpoint_Read_Byte();\r
        \r


@@ -178,12 +178,12 @@ uint8_t CDC_Device_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return DataByte;\r
 }\r
 \r
        return DataByte;\r
 }\r
 \r

-void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint16_t LineStateMask)\r
+void CDC_Device_SendControlLineStateChange(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo, uint16_t LineStateMask)\r

 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r
 {\r
        if (!(USB_IsConnected))\r
          return;\r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->NotificationEndpointNumber);\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber);\r

        \r
        USB_Request_Header_t Notification = (USB_Request_Header_t)\r
                {\r
        \r
        USB_Request_Header_t Notification = (USB_Request_Header_t)\r
                {\r