From 6a8a643ab00e5964a3fb77e5b2394561bb797e55 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Wed, 9 May 2012 18:44:47 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4179
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/hal/include/mmc_spi.h | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

(limited to 'os/hal/include/mmc_spi.h')

diff --git a/os/hal/include/mmc_spi.h b/os/hal/include/mmc_spi.h
index fd2850576..760ab3ad1 100644
--- a/os/hal/include/mmc_spi.h
+++ b/os/hal/include/mmc_spi.h
@@ -101,13 +101,6 @@ typedef enum {
   MMC_WRITING = 6                           /**< Writing.                   */
 } mmcstate_t;
 
-/**
- * @brief   Function used to query some hardware status bits.
- *
- * @return              The status.
- */
-typedef bool_t (*mmcquery_t)(void);
-
 /**
  * @brief   Driver configuration structure.
  * @note    Not required in the current implementation.
@@ -146,14 +139,6 @@ typedef struct {
    * @brief SPI high speed configuration used during transfers.
    */
   const SPIConfig       *hscfg;
-  /**
-   * @brief Write protect status query function.
-   */
-  mmcquery_t            is_protected;
-  /**
-   * @brief Insertion status query function.
-   */
-  mmcquery_t            is_inserted;
   /**
    * @brief Card insertion event source.
    */
@@ -204,7 +189,7 @@ typedef struct {
  *
  * @api
  */
-#define mmcIsWriteProtected(mmcp) ((mmcp)->is_protected())
+#define mmcIsWriteProtected(mmcp) mmc_lld_is_write_protected(mmcp)
 /** @} */
 
 /*===========================================================================*/
@@ -216,8 +201,7 @@ 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);
+                     const SPIConfig *lscfg, const SPIConfig *hscfg);
   void mmcStart(MMCDriver *mmcp, const MMCConfig *config);
   void mmcStop(MMCDriver *mmcp);
   bool_t mmcConnect(MMCDriver *mmcp);
@@ -230,6 +214,8 @@ extern "C" {
   bool_t mmcStopSequentialWrite(MMCDriver *mmcp);
   bool_t mmcSync(MMCDriver *mmcp);
   bool_t mmcGetInfo(MMCDriver *mmcp, BlockDeviceInfo *bdip);
+  bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp);
+  bool_t mmc_lld_is_write_protected(MMCDriver *mmcp);
 #ifdef __cplusplus
 }
 #endif
-- 
cgit v1.2.3