Collapse configuration descriptor size retrieval and size testing into a single if...

[pub/USBasp.git] / Demos / Device / LowLevel / CDC / CDC.c

diff --git a/Demos/Device/LowLevel/CDC/CDC.c b/Demos/Device/LowLevel/CDC/CDC.c
index 3db4c1e..e63257d 100644 (file)
--- a/Demos/Device/LowLevel/CDC/CDC.c
+++ b/Demos/Device/LowLevel/CDC/CDC.c
@@ -50,6 +50,58 @@ CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
                                  .ParityType  = Parity_None,\r
                                  .DataBits    = 8            };\r
 \r
                                  .ParityType  = Parity_None,\r
                                  .DataBits    = 8            };\r
 \r

+#if 0\r
+/* NOTE: Here you can set up a standard stream using the created virtual serial port, so that the standard stream functions in\r
+ *       <stdio.h> can be used on the virtual serial port (e.g. fprintf(&USBSerial, "Test"); to print a string).\r
+ */\r
+       \r
+static int CDC_putchar (char c, FILE *stream)\r
+{        \r
+       Endpoint_SelectEndpoint(CDC_TX_EPNUM);\r
+\r
+       while (!(Endpoint_IsReadWriteAllowed()))\r
+       {\r
+               if (USB_DeviceState != DEVICE_STATE_Configured)\r
+                 return -1;\r
+       }\r
+\r
+       Endpoint_Write_Byte(c);\r
+       Endpoint_ClearIN();\r
+       \r
+       return 0;\r
+}\r
+\r
+static int CDC_getchar (FILE *stream)\r
+{\r
+       int c;\r
+         \r
+       Endpoint_SelectEndpoint(CDC_RX_EPNUM);\r
+       \r
+       for (;;)\r
+       {\r
+               while (!(Endpoint_IsReadWriteAllowed()))\r
+               {\r
+                       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+                         return -1;\r
+               }\r
+       \r
+               if (!(Endpoint_BytesInEndpoint()))\r
+               {\r
+                       Endpoint_ClearOUT();\r
+               }\r
+               else\r
+               {\r
+                       c = Endpoint_Read_Byte();\r
+                       break;\r
+               }\r
+       }\r
+       \r
+       return c;\r
+}\r
+\r
+static FILE USBSerial = FDEV_SETUP_STREAM(CDC_putchar, CDC_getchar, _FDEV_SETUP_RW);\r
+#endif\r
+\r

 /** Main program entry point. This routine contains the overall program flow, including initial\r
  *  setup of all components and the main program loop.\r
  */\r
 /** Main program entry point. This routine contains the overall program flow, including initial\r
  *  setup of all components and the main program loop.\r
  */\r


@@ -105,21 +157,30 @@ void EVENT_USB_Disconnect(void)
  */\r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r
  */\r
 void EVENT_USB_ConfigurationChanged(void)\r
 {\r

-       /* Setup CDC Notification, Rx and Tx Endpoints */\r
-       Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
-                                      ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r
-       Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
-                                      ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
-                                  ENDPOINT_BANK_SINGLE);\r
-\r

        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r
        /* Indicate USB connected and ready */\r
        LEDs_SetAllLEDs(LEDMASK_USB_READY);\r

+\r
+       /* Setup CDC Notification, Rx and Tx Endpoints */\r
+       if (!(Endpoint_ConfigureEndpoint(CDC_NOTIFICATION_EPNUM, EP_TYPE_INTERRUPT,\r
+                                            ENDPOINT_DIR_IN, CDC_NOTIFICATION_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r
+       \r
+       if (!(Endpoint_ConfigureEndpoint(CDC_TX_EPNUM, EP_TYPE_BULK,\r
+                                            ENDPOINT_DIR_IN, CDC_TXRX_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r
+       \r
+       if (!(Endpoint_ConfigureEndpoint(CDC_RX_EPNUM, EP_TYPE_BULK,\r
+                                            ENDPOINT_DIR_OUT, CDC_TXRX_EPSIZE,\r
+                                        ENDPOINT_BANK_SINGLE)))\r
+       {\r
+               LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
+       }\r

 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r
 }\r
 \r
 /** Event handler for the USB_UnhandledControlPacket event. This is used to catch standard and class specific\r


@@ -172,9 +233,7 @@ void EVENT_USB_UnhandledControlPacket(void)
                                                 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
                                */\r
                                \r
                                                 CONTROL_LINE_OUT_* masks to determine the RTS and DTR line states using the following code:\r
                                */\r
                                \r

-                               /* Acknowledge status stage */\r
-                               while (!(Endpoint_IsINReady()));\r
-                               Endpoint_ClearIN();\r
+                               Endpoint_ClearStatusStage();\r

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


@@ -187,20 +246,23 @@ void CDC_Task(void)
        char*       ReportString    = NULL;\r
        uint8_t     JoyStatus_LCL   = Joystick_GetStatus();\r
        static bool ActionSent      = false;\r
        char*       ReportString    = NULL;\r
        uint8_t     JoyStatus_LCL   = Joystick_GetStatus();\r
        static bool ActionSent      = false;\r

-\r
-       char* JoystickStrings[] =\r
-               {\r
-                       "Joystick Up\r\n",\r
-                       "Joystick Down\r\n",\r
-                       "Joystick Left\r\n",\r
-                       "Joystick Right\r\n",\r
-                       "Joystick Pressed\r\n",\r
-               };\r
+       char*       JoystickStrings[] =\r
+                                       {\r
+                                               "Joystick Up\r\n",\r
+                                               "Joystick Down\r\n",\r
+                                               "Joystick Left\r\n",\r
+                                               "Joystick Right\r\n",\r
+                                               "Joystick Pressed\r\n",\r
+                                       };\r

        \r
        \r

+       /* Device must be connected and configured for the task to run */\r
+       if (USB_DeviceState != DEVICE_STATE_Configured)\r
+         return;\r
+         \r

 #if 0\r
        /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r
 #if 0\r
        /* NOTE: Here you can use the notification endpoint to send back line state changes to the host, for the special RS-232\r

-                handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
-       */\r
+        *       handshake signal lines (and some error states), via the CONTROL_LINE_IN_* masks and the following code:\r
+        */\r

        USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
                {\r
                        .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r
        USB_Notification_Header_t Notification = (USB_Notification_Header_t)\r
                {\r
                        .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE),\r


@@ -258,7 +320,11 @@ void CDC_Task(void)
                if (IsFull)\r
                {\r
                        /* Wait until the endpoint is ready for another packet */\r
                if (IsFull)\r
                {\r
                        /* Wait until the endpoint is ready for another packet */\r

-                       while (!(Endpoint_IsINReady()));\r
+                       while (!(Endpoint_IsINReady()))\r
+                       {\r
+                               if (USB_DeviceState == DEVICE_STATE_Unattached)\r
+                                 return;\r
+                       }\r

                        \r
                        /* Send an empty packet to ensure that the host does not buffer data sent to it */\r
                        Endpoint_ClearIN();\r
                        \r
                        /* Send an empty packet to ensure that the host does not buffer data sent to it */\r
                        Endpoint_ClearIN();\r