Initial code for USB Mass Storage Class demo, still lot to do.

Moved usb_cdc.h and mii.h into ./os/various.

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

4 files changed, 343 insertions, 4 deletions

diff --git a/os/hal/include/mii.h b/os/various/mii.h
index 87612273a..a808b16f8 100644
--- a/os/hal/include/mii.h
+++ b/os/various/mii.h
@@ -18,11 +18,12 @@
 */

 

 /*

- * Parts of this file are borrowed by the Linux include file linux/mii.h:

+ * Parts of this file have been borrowed from the Linux include file

+ * linux/mii.h:

  * Copyright (C) 1996, 1999, 2001 David S. Miller (davem@redhat.com)

  */

 

-/*-*

+/**

  * @file    mii.h

  * @brief   MII Driver macros and structures.

  *

@@ -185,4 +186,4 @@
 

 #endif /* _MII_H_ */

 

-/*-* @} */

+/** @} */

diff --git a/os/hal/include/usb_cdc.h b/os/various/usb_cdc.h
index 39df4ccf3..c1d3da3e7 100644
--- a/os/hal/include/usb_cdc.h
+++ b/os/various/usb_cdc.h
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

-/*-*

+/**

  * @file    usb_cdc.h

  * @brief   USB Communication Device Class support header.

  *

diff --git a/os/various/usb_msc.c b/os/various/usb_msc.c
new file mode 100644
index 000000000..fdabcd6ad
--- /dev/null
+++ b/os/various/usb_msc.c
@@ -0,0 +1,207 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 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_msc.c

+ * @brief   USB Mass Storage Class code.

+ *

+ * @addtogroup USB_MSC

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+

+#include "usb_msc.h"

+

+/*===========================================================================*/

+/* Driver exported variables.                                                */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver local variables.                                                   */

+/*===========================================================================*/

+

+/**

+ * @brief   Zero-filled constant buffer.

+ */

+static const uint8_t zerobuf[4] = {0, 0, 0, 0};

+

+/**

+ * @brief   MSC state machine current state.

+ */

+static mscstate_t msc_state;

+

+/**

+ * @brief   Transfer lenght specified in the CBW.

+ */

+static uint32_t cbw_length;

+

+/**

+ * @brief   Tag specified in the CBW.

+ */

+static uint32_t cbw_tag;

+

+/**

+ * @brief   Transmitted lenght.

+ */

+static uint32_t csw_sent;

+

+/**

+ * @brief   Status .

+ */

+static uint8_t csw_status;

+

+/**

+ * @brief   Multi purpose I/O buffer.

+ */

+static union {

+  uint8_t           buf[512];

+  msccbw_t          CBW;

+  msccsw_t          CSW;

+} u;

+

+/*===========================================================================*/

+/* Driver local functions.                                                   */

+/*===========================================================================*/

+

+/**

+ * @brief   MSC state machine initialization.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ */

+static void msc_reset(USBDriver *usbp) {

+

+  msc_state = MSC_IDLE;

+  chSysLockFromIsr();

+  usbStartReceiveI(usbp, MSC_DATA_OUT_EP, u.buf, sizeof(u.buf));

+  chSysUnlockFromIsr();

+}

+

+/*===========================================================================*/

+/* Driver exported functions.                                                */

+/*===========================================================================*/

+

+/**

+ * @brief   Default requests hook.

+ * @details The application must use this function as callback for the

+ *          messages hook.

+ *          The following requests are emulated:

+ *          - MSC_GET_MAX_LUN_COMMAND.

+ *          - MSC_MASS_STORAGE_RESET_COMMAND.

+ *          .

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @return              The hook status.

+ * @retval TRUE         Message handled internally.

+ * @retval FALSE        Message not handled.

+ */

+bool_t mscRequestsHook(USBDriver *usbp) {

+

+  if ((usbp->setup[0] & (USB_RTYPE_TYPE_MASK | USB_RTYPE_RECIPIENT_MASK)) ==

+       (USB_RTYPE_TYPE_CLASS | USB_RTYPE_RECIPIENT_INTERFACE)) {

+    switch (usbp->setup[1]) {

+    case MSC_GET_MAX_LUN_COMMAND:

+      usbSetupTransfer(usbp, (uint8_t *)zerobuf, 1, NULL);

+      return TRUE;

+    case MSC_MASS_STORAGE_RESET_COMMAND:

+      msc_reset(usbp);

+      usbSetupTransfer(usbp, NULL, 0, NULL);

+      return TRUE;

+    default:

+      return FALSE;

+    }

+  }

+  return FALSE;

+}

+

+/**

+ * @brief   Default data transmitted callback.

+ * @details The application must use this function as callback for the IN

+ *          data endpoint.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ */

+void mscDataTransmitted(USBDriver *usbp, usbep_t ep) {

+

+  switch (msc_state) {

+  case MSC_DATA_IN:

+    u.CSW.dCSWSignature = MSC_CSW_SIGNATURE;

+    u.CSW.dCSWTag = cbw_tag;

+    u.CSW.dCSWDataResidue = cbw_length - csw_sent;

+    u.CSW.bCSWStatus = csw_status;

+    chSysLockFromIsr();

+    usbStartTransmitI(usbp, ep, (uint8_t *)&u.CSW, sizeof(u.CSW));

+    chSysUnlockFromIsr();

+    msc_state = MSC_SENDING_CSW;

+    break;

+  case MSC_SENDING_CSW:

+    chSysLockFromIsr();

+    usbStartReceiveI(usbp, MSC_DATA_OUT_EP, u.buf, sizeof(u.buf));

+    chSysUnlockFromIsr();

+    msc_state = MSC_IDLE;

+    break;

+  default:

+    ;

+  }

+}

+

+/**

+ * @brief   Default data received callback.

+ * @details The application must use this function as callback for the OUT

+ *          data endpoint.

+ *

+ * @param[in] usbp      pointer to the @p USBDriver object

+ * @param[in] ep        endpoint number

+ */

+void mscDataReceived(USBDriver *usbp, usbep_t ep) {

+  size_t n;

+

+  n = usbGetReceiveTransactionSizeI(usbp, ep);

+  switch (msc_state) {

+  case MSC_IDLE:

+    if ((n != sizeof(msccbw_t)) ||

+        (u.CBW.dCBWSignature != MSC_CBW_SIGNATURE))

+      goto stallout; /* 6.6.1 */

+

+    cbw_length = u.CBW.dCBWDataTransferLength;

+    cbw_tag = u.CBW.dCBWTag;

+    if (u.CBW.bmCBWFlags & 0x80) {

+      /* IN, Device to Host.*/

+/*      if (scsi_decode_in(usbp))

+        goto stallout;*/

+      msc_state = MSC_DATA_IN;

+    }

+    else {

+      /* OUT, Host to Device.*/

+/*      if (scsi_decode_out(usbp))

+        goto stallout;*/

+      msc_state = MSC_DATA_OUT;

+    }

+    break;

+  default:

+    ;

+  }

+  return;

+stallout:

+  msc_state = MSC_ERROR;

+  usbStallReceiveI(usbp, ep);

+  return;

+}

diff --git a/os/various/usb_msc.h b/os/various/usb_msc.h
new file mode 100644
index 000000000..f7ab77c9c
--- /dev/null
+++ b/os/various/usb_msc.h
@@ -0,0 +1,131 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 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_msc.h

+ * @brief   USB Mass Storage Class header.

+ *

+ * @addtogroup USB_MSC

+ * @{

+ */

+

+#ifndef _USB_MSC_H_

+#define _USB_MSC_H_

+

+/*===========================================================================*/

+/* Driver constants.                                                         */

+/*===========================================================================*/

+

+#define MSC_CBW_SIGNATURE               0x43425355

+#define MSC_CSW_SIGNATURE               0x53425355

+

+#define MSC_GET_MAX_LUN_COMMAND         0xFE

+#define MSC_MASS_STORAGE_RESET_COMMAND  0xFF

+

+/*===========================================================================*/

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

+/*===========================================================================*/

+

+/**

+ * @brief   Endpoint number for bulk IN.

+ */

+#if !defined(MSC_DATA_IN_EP) || defined(__DOXYGEN__)

+#define MSC_DATA_IN_EP          1

+#endif

+

+/**

+ * @brief   Endpoint number for bulk OUT.

+ */

+#if !defined(MSC_DATA_OUT_EP) || defined(__DOXYGEN__)

+#define MSC_DATA_OUT_EP         2

+#endif

+

+/*===========================================================================*/

+/* Derived constants and error checks.                                       */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* Driver data structures and types.                                         */

+/*===========================================================================*/

+

+/**

+ * @brief   Type of the MSC possible states.

+ */

+typedef enum {

+  MSC_IDLE = 0,

+  MSC_DATA_OUT,

+  MSC_DATA_IN,

+  MSC_SENDING_CSW,

+  MSC_ERROR

+} mscstate_t;

+

+/**

+ * @brief   CBW structure.

+ */

+struct CBW {

+  uint32_t          dCBWSignature;

+  uint32_t          dCBWTag;

+  uint32_t          dCBWDataTransferLength;

+  uint8_t           bmCBWFlags;

+  uint8_t           bCBWLUN;

+  uint8_t           bCBWCBLength;

+  uint8_t           CBWCB[16];

+};

+

+/**

+ * @brief   CSW structure.

+ */

+struct CSW {

+  uint32_t          dCSWSignature;

+  uint32_t          dCSWTag;

+  uint32_t          dCSWDataResidue;

+  uint8_t           bCSWStatus;

+};

+

+/**

+ * @brief   Type of a CBW structure.

+ */

+typedef struct CBW msccbw_t;

+

+/**

+ * @brief   Type of a CSW structure.

+ */

+typedef struct CSW msccsw_t;

+

+/*===========================================================================*/

+/* Driver macros.                                                            */

+/*===========================================================================*/

+

+/*===========================================================================*/

+/* External declarations.                                                    */

+/*===========================================================================*/

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  bool_t mscRequestsHook(USBDriver *usbp);

+  void mscDataTransmitted(USBDriver *usbp, usbep_t ep);

+  void mscDataReceived(USBDriver *usbp, usbep_t ep);

+#ifdef __cplusplus

+}

+#endif

+

+#endif  /* _USB_MSC_H_ */

+

+/** @} */