stm32/storage: Provide support for a second block device. · micropython/micropython@0d5bcca
@@ -36,6 +36,10 @@
36363737#define FLASH_PART1_START_BLOCK (0x100)
383839+#if defined(MICROPY_HW_BDEV2_IOCTL)
40+#define FLASH_PART2_START_BLOCK (FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0))
41+#endif
42+3943static bool storage_is_initialised = false;
40444145void storage_init(void) {
@@ -44,6 +48,10 @@ void storage_init(void) {
44484549MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_INIT, 0);
465051+#if defined(MICROPY_HW_BDEV2_IOCTL)
52+MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_INIT, 0);
53+#endif
54+4755// Enable the flash IRQ, which is used to also call our storage IRQ handler
4856// It needs to go at a higher priority than all those components that rely on
4957// the flash storage (eg higher than USB MSC).
@@ -57,15 +65,25 @@ uint32_t storage_get_block_size(void) {
5765}
58665967uint32_t storage_get_block_count(void) {
68+#if defined(MICROPY_HW_BDEV2_IOCTL)
69+return FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
70+#else
6071return FLASH_PART1_START_BLOCK + MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0);
72+#endif
6173}
62746375void storage_irq_handler(void) {
6476MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
77+#if defined(MICROPY_HW_BDEV2_IOCTL)
78+MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_IRQ_HANDLER, 0);
79+#endif
6580}
66816782void storage_flush(void) {
6883MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_SYNC, 0);
84+#if defined(MICROPY_HW_BDEV2_IOCTL)
85+MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_SYNC, 0);
86+#endif
6987}
70887189static 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) {
114132 }
115133116134build_partition(dest + 446, 0, 0x01 /* FAT12 */, FLASH_PART1_START_BLOCK, MICROPY_HW_BDEV_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
135+#if defined(MICROPY_HW_BDEV2_IOCTL)
136+build_partition(dest + 462, 0, 0x01 /* FAT12 */, FLASH_PART2_START_BLOCK, MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0));
137+#else
117138build_partition(dest + 462, 0, 0, 0, 0);
139+#endif
118140build_partition(dest + 478, 0, 0, 0, 0);
119141build_partition(dest + 494, 0, 0, 0, 0);
120142@@ -153,6 +175,12 @@ mp_uint_t storage_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_bl
153175 }
154176#endif
155177178+#if defined(MICROPY_HW_BDEV2_READBLOCKS)
179+if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
180+return MICROPY_HW_BDEV2_READBLOCKS(dest, block_num - FLASH_PART2_START_BLOCK, num_blocks);
181+ }
182+#endif
183+156184for (size_t i = 0; i < num_blocks; i++) {
157185if (!storage_read_block(dest + i * FLASH_BLOCK_SIZE, block_num + i)) {
158186return 1; // error
@@ -168,6 +196,12 @@ mp_uint_t storage_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t
168196 }
169197#endif
170198199+#if defined(MICROPY_HW_BDEV2_WRITEBLOCKS)
200+if (FLASH_PART2_START_BLOCK <= block_num && block_num + num_blocks <= FLASH_PART2_START_BLOCK + MICROPY_HW_BDEV2_IOCTL(BDEV_IOCTL_NUM_BLOCKS, 0)) {
201+return MICROPY_HW_BDEV2_WRITEBLOCKS(src, block_num - FLASH_PART2_START_BLOCK, num_blocks);
202+ }
203+#endif
204+171205for (size_t i = 0; i < num_blocks; i++) {
172206if (!storage_write_block(src + i * FLASH_BLOCK_SIZE, block_num + i)) {
173207return 1; // error