diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-23 16:44:32 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2010-10-23 16:44:32 +0000 |
| commit | 16423f77811790eb11d089ed5ed45aa11abcb5af (patch) | |
| tree | d3789719c2eedc236f553c23c2e53c9717e5b17f /demos | |
| parent | 341a89dfd55141c458b8a73b44b4188554208e46 (diff) | |
| download | ChibiOS-16423f77811790eb11d089ed5ed45aa11abcb5af.tar.gz ChibiOS-16423f77811790eb11d089ed5ed45aa11abcb5af.tar.bz2 ChibiOS-16423f77811790eb11d089ed5ed45aa11abcb5af.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2272 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/ARM7-AT91SAM7S-FATFS-GCC/main.c | 6 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7S-FATFS-GCC/mcuconf.h | 4 | ||||
| -rw-r--r-- | demos/ARM7-AT91SAM7X-FATFS-GCC/mcuconf.h | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c b/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c index 478d2a606..5ebd0b9ff 100644 --- a/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c +++ b/demos/ARM7-AT91SAM7S-FATFS-GCC/main.c @@ -45,17 +45,17 @@ static bool_t fs_ready = FALSE; /* Maximum speed SPI configuration (__MHz, NCPHA=1, CPOL=0).*/
static SPIConfig hs_spicfg = {
+ NULL,
IOPORT1,
PIOA_MMC_NPCS0,
- AT91C_SPI_MSTR | AT91C_SPI_MODFDIS,
(MAX_SPI_BITRATE << 8) | AT91C_SPI_NCPHA | AT91C_SPI_BITS_8
};
/* Low speed SPI configuration (192KHz, NCPHA=1, CPOL=0).*/
static SPIConfig ls_spicfg = {
+ NULL,
IOPORT1,
PIOA_MMC_NPCS0,
- AT91C_SPI_MSTR | AT91C_SPI_MODFDIS,
(MIN_SPI_BITRATE << 8) | AT91C_SPI_NCPHA | AT91C_SPI_BITS_8
};
@@ -320,7 +320,7 @@ int main(int argc, char **argv) { */
palSetPadMode(IOPORT1, PIOA_MMC_NPCS0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPad(IOPORT1, PIOA_MMC_NPCS0);
- mmcObjectInit(&MMCD1, &SPID,
+ mmcObjectInit(&MMCD1, &SPID1,
&ls_spicfg, &hs_spicfg,
mmc_is_protected, mmc_is_inserted);
mmcStart(&MMCD1, &mmc_cfg);
diff --git a/demos/ARM7-AT91SAM7S-FATFS-GCC/mcuconf.h b/demos/ARM7-AT91SAM7S-FATFS-GCC/mcuconf.h index a8c41b07b..27117bfc7 100644 --- a/demos/ARM7-AT91SAM7S-FATFS-GCC/mcuconf.h +++ b/demos/ARM7-AT91SAM7S-FATFS-GCC/mcuconf.h @@ -57,3 +57,7 @@ * SPI driver system settings.
*/
#define USE_AT91SAM7_SPI TRUE
+#define AT91SAM7_SPI_USE_SPI0 TRUE
+#define AT91SAM7_SPI_USE_SPI1 FALSE
+#define AT91SAM7_SPI0_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1)
+#define AT91SAM7_SPI1_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1)
diff --git a/demos/ARM7-AT91SAM7X-FATFS-GCC/mcuconf.h b/demos/ARM7-AT91SAM7X-FATFS-GCC/mcuconf.h index a8c41b07b..7229a7e8a 100644 --- a/demos/ARM7-AT91SAM7X-FATFS-GCC/mcuconf.h +++ b/demos/ARM7-AT91SAM7X-FATFS-GCC/mcuconf.h @@ -57,3 +57,7 @@ * SPI driver system settings.
*/
#define USE_AT91SAM7_SPI TRUE
+#define AT91SAM7_SPI_USE_SPI0 TRUE
+#define AT91SAM7_SPI_USE_SPI1 TRUE
+#define AT91SAM7_SPI0_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1)
+#define AT91SAM7_SPI1_PRIORITY (AT91C_AIC_PRIOR_HIGHEST - 1)
|