diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-22 10:34:57 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-02-22 10:34:57 +0000 |
| commit | 4149bab2ca98e041d09d9908b04e634b84257f2c (patch) | |
| tree | 6ec371020efeaa54f779f6c18f9b11aa32c2babd | |
| parent | 99bd11676fd5deed046c8881fb0e3f651fa310d8 (diff) | |
| download | ChibiOS-4149bab2ca98e041d09d9908b04e634b84257f2c.tar.gz ChibiOS-4149bab2ca98e041d09d9908b04e634b84257f2c.tar.bz2 ChibiOS-4149bab2ca98e041d09d9908b04e634b84257f2c.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5297 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/ARMCM3-STM32F103-FATFS/main.c | 2 | ||||
| -rw-r--r-- | demos/ARMCM3-STM32F107-FATFS/main.c | 2 | ||||
| -rw-r--r-- | os/hal/platforms/STM32F1xx/platform_f105_f107.mk | 2 | ||||
| -rw-r--r-- | os/hal/src/mmc_spi.c | 2 | ||||
| -rw-r--r-- | os/various/fatfs_bindings/fatfs_diskio.c | 6 |
5 files changed, 8 insertions, 6 deletions
diff --git a/demos/ARMCM3-STM32F103-FATFS/main.c b/demos/ARMCM3-STM32F103-FATFS/main.c index 2fcd840dc..81888d0a0 100644 --- a/demos/ARMCM3-STM32F103-FATFS/main.c +++ b/demos/ARMCM3-STM32F103-FATFS/main.c @@ -253,7 +253,7 @@ static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) { chprintf(chp,
"FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",
clusters, (uint32_t)MMC_FS.csize,
- clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMC_SECTOR_SIZE);
+ clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);
fbuff[0] = 0;
scan_files(chp, (char *)fbuff);
}
diff --git a/demos/ARMCM3-STM32F107-FATFS/main.c b/demos/ARMCM3-STM32F107-FATFS/main.c index 75a4c82ab..afed273da 100644 --- a/demos/ARMCM3-STM32F107-FATFS/main.c +++ b/demos/ARMCM3-STM32F107-FATFS/main.c @@ -245,7 +245,7 @@ static void cmd_tree(BaseSequentialStream *chp, int argc, char *argv[]) { chprintf(chp,
"FS: %lu free clusters, %lu sectors per cluster, %lu bytes free\r\n",
clusters, (uint32_t)MMC_FS.csize,
- clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMC_SECTOR_SIZE);
+ clusters * (uint32_t)MMC_FS.csize * (uint32_t)MMCSD_BLOCK_SIZE);
fbuff[0] = 0;
scan_files(chp, (char *)fbuff);
}
diff --git a/os/hal/platforms/STM32F1xx/platform_f105_f107.mk b/os/hal/platforms/STM32F1xx/platform_f105_f107.mk index efc949763..5778a63eb 100644 --- a/os/hal/platforms/STM32F1xx/platform_f105_f107.mk +++ b/os/hal/platforms/STM32F1xx/platform_f105_f107.mk @@ -9,12 +9,12 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.c \ ${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/mac_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
- ${CHIBIOS}/os/hal/platforms/STM32/serial_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/sdc_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/GPIOv1/pal_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/I2Cv1/i2c_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/RTCv1/rtc_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/SPIv1/spi_lld.c \
+ ${CHIBIOS}/os/hal/platforms/STM32/USARTv1/serial_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/USARTv1/uart_lld.c \
${CHIBIOS}/os/hal/platforms/STM32/OTGv1/usb_lld.c
diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c index c06ce3351..b2fd5b724 100644 --- a/os/hal/src/mmc_spi.c +++ b/os/hal/src/mmc_spi.c @@ -559,6 +559,7 @@ bool_t mmcDisconnect(MMCDriver *mmcp) { chSysUnlock();
/* Wait for the pending write operations to complete.*/
+ spiStart(mmcp->config->spip, mmcp->config->hscfg);
sync(mmcp);
spiStop(mmcp->config->spip);
@@ -787,6 +788,7 @@ bool_t mmcSync(MMCDriver *mmcp) { if (mmcp->state != BLK_READY)
return CH_FAILED;
+ spiStart(mmcp->config->spip, mmcp->config->hscfg);
sync(mmcp);
return CH_SUCCESS;
}
diff --git a/os/various/fatfs_bindings/fatfs_diskio.c b/os/various/fatfs_bindings/fatfs_diskio.c index 1064a6875..c724fa5f9 100644 --- a/os/various/fatfs_bindings/fatfs_diskio.c +++ b/os/various/fatfs_bindings/fatfs_diskio.c @@ -125,7 +125,7 @@ DRESULT disk_read ( while (count > 0) {
if (mmcSequentialRead(&MMCD1, buff))
return RES_ERROR;
- buff += MMC_SECTOR_SIZE;
+ buff += MMCSD_BLOCK_SIZE;
count--;
}
if (mmcStopSequentialRead(&MMCD1))
@@ -168,7 +168,7 @@ DRESULT disk_write ( while (count > 0) {
if (mmcSequentialWrite(&MMCD1, buff))
return RES_ERROR;
- buff += MMC_SECTOR_SIZE;
+ buff += MMCSD_BLOCK_SIZE;
count--;
}
if (mmcStopSequentialWrite(&MMCD1))
@@ -205,7 +205,7 @@ DRESULT disk_ioctl ( case CTRL_SYNC:
return RES_OK;
case GET_SECTOR_SIZE:
- *((WORD *)buff) = MMC_SECTOR_SIZE;
+ *((WORD *)buff) = MMCSD_BLOCK_SIZE;
return RES_OK;
#if _USE_ERASE
case CTRL_ERASE_SECTOR:
|