I2C. Merged code from trunk.

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

12 files changed, 502 insertions, 21 deletions

diff --git a/os/various/ch.cpp b/os/various/ch.cpp
index a3507868d..2b23768d7 100644
--- a/os/various/ch.cpp
+++ b/os/various/ch.cpp
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -130,19 +131,19 @@ namespace chibios_rt {
     return chMsgSend(thread_ref, msg);

   }

 

-  msg_t BaseThread::WaitMessage(void) {

+  Thread *BaseThread::WaitMessage(void) {

 

     return chMsgWait();

   }

 

-  msg_t BaseThread::GetMessage(void) {

+  msg_t BaseThread::GetMessage(Thread* tp) {

 

-    return chMsgGet();

+    return chMsgGet(tp);

   }

 

-  void BaseThread::ReleaseMessage(msg_t msg) {

+  void BaseThread::ReleaseMessage(Thread* tp, msg_t msg) {

 

-    chMsgRelease(msg);

+    chMsgRelease(tp, msg);

   }

 

   bool BaseThread::IsPendingMessage(void) {

diff --git a/os/various/ch.hpp b/os/various/ch.hpp
index 7bbd43c9f..d48dc30fe 100644
--- a/os/various/ch.hpp
+++ b/os/various/ch.hpp
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

@@ -197,26 +198,27 @@ namespace chibios_rt {
     msg_t SendMessage(msg_t msg);

 

     /**

-     * @brief   Waits for a message and returns it.

+     * @brief   Waits for a message.

      *

-     * @return                  The incoming message.

+     * @return                  The sebder thread.

      */

-    static msg_t WaitMessage(void);

+    static Thread *WaitMessage(void);

 

     /**

      * @brief   Returns an enqueued message or @p NULL.

      *

+     * @param[in] tp            the sender thread

      * @return                  The incoming message.

-     * @retval NULL             No incoming message.

      */

-    static msg_t GetMessage(void);

+    static msg_t GetMessage(Thread* tp);

 

     /**

      * @brief   Releases the next message in queue with a reply.

      *

+     * @param[in] tp            the sender thread

      * @param[in] msg           the answer message

      */

-    static void ReleaseMessage(msg_t msg);

+    static void ReleaseMessage(Thread* tp, msg_t msg);

 

     /**

      * @brief   Returns true if there is at least one message in queue.

diff --git a/os/various/evtimer.c b/os/various/evtimer.c
index 140d90ed0..6a7226b27 100644
--- a/os/various/evtimer.c
+++ b/os/various/evtimer.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/evtimer.h b/os/various/evtimer.h
index 3f675fffc..a753e8984 100644
--- a/os/various/evtimer.h
+++ b/os/various/evtimer.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/memstreams.c b/os/various/memstreams.c
index 9e6bd1e3a..b1edf1a45 100644
--- a/os/various/memstreams.c
+++ b/os/various/memstreams.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/memstreams.h b/os/various/memstreams.h
index 438b8ce00..53d8c567d 100644
--- a/os/various/memstreams.h
+++ b/os/various/memstreams.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/shell.c b/os/various/shell.c
index 8a0fd4d45..e3686c6cb 100644
--- a/os/various/shell.c
+++ b/os/various/shell.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/shell.h b/os/various/shell.h
index 821a2c985..9b3b70513 100644
--- a/os/various/shell.h
+++ b/os/various/shell.h
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

diff --git a/os/various/syscalls.c b/os/various/syscalls.c
index 2abe6dfde..b22765b80 100644
--- a/os/various/syscalls.c
+++ b/os/various/syscalls.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

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

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

+                 2011 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   Answer to the INQUIRY command.

+ */

+static const uint8_t scsi_inquiry_data[] = {

+  0x00,             /* Direct Access Device.      */

+  0x80,             /* RMB = 1: Removable Medium. */

+  0x02,             /* ISO, ECMA, ANSI = 2.       */

+  0x00,             /* UFI response format.       */

+

+  36 - 4,           /* Additional Length.         */

+  0x00,

+  0x00,

+  0x00,

+  /* Vendor Identification */

+  'C', 'h', 'i', 'b', 'i', 'O', 'S', ' ',

+  /* Product Identification */

+  'S', 'D', ' ', 'F', 'l', 'a', 's', 'h',

+  ' ', 'D', 'i', 's', 'k', ' ', ' ', ' ',

+  /* Product Revision Level */

+  '1', '.', '0', ' '

+};

+

+/**

+ * @brief   Generic buffer.

+ */

+uint8_t buf[16];

+

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

+/* MMC interface code.                                                       */

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

+

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

+/* SCSI emulation code.                                                      */

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

+

+static uint8_t scsi_read_format_capacities(uint32_t *nblocks,

+                                           uint32_t *secsize) {

+

+  *nblocks = 1024;

+  *secsize = 512;

+  return 3; /* No Media.*/

+}

+

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

+/* Mass Storage Class related code.                                          */

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

+

+/**

+ * @brief   MSC state machine current state.

+ */

+static mscstate_t msc_state;

+

+/**

+ * @brief   Received CBW.

+ */

+static msccbw_t CBW;

+

+/**

+ * @brief   CSW to be transmitted.

+ */

+static msccsw_t CSW;

+

+/**

+ * @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, (uint8_t *)&CBW, sizeof CBW);

+  chSysUnlockFromIsr();

+}

+

+static void msc_transmit(USBDriver *usbp, const uint8_t *p, size_t n) {

+

+  if (n > CBW.dCBWDataTransferLength)

+    n = CBW.dCBWDataTransferLength;

+  CSW.dCSWDataResidue = CBW.dCBWDataTransferLength - (uint32_t)n;

+  chSysLockFromIsr();

+  usbStartTransmitI(usbp, MSC_DATA_IN_EP, p, n);

+  chSysUnlockFromIsr();

+}

+

+static void msc_sendstatus(USBDriver *usbp) {

+

+  msc_state = MSC_SENDING_CSW;

+  chSysLockFromIsr();

+  usbStartTransmitI(usbp, MSC_DATA_IN_EP, (uint8_t *)&CSW, sizeof CSW);

+  chSysUnlockFromIsr();

+}

+

+static bool_t msc_decode(USBDriver *usbp) {

+  uint32_t nblocks, secsize;

+

+  switch (CBW.CBWCB[0]) {

+  case SCSI_REQUEST_SENSE:

+    break;

+  case SCSI_INQUIRY:

+    msc_transmit(usbp, (uint8_t *)&scsi_inquiry_data,

+                 sizeof scsi_inquiry_data);

+    CSW.bCSWStatus = MSC_CSW_STATUS_PASSED;

+    break;

+  case SCSI_READ_FORMAT_CAPACITIES:

+    buf[8]  = scsi_read_format_capacities(&nblocks, &secsize);

+    buf[0]  = buf[1] = buf[2] = 0;

+    buf[3]  = 8;

+    buf[4]  = (uint8_t)(nblocks >> 24);

+    buf[5]  = (uint8_t)(nblocks >> 16);

+    buf[6]  = (uint8_t)(nblocks >> 8);

+    buf[7]  = (uint8_t)(nblocks >> 0);

+    buf[9]  = (uint8_t)(secsize >> 16);

+    buf[10] = (uint8_t)(secsize >> 8);

+    buf[11] = (uint8_t)(secsize >> 0);

+    msc_transmit(usbp, buf, 12);

+    CSW.bCSWStatus = MSC_CSW_STATUS_PASSED;

+    break;

+  default:

+    return TRUE;

+  }

+  return FALSE;

+}

+

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

+/* 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:

+    CSW.dCSWSignature = MSC_CSW_SIGNATURE;

+    CSW.dCSWTag = CBW.dCBWTag;

+    chSysLockFromIsr();

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

+    chSysUnlockFromIsr();

+    msc_state = MSC_SENDING_CSW;

+    break;

+  case MSC_SENDING_CSW:

+    chSysLockFromIsr();

+    usbStartReceiveI(usbp, MSC_DATA_OUT_EP, (uint8_t *)&CBW, sizeof CBW);

+    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)) || (CBW.dCBWSignature != MSC_CBW_SIGNATURE))

+      goto stall_out; /* 6.6.1 */

+

+    /* Decoding SCSI command.*/

+    if (msc_decode(usbp)) {

+      if (CBW.dCBWDataTransferLength == 0) {

+        CSW.bCSWStatus = MSC_CSW_STATUS_FAILED;

+        CSW.dCSWDataResidue = 0;

+        msc_sendstatus(usbp);

+        return;

+      }

+      goto stall_both;

+    }

+

+    /* Commands with zero transfer length, 5.1.*/

+    if (CBW.dCBWDataTransferLength == 0) {

+      msc_sendstatus(usbp);

+      return;

+    }

+

+    /* Transfer direction.*/

+    if (CBW.bmCBWFlags & 0x80) {

+      /* IN, Device to Host.*/

+      msc_state = MSC_DATA_IN;

+    }

+    else {

+      /* OUT, Host to Device.*/

+      msc_state = MSC_DATA_OUT;

+    }

+    break;

+  case MSC_DATA_OUT:

+    break;

+  default:

+    ;

+  }

+  return;

+stall_out:

+  msc_state = MSC_ERROR;

+  chSysLockFromIsr();

+  usbStallReceiveI(usbp, ep);

+  chSysUnlockFromIsr();

+  return;

+stall_both:

+  msc_state = MSC_ERROR;

+  chSysLockFromIsr();

+  usbStallTransmitI(usbp, ep);

+  usbStallReceiveI(usbp, ep);

+  chSysUnlockFromIsr();

+  return;

+}

+

+/** @} */

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

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

+                 2011 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

+

+#define MSC_CSW_STATUS_PASSED           0

+#define MSC_CSW_STATUS_FAILED           1

+#define MSC_CSW_STATUS_PHASE_ERROR      2

+

+

+#define SCSI_FORMAT_UNIT            0x04

+#define SCSI_INQUIRY                0x12

+#define SCSI_MODE_SELECT6           0x15

+#define SCSI_MODE_SELECT10          0x55

+#define SCSI_MODE_SENSE6            0x1A

+#define SCSI_MODE_SENSE10           0x5A

+#define SCSI_ALLOW_MEDIUM_REMOVAL   0x1E

+#define SCSI_READ6                  0x08

+#define SCSI_READ10                 0x28

+#define SCSI_READ12                 0xA8

+#define SCSI_READ16                 0x88

+

+#define SCSI_READ_CAPACITY10        0x25

+#define SCSI_READ_CAPACITY16        0x9E

+

+#define SCSI_REQUEST_SENSE          0x03

+#define SCSI_START_STOP_UNIT        0x1B

+#define SCSI_TEST_UNIT_READY        0x00

+#define SCSI_WRITE6                 0x0A

+#define SCSI_WRITE10                0x2A

+#define SCSI_WRITE12                0xAA

+#define SCSI_WRITE16                0x8A

+

+#define SCSI_VERIFY10               0x2F

+#define SCSI_VERIFY12               0xAF

+#define SCSI_VERIFY16               0x8F

+

+#define SCSI_SEND_DIAGNOSTIC        0x1D

+#define SCSI_READ_FORMAT_CAPACITIES 0x23

+

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

+/* 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_ */

+

+/** @} */

diff --git a/os/various/various.dox b/os/various/various.dox
index 1a8130f4d..9ae895af4 100644
--- a/os/various/various.dox
+++ b/os/various/various.dox
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

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

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.