Add FatFS library to the Webserver project, extend the HTTP server so that it now...

[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..b8a673f 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDC.c
@@ -1,21 +1,21 @@
 /*\r
              LUFA Library\r
 /*\r
              LUFA Library\r

-     Copyright (C) Dean Camera, 2009.\r
+     Copyright (C) Dean Camera, 2010.\r

               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r
               \r
   dean [at] fourwalledcubicle [dot] com\r
       www.fourwalledcubicle.com\r
 */\r
 \r
 /*\r

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
-\r
-  Permission to use, copy, modify, and distribute this software\r
-  and its documentation for any purpose and without fee is hereby\r
-  granted, provided that the above copyright notice appear in all\r
-  copies and that both that the copyright notice and this\r
-  permission notice and warranty disclaimer appear in supporting\r
-  documentation, and that the name of the author not be used in\r
-  advertising or publicity pertaining to distribution of the\r
+  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)\r
+\r
+  Permission to use, copy, modify, distribute, and sell this \r
+  software and its documentation for any purpose is hereby granted\r
+  without fee, provided that the above copyright notice appear in \r
+  all copies and that both that the copyright notice and this\r
+  permission notice and warranty disclaimer appear in supporting \r
+  documentation, and that the name of the author not be used in \r
+  advertising or publicity pertaining to distribution of the \r

   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r
   software without specific, written prior permission.\r
 \r
   The author disclaim all warranties with regard to this\r


@@ -28,20 +28,23 @@
   this software.\r
 */\r
 \r
   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
 #include "CDC.h"\r
 \r

-void USB_CDC_Event_Stub(void)\r
+void CDC_Device_Event_Stub(void)\r

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

-void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)\r
+void CDC_Device_ProcessControlRequest(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


@@ -50,7 +53,7 @@ void USB_CDC_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


@@ -59,10 +62,10 @@ void USB_CDC_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
                                Endpoint_ClearIN();\r
 \r

-                               EVENT_USB_CDC_LineEncodingChanged(CDCInterfaceInfo);\r
+                               EVENT_CDC_Device_LineEncodingChanged(CDCInterfaceInfo);\r

                        }\r
        \r
                        break;\r
                        }\r
        \r
                        break;\r


@@ -71,37 +74,38 @@ void USB_CDC_ProcessControlPacket(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
                        {                               \r
                                Endpoint_ClearSETUP();\r
                                \r
                        {                               \r
                                Endpoint_ClearSETUP();\r
                                \r

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

                                \r
                                \r

-                               EVENT_USB_CDC_ControLineStateChanged(CDCInterfaceInfo);\r
+                               EVENT_CDC_Device_ControLineStateChanged(CDCInterfaceInfo);\r

 \r
 \r

-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

                        }\r
        \r
                        break;\r
        }\r
 }\r
 \r
                        }\r
        \r
                        break;\r
        }\r
 }\r
 \r

-bool USB_CDC_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
-                                                                ENDPOINT_BANK_SINGLE)))\r
+       memset(&CDCInterfaceInfo->State, 0x00, sizeof(CDCInterfaceInfo->State));\r
+\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber, EP_TYPE_BULK,\r
+                                                                ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.DataINEndpointSize,\r
+                                                                CDCInterfaceInfo->Config.DataINEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

        {\r
                return false;\r
        }\r
 \r
        {\r
                return false;\r
        }\r
 \r

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber, EP_TYPE_BULK,\r
-                                        ENDPOINT_DIR_OUT, CDCInterfaceInfo->DataOUTEndpointSize,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber, EP_TYPE_BULK,\r
+                                        ENDPOINT_DIR_OUT, CDCInterfaceInfo->Config.DataOUTEndpointSize,\r
+                                        CDCInterfaceInfo->Config.DataOUTEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

        {\r
                return false;\r
        }\r
 \r
        {\r
                return false;\r
        }\r
 \r

-       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->NotificationEndpointNumber, EP_TYPE_INTERRUPT,\r
-                                        ENDPOINT_DIR_IN, CDCInterfaceInfo->NotificationEndpointSize,\r
-                                        ENDPOINT_BANK_SINGLE)))\r
+       if (!(Endpoint_ConfigureEndpoint(CDCInterfaceInfo->Config.NotificationEndpointNumber, EP_TYPE_INTERRUPT,\r
+                                        ENDPOINT_DIR_IN, CDCInterfaceInfo->Config.NotificationEndpointSize,\r
+                                        CDCInterfaceInfo->Config.NotificationEndpointDoubleBank ? ENDPOINT_BANK_DOUBLE : ENDPOINT_BANK_SINGLE)))\r

        {\r
                return false;\r
        }\r
        {\r
                return false;\r
        }\r


@@ -109,63 +113,102 @@ bool USB_CDC_ConfigureEndpoints(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return true;\r
 }\r
 \r
        return true;\r
 }\r
 \r

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

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r

          return;\r
 \r
          return;\r
 \r

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

 \r
 \r

-       if (!(Endpoint_BytesInEndpoint()))\r
-         return;\r
+       if (Endpoint_IsOUTReceived() && !(Endpoint_BytesInEndpoint()))\r
+         Endpoint_ClearOUT();\r

          \r
          \r

-       if (!(Endpoint_IsReadWriteAllowed()))\r
-       {\r
-               Endpoint_ClearIN();\r
-               while (!(Endpoint_IsReadWriteAllowed()));\r
-       }       \r
+       CDC_Device_Flush(CDCInterfaceInfo);\r
+}\r
+\r
+uint8_t CDC_Device_SendString(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, char* const Data, const uint16_t Length)\r
+{\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r

        \r
        \r

-       Endpoint_ClearIN();\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r
+       return Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r

 }\r
 \r
 }\r
 \r

-void USB_CDC_SendString(USB_ClassInfo_CDC_t* CDCInterfaceInfo, char* Data, uint16_t Length)\r
+uint8_t CDC_Device_SendByte(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo, const uint8_t Data)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
-         return;\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r
+\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r

 \r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
-       Endpoint_Write_Stream_LE(Data, Length, NO_STREAM_CALLBACK);\r
+       if (!(Endpoint_IsReadWriteAllowed()))\r
+       {       \r
+               Endpoint_ClearIN();\r
+\r
+               uint8_t ErrorCode;\r
+\r
+               if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)\r
+                 return ErrorCode;\r
+       }\r
+\r
+       Endpoint_Write_Byte(Data);\r
+       return ENDPOINT_READYWAIT_NoError;\r

 }\r
 \r
 }\r
 \r

-void USB_CDC_SendByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo, uint8_t Data)\r
+uint8_t CDC_Device_Flush(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
-         return;\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r
+         return ENDPOINT_RWSTREAM_DeviceDisconnected;\r

 \r
 \r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataINEndpointNumber);\r
+       uint8_t ErrorCode;\r

 \r
 \r

-       if (!(Endpoint_IsReadWriteAllowed()))\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataINEndpointNumber);\r
+\r
+       if (!(Endpoint_BytesInEndpoint()))\r
+         return ENDPOINT_READYWAIT_NoError;\r
+       \r
+       bool BankFull = !(Endpoint_IsReadWriteAllowed());\r
+       \r
+       Endpoint_ClearIN();\r
+       \r
+       if (BankFull)\r

        {\r
        {\r

+               if ((ErrorCode = Endpoint_WaitUntilReady()) != ENDPOINT_READYWAIT_NoError)\r
+                 return ErrorCode;\r
+\r

                Endpoint_ClearIN();\r
                Endpoint_ClearIN();\r

-               while (!(Endpoint_IsReadWriteAllowed()));\r

        }\r
        }\r

-\r
-       Endpoint_Write_Byte(Data);      \r
+       \r
+       return ENDPOINT_READYWAIT_NoError;\r

 }\r
 \r
 }\r
 \r

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

 {\r
 {\r

-       Endpoint_SelectEndpoint(CDCInterfaceInfo->DataOUTEndpointNumber);\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r
+         return 0;\r
+\r
+       Endpoint_SelectEndpoint(CDCInterfaceInfo->Config.DataOUTEndpointNumber);\r

 \r
 \r

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

 }\r
 \r
 }\r
 \r

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

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r

          return 0;\r
 \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


@@ -175,12 +218,12 @@ uint8_t USB_CDC_ReceiveByte(USB_ClassInfo_CDC_t* CDCInterfaceInfo)
        return DataByte;\r
 }\r
 \r
        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_Device_t* const CDCInterfaceInfo)\r

 {\r
 {\r

-       if (!(USB_IsConnected))\r
+       if ((USB_DeviceState != DEVICE_STATE_Configured) || !(CDCInterfaceInfo->State.LineEncoding.BaudRateBPS))\r

          return;\r
 \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


@@ -188,10 +231,53 @@ void USB_CDC_SendSerialLineStateChange(USB_ClassInfo_CDC_t* CDCInterfaceInfo, ui
                        .bRequest      = NOTIF_SerialState,\r
                        .wValue        = 0,\r
                        .wIndex        = 0,\r
                        .bRequest      = NOTIF_SerialState,\r
                        .wValue        = 0,\r
                        .wIndex        = 0,\r

-                       .wLength       = sizeof(uint16_t),\r
+                       .wLength       = sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),\r

                };\r
 \r
                };\r
 \r

-       Endpoint_Write_Stream_LE(&Notification, sizeof(Notification), NO_STREAM_CALLBACK);\r
-       Endpoint_Write_Stream_LE(&LineStateMask, sizeof(LineStateMask), NO_STREAM_CALLBACK);\r
+       Endpoint_Write_Stream_LE(&Notification, sizeof(USB_Request_Header_t), NO_STREAM_CALLBACK);\r
+       Endpoint_Write_Stream_LE(&CDCInterfaceInfo->State.ControlLineStates.DeviceToHost,\r
+                                sizeof(CDCInterfaceInfo->State.ControlLineStates.DeviceToHost),\r
+                                NO_STREAM_CALLBACK);\r

        Endpoint_ClearIN();\r
 }\r
        Endpoint_ClearIN();\r
 }\r

+\r
+void CDC_Device_CreateStream(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo, FILE* Stream)\r
+{\r
+       *Stream = (FILE)FDEV_SETUP_STREAM(CDC_Device_putchar, CDC_Device_getchar, _FDEV_SETUP_RW);\r
+       fdev_set_udata(Stream, CDCInterfaceInfo);\r
+}\r
+\r
+void CDC_Device_CreateBlockingStream(USB_ClassInfo_CDC_Device_t* CDCInterfaceInfo, FILE* Stream)\r
+{\r
+       *Stream = (FILE)FDEV_SETUP_STREAM(CDC_Device_putchar, CDC_Device_getchar_Blocking, _FDEV_SETUP_RW);\r
+       fdev_set_udata(Stream, CDCInterfaceInfo);\r
+}\r
+\r
+static int CDC_Device_putchar(char c, FILE* Stream)\r
+{\r
+       return CDC_Device_SendByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream), c) ? _FDEV_ERR : 0;\r
+}\r
+\r
+static int CDC_Device_getchar(FILE* Stream)\r
+{\r
+       if (!(CDC_Device_BytesReceived((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream))))\r
+         return _FDEV_EOF;\r
+\r
+       return CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));\r
+}\r
+\r
+static int CDC_Device_getchar_Blocking(FILE* Stream)\r
+{\r
+       while (!(CDC_Device_BytesReceived((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream))))\r
+       {\r
+               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                 return _FDEV_EOF;\r
+       \r
+               CDC_Device_USBTask((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));\r
+               USB_USBTask();\r
+       }\r
+\r
+       return CDC_Device_ReceiveByte((USB_ClassInfo_CDC_Device_t*)fdev_get_udata(Stream));\r
+}\r
+\r
+#endif\r