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

os/io/io.dox

@@ -150,7 +150,7 @@
       stop  [label="SPI_STOP\nLow Power"];
       ready [label="SPI_READY\nClock Enabled"];
       active [label="SPI_ACTIVE\nBus Active"];
-      uninit -> stop [label="spiInit()"];
+      uninit -> stop [label="spiObjectInit()"];
       stop -> ready [label="spiStart()"];
       ready -> ready [label="spiStart()"];
       ready -> stop [label="spiStop()"];
@@ -190,7 +190,7 @@
       stop  [label="ADC_STOP\nLow Power"];
       ready [label="ADC_READY\nClock Enabled"];
       running [label="ADC_RUNNING\nConverting"];
-      uninit -> stop [label="adcInit()"];
+      uninit -> stop [label="adcObjectInit()"];
       stop -> ready [label="adcStart()"];
       ready -> ready [label="adcStart()"];
       ready -> stop [label="adcStop()"];

os/io/mmc_spi.c

@@ -0,0 +1,92 @@
+/*
+    ChibiOS/RT - Copyright (C) 2006-2007 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 mmc_spi.c
+ * @brief MMC over SPI driver code
+ * @addtogroup MMC_SPI
+ * @{
+ */
+
+#include <ch.h>
+#include <spi.h>
+#include <mmc_spi.h>
+
+/**
+ * @brief MMC over SPI driver initialization.
+ */
+void mmcInit(void) {
+
+}
+
+/**
+ * @brief Initializes an instance.
+ *
+ * @param[in] mmcp      pointer to the @p MMCDriver object
+ */
+void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip,
+                   const SPIConfig *lscfg, const SPIConfig *hscfg,
+                   mmcquery_t is_protected, mmcquery_t is_inserted) {
+
+  mmcp->mmc_state = MMC_STOP;
+  mmcp->mmc_config = NULL;
+  mmcp->mmc_spip = spip;
+  mmcp->mmc_lscfg = lscfg;
+  mmcp->mmc_hscfg = hscfg;
+  mmcp->mmc_is_protected = is_protected;
+  mmcp->mmc_is_inserted = is_inserted;
+}
+
+/**
+ * @brief Configures and activates the MMC peripheral.
+ *
+ * @param[in] mmcp      pointer to the @p MMCDriver object
+ * @param[in] config    pointer to the @p MMCConfig object
+ */
+void mmcStart(MMCDriver *mmcp, const MMCConfig *config) {
+
+  chDbgCheck((mmcp != NULL) && (config != NULL), "mmcStart");
+
+  chSysLock();
+  chDbgAssert((mmcp->mmc_state == MMC_STOP) || (mmcp->mmc_state == MMC_READY),
+              "mmcStart(), #1",
+              "invalid state");
+  mmcp->mmc_config = config;
+  mmcp->mmc_state = MMC_READY;
+  chSysUnlock();
+}
+
+/**
+ * @brief Deactivates the MMC peripheral.
+ *
+ * @param[in] mmcp      pointer to the @p MMCDriver object
+ */
+void mmcStop(MMCDriver *mmcp) {
+
+  chDbgCheck(mmcp != NULL, "mmcStop");
+
+  chSysLock();
+  chDbgAssert((mmcp->mmc_state == MMC_STOP) || (mmcp->mmc_state == MMC_READY),
+              "mmcStop(), #1",
+              "invalid state");
+  mmcp->mmc_state = MMC_STOP;
+  chSysUnlock();
+}
+
+/** @} */

os/io/mmc_spi.h

@@ -0,0 +1,102 @@
+/*
+    ChibiOS/RT - Copyright (C) 2006-2007 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 mmc_spi.h
+ * @brief MMC over SPI driver header
+ * @addtogroup MMC_SPI
+ * @{
+ */
+
+#ifndef _MMC_SPI_H_
+#define _MMC_SPI_H_
+
+/**
+ * @brief Driver state machine possible states.
+ */
+typedef enum {
+  MMC_UNINIT = 0,                           /**< @brief Not initialized.    */
+  MMC_STOP = 1,                             /**< @brief Stopped.            */
+  MMC_READY = 2                             /**< @brief Ready.              */
+} mmcstate_t;
+
+/**
+ * @brief Driver configuration structure.
+ */
+typedef struct {
+
+} MMCConfig;
+
+/**
+ * @brief Structure representing a MMC driver.
+ */
+typedef struct {
+  /**
+   * @brief Driver state.
+   */
+  mmcstate_t            mmc_state;
+  /**
+   * @brief Current configuration data.
+   */
+  const MMCConfig       *mmc_config;
+  /**
+   * @brief SPI driver associated to this MMC driver.
+   */
+  SPIDriver             *mmc_spip;
+  /**
+   * @brief SPI low speed configuration used during initialization.
+   */
+  const SPIConfig       *mmc_lscfg;
+  /**
+   * @brief SPI high speed configuration used during transfers.
+   */
+  const SPIConfig       *mmc_hscfg;
+  /**
+   * @brief Write protect status query function.
+   */
+  mmcquery_t            mmc_is_protected;
+  /**
+   * @brief Insertion status query function.
+   */
+  mmcquery_t            mmc_is_inserted;
+} MMCDriver;
+
+/**
+ * @brief Function used to query some hardware status bits.
+ *
+ * @return The status.
+ */
+typedef bool_t (*mmcquery_t)(void);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void mmcInit(void);
+  void mmcObjectInit(MMCDriver *mmcp, SPIDriver *spip,
+                     const SPIConfig *lscfg, const SPIConfig *hscfg,
+                     mmcquery_t is_protected, mmcquery_t is_inserted);
+  void mmcStart(MMCDriver *mmcp, const MMCConfig *config);
+  void mmcStop(MMCDriver *mmcp);
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MMC_SPI_H_ */
+
+/** @} */