diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-25 12:45:23 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2015-12-25 12:45:23 +0000 |
| commit | 2fdca55f58f29aa01be6a0b90728c902c20098ef (patch) | |
| tree | 616b0a91bbf31c7882f292a44fccd99fef1d1151 /demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c | |
| parent | 6857f4ff339826e7c5b2f26cf19d6275208631e6 (diff) | |
| download | ChibiOS-2fdca55f58f29aa01be6a0b90728c902c20098ef.tar.gz ChibiOS-2fdca55f58f29aa01be6a0b90728c902c20098ef.tar.bz2 ChibiOS-2fdca55f58f29aa01be6a0b90728c902c20098ef.zip | |
Updated all USB demos.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8644 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c')
| -rw-r--r-- | demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c | 34 |
1 files changed, 28 insertions, 6 deletions
diff --git a/demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c b/demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c index a01c9dcb3..07a492758 100644 --- a/demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c +++ b/demos/STM32/RT-STM32F103-MAPLEMINI/usbcfg.c @@ -14,9 +14,11 @@ limitations under the License.
*/
-#include "ch.h"
#include "hal.h"
+/* Virtual serial port over USB.*/
+SerialUSBDriver SDU1;
+
/*
* Endpoints to be used for USBD1.
*/
@@ -33,8 +35,8 @@ static const uint8_t vcom_device_descriptor_data[18] = { 0x00, /* bDeviceSubClass. */
0x00, /* bDeviceProtocol. */
0x40, /* bMaxPacketSize. */
- 0x1eaf, /* idVendor (LeafLabs). */
- 0x0004, /* idProduct. */
+ 0x0483, /* idVendor (ST). */
+ 0x5740, /* idProduct. */
0x0200, /* bcdDevice. */
1, /* iManufacturer. */
2, /* iProduct. */
@@ -148,9 +150,11 @@ static const uint8_t vcom_string0[] = { * Vendor string.
*/
static const uint8_t vcom_string1[] = {
- USB_DESC_BYTE(18), /* bLength. */
+ USB_DESC_BYTE(38), /* bLength. */
USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */
- 'L', 0, 'e', 0, 'a', 0, 'f', 0, 'L', 0, 'a', 0, 'b', 0, 's', 0,
+ '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
};
/*
@@ -282,6 +286,12 @@ static void usb_event(USBDriver *usbp, usbevent_t event) { chSysUnlockFromISR();
return;
case USB_EVENT_SUSPEND:
+ chSysLockFromISR();
+
+ /* Disconnection event on suspend.*/
+ sduDisconnectI(&SDU1);
+
+ chSysUnlockFromISR();
return;
case USB_EVENT_WAKEUP:
return;
@@ -292,13 +302,25 @@ static void usb_event(USBDriver *usbp, usbevent_t event) { }
/*
+ * Handles the USB driver global events.
+ */
+static void sof_handler(USBDriver *usbp) {
+
+ (void)usbp;
+
+ osalSysLockFromISR();
+ sduSOFHookI(&SDU1);
+ osalSysUnlockFromISR();
+}
+
+/*
* USB driver configuration.
*/
const USBConfig usbcfg = {
usb_event,
get_descriptor,
sduRequestsHook,
- NULL
+ sof_handler
};
/*
|