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

4 files changed, 620 insertions, 0 deletions

diff --git a/os/hal/include/sdc.h b/os/hal/include/sdc.h
new file mode 100644
index 000000000..d578e65b4
--- /dev/null
+++ b/os/hal/include/sdc.h
@@ -0,0 +1,94 @@
+/*

+    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    sdc.h

+ * @brief   SDC Driver macros and structures.

+ *

+ * @addtogroup SDC

+ * @{

+ */

+

+#ifndef _SDC_H_

+#define _SDC_H_

+

+#if HAL_USE_SDC || defined(__DOXYGEN__)

+

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

+/* Driver constants.                                                         */

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

+

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

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

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

+

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

+/* Derived constants and error checks.                                       */

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

+

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

+/* Driver data structures and types.                                         */

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

+

+/**

+ * @brief   Driver state machine possible states.

+ */

+typedef enum {

+  SDC_UNINIT = 0,                   /**< Not initialized.                   */

+  SDC_STOP = 1,                     /**< Stopped.                           */

+  SDC_READY = 2,                    /**< Ready.                             */

+  SDC_INITNG = 3,                   /**< Card initialization in progress.   */

+  SDC_ACTIVE = 4,                   /**< Cart initialized.                  */

+  SDC_READING = 5,                  /**< Read operation in progress.        */

+  SDC_WRITING = 6,                  /**< Write operation in progress.       */

+} sdcstate_t;

+

+#include "sdc_lld.h"

+

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

+/* Driver macros.                                                            */

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

+

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

+/* External declarations.                                                    */

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

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void sdcInit(void);

+  void sdcObjectInit(SDCDriver *sdcp);

+  void sdcStart(SDCDriver *sdcp, const SDCConfig *config);

+  void sdcStop(SDCDriver *sdcp);

+  bool_t sdcConnect(SDCDriver *sdcp);

+  bool_t sdcDisconnect(SDCDriver *sdcp);

+  bool_t sdcRead(SDCDriver *sdcp, uint32_t startblk,

+                 uint8_t *buffer, uint32_t n);

+  bool_t sdcWrite(SDCDriver *sdcp, uint32_t startblk,

+                  const uint8_t *buffer, uint32_t n);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* HAL_USE_SDC */

+

+#endif /* _SDC_H_ */

+

+/** @} */

diff --git a/os/hal/platforms/STM32/sdc_lld.c b/os/hal/platforms/STM32/sdc_lld.c
new file mode 100644
index 000000000..48f8561f9
--- /dev/null
+++ b/os/hal/platforms/STM32/sdc_lld.c
@@ -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    STM32/sdc_lld.c

+ * @brief   STM32 SDC subsystem low level driver source.

+ *

+ * @addtogroup SDC

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+

+#if HAL_USE_SDC || defined(__DOXYGEN__)

+

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

+/* Driver exported variables.                                                */

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

+

+/** @brief SDCD1 driver identifier.*/

+SDCDriver SDCD1;

+

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

+/* Driver local variables.                                                   */

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

+

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

+/* Driver local functions.                                                   */

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

+

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

+/* Driver interrupt handlers.                                                */

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

+

+/**

+ * @brief   SDIO IRQ handler.

+ *

+ * @isr

+ */

+CH_IRQ_HANDLER(SDIO_IRQHandler) {

+

+  CH_IRQ_PROLOGUE();

+

+

+  CH_IRQ_EPILOGUE();

+}

+

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

+/* Driver exported functions.                                                */

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

+

+/**

+ * @brief   Low level SDC driver initialization.

+ *

+ * @notapi

+ */

+void sdc_lld_init(void) {

+

+  sdcObjectInit(&SDCD1);

+}

+

+/**

+ * @brief   Configures and activates the SDC peripheral.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ *

+ * @notapi

+ */

+void sdc_lld_start(SDCDriver *sdcp) {

+

+  if (sdcp->state == SDC_STOP) {

+    /* Note, the DMA must be enabled before the IRQs.*/

+    dmaAllocate(STM32_DMA2_ID, STM32_DMA_CHANNEL_4, NULL, NULL);

+    NVICEnableVector(SDIO_IRQn,

+                     CORTEX_PRIORITY_MASK(STM32_SDC_SDIO_IRQ_PRIORITY));

+    RCC->AHBENR |= RCC_AHBENR_SDIOEN;

+  }

+  /* Configuration, card clock is initially stopped.*/

+  SDIO->POWER = 0;

+  SDIO->CLKCR = 0;

+  SDIO->DCTRL = 0;

+}

+

+/**

+ * @brief   Deactivates the SDC peripheral.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ *

+ * @notapi

+ */

+void sdc_lld_stop(SDCDriver *sdcp) {

+

+  if ((sdcp->state == SDC_READY) || (sdcp->state == SDC_ACTIVE)) {

+    SDIO->POWER = 0;

+    SDIO->CLKCR = 0;

+    SDIO->DCTRL = 0;

+

+    /* Clock deactivation.*/

+    NVICDisableVector(SDIO_IRQn);

+    dmaRelease(STM32_DMA2_ID, STM32_DMA_CHANNEL_4);

+  }

+}

+

+/**

+ * @brief   Sends an SDIO command with no response expected.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ *

+ * @notapi

+ */

+void sdc_lld_send_cmd_none(SDCDriver *sdcp, uint8_t cmd, uint32_t arg) {

+

+}

+

+/**

+ * @brief   Sends an SDIO command with a short response expected.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @return              The operation status.

+ * @retval FALSE        the operation succeeded.

+ * @retval TRUE         the operation failed because timeout, CRC check or

+ *                      other errors.

+ *

+ * @notapi

+ */

+bool_t sdc_lld_send_cmd_short(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,

+                              uint32_t *resp) {

+

+}

+

+/**

+ * @brief   Sends an SDIO command with a long response expected.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @return              The operation status.

+ * @retval FALSE        the operation succeeded.

+ * @retval TRUE         the operation failed because timeout, CRC check or

+ *                      other errors.

+ *

+ * @notapi

+ */

+bool_t sdc_lld_send_cmd_long(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,

+                             uint32_t *resp) {

+

+}

+

+#endif /* HAL_USE_SDC */

+

+/** @} */

diff --git a/os/hal/platforms/STM32/sdc_lld.h b/os/hal/platforms/STM32/sdc_lld.h
new file mode 100644
index 000000000..012fdb1c7
--- /dev/null
+++ b/os/hal/platforms/STM32/sdc_lld.h
@@ -0,0 +1,152 @@
+/*

+    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    STM32/sdc_lld.h

+ * @brief   STM32 SDC subsystem low level driver header.

+ *

+ * @addtogroup SDC

+ * @{

+ */

+

+#ifndef _SDC_LLD_H_

+#define _SDC_LLD_H_

+

+#if HAL_USE_SDC || defined(__DOXYGEN__)

+

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

+/* Driver constants.                                                         */

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

+

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

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

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

+

+/**

+ * @brief   SDIO DMA priority (0..3|lowest..highest).

+ */

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

+#define STM32_SDC_SDIO_DMA_PRIORITY         2

+#endif

+

+/**

+ * @brief   SDIO interrupt priority level setting.

+ */

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

+#define STM32_SDC_SDIO_IRQ_PRIORITY         9

+#endif

+

+/**

+ * @brief   SDIO DMA error hook.

+ * @note    The default action for DMA errors is a system halt because DMA

+ *          error can only happen because programming errors.

+ */

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

+#define STM32_SDC_DMA_ERROR_HOOK(sdcp)      chSysHalt()

+#endif

+

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

+/* Derived constants and error checks.                                       */

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

+

+#if !STM32_HAS_SDIO

+#error "SDIO not present in the selected device"

+#endif

+

+#if !defined(STM32_DMA_REQUIRED)

+#define STM32_DMA_REQUIRED

+#endif

+

+/*

+ * SDIO clock divider.

+ */

+#if STM32_HCLK > 48000000

+#define STM32_SDIO_DIV_HS                   0x01

+#define STM32_SDIO_DIV_LS                   0xB2

+#else

+#define STM32_SDIO_DIV_HS                   0x00

+#define STM32_SDIO_DIV_LS                   0x76

+#endif

+

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

+/* Driver data structures and types.                                         */

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

+

+

+/**

+ * @brief   Type of a structure representing an SDC driver.

+ */

+typedef struct SDCDriver SDCDriver;

+

+/**

+ * @brief   Driver configuration structure.

+ * @note    It could be empty on some architectures.

+ */

+typedef struct {

+

+} SDCConfig;

+

+/**

+ * @brief   Structure representing an SDC driver.

+ */

+struct SDCDriver {

+  /**

+   * @brief Driver state.

+   */

+  sdcstate_t                state;

+  /**

+   * @brief Current configuration data.

+   */

+  const SDCConfig           *config;

+  /* End of the mandatory fields.*/

+};

+

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

+/* Driver macros.                                                            */

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

+

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

+/* External declarations.                                                    */

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

+

+#if !defined(__DOXYGEN__)

+extern SDCDriver SDCD1;

+#endif

+

+#ifdef __cplusplus

+extern "C" {

+#endif

+  void sdc_lld_init(void);

+  void sdc_lld_start(SDCDriver *sdcp);

+  void sdc_lld_stop(SDCDriver *sdcp);

+  void sdc_lld_send_cmd_none(SDCDriver *sdcp, uint8_t cmd, uint32_t arg);

+  bool_t sdc_lld_send_cmd_short(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,

+                                uint32_t *resp);

+  bool_t sdc_lld_send_cmd_long(SDCDriver *sdcp, uint8_t cmd, uint32_t arg,

+                               uint32_t *resp);

+#ifdef __cplusplus

+}

+#endif

+

+#endif /* HAL_USE_SDC */

+

+#endif /* _SDC_LLD_H_ */

+

+/** @} */

diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c
new file mode 100644
index 000000000..33f2b3612
--- /dev/null
+++ b/os/hal/src/sdc.c
@@ -0,0 +1,207 @@
+/*

+    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    sdc.c

+ * @brief   SDC Driver code.

+ *

+ * @addtogroup SDC

+ * @{

+ */

+

+#include "ch.h"

+#include "hal.h"

+

+#if HAL_USE_SDC || defined(__DOXYGEN__)

+

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

+/* Driver exported variables.                                                */

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

+

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

+/* Driver local variables.                                                   */

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

+

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

+/* Driver local functions.                                                   */

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

+

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

+/* Driver exported functions.                                                */

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

+

+/**

+ * @brief   SDC Driver initialization.

+ * @note    This function is implicitly invoked by @p halInit(), there is

+ *          no need to explicitly initialize the driver.

+ *

+ * @init

+ */

+void sdcInit(void) {

+

+  sdc_lld_init();

+}

+

+/**

+ * @brief   Initializes the standard part of a @p SDCDriver structure.

+ *

+ * @param[out] sdcp     pointer to the @p SDCDriver object

+ *

+ * @init

+ */

+void sdcObjectInit(SDCDriver *sdcp) {

+

+  sdcp->state  = SDC_STOP;

+  sdcp->config = NULL;

+}

+

+/**

+ * @brief   Configures and activates the SDC peripheral.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @param[in] config    pointer to the @p SDCConfig object

+ *

+ * @api

+ */

+void sdcStart(SDCDriver *sdcp, const SDCConfig *config) {

+

+  chDbgCheck((sdcp != NULL) && (config != NULL), "sdcStart");

+

+  chSysLock();

+  chDbgAssert((sdcp->state == SDC_STOP) || (sdcp->state == SDC_READY),

+              "sdcStart(), #1", "invalid state");

+  sdcp->config = config;

+  sdc_lld_start(sdcp);

+  sdcp->state = SDC_READY;

+  chSysUnlock();

+}

+

+/**

+ * @brief   Deactivates the SDC peripheral.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ *

+ * @api

+ */

+void sdcStop(SDCDriver *sdcp) {

+

+  chDbgCheck(sdcp != NULL, "sdcStop");

+

+  chSysLock();

+  chDbgAssert((sdcp->state == SDC_STOP) || (sdcp->state == SDC_READY),

+              "sdcStop(), #1", "invalid state");

+  sdc_lld_stop(sdcp);

+  sdcp->state = SDC_STOP;

+  chSysUnlock();

+}

+

+/**

+ * @brief   Performs the initialization procedure on the inserted card.

+ * @details This function should be invoked when a card is inserted and

+ *          brings the driver in the @p SDC_ACTIVE state where it is possible

+ *          to perform read and write operations.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @return              The operation status.

+ * @retval FALSE        operation succeeded, the driver is now

+ *                      in the @p SDC_ACTIVE state.

+ * @retval TRUE         operation failed.

+ *

+ * @api

+ */

+bool_t sdcConnect(SDCDriver *sdcp) {

+

+  chDbgCheck(sdcp != NULL, "sdcConnect");

+

+  chSysLock();

+  chDbgAssert(sdcp->state == SDC_READY, "mmcConnect(), #1", "invalid state");

+  sdcp->state = SDC_INITNG;

+  chSysUnlock();

+

+  sdcp->state = SDC_ACTIVE;

+  return FALSE;

+}

+

+/**

+ * @brief   Brings the driver in a state safe for card removal.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @return              The operation status.

+ * @retval FALSE        the operation succeeded and the driver is now

+ *                      in the @p SDC_READY state.

+ * @retval TRUE         the operation failed.

+ *

+ * @api

+ */

+bool_t sdcDisconnect(SDCDriver *sdcp) {

+

+  chDbgCheck(sdcp != NULL, "sdcConnect");

+

+  chSysLock();

+  chDbgAssert(sdcp->state == SDC_ACTIVE,

+              "sdcDisconnect(), #1", "invalid state");

+  sdcp->state = SDC_READY;

+  chSysUnlock();

+  return FALSE;

+}

+

+/**

+ * @brief   Reads one or more blocks.

+ * @pre     The driver must be in the @p SDC_ACTIVE state after a successful

+ *          sdcConnect() invocation.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @param[in] startblk  first block to read

+ * @param[out] buffer   pointer to the read buffer

+ * @return              The operation status.

+ * @retval FALSE        operation succeeded, the requested blocks have been

+ *                      read.

+ * @retval TRUE         operation failed, the state of the buffer is uncertain.

+ *

+ * @api

+ */

+bool_t sdcRead(SDCDriver *sdcp, uint32_t startblk,

+               uint8_t *buffer, uint32_t n) {

+

+}

+

+/**

+ * @brief   Writes one or more blocks.

+ * @pre     The driver must be in the @p SDC_ACTIVE state after a successful

+ *          sdcConnect() invocation.

+ *

+ * @param[in] sdcp      pointer to the @p SDCDriver object

+ * @param[in] startblk  first block to write

+ * @param[out] buffer   pointer to the write buffer

+ * @return              The operation status.

+ * @retval FALSE        operation succeeded, the requested blocks have been

+ *                      written.

+ * @retval TRUE         operation failed.

+ *

+ * @api

+ */

+bool_t sdcWrite(SDCDriver *sdcp, uint32_t startblk,

+                const uint8_t *buffer, uint32_t n) {

+

+}

+

+#endif /* HAL_USE_SDC */

+

+/** @} */