Skip to content

Commit 2d9a0c7

Browse files
tannewttannewt
committed
atmel-samd: Switch to MICROPY_PORT_ROOT_POINTERS for the flash cache.
1 parent 05c14df commit 2d9a0c7

14 files changed

Lines changed: 33 additions & 50 deletions

File tree

‎atmel-samd/boards/arduino_zero/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
#define AUTORESET_DELAY_MS 500
1313

14-
#define FLASH_INCLUDE "internal_flash.h"
14+
#include "internal_flash.h"

‎atmel-samd/boards/cplay_m0_flash/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919

2020
#define AUTORESET_DELAY_MS 500
2121

22-
#define FLASH_INCLUDE "spi_flash.h"
22+
#include "spi_flash.h"

‎atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
#define AUTORESET_DELAY_MS 500
1010

11-
#define FLASH_INCLUDE "internal_flash.h"
11+
#include "internal_flash.h"

‎atmel-samd/boards/feather_m0_basic/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
#define AUTORESET_DELAY_MS 500
1010

11-
#define FLASH_INCLUDE "internal_flash.h"
11+
#include "internal_flash.h"

‎atmel-samd/boards/feather_m0_flash/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020

2121
#define AUTORESET_DELAY_MS 500
2222

23-
#define FLASH_INCLUDE "spi_flash.h"
23+
#include "spi_flash.h"

‎atmel-samd/boards/gemma_m0/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
#define AUTORESET_DELAY_MS 500
99

10-
#define FLASH_INCLUDE "internal_flash.h"
10+
#include "internal_flash.h"

‎atmel-samd/boards/metro_m0_flash/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434

3535
#define AUTORESET_DELAY_MS 500
3636

37-
#define FLASH_INCLUDE "spi_flash.h"
37+
#include "spi_flash.h"

‎atmel-samd/boards/trinket_m0/mpconfigboard.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77

88
#define AUTORESET_DELAY_MS 500
99

10-
#define FLASH_INCLUDE "internal_flash.h"
10+
#include "internal_flash.h"

‎atmel-samd/internal_flash.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,6 @@ mp_uint_t internal_flash_write_blocks(const uint8_t *src, uint32_t block_num, ui
242242
return 0; // success
243243
}
244244

245-
void mark_flash_cache_for_gc(void) {}
246-
247245
/******************************************************************************/
248246
// MicroPython bindings
249247
//

‎atmel-samd/internal_flash.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
#include "mpconfigport.h"
3232

33+
#define FLASH_ROOT_POINTERS (0)
34+
3335
#define INTERNAL_FLASH_BLOCK_SIZE (512)
3436

3537
#define INTERNAL_FLASH_SYSTICK_MASK (0x1ff) // 512ms
@@ -47,8 +49,6 @@ bool internal_flash_write_block(const uint8_t *src, uint32_t block);
4749
mp_uint_t internal_flash_read_blocks(uint8_t *dest, uint32_t block_num, uint32_t num_blocks);
4850
mp_uint_t internal_flash_write_blocks(const uint8_t *src, uint32_t block_num, uint32_t num_blocks);
4951

50-
void mark_flash_cache_for_gc(void);
51-
5252
extern const struct _mp_obj_type_t internal_flash_type;
5353

5454
struct _fs_user_mount_t;

0 commit comments

Comments
 (0)