Updated serial_usb driver and demos.

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

3 files changed, 87 insertions, 151 deletions

diff --git a/os/hal/include/serial_usb.h b/os/hal/include/serial_usb.h
index cdde81ee4..3d2a7483a 100644
--- a/os/hal/include/serial_usb.h
+++ b/os/hal/include/serial_usb.h
@@ -35,6 +35,46 @@
 /* Driver constants.                                                         */

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

 

+/**

+ * @name    CDC specific messages.

+ * @{

+ */

+#define CDC_SEND_ENCAPSULATED_COMMAND   0x00

+#define CDC_GET_ENCAPSULATED_RESPONSE   0x01

+#define CDC_SET_COMM_FEATURE            0x02

+#define CDC_GET_COMM_FEATURE            0x03

+#define CDC_CLEAR_COMM_FEATURE          0x04

+#define CDC_SET_AUX_LINE_STATE          0x10

+#define CDC_SET_HOOK_STATE              0x11

+#define CDC_PULSE_SETUP                 0x12

+#define CDC_SEND_PULSE                  0x13

+#define CDC_SET_PULSE_TIME              0x14

+#define CDC_RING_AUX_JACK               0x15

+#define CDC_SET_LINE_CODING             0x20

+#define CDC_GET_LINE_CODING             0x21

+#define CDC_SET_CONTROL_LINE_STATE      0x22

+#define CDC_SEND_BREAK                  0x23

+#define CDC_SET_RINGER_PARMS            0x30

+#define CDC_GET_RINGER_PARMS            0x31

+#define CDC_SET_OPERATION_PARMS         0x32

+#define CDC_GET_OPERATION_PARMS         0x33

+/** @} */

+

+/**

+ * @name    Line Control bit definitions.

+ * @{

+ */

+#define LC_STOP_1                       0

+#define LC_STOP_1P5                     1

+#define LC_STOP_2                       2

+

+#define LC_PARITY_NONE                  0

+#define LC_PARITY_ODD                   1

+#define LC_PARITY_EVEN                  2

+#define LC_PARITY_MARK                  3

+#define LC_PARITY_SPACE                 4

+/** @} */

+

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

 /* Driver pre-compile time settings.                                         */

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

@@ -69,6 +109,16 @@
 /*===========================================================================*/

 

 /**

+ * @brief   Type of Line Coding structure.

+ */

+typedef struct {

+  uint8_t                       dwDTERate[4];

+  uint8_t                       bCharFormat;

+  uint8_t                       bParityType;

+  uint8_t                       bDataBits;

+} cdc_linecoding_t;

+

+/**

  * @brief Driver state machine possible states.

  */

 typedef enum {

@@ -92,6 +142,18 @@ typedef struct {
    * @brief   USB driver to use.

    */

   USBDriver                 *usbp;

+  /**

+   * @brief   Bulk IN endpoint used for outgoing data transfer.

+   */

+  usbep_t                   bulk_in;

+  /**

+   * @brief   Bulk OUT endpoint used for incoming data transfer.

+   */

+  usbep_t                   bulk_out;

+  /**

+   * @brief   Interrupt IN endpoint used for notifications.

+   */

+  usbep_t                   int_in;

 } SerialUSBConfig;

 

 /**

diff --git a/os/hal/include/usb_cdc.h b/os/hal/include/usb_cdc.h
deleted file mode 100644
index fe6db56ae..000000000
--- a/os/hal/include/usb_cdc.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*

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

-                 2011,2012,2013 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/>.

-*/

-

-/*-*

- * @file    usb_cdc.h

- * @brief   USB Communication Device Class support header.

- *

- * @addtogroup USB_CDC

- * @{

- */

-

-#ifndef _USB_CDC_H_

-#define _USB_CDC_H_

-

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

-/* Driver constants.                                                         */

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

-

-/**

- * @name    CDC specific messages.

- * @{

- */

-#define CDC_SEND_ENCAPSULATED_COMMAND   0x00

-#define CDC_GET_ENCAPSULATED_RESPONSE   0x01

-#define CDC_SET_COMM_FEATURE            0x02

-#define CDC_GET_COMM_FEATURE            0x03

-#define CDC_CLEAR_COMM_FEATURE          0x04

-#define CDC_SET_AUX_LINE_STATE          0x10

-#define CDC_SET_HOOK_STATE              0x11

-#define CDC_PULSE_SETUP                 0x12

-#define CDC_SEND_PULSE                  0x13

-#define CDC_SET_PULSE_TIME              0x14

-#define CDC_RING_AUX_JACK               0x15

-#define CDC_SET_LINE_CODING             0x20

-#define CDC_GET_LINE_CODING             0x21

-#define CDC_SET_CONTROL_LINE_STATE      0x22

-#define CDC_SEND_BREAK                  0x23

-#define CDC_SET_RINGER_PARMS            0x30

-#define CDC_GET_RINGER_PARMS            0x31

-#define CDC_SET_OPERATION_PARMS         0x32

-#define CDC_GET_OPERATION_PARMS         0x33

-/** @} */

-

-/**

- * @name    Line Control bit definitions.

- * @{

- */

-#define LC_STOP_1                       0

-#define LC_STOP_1P5                     1

-#define LC_STOP_2                       2

-

-#define LC_PARITY_NONE                  0

-#define LC_PARITY_ODD                   1

-#define LC_PARITY_EVEN                  2

-#define LC_PARITY_MARK                  3

-#define LC_PARITY_SPACE                 4

-/** @} */

-

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

-/* Driver pre-compile time settings.                                         */

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

-

-/**

- * @name    USB_CDC configuration options

- * @{

- */

-/**

- * @brief   Endpoint number for bulk IN.

- */

-#if !defined(USB_CDC_DATA_REQUEST_EP) || defined(__DOXYGEN__)

-#define USB_CDC_DATA_REQUEST_EP         1

-#endif

-

-/**

- * @brief   Endpoint number for bulk OUT.

- */

-#if !defined(USB_CDC_DATA_AVAILABLE_EP) || defined(__DOXYGEN__)

-#define USB_CDC_DATA_AVAILABLE_EP       1

-#endif

-/** @} */

-

-/**

- * @brief   Endpoint number for interrupt IN.

- */

-#if !defined(USB_CDC_INTERRUPT_REQUEST_EP) || defined(__DOXYGEN__)

-#define USB_CDC_INTERRUPT_REQUEST_EP    2

-#endif

-

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

-/* Derived constants and error checks.                                       */

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

-

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

-/* Driver data structures and types.                                         */

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

-

-/**

- * @brief   Type of Line Coding structure.

- */

-typedef struct {

-  uint8_t                       dwDTERate[4];

-  uint8_t                       bCharFormat;

-  uint8_t                       bParityType;

-  uint8_t                       bDataBits;

-} cdc_linecoding_t;

-

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

-/* Driver macros.                                                            */

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

-

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

-/* External declarations.                                                    */

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

-

-#endif /* _USB_CDC_H_ */

-

-/** @} */

diff --git a/os/hal/src/serial_usb.c b/os/hal/src/serial_usb.c
index 7b7d255ed..37b1d3fe6 100644
--- a/os/hal/src/serial_usb.c
+++ b/os/hal/src/serial_usb.c
@@ -29,8 +29,6 @@
 #include "ch.h"

 #include "hal.h"

 

-#include "usb_cdc.h"

-

 #if HAL_USE_SERIAL_USB || defined(__DOXYGEN__)

 

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

@@ -117,24 +115,25 @@ static void inotify(GenericQueue *qp) {
 

   /* If the USB driver is not in the appropriate state then transactions

      must not be started.*/

-  if (usbGetDriverStateI(sdup->config->usbp) != USB_ACTIVE)

+  if ((usbGetDriverStateI(sdup->config->usbp) != USB_ACTIVE) ||

+      (sdup->state != SDU_READY))

     return;

 

   /* If there is in the queue enough space to hold at least one packet and

      a transaction is not yet started then a new transaction is started for

      the available space.*/

-  maxsize = sdup->config->usbp->epc[USB_CDC_DATA_AVAILABLE_EP]->out_maxsize;

-  if (!usbGetReceiveStatusI(sdup->config->usbp, USB_CDC_DATA_AVAILABLE_EP) &&

+  maxsize = sdup->config->usbp->epc[sdup->config->bulk_out]->out_maxsize;

+  if (!usbGetReceiveStatusI(sdup->config->usbp, sdup->config->bulk_out) &&

       ((n = chIQGetEmptyI(&sdup->iqueue)) >= maxsize)) {

     chSysUnlock();

 

     n = (n / maxsize) * maxsize;

     usbPrepareQueuedReceive(sdup->config->usbp,

-                            USB_CDC_DATA_AVAILABLE_EP,

+                            sdup->config->bulk_out,

                             &sdup->iqueue, n);

 

     chSysLock();

-    usbStartReceiveI(sdup->config->usbp, USB_CDC_DATA_AVAILABLE_EP);

+    usbStartReceiveI(sdup->config->usbp, sdup->config->bulk_out);

   }

 }

 

@@ -147,21 +146,22 @@ static void onotify(GenericQueue *qp) {
 

   /* If the USB driver is not in the appropriate state then transactions

      must not be started.*/

-  if (usbGetDriverStateI(sdup->config->usbp) != USB_ACTIVE)

+  if ((usbGetDriverStateI(sdup->config->usbp) != USB_ACTIVE) ||

+      (sdup->state != SDU_READY))

     return;

 

   /* If there is not an ongoing transaction and the output queue contains

      data then a new transaction is started.*/

-  if (!usbGetTransmitStatusI(sdup->config->usbp, USB_CDC_DATA_REQUEST_EP) &&

+  if (!usbGetTransmitStatusI(sdup->config->usbp, sdup->config->bulk_in) &&

       ((n = chOQGetFullI(&sdup->oqueue)) > 0)) {

     chSysUnlock();

 

     usbPrepareQueuedTransmit(sdup->config->usbp,

-                             USB_CDC_DATA_REQUEST_EP,

+                             sdup->config->bulk_in,

                              &sdup->oqueue, n);

 

     chSysLock();

-    usbStartTransmitI(sdup->config->usbp, USB_CDC_DATA_REQUEST_EP);

+    usbStartTransmitI(sdup->config->usbp, sdup->config->bulk_in);

   }

 }

 

@@ -236,6 +236,12 @@ void sduStop(SerialUSBDriver *sdup) {
   chDbgAssert((sdup->state == SDU_STOP) || (sdup->state == SDU_READY),

               "sduStop(), #1",

               "invalid state");

+

+  chIQResetI(&sdup->iqueue);

+  chOQResetI(&sdup->oqueue);

+  chSchRescheduleS();

+  chnAddFlagsI(sdup, CHN_DISCONNECTED);

+

   sdup->state = SDU_STOP;

   chSysUnlock();

 }

@@ -255,9 +261,9 @@ void sduConfigureHookI(USBDriver *usbp) {
   chnAddFlagsI(sdup, CHN_CONNECTED);

 

   /* Starts the first OUT transaction immediately.*/

-  usbPrepareQueuedReceive(usbp, USB_CDC_DATA_AVAILABLE_EP, &sdup->iqueue,

-                          usbp->epc[USB_CDC_DATA_AVAILABLE_EP]->out_maxsize);

-  usbStartReceiveI(usbp, USB_CDC_DATA_AVAILABLE_EP);

+  usbPrepareQueuedReceive(usbp, sdup->config->bulk_out, &sdup->iqueue,

+                          usbp->epc[sdup->config->bulk_out]->out_maxsize);

+  usbStartReceiveI(usbp, sdup->config->bulk_out);

 }

 

 /**

@@ -308,7 +314,8 @@ void sduDataTransmitted(USBDriver *usbp, usbep_t ep) {
   size_t n;

   SerialUSBDriver *sdup = usbp->param;

 

-  (void)ep;

+  if (sdup->state != SDU_READY)

+    return;

 

   chSysLockFromIsr();

   chnAddFlagsI(sdup, CHN_OUTPUT_EMPTY);

@@ -353,14 +360,15 @@ void sduDataReceived(USBDriver *usbp, usbep_t ep) {
   size_t n, maxsize;

   SerialUSBDriver *sdup = usbp->param;

 

-  (void)ep;

+  if (sdup->state != SDU_READY)

+    return;

 

   chSysLockFromIsr();

   chnAddFlagsI(sdup, CHN_INPUT_AVAILABLE);

 

   /* Writes to the input queue can only happen when there is enough space

      to hold at least one packet.*/

-  maxsize = usbp->epc[USB_CDC_DATA_AVAILABLE_EP]->out_maxsize;

+  maxsize = usbp->epc[ep]->out_maxsize;

   if ((n = chIQGetEmptyI(&sdup->iqueue)) >= maxsize) {

     /* The endpoint cannot be busy, we are in the context of the callback,

        so a packet is in the buffer for sure.*/