Updated Serial-USB driver using the new buffering mechanism. Only the STM32F4 CDC demo updated for it. Apparently it works.

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

2 files changed, 10 insertions, 1 deletions

diff --git a/os/hal/include/hal_buffers.h b/os/hal/include/hal_buffers.h
index e5d5fa7b9..d537477f2 100644
--- a/os/hal/include/hal_buffers.h
+++ b/os/hal/include/hal_buffers.h
@@ -102,6 +102,12 @@ struct io_buffers_queue {
    */

   uint8_t               *top;

   /**

+   * @brief   Buffer is being accessed.

+   * @details This flag indicates that the current buffer is being read or

+   *          written by a long, preemptable operation.

+   */

+  bool                  accessed;

+  /**

    * @brief   Data notification callback.

    */

   bqnotify_t            notify;

@@ -205,7 +211,7 @@ typedef io_buffers_queue_t output_buffers_queue_t;
  *

  * @iclass

  */

-#define obqIsEmptyI(oqp) ((bool)(((obqp)->bwrptr == (obqp)->brdptr) &&       \

+#define obqIsEmptyI(oqp) ((bool)(((obqp)->bwrptr == (obqp)->brdptr) &&      \

                                  ((obqp)->bcounter != 0U)))

 

 /**

@@ -254,6 +260,8 @@ extern "C" {
                       systime_t timeout);

   size_t obqWriteTimeout(output_buffers_queue_t *obqp, const uint8_t *bp,

                          size_t n, systime_t timeout);

+  bool obqTryFlushI(output_buffers_queue_t *obqp);

+  void obqFlush(output_buffers_queue_t *obqp);

 #ifdef __cplusplus

 }

 #endif

diff --git a/os/hal/include/serial_usb.h b/os/hal/include/serial_usb.h
index fca8d56ea..0ca4ba06d 100644
--- a/os/hal/include/serial_usb.h
+++ b/os/hal/include/serial_usb.h
@@ -260,6 +260,7 @@ extern "C" {
   void sduDisconnectI(SerialUSBDriver *sdup);

   void sduConfigureHookI(SerialUSBDriver *sdup);

   bool sduRequestsHook(USBDriver *usbp);

+  void sduSOFHookI(SerialUSBDriver *sdup);

   void sduDataTransmitted(USBDriver *usbp, usbep_t ep);

   void sduDataReceived(USBDriver *usbp, usbep_t ep);

   void sduInterruptTransmitted(USBDriver *usbp, usbep_t ep);