Skip to content

Commit bfc3dde

Browse files
committed
extmod/modmachine: Add MICROPY_PY_MACHINE_RESET configuration option.
Disabled by default, but enabled on all boards that previously had `MICROPY_PY_MACHINE_BARE_METAL_FUNCS` enabled. Signed-off-by: Damien George <[email protected]>
1 parent dd134e4 commit bfc3dde

File tree

11 files changed

+30
-9
lines changed

11 files changed

+30
-9
lines changed

extmod/modmachine.c

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,13 @@ static void mp_machine_idle(void);
4343
NORETURN void mp_machine_bootloader(size_t n_args, const mp_obj_t *args);
4444
#endif
4545

46-
#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
47-
static mp_obj_t mp_machine_unique_id(void);
46+
#if MICROPY_PY_MACHINE_RESET
4847
NORETURN static void mp_machine_reset(void);
4948
static mp_int_t mp_machine_reset_cause(void);
49+
#endif
50+
51+
#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
52+
static mp_obj_t mp_machine_unique_id(void);
5053
static mp_obj_t mp_machine_get_freq(void);
5154
static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args);
5255
static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args);
@@ -77,12 +80,7 @@ static mp_obj_t machine_idle(void) {
7780
}
7881
static MP_DEFINE_CONST_FUN_OBJ_0(machine_idle_obj, machine_idle);
7982

80-
#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
81-
82-
static mp_obj_t machine_unique_id(void) {
83-
return mp_machine_unique_id();
84-
}
85-
MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
83+
#if MICROPY_PY_MACHINE_RESET
8684

8785
NORETURN static mp_obj_t machine_reset(void) {
8886
mp_machine_reset();
@@ -94,6 +92,15 @@ static mp_obj_t machine_reset_cause(void) {
9492
}
9593
MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
9694

95+
#endif
96+
97+
#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
98+
99+
static mp_obj_t machine_unique_id(void) {
100+
return mp_machine_unique_id();
101+
}
102+
MP_DEFINE_CONST_FUN_OBJ_0(machine_unique_id_obj, machine_unique_id);
103+
97104
static mp_obj_t machine_freq(size_t n_args, const mp_obj_t *args) {
98105
if (n_args == 0) {
99106
return mp_machine_get_freq();
@@ -154,7 +161,7 @@ static const mp_rom_map_elem_t machine_module_globals_table[] = {
154161
#if MICROPY_PY_MACHINE_BOOTLOADER
155162
{ MP_ROM_QSTR(MP_QSTR_bootloader), MP_ROM_PTR(&machine_bootloader_obj) },
156163
#endif
157-
#if MICROPY_PY_MACHINE_BARE_METAL_FUNCS
164+
#if MICROPY_PY_MACHINE_RESET
158165
{ MP_ROM_QSTR(MP_QSTR_reset), MP_ROM_PTR(&machine_reset_obj) },
159166
{ MP_ROM_QSTR(MP_QSTR_reset_cause), MP_ROM_PTR(&machine_reset_cause_obj) },
160167
#endif

ports/cc3200/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
#define MICROPY_PY_VFS (1)
128128
#define MICROPY_PY_MACHINE (1)
129129
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/cc3200/mods/modmachine.c"
130+
#define MICROPY_PY_MACHINE_RESET (1)
130131
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
131132
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
132133
#define MICROPY_PY_MACHINE_WDT (1)

ports/esp32/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@
114114
#define MICROPY_PY_OS_URANDOM (1)
115115
#define MICROPY_PY_MACHINE (1)
116116
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp32/modmachine.c"
117+
#define MICROPY_PY_MACHINE_RESET (1)
117118
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
118119
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
119120
#define MICROPY_PY_MACHINE_ADC (1)

ports/esp8266/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#define MICROPY_PY_LWIP_SOCK_RAW (1)
6767
#define MICROPY_PY_MACHINE (1)
6868
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/esp8266/modmachine.c"
69+
#define MICROPY_PY_MACHINE_RESET (1)
6970
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
7071
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
7172
#define MICROPY_PY_MACHINE_ADC (1)

ports/mimxrt/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ uint32_t trng_random_u32(void);
7979
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (trng_random_u32())
8080
#define MICROPY_PY_MACHINE (1)
8181
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/mimxrt/modmachine.c"
82+
#define MICROPY_PY_MACHINE_RESET (1)
8283
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
8384
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
8485
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)

ports/nrf/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@
174174
#define MICROPY_PY_TIME (1)
175175
#define MICROPY_PY_MACHINE (1)
176176
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/nrf/modules/machine/modmachine.c"
177+
#define MICROPY_PY_MACHINE_RESET (1)
177178
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
178179
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
179180
#define MICROPY_PY_MACHINE_PULSE (0)

ports/renesas-ra/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
#ifndef MICROPY_PY_MACHINE
132132
#define MICROPY_PY_MACHINE (1)
133133
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/renesas-ra/modmachine.c"
134+
#define MICROPY_PY_MACHINE_RESET (1)
134135
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
135136
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
136137
#define MICROPY_PY_MACHINE_ADC (1)

ports/rp2/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
#define MICROPY_PY_RANDOM_SEED_INIT_FUNC (rosc_random_u32())
116116
#define MICROPY_PY_MACHINE (1)
117117
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/rp2/modmachine.c"
118+
#define MICROPY_PY_MACHINE_RESET (1)
118119
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
119120
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
120121
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)

ports/samd/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
#define MICROPY_PY_TIME_INCLUDEFILE "ports/samd/modtime.c"
7474
#define MICROPY_PY_MACHINE (1)
7575
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/samd/modmachine.c"
76+
#define MICROPY_PY_MACHINE_RESET (1)
7677
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
7778
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
7879
#define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)

ports/stm32/mpconfigport.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
#ifndef MICROPY_PY_MACHINE
112112
#define MICROPY_PY_MACHINE (1)
113113
#define MICROPY_PY_MACHINE_INCLUDEFILE "ports/stm32/modmachine.c"
114+
#define MICROPY_PY_MACHINE_RESET (1)
114115
#define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
115116
#define MICROPY_PY_MACHINE_BOOTLOADER (1)
116117
#define MICROPY_PY_MACHINE_ADC (1)

0 commit comments

Comments
 (0)