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

1 files changed, 4 insertions, 13 deletions

diff --git a/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c b/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c
index 8b6e0d32b..fea6e72b9 100644
--- a/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c
+++ b/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c
@@ -61,15 +61,8 @@ static SPIConfig ls_spicfg = {
   (MIN_SPI_BITRATE << 8) | AT91C_SPI_NCPHA | AT91C_SPI_BITS_8

 };

 

-/* Card insertion verification.*/

-static bool_t mmc_is_inserted(void) {

-  return !palReadPad(IOPORT1, PIOA_MMC_CP);

-}

-

-/* Card protection verification.*/

-static bool_t mmc_is_protected(void) {

-  return palReadPad(IOPORT1, PIOA_MMC_WP);

-}

+/* MMC/SD over SPI driver configuration.*/

+static MMCConfig mmccfg = {&SPID1, &ls_spicfg, &hs_spicfg};

 

 /* Generic large buffer.*/

 uint8_t fbuff[1024];

@@ -306,10 +299,8 @@ int main(void) {
    */

   palSetPadMode(IOPORT1, PIOA_MMC_NPCS0, PAL_MODE_OUTPUT_PUSHPULL);

   palSetPad(IOPORT1, PIOA_MMC_NPCS0);

-  mmcObjectInit(&MMCD1, &SPID1,

-                &ls_spicfg, &hs_spicfg,

-                mmc_is_protected, mmc_is_inserted);

-  mmcStart(&MMCD1, NULL);

+  mmcObjectInit(&MMCD1);

+  mmcStart(&MMCD1, &mmccfg);

 

   /*

    * Creates the blinker threads.