diff options
author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-02-06 14:48:58 +0200 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-02-06 15:07:01 +0200 |
commit | 97a0846af906cde677742bff810fb7965c38fbb7 (patch) | |
tree | f7cabd3529645afc62463a105116398fdcd825af /stmhal/diskio.c | |
parent | ff1a96ce2cd95c42beca5209b353f83da773522d (diff) | |
download | micropython-97a0846af906cde677742bff810fb7965c38fbb7.tar.gz micropython-97a0846af906cde677742bff810fb7965c38fbb7.zip |
stmhal/diskio: Introduce MICROPY_HW_HAS_FLASH setting.
To allow to reuse stmhal/diskio for ports which don't have flash but have
other storage devices.
Diffstat (limited to 'stmhal/diskio.c')
-rw-r--r-- | stmhal/diskio.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/stmhal/diskio.c b/stmhal/diskio.c index 6d0a8b40cd..136291d5c2 100644 --- a/stmhal/diskio.c +++ b/stmhal/diskio.c @@ -30,7 +30,7 @@ #include <stdint.h> #include <stdio.h> -#include STM32_HAL_H +#include "py/mphal.h" #include "py/runtime.h" #include "lib/fatfs/ff.h" /* FatFs lower layer API */ @@ -60,9 +60,11 @@ DSTATUS disk_initialize ( ) { switch (pdrv) { +#if MICROPY_HW_HAS_FLASH case PD_FLASH: storage_init(); return 0; +#endif #if MICROPY_HW_HAS_SDCARD case PD_SDCARD: @@ -130,6 +132,7 @@ DRESULT disk_read ( ) { switch (pdrv) { +#if MICROPY_HW_HAS_FLASH case PD_FLASH: for (int i = 0; i < count; i++) { if (!storage_read_block(buff + i * FLASH_BLOCK_SIZE, sector + i)) { @@ -137,6 +140,7 @@ DRESULT disk_read ( } } return RES_OK; +#endif #if MICROPY_HW_HAS_SDCARD case PD_SDCARD: @@ -173,6 +177,7 @@ DRESULT disk_write ( ) { switch (pdrv) { +#if MICROPY_HW_HAS_FLASH case PD_FLASH: for (int i = 0; i < count; i++) { if (!storage_write_block(buff + i * FLASH_BLOCK_SIZE, sector + i)) { @@ -180,6 +185,7 @@ DRESULT disk_write ( } } return RES_OK; +#endif #if MICROPY_HW_HAS_SDCARD case PD_SDCARD: @@ -221,6 +227,7 @@ DRESULT disk_ioctl ( ) { switch (pdrv) { +#if MICROPY_HW_HAS_FLASH case PD_FLASH: switch (cmd) { case CTRL_SYNC: @@ -232,6 +239,7 @@ DRESULT disk_ioctl ( return RES_OK; } break; +#endif #if MICROPY_HW_HAS_SDCARD case PD_SDCARD: |