Updated C++ wrapper and STM32F4-Discovery C++ demo.

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

8 files changed, 49 insertions, 368 deletions

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.cproject b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.cproject
index e597e08ee..c01cf00c2 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.cproject
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.cproject
@@ -20,7 +20,7 @@
 					<folderInfo id="0.1009102984." name="/" resourcePath="">

 						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1946069146" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">

 							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1946069146.2089243740" name=""/>

-							<builder id="org.eclipse.cdt.build.core.settings.default.builder.720063510" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="-1" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.720063510" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="unlimited" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.51513407" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>

 							<tool id="org.eclipse.cdt.build.core.settings.holder.128428406" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">

 								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.776734772" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>

@@ -47,4 +47,5 @@
 			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>

 		</scannerConfigBuildInfo>

 	</storageModule>

+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>

 </cproject>

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
index c36adaf20..e5df63390 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>ARMCM4-STM32F407-DISCOVERY-MEMS-G++</name>

+	<name>ARMCM4-STM32F407-DISCOVERY-G++</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile b/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
index 80c926465..0dd07d61b 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/Makefile
@@ -84,12 +84,7 @@ CSRC = $(PORTSRC) \
        $(TESTSRC) \

        $(HALSRC) \

        $(PLATFORMSRC) \

-       $(BOARDSRC) \

-       $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \

-       $(CHIBIOS)/os/various/evtimer.c \

-       $(CHIBIOS)/os/various/shell.c \

-       $(CHIBIOS)/os/various/chprintf.c \

-       usbcfg.c

+       $(BOARDSRC)

 

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

 # setting.

@@ -122,7 +117,6 @@ ASMSRC = $(PORTASM)
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \

          $(HALINC) $(PLATFORMINC) $(BOARDINC) \

          $(CHCPPINC) \

-         $(CHIBIOS)/os/various/devices_lib/accel \

          $(CHIBIOS)/os/various

 

 #

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/halconf.h b/demos/ARMCM4-STM32F407-DISCOVERY-G++/halconf.h
index 87c9adfd9..25538a2a8 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/halconf.h
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/halconf.h
@@ -108,7 +108,7 @@
  * @brief   Enables the PWM subsystem.

  */

 #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)

-#define HAL_USE_PWM                 TRUE

+#define HAL_USE_PWM                 FALSE

 #endif

 

 /**

@@ -136,14 +136,14 @@
  * @brief   Enables the SERIAL over USB subsystem.

  */

 #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)

-#define HAL_USE_SERIAL_USB          TRUE

+#define HAL_USE_SERIAL_USB          FALSE

 #endif

 

 /**

  * @brief   Enables the SPI subsystem.

  */

 #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)

-#define HAL_USE_SPI                 TRUE

+#define HAL_USE_SPI                 FALSE

 #endif

 

 /**

@@ -157,7 +157,7 @@
  * @brief   Enables the USB subsystem.

  */

 #if !defined(HAL_USE_USB) || defined(__DOXYGEN__)

-#define HAL_USE_USB                 TRUE

+#define HAL_USE_USB                 FALSE

 #endif

 

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

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp b/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
index 3851e1d29..0caee9bc4 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/main.cpp
@@ -21,7 +21,6 @@
 #include "ch.hpp"

 #include "hal.h"

 #include "test.h"

-#include "evtimer.h"

 

 using namespace chibios_rt;

 

@@ -42,25 +41,44 @@ typedef struct {
   uint32_t      value;

 } seqop_t;

 

+// Flashing sequence for LED3.

+static const seqop_t LED3_sequence[] =

+{

+  {BITSET, PAL_PORT_BIT(GPIOD_LED3)},

+  {SLEEP,    800},

+  {BITCLEAR,   PAL_PORT_BIT(GPIOD_LED3)},

+  {SLEEP,    200},

+  {GOTO,     0}

+};

+

 // Flashing sequence for LED4.

 static const seqop_t LED4_sequence[] =

 {

-  {BITCLEAR, PAL_PORT_BIT(GPIOD_LED4)},

-  {SLEEP,    200},

-  {BITSET,   PAL_PORT_BIT(GPIOD_LED4)},

-  {SLEEP,    1800},

+  {BITSET, PAL_PORT_BIT(GPIOD_LED4)},

+  {SLEEP,    600},

+  {BITCLEAR,   PAL_PORT_BIT(GPIOD_LED4)},

+  {SLEEP,    400},

   {GOTO,     0}

 };

 

-// Flashing sequence for LED3.

-static const seqop_t LED3_sequence[] =

+// Flashing sequence for LED5.

+static const seqop_t LED5_sequence[] =

 {

-  {SLEEP,    1000},

-  {BITCLEAR, PAL_PORT_BIT(GPIOD_LED3)},

-  {SLEEP,    1800},

-  {BITSET,   PAL_PORT_BIT(GPIOD_LED3)},

+  {BITSET, PAL_PORT_BIT(GPIOD_LED5)},

+  {SLEEP,    400},

+  {BITCLEAR,   PAL_PORT_BIT(GPIOD_LED5)},

+  {SLEEP,    600},

+  {GOTO,     0}

+};

+

+// Flashing sequence for LED6.

+static const seqop_t LED6_sequence[] =

+{

+  {BITSET, PAL_PORT_BIT(GPIOD_LED6)},

   {SLEEP,    200},

-  {GOTO,     1}

+  {BITCLEAR,   PAL_PORT_BIT(GPIOD_LED6)},

+  {SLEEP,    800},

+  {GOTO,     0}

 };

 

 /*

@@ -127,6 +145,8 @@ public:
 static TesterThread tester;

 static SequencerThread blinker1(LED3_sequence);

 static SequencerThread blinker2(LED4_sequence);

+static SequencerThread blinker3(LED5_sequence);

+static SequencerThread blinker4(LED6_sequence);

 

 /*

  * Application entry point.

@@ -145,8 +165,11 @@ int main(void) {
 

   /*

    * Activates the serial driver 2 using the driver default configuration.

+   * PA2(TX) and PA3(RX) are routed to USART2.

    */

   sdStart(&SD2, NULL);

+  palSetPadMode(GPIOA, 2, PAL_MODE_ALTERNATE(7));

+  palSetPadMode(GPIOA, 3, PAL_MODE_ALTERNATE(7));

 

   /*

    * Starts several instances of the SequencerThread class, each one operating

@@ -154,6 +177,8 @@ int main(void) {
    */

   blinker1.start(NORMALPRIO + 10);

   blinker2.start(NORMALPRIO + 10);

+  blinker3.start(NORMALPRIO + 10);

+  blinker4.start(NORMALPRIO + 10);

 

   /*

    * Serves timer events.

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/mcuconf.h b/demos/ARMCM4-STM32F407-DISCOVERY-G++/mcuconf.h
index d90d656e0..da23f2138 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/mcuconf.h
+++ b/demos/ARMCM4-STM32F407-DISCOVERY-G++/mcuconf.h
@@ -181,7 +181,7 @@
 #define STM32_PWM_USE_TIM1                  FALSE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

-#define STM32_PWM_USE_TIM4                  TRUE

+#define STM32_PWM_USE_TIM4                  FALSE

 #define STM32_PWM_USE_TIM5                  FALSE

 #define STM32_PWM_USE_TIM8                  FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         7

@@ -210,8 +210,8 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  TRUE

-#define STM32_SPI_USE_SPI2                  TRUE

+#define STM32_SPI_USE_SPI1                  FALSE

+#define STM32_SPI_USE_SPI2                  FALSE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 0)

 #define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 3)

@@ -255,7 +255,7 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_OTG1                  TRUE

+#define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

@@ -264,5 +264,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.c b/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.c
deleted file mode 100644
index 7472b634d..000000000
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.c
+++ /dev/null
@@ -1,308 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "ch.h"

-#include "hal.h"

-#include "usb_cdc.h"

-

-/*

- * 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     (USB_CDC_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     (USB_CDC_DATA_AVAILABLE_EP,     /* bEndpointAddress.*/

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

-                         0x0040,        /* wMaxPacketSize.                  */

-                         0x00),         /* bInterval.                       */

-  /* Endpoint 1 Descriptor.*/

-  USB_DESC_ENDPOINT     (USB_CDC_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) {

-

-  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, USB_CDC_DATA_REQUEST_EP, &ep1config);

-    usbInitEndpointI(usbp, USB_CDC_INTERRUPT_REQUEST_EP, &ep2config);

-

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

-    sduConfigureHookI(usbp);

-

-    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

-};

diff --git a/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.h b/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.h
deleted file mode 100644
index 4e98067eb..000000000
--- a/demos/ARMCM4-STM32F407-DISCOVERY-G++/usbcfg.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011,2012 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#ifndef _USBCFG_H_

-#define _USBCFG_H_

-

-extern const USBConfig usbcfg;

-extern SerialUSBConfig serusbcfg;

-

-#endif  /* _USBCFG_H_ */

-

-/** @} */