From 4b601a5d0fd06f8e238c17fb96633100ecc59503 Mon Sep 17 00:00:00 2001
From: Giovanni Di Sirio <gdisirio@gmail.com>
Date: Fri, 25 Dec 2015 08:59:10 +0000
Subject: USB upgrade.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8641 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 testhal/STM32/STM32F4xx/USB_CDC_IAD/main.c   | 17 ++++++++++-------
 testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.c | 21 ++++++++++++++++++++-
 testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.h |  2 ++
 3 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'testhal/STM32/STM32F4xx/USB_CDC_IAD')

diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/main.c b/testhal/STM32/STM32F4xx/USB_CDC_IAD/main.c
index 7827acf47..486942104 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/main.c
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/main.c
@@ -26,12 +26,6 @@
 
 #include "usbcfg.h"
 
-/*
- * Virtual serial ports over USB.
- */
-SerialUSBDriver SDU1;
-SerialUSBDriver SDU2;
-
 /*===========================================================================*/
 /* Command line related.                                                     */
 /*===========================================================================*/
@@ -90,6 +84,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[]) {
   chThdWait(tp);
 }
 
+/* Can be measured using dd if=/dev/xxxx of=/dev/null bs=512 count=10000.*/
 static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
   static uint8_t buf[] =
       "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
@@ -116,7 +111,15 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
   }
 
   while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
-    chSequentialStreamWrite(&SDU1, buf, sizeof buf - 1);
+#if 1
+    /* Writing in channel mode.*/
+    chnWrite(&SDU1, buf, sizeof buf - 1);
+#else
+    /* Writing in buffer mode.*/
+    (void) obqGetEmptyBufferTimeout(&SDU1.obqueue, TIME_INFINITE);
+    memcpy(SDU1.obqueue.ptr, buf, SERIAL_USB_BUFFERS_SIZE);
+    obqPostFullBuffer(&SDU1.obqueue, SERIAL_USB_BUFFERS_SIZE);
+#endif
   }
   chprintf(chp, "\r\n\nstopped\r\n");
 }
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.c b/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.c
index 873bea31e..14bd5ed32 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.c
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.c
@@ -16,6 +16,12 @@
 
 #include "hal.h"
 
+/*
+ * Virtual serial ports over USB.
+ */
+SerialUSBDriver SDU1;
+SerialUSBDriver SDU2;
+
 #define USB_DEVICE_VID                  0xF055  /* You MUST change this.*/
 #define USB_DEVICE_PID                  0xE063  /* You MUST change this.*/
 
@@ -424,6 +430,19 @@ static bool requests_hook(USBDriver *usbp) {
   return sduRequestsHook(usbp);
 }
 
+/*
+ * Handles the USB driver global events.
+ */
+static void sof_handler(USBDriver *usbp) {
+
+  (void)usbp;
+
+  osalSysLockFromISR();
+  sduSOFHookI(&SDU1);
+  sduSOFHookI(&SDU2);
+  osalSysUnlockFromISR();
+}
+
 /*
  * USB driver configuration.
  */
@@ -431,7 +450,7 @@ const USBConfig usbcfg = {
   usb_event,
   get_descriptor,
   requests_hook,
-  NULL
+  sof_handler
 };
 
 /*
diff --git a/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.h b/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.h
index a97780b09..7c6aaebf3 100644
--- a/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.h
+++ b/testhal/STM32/STM32F4xx/USB_CDC_IAD/usbcfg.h
@@ -20,6 +20,8 @@
 extern const USBConfig usbcfg;
 extern SerialUSBConfig serusbcfg1;
 extern SerialUSBConfig serusbcfg2;
+extern SerialUSBDriver SDU1;
+extern SerialUSBDriver SDU2;
 
 #endif  /* _USBCFG_H_ */
 
-- 
cgit v1.2.3