py/mpstate: Drop MICROPY_PORT_ROOT_POINTERS from mp_state_vm_t.
All in-tree uses of MICROPY_PORT_ROOT_POINTERS have been replaced with MP_REGISTER_ROOT_POINTER(), so now we can remove both MICROPY_PORT_ROOT_POINTERS and MICROPY_BOARD_ROOT_POINTERS from the code and remaining config files. Signed-off-by: David Lechner <david@pybricks.com>
This commit is contained in:
parent
ccda7686a4
commit
7e4b205cb0
@ -237,14 +237,6 @@ extern const struct _mp_obj_type_t network_lan_type;
|
||||
|
||||
#define MICROPY_HW_PIT_NUM_CHANNELS 3
|
||||
|
||||
#ifndef MICROPY_BOARD_ROOT_POINTERS
|
||||
#define MICROPY_BOARD_ROOT_POINTERS
|
||||
#endif
|
||||
|
||||
#define MICROPY_PORT_ROOT_POINTERS \
|
||||
/* root pointers defined by a board */ \
|
||||
MICROPY_BOARD_ROOT_POINTERS \
|
||||
|
||||
#define MP_STATE_PORT MP_STATE_VM
|
||||
|
||||
// Miscellaneous settings
|
||||
|
@ -163,14 +163,6 @@
|
||||
|
||||
#define MP_STATE_PORT MP_STATE_VM
|
||||
|
||||
#ifndef MICROPY_BOARD_ROOT_POINTERS
|
||||
#define MICROPY_BOARD_ROOT_POINTERS
|
||||
#endif
|
||||
|
||||
#define MICROPY_PORT_ROOT_POINTERS \
|
||||
/* root pointers defined by a board */ \
|
||||
MICROPY_BOARD_ROOT_POINTERS \
|
||||
|
||||
// type definitions for the specific machine
|
||||
|
||||
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
|
||||
|
@ -204,13 +204,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_wiznet5k;
|
||||
MICROPY_HW_NIC_WIZNET5K \
|
||||
MICROPY_BOARD_NETWORK_INTERFACES \
|
||||
|
||||
#ifndef MICROPY_BOARD_ROOT_POINTERS
|
||||
#define MICROPY_BOARD_ROOT_POINTERS
|
||||
#endif
|
||||
|
||||
#define MICROPY_PORT_ROOT_POINTERS \
|
||||
MICROPY_BOARD_ROOT_POINTERS \
|
||||
|
||||
#define MP_STATE_PORT MP_STATE_VM
|
||||
|
||||
// Miscellaneous settings
|
||||
|
@ -238,14 +238,6 @@ extern const struct _mod_network_nic_type_t mod_network_nic_type_cc3k;
|
||||
|
||||
#define MP_STATE_PORT MP_STATE_VM
|
||||
|
||||
#ifndef MICROPY_BOARD_ROOT_POINTERS
|
||||
#define MICROPY_BOARD_ROOT_POINTERS
|
||||
#endif
|
||||
|
||||
#define MICROPY_PORT_ROOT_POINTERS \
|
||||
/* root pointers defined by a board */ \
|
||||
MICROPY_BOARD_ROOT_POINTERS \
|
||||
|
||||
// type definitions for the specific machine
|
||||
|
||||
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void *)((uint32_t)(p) | 1))
|
||||
|
@ -107,8 +107,6 @@
|
||||
#define MICROPY_PY_UHASHLIB (0)
|
||||
#define MICROPY_PY_UBINASCII (0)
|
||||
|
||||
#define MICROPY_PORT_ROOT_POINTERS \
|
||||
|
||||
#define mp_type_fileio mp_type_vfs_posix_fileio
|
||||
#define mp_type_textio mp_type_vfs_posix_textio
|
||||
|
||||
|
@ -1659,11 +1659,6 @@ typedef double mp_float_t;
|
||||
#define MICROPY_PORT_CONSTANTS
|
||||
#endif
|
||||
|
||||
// Any root pointers for GC scanning - see mpstate.c
|
||||
#ifndef MICROPY_PORT_ROOT_POINTERS
|
||||
#define MICROPY_PORT_ROOT_POINTERS
|
||||
#endif
|
||||
|
||||
/*****************************************************************************/
|
||||
/* Hooks for a port to wrap functions with attributes */
|
||||
|
||||
|
@ -189,9 +189,6 @@ typedef struct _mp_state_vm_t {
|
||||
mp_obj_t track_reloc_code_list;
|
||||
#endif
|
||||
|
||||
// include any root pointers defined by a port
|
||||
MICROPY_PORT_ROOT_POINTERS
|
||||
|
||||
// Include any root pointers registered with MP_REGISTER_ROOT_POINTER().
|
||||
#ifndef NO_QSTR
|
||||
// Only include root pointer definitions when not doing qstr extraction, because
|
||||
|
Loading…
Reference in New Issue
Block a user