Improved STM32F4 USB_CDC demo, now it supports both the ST and Olimex boards.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8267 35acf78f-673a-0410-8e92-d51de3d6d3f4

6 files changed, 362 insertions, 309 deletions

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/Makefile b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
index 5b0aae485..a8a9dd05c 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/Makefile
+++ b/testhal/STM32/STM32F4xx/USB_CDC/Makefile
@@ -93,6 +93,7 @@ include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk
 include $(CHIBIOS)/os/hal/hal.mk

 include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/boards/OLIMEX_STM32_E407/board.mk

+#include $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

 # RTOS files (optional).

 include $(CHIBIOS)/os/rt/rt.mk

@@ -116,7 +117,7 @@ CSRC = $(STARTUPSRC) \
        $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/hal/lib/streams/memstreams.c \

        $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

-       main.c

+       usbcfg.c main.c

 

 # C++ sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/main.c b/testhal/STM32/STM32F4xx/USB_CDC/main.c
index a7b70c23e..67cfec3da 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/main.c
+++ b/testhal/STM32/STM32F4xx/USB_CDC/main.c
@@ -24,309 +24,10 @@
 #include "shell.h"

 #include "chprintf.h"

 

-/*===========================================================================*/

-/* USB related stuff.                                                        */

-/*===========================================================================*/

-

-/*

- * Endpoints to be used for USBD2.

- */

-#define USBD2_DATA_REQUEST_EP           1

-#define USBD2_DATA_AVAILABLE_EP         1

-#define USBD2_INTERRUPT_REQUEST_EP      2

-

-/*

- * Serial over USB Driver structure.

- */

-static SerialUSBDriver SDU2;

-

-/*

- * USB Device Descriptor.

- */

-static const uint8_t vcom_device_descriptor_data[18] = {

-  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */

-                         0x02,          /* bDeviceClass (CDC).              */

-                         0x00,          /* bDeviceSubClass.                 */

-                         0x00,          /* bDeviceProtocol.                 */

-                         0x40,          /* bMaxPacketSize.                  */

-                         0x0483,        /* idVendor (ST).                   */

-                         0x5740,        /* idProduct.                       */

-                         0x0200,        /* bcdDevice.                       */

-                         1,             /* iManufacturer.                   */

-                         2,             /* iProduct.                        */

-                         3,             /* iSerialNumber.                   */

-                         1)             /* bNumConfigurations.              */

-};

-

-/*

- * Device Descriptor wrapper.

- */

-static const USBDescriptor vcom_device_descriptor = {

-  sizeof vcom_device_descriptor_data,

-  vcom_device_descriptor_data

-};

-

-/* Configuration Descriptor tree for a CDC.*/

-static const uint8_t vcom_configuration_descriptor_data[67] = {

-  /* Configuration Descriptor.*/

-  USB_DESC_CONFIGURATION(67,            /* wTotalLength.                    */

-                         0x02,          /* bNumInterfaces.                  */

-                         0x01,          /* bConfigurationValue.             */

-                         0,             /* iConfiguration.                  */

-                         0xC0,          /* bmAttributes (self powered).     */

-                         50),           /* bMaxPower (100mA).               */

-  /* Interface Descriptor.*/

-  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */

-                         0x00,          /* bAlternateSetting.               */

-                         0x01,          /* bNumEndpoints.                   */

-                         0x02,          /* bInterfaceClass (Communications

-                                           Interface Class, CDC section

-                                           4.2).                            */

-                         0x02,          /* bInterfaceSubClass (Abstract

-                                         Control Model, CDC section 4.3).   */

-                         0x01,          /* bInterfaceProtocol (AT commands,

-                                           CDC section 4.4).                */

-                         0),            /* iInterface.                      */

-  /* Header Functional Descriptor (CDC section 5.2.3).*/

-  USB_DESC_BYTE         (5),            /* bLength.                         */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x00),         /* bDescriptorSubtype (Header

-                                           Functional Descriptor.           */

-  USB_DESC_BCD          (0x0110),       /* bcdCDC.                          */

-  /* Call Management Functional Descriptor. */

-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x01),         /* bDescriptorSubtype (Call Management

-                                           Functional Descriptor).          */

-  USB_DESC_BYTE         (0x00),         /* bmCapabilities (D0+D1).          */

-  USB_DESC_BYTE         (0x01),         /* bDataInterface.                  */

-  /* ACM Functional Descriptor.*/

-  USB_DESC_BYTE         (4),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x02),         /* bDescriptorSubtype (Abstract

-                                           Control Management Descriptor).  */

-  USB_DESC_BYTE         (0x02),         /* bmCapabilities.                  */

-  /* Union Functional Descriptor.*/

-  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

-  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

-  USB_DESC_BYTE         (0x06),         /* bDescriptorSubtype (Union

-                                           Functional Descriptor).          */

-  USB_DESC_BYTE         (0x00),         /* bMasterInterface (Communication

-                                           Class Interface).                */

-  USB_DESC_BYTE         (0x01),         /* bSlaveInterface0 (Data Class

-                                           Interface).                      */

-  /* Endpoint 2 Descriptor.*/

-  USB_DESC_ENDPOINT     (USBD2_INTERRUPT_REQUEST_EP|0x80,

-                         0x03,          /* bmAttributes (Interrupt).        */

-                         0x0008,        /* wMaxPacketSize.                  */

-                         0xFF),         /* bInterval.                       */

-  /* Interface Descriptor.*/

-  USB_DESC_INTERFACE    (0x01,          /* bInterfaceNumber.                */

-                         0x00,          /* bAlternateSetting.               */

-                         0x02,          /* bNumEndpoints.                   */

-                         0x0A,          /* bInterfaceClass (Data Class

-                                           Interface, CDC section 4.5).     */

-                         0x00,          /* bInterfaceSubClass (CDC section

-                                           4.6).                            */

-                         0x00,          /* bInterfaceProtocol (CDC section

-                                           4.7).                            */

-                         0x00),         /* iInterface.                      */

-  /* Endpoint 3 Descriptor.*/

-  USB_DESC_ENDPOINT     (USBD2_DATA_AVAILABLE_EP,       /* bEndpointAddress.*/

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00),         /* bInterval.                       */

-  /* Endpoint 1 Descriptor.*/

-  USB_DESC_ENDPOINT     (USBD2_DATA_REQUEST_EP|0x80,    /* bEndpointAddress.*/

-                         0x02,          /* bmAttributes (Bulk).             */

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00)          /* bInterval.                       */

-};

-

-/*

- * Configuration Descriptor wrapper.

- */

-static const USBDescriptor vcom_configuration_descriptor = {

-  sizeof vcom_configuration_descriptor_data,

-  vcom_configuration_descriptor_data

-};

+#include "usbcfg.h"

 

-/*

- * U.S. English language identifier.

- */

-static const uint8_t vcom_string0[] = {

-  USB_DESC_BYTE(4),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */

-};

-

-/*

- * Vendor string.

- */

-static const uint8_t vcom_string1[] = {

-  USB_DESC_BYTE(38),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,

-  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,

-  'c', 0, 's', 0

-};

-

-/*

- * Device Description string.

- */

-static const uint8_t vcom_string2[] = {

-  USB_DESC_BYTE(56),                    /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,

-  'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,

-  'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,

-  'o', 0, 'r', 0, 't', 0

-};

-

-/*

- * Serial Number string.

- */

-static const uint8_t vcom_string3[] = {

-  USB_DESC_BYTE(8),                     /* bLength.                         */

-  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

-  '0' + CH_KERNEL_MAJOR, 0,

-  '0' + CH_KERNEL_MINOR, 0,

-  '0' + CH_KERNEL_PATCH, 0

-};

-

-/*

- * Strings wrappers array.

- */

-static const USBDescriptor vcom_strings[] = {

-  {sizeof vcom_string0, vcom_string0},

-  {sizeof vcom_string1, vcom_string1},

-  {sizeof vcom_string2, vcom_string2},

-  {sizeof vcom_string3, vcom_string3}

-};

-

-/*

- * Handles the GET_DESCRIPTOR callback. All required descriptors must be

- * handled here.

- */

-static const USBDescriptor *get_descriptor(USBDriver *usbp,

-                                           uint8_t dtype,

-                                           uint8_t dindex,

-                                           uint16_t lang) {

-

-  (void)usbp;

-  (void)lang;

-  switch (dtype) {

-  case USB_DESCRIPTOR_DEVICE:

-    return &vcom_device_descriptor;

-  case USB_DESCRIPTOR_CONFIGURATION:

-    return &vcom_configuration_descriptor;

-  case USB_DESCRIPTOR_STRING:

-    if (dindex < 4)

-      return &vcom_strings[dindex];

-  }

-  return NULL;

-}

-

-/**

- * @brief   IN EP1 state.

- */

-static USBInEndpointState ep1instate;

-

-/**

- * @brief   OUT EP1 state.

- */

-static USBOutEndpointState ep1outstate;

-

-/**

- * @brief   EP1 initialization structure (both IN and OUT).

- */

-static const USBEndpointConfig ep1config = {

-  USB_EP_MODE_TYPE_BULK,

-  NULL,

-  sduDataTransmitted,

-  sduDataReceived,

-  0x0040,

-  0x0040,

-  &ep1instate,

-  &ep1outstate,

-  2,

-  NULL

-};

-

-/**

- * @brief   IN EP2 state.

- */

-static USBInEndpointState ep2instate;

-

-/**

- * @brief   EP2 initialization structure (IN only).

- */

-static const USBEndpointConfig ep2config = {

-  USB_EP_MODE_TYPE_INTR,

-  NULL,

-  sduInterruptTransmitted,

-  NULL,

-  0x0010,

-  0x0000,

-  &ep2instate,

-  NULL,

-  1,

-  NULL

-};

-

-/*

- * Handles the USB driver global events.

- */

-static void usb_event(USBDriver *usbp, usbevent_t event) {

-

-  switch (event) {

-  case USB_EVENT_RESET:

-    return;

-  case USB_EVENT_ADDRESS:

-    return;

-  case USB_EVENT_CONFIGURED:

-    chSysLockFromISR();

-

-    /* Enables the endpoints specified into the configuration.

-       Note, this callback is invoked from an ISR so I-Class functions

-       must be used.*/

-    usbInitEndpointI(usbp, USBD2_DATA_REQUEST_EP, &ep1config);

-    usbInitEndpointI(usbp, USBD2_INTERRUPT_REQUEST_EP, &ep2config);

-

-    /* Resetting the state of the CDC subsystem.*/

-    sduConfigureHookI(&SDU2);

-

-    chSysUnlockFromISR();

-    return;

-  case USB_EVENT_SUSPEND:

-    return;

-  case USB_EVENT_WAKEUP:

-    return;

-  case USB_EVENT_STALLED:

-    return;

-  }

-  return;

-}

-

-/*

- * USB driver configuration.

- */

-static const USBConfig usbcfg = {

-  usb_event,

-  get_descriptor,

-  sduRequestsHook,

-  NULL

-};

-

-/*

- * Serial over USB driver configuration.

- */

-static const SerialUSBConfig serusbcfg = {

-  &USBD2,

-  USBD2_DATA_REQUEST_EP,

-  USBD2_DATA_AVAILABLE_EP,

-  USBD2_INTERRUPT_REQUEST_EP

-};

+/* Virtual serial port over USB.*/

+SerialUSBDriver SDU1;

 

 /*===========================================================================*/

 /* Command line related.                                                     */

@@ -412,7 +113,7 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
   }

 

   while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {

-    chSequentialStreamWrite(&SDU2, buf, sizeof buf - 1);

+    chSequentialStreamWrite(&SDU1, buf, sizeof buf - 1);

   }

   chprintf(chp, "\r\n\nstopped\r\n");

 }

@@ -426,7 +127,7 @@ static const ShellCommand commands[] = {
 };

 

 static const ShellConfig shell_cfg1 = {

-  (BaseSequentialStream *)&SDU2,

+  (BaseSequentialStream *)&SDU1,

   commands

 };

 

@@ -446,10 +147,17 @@ static THD_FUNCTION(Thread1, arg) {
     systime_t time;

 

     time = serusbcfg.usbp->state == USB_ACTIVE ? 250 : 500;

+#if defined(BOARD_ST_STM32F4_DISCOVERY)

+    palClearPad(GPIOD, GPIOD_LED4);

+    chThdSleepMilliseconds(time);

+    palSetPad(GPIOD, GPIOD_LED4);

+    chThdSleepMilliseconds(time);

+#else

     palClearPad(GPIOC, GPIOC_LED);

     chThdSleepMilliseconds(time);

     palSetPad(GPIOC, GPIOC_LED);

     chThdSleepMilliseconds(time);

+#endif

   }

 }

 

@@ -472,8 +180,8 @@ int main(void) {
   /*

    * Initializes a serial-over-USB CDC driver.

    */

-  sduObjectInit(&SDU2);

-  sduStart(&SDU2, &serusbcfg);

+  sduObjectInit(&SDU1);

+  sduStart(&SDU1, &serusbcfg);

 

   /*

    * Activates the USB driver and then the USB bus pull-up on D+.

@@ -500,7 +208,7 @@ int main(void) {
    * sleeping in a loop and check the button state.

    */

   while (true) {

-    if (!shelltp && (SDU2.config->usbp->state == USB_ACTIVE))

+    if (!shelltp && (SDU1.config->usbp->state == USB_ACTIVE))

       shelltp = shellCreate(&shell_cfg1, SHELL_WA_SIZE, NORMALPRIO);

     else if (chThdTerminatedX(shelltp)) {

       chThdRelease(shelltp);    /* Recovers memory of the previous shell.   */

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h b/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
index 1ca1d11d1..b2e8796ad 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC/mcuconf.h
@@ -44,7 +44,11 @@
 #define STM32_CLOCK48_REQUIRED              TRUE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

+#if defined(BOARD_ST_STM32F4_DISCOVERY)

+#define STM32_PLLM_VALUE                    8

+#else

 #define STM32_PLLM_VALUE                    12

+#endif

 #define STM32_PLLN_VALUE                    336

 #define STM32_PLLP_VALUE                    2

 #define STM32_PLLQ_VALUE                    7

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/readme.txt b/testhal/STM32/STM32F4xx/USB_CDC/readme.txt
index 9fd5d6f20..226822f2d 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC/readme.txt
+++ b/testhal/STM32/STM32F4xx/USB_CDC/readme.txt
@@ -4,7 +4,8 @@
 

 ** TARGET **

 

-The demo runs on an Olimex STM32-E407 board.

+The demo runs on both Olimex STM32-E407 or STM32F4-Discovery boards, just

+change the board reference in the Makefile.

 

 ** The Demo **

 

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.c b/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.c
new file mode 100644
index 000000000..f825ec239
--- /dev/null
+++ b/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.c
@@ -0,0 +1,314 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+#include "ch.h"

+#include "hal.h"

+

+/*

+ * Endpoints to be used for USBD1.

+ */

+#define USBD1_DATA_REQUEST_EP           1

+#define USBD1_DATA_AVAILABLE_EP         1

+#define USBD1_INTERRUPT_REQUEST_EP      2

+

+/*

+ * USB Device Descriptor.

+ */

+static const uint8_t vcom_device_descriptor_data[18] = {

+  USB_DESC_DEVICE       (0x0110,        /* bcdUSB (1.1).                    */

+                         0x02,          /* bDeviceClass (CDC).              */

+                         0x00,          /* bDeviceSubClass.                 */

+                         0x00,          /* bDeviceProtocol.                 */

+                         0x40,          /* bMaxPacketSize.                  */

+                         0x0483,        /* idVendor (ST).                   */

+                         0x5740,        /* idProduct.                       */

+                         0x0200,        /* bcdDevice.                       */

+                         1,             /* iManufacturer.                   */

+                         2,             /* iProduct.                        */

+                         3,             /* iSerialNumber.                   */

+                         1)             /* bNumConfigurations.              */

+};

+

+/*

+ * Device Descriptor wrapper.

+ */

+static const USBDescriptor vcom_device_descriptor = {

+  sizeof vcom_device_descriptor_data,

+  vcom_device_descriptor_data

+};

+

+/* Configuration Descriptor tree for a CDC.*/

+static const uint8_t vcom_configuration_descriptor_data[67] = {

+  /* Configuration Descriptor.*/

+  USB_DESC_CONFIGURATION(67,            /* wTotalLength.                    */

+                         0x02,          /* bNumInterfaces.                  */

+                         0x01,          /* bConfigurationValue.             */

+                         0,             /* iConfiguration.                  */

+                         0xC0,          /* bmAttributes (self powered).     */

+                         50),           /* bMaxPower (100mA).               */

+  /* Interface Descriptor.*/

+  USB_DESC_INTERFACE    (0x00,          /* bInterfaceNumber.                */

+                         0x00,          /* bAlternateSetting.               */

+                         0x01,          /* bNumEndpoints.                   */

+                         0x02,          /* bInterfaceClass (Communications

+                                           Interface Class, CDC section

+                                           4.2).                            */

+                         0x02,          /* bInterfaceSubClass (Abstract

+                                         Control Model, CDC section 4.3).   */

+                         0x01,          /* bInterfaceProtocol (AT commands,

+                                           CDC section 4.4).                */

+                         0),            /* iInterface.                      */

+  /* Header Functional Descriptor (CDC section 5.2.3).*/

+  USB_DESC_BYTE         (5),            /* bLength.                         */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x00),         /* bDescriptorSubtype (Header

+                                           Functional Descriptor.           */

+  USB_DESC_BCD          (0x0110),       /* bcdCDC.                          */

+  /* Call Management Functional Descriptor. */

+  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x01),         /* bDescriptorSubtype (Call Management

+                                           Functional Descriptor).          */

+  USB_DESC_BYTE         (0x00),         /* bmCapabilities (D0+D1).          */

+  USB_DESC_BYTE         (0x01),         /* bDataInterface.                  */

+  /* ACM Functional Descriptor.*/

+  USB_DESC_BYTE         (4),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x02),         /* bDescriptorSubtype (Abstract

+                                           Control Management Descriptor).  */

+  USB_DESC_BYTE         (0x02),         /* bmCapabilities.                  */

+  /* Union Functional Descriptor.*/

+  USB_DESC_BYTE         (5),            /* bFunctionLength.                 */

+  USB_DESC_BYTE         (0x24),         /* bDescriptorType (CS_INTERFACE).  */

+  USB_DESC_BYTE         (0x06),         /* bDescriptorSubtype (Union

+                                           Functional Descriptor).          */

+  USB_DESC_BYTE         (0x00),         /* bMasterInterface (Communication

+                                           Class Interface).                */

+  USB_DESC_BYTE         (0x01),         /* bSlaveInterface0 (Data Class

+                                           Interface).                      */

+  /* Endpoint 2 Descriptor.*/

+  USB_DESC_ENDPOINT     (USBD1_INTERRUPT_REQUEST_EP|0x80,

+                         0x03,          /* bmAttributes (Interrupt).        */

+                         0x0008,        /* wMaxPacketSize.                  */

+                         0xFF),         /* bInterval.                       */

+  /* Interface Descriptor.*/

+  USB_DESC_INTERFACE    (0x01,          /* bInterfaceNumber.                */

+                         0x00,          /* bAlternateSetting.               */

+                         0x02,          /* bNumEndpoints.                   */

+                         0x0A,          /* bInterfaceClass (Data Class

+                                           Interface, CDC section 4.5).     */

+                         0x00,          /* bInterfaceSubClass (CDC section

+                                           4.6).                            */

+                         0x00,          /* bInterfaceProtocol (CDC section

+                                           4.7).                            */

+                         0x00),         /* iInterface.                      */

+  /* Endpoint 3 Descriptor.*/

+  USB_DESC_ENDPOINT     (USBD1_DATA_AVAILABLE_EP,       /* bEndpointAddress.*/

+                         0x02,          /* bmAttributes (Bulk).             */

+                         0x0040,        /* wMaxPacketSize.                  */

+                         0x00),         /* bInterval.                       */

+  /* Endpoint 1 Descriptor.*/

+  USB_DESC_ENDPOINT     (USBD1_DATA_REQUEST_EP|0x80,    /* bEndpointAddress.*/

+                         0x02,          /* bmAttributes (Bulk).             */

+                         0x0040,        /* wMaxPacketSize.                  */

+                         0x00)          /* bInterval.                       */

+};

+

+/*

+ * Configuration Descriptor wrapper.

+ */

+static const USBDescriptor vcom_configuration_descriptor = {

+  sizeof vcom_configuration_descriptor_data,

+  vcom_configuration_descriptor_data

+};

+

+/*

+ * U.S. English language identifier.

+ */

+static const uint8_t vcom_string0[] = {

+  USB_DESC_BYTE(4),                     /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  USB_DESC_WORD(0x0409)                 /* wLANGID (U.S. English).          */

+};

+

+/*

+ * Vendor string.

+ */

+static const uint8_t vcom_string1[] = {

+  USB_DESC_BYTE(38),                    /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  'S', 0, 'T', 0, 'M', 0, 'i', 0, 'c', 0, 'r', 0, 'o', 0, 'e', 0,

+  'l', 0, 'e', 0, 'c', 0, 't', 0, 'r', 0, 'o', 0, 'n', 0, 'i', 0,

+  'c', 0, 's', 0

+};

+

+/*

+ * Device Description string.

+ */

+static const uint8_t vcom_string2[] = {

+  USB_DESC_BYTE(56),                    /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  'C', 0, 'h', 0, 'i', 0, 'b', 0, 'i', 0, 'O', 0, 'S', 0, '/', 0,

+  'R', 0, 'T', 0, ' ', 0, 'V', 0, 'i', 0, 'r', 0, 't', 0, 'u', 0,

+  'a', 0, 'l', 0, ' ', 0, 'C', 0, 'O', 0, 'M', 0, ' ', 0, 'P', 0,

+  'o', 0, 'r', 0, 't', 0

+};

+

+/*

+ * Serial Number string.

+ */

+static const uint8_t vcom_string3[] = {

+  USB_DESC_BYTE(8),                     /* bLength.                         */

+  USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType.                 */

+  '0' + CH_KERNEL_MAJOR, 0,

+  '0' + CH_KERNEL_MINOR, 0,

+  '0' + CH_KERNEL_PATCH, 0

+};

+

+/*

+ * Strings wrappers array.

+ */

+static const USBDescriptor vcom_strings[] = {

+  {sizeof vcom_string0, vcom_string0},

+  {sizeof vcom_string1, vcom_string1},

+  {sizeof vcom_string2, vcom_string2},

+  {sizeof vcom_string3, vcom_string3}

+};

+

+/*

+ * Handles the GET_DESCRIPTOR callback. All required descriptors must be

+ * handled here.

+ */

+static const USBDescriptor *get_descriptor(USBDriver *usbp,

+                                           uint8_t dtype,

+                                           uint8_t dindex,

+                                           uint16_t lang) {

+

+  (void)usbp;

+  (void)lang;

+  switch (dtype) {

+  case USB_DESCRIPTOR_DEVICE:

+    return &vcom_device_descriptor;

+  case USB_DESCRIPTOR_CONFIGURATION:

+    return &vcom_configuration_descriptor;

+  case USB_DESCRIPTOR_STRING:

+    if (dindex < 4)

+      return &vcom_strings[dindex];

+  }

+  return NULL;

+}

+

+/**

+ * @brief   IN EP1 state.

+ */

+static USBInEndpointState ep1instate;

+

+/**

+ * @brief   OUT EP1 state.

+ */

+static USBOutEndpointState ep1outstate;

+

+/**

+ * @brief   EP1 initialization structure (both IN and OUT).

+ */

+static const USBEndpointConfig ep1config = {

+  USB_EP_MODE_TYPE_BULK,

+  NULL,

+  sduDataTransmitted,

+  sduDataReceived,

+  0x0040,

+  0x0040,

+  &ep1instate,

+  &ep1outstate,

+  2,

+  NULL

+};

+

+/**

+ * @brief   IN EP2 state.

+ */

+static USBInEndpointState ep2instate;

+

+/**

+ * @brief   EP2 initialization structure (IN only).

+ */

+static const USBEndpointConfig ep2config = {

+  USB_EP_MODE_TYPE_INTR,

+  NULL,

+  sduInterruptTransmitted,

+  NULL,

+  0x0010,

+  0x0000,

+  &ep2instate,

+  NULL,

+  1,

+  NULL

+};

+

+/*

+ * Handles the USB driver global events.

+ */

+static void usb_event(USBDriver *usbp, usbevent_t event) {

+  extern SerialUSBDriver SDU1;

+

+  switch (event) {

+  case USB_EVENT_RESET:

+    return;

+  case USB_EVENT_ADDRESS:

+    return;

+  case USB_EVENT_CONFIGURED:

+    chSysLockFromISR();

+

+    /* Enables the endpoints specified into the configuration.

+       Note, this callback is invoked from an ISR so I-Class functions

+       must be used.*/

+    usbInitEndpointI(usbp, USBD1_DATA_REQUEST_EP, &ep1config);

+    usbInitEndpointI(usbp, USBD1_INTERRUPT_REQUEST_EP, &ep2config);

+

+    /* Resetting the state of the CDC subsystem.*/

+    sduConfigureHookI(&SDU1);

+

+    chSysUnlockFromISR();

+    return;

+  case USB_EVENT_SUSPEND:

+    return;

+  case USB_EVENT_WAKEUP:

+    return;

+  case USB_EVENT_STALLED:

+    return;

+  }

+  return;

+}

+

+/*

+ * USB driver configuration.

+ */

+const USBConfig usbcfg = {

+  usb_event,

+  get_descriptor,

+  sduRequestsHook,

+  NULL

+};

+

+/*

+ * Serial over USB driver configuration.

+ */

+const SerialUSBConfig serusbcfg = {

+  &USBD1,

+  USBD1_DATA_REQUEST_EP,

+  USBD1_DATA_AVAILABLE_EP,

+  USBD1_INTERRUPT_REQUEST_EP

+};

diff --git a/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.h b/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.h
new file mode 100644
index 000000000..2ffaa17f9
--- /dev/null
+++ b/testhal/STM32/STM32F4xx/USB_CDC/usbcfg.h
@@ -0,0 +1,25 @@
+/*

+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+#ifndef _USBCFG_H_

+#define _USBCFG_H_

+

+extern const USBConfig usbcfg;

+extern SerialUSBConfig serusbcfg;

+

+#endif  /* _USBCFG_H_ */

+

+/** @} */