djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/storage: Provide support for a second block device.

This commit is contained in:
Damien George 2018-03-10 01:03:27 +11:00
parent bb3359f357
commit 0d5bccad11
1 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ports/stm32/storage.c
View File

@ -36,6 +36,10 @@
#define FLASH_PART1_START_BLOCK (0x100) #define FLASH_PART1_START_BLOCK (0x100)
#if defined(MICROPY_HW_BDEV2_IOCTL)
#define FLASH_PART2_START_BLOCK (FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0))
#endif
static bool storage_is_initialised = false; static bool storage_is_initialised = false;
void storage_init(void) { void storage_init(void) {
@ -44,6 +48,10 @@ void storage_init(void) {
MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_INIT, 0); MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_INIT, 0);
#if defined(MICROPY_HW_BDEV2_IOCTL)
MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_INIT, 0);
#endif
// Enable the flash IRQ, which is used to also call our storage IRQ handler // Enable the flash IRQ, which is used to also call our storage IRQ handler
// It needs to go at a higher priority than all those components that rely on // It needs to go at a higher priority than all those components that rely on
// the flash storage (eg higher than USB MSC). // the flash storage (eg higher than USB MSC).
@ -57,15 +65,25 @@ uint32_t storage_get_block_size(void) {
} }
uint32_t storage_get_block_count(void) { uint32_t storage_get_block_count(void) {
#if defined(MICROPY_HW_BDEV2_IOCTL)
return FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
#else
return FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0); return FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
#endif
} }
void storage_irq_handler(void) { void storage_irq_handler(void) {
MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0); MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
#if defined(MICROPY_HW_BDEV2_IOCTL)
MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
#endif
} }
void storage_flush(void) { void storage_flush(void) {
MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_SYNC, 0); MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_SYNC, 0);
#if defined(MICROPY_HW_BDEV2_IOCTL)
MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_SYNC, 0);
#endif
} }
static void build_partition(uint8_t *buf, int boot, int type, uint32_t start_block, uint32_t num_blocks) { static void build_partition(uint8_t *buf, int boot, int type, uint32_t start_block, uint32_t num_blocks) {
@ -114,7 +132,11 @@ bool storage_read_block(uint8_t *dest, uint32_t block) {
} }
build_partition(dest + 446, 0, 0x01 /* FAT12 */, FLASH_PART1_START_BLOCK, MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)); build_partition(dest + 446, 0, 0x01 /* FAT12 */, FLASH_PART1_START_BLOCK, MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
#if defined(MICROPY_HW_BDEV2_IOCTL)
build_partition(dest + 462, 0, 0x01 /* FAT12 */, FLASH_PART2_START_BLOCK, MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
#else
build_partition(dest + 462, 0, 0, 0, 0); build_partition(dest + 462, 0, 0, 0, 0);
#endif
build_partition(dest + 478, 0, 0, 0, 0); build_partition(dest + 478, 0, 0, 0, 0);
build_partition(dest + 494, 0, 0, 0, 0); build_partition(dest + 494, 0, 0, 0, 0);
@ -153,6 +175,12 @@ mp_uint_t storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_bl
} }
#endif #endif
#if defined(MICROPY_HW_BDEV2_READBLOCKS)
if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
return MICROPY_HW_BDEV2_READBLOCKS(dest, block_num - FLASH_PART2_START_BLOCK, num_blocks);
}
#endif
for (size_t i = 0; i < num_blocks; i++) { for (size_t i = 0; i < num_blocks; i++) {
if (!storage_read_block(dest + i * FLASH_BLOCK_SIZE, block_num + i)) { if (!storage_read_block(dest + i * FLASH_BLOCK_SIZE, block_num + i)) {
return 1; // error return 1; // error
@ -168,6 +196,12 @@ mp_uint_t storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t
} }
#endif #endif
#if defined(MICROPY_HW_BDEV2_WRITEBLOCKS)
if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
return MICROPY_HW_BDEV2_WRITEBLOCKS(src, block_num - FLASH_PART2_START_BLOCK, num_blocks);
}
#endif
for (size_t i = 0; i < num_blocks; i++) { for (size_t i = 0; i < num_blocks; i++) {
if (!storage_write_block(src + i * FLASH_BLOCK_SIZE, block_num + i)) { if (!storage_write_block(src + i * FLASH_BLOCK_SIZE, block_num + i)) {
return 1; // error return 1; // error