Skip to content

Commit 2eb844e

Browse files
pfalconpfalcon
committed
ports: Rename "machine" module to "umachine".
To let unix port implement "machine" functionality on Python level, and keep consistent naming in other ports (baremetal ports will use magic module "symlinking" to still load it on "import machine"). Fixes adafruit#1701.
1 parent 2195046 commit 2eb844e

File tree

9 files changed

+14
-14
lines changed

9 files changed

+14
-14
lines changed

‎cc3200/mods/modmachine.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ STATIC mp_obj_t machine_wake_reason (void) {
165165
STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_wake_reason_obj, machine_wake_reason);
166166

167167
STATIC const mp_map_elem_t machine_module_globals_table[] = {
168-
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_machine) },
168+
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_umachine) },
169169

170170
{ MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&machine_reset_obj },
171171
#ifdef DEBUG
@@ -212,6 +212,6 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table
212212

213213
const mp_obj_module_t machine_module = {
214214
.base = { &mp_type_module },
215-
.name = MP_QSTR_machine,
215+
.name = MP_QSTR_umachine,
216216
.globals = (mp_obj_dict_t*)&machine_module_globals,
217217
};

‎cc3200/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ extern const struct _mp_obj_module_t mp_module_ubinascii;
134134
extern const struct _mp_obj_module_t mp_module_ussl;
135135

136136
#define MICROPY_PORT_BUILTIN_MODULES \
137-
{ MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&machine_module }, \
137+
{ MP_OBJ_NEW_QSTR(MP_QSTR_umachine), (mp_obj_t)&machine_module }, \
138138
{ MP_OBJ_NEW_QSTR(MP_QSTR_wipy), (mp_obj_t)&wipy_module }, \
139139
{ MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&mp_module_uos }, \
140140
{ MP_OBJ_NEW_QSTR(MP_QSTR_utime), (mp_obj_t)&mp_module_utime }, \
@@ -157,7 +157,7 @@ extern const struct _mp_obj_module_t mp_module_ussl;
157157

158158
// extra constants
159159
#define MICROPY_PORT_CONSTANTS \
160-
{ MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&machine_module }, \
160+
{ MP_OBJ_NEW_QSTR(MP_QSTR_umachine), (mp_obj_t)&machine_module }, \
161161

162162
// vm state and root pointers for the gc
163163
#define MP_STATE_PORT MP_STATE_VM

‎cc3200/qstrdefsport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727

2828
// for machine module
29-
Q(machine)
29+
Q(umachine)
3030
#ifdef DEBUG
3131
Q(info)
3232
#endif

‎py/qstrdefs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ Q(b2a_base64)
613613
#endif
614614

615615
#if MICROPY_PY_MACHINE
616-
Q(machine)
616+
Q(umachine)
617617
Q(mem)
618618
Q(mem8)
619619
Q(mem16)

‎stmhal/modmachine.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(machine_reset_cause_obj, machine_reset_cause);
419419
#endif
420420

421421
STATIC const mp_map_elem_t machine_module_globals_table[] = {
422-
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_machine) },
422+
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_umachine) },
423423
{ MP_OBJ_NEW_QSTR(MP_QSTR_info), (mp_obj_t)&machine_info_obj },
424424
{ MP_OBJ_NEW_QSTR(MP_QSTR_unique_id), (mp_obj_t)&machine_unique_id_obj },
425425
{ MP_OBJ_NEW_QSTR(MP_QSTR_reset), (mp_obj_t)&machine_reset_obj },
@@ -475,7 +475,7 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table
475475

476476
const mp_obj_module_t machine_module = {
477477
.base = { &mp_type_module },
478-
.name = MP_QSTR_machine,
478+
.name = MP_QSTR_umachine,
479479
.globals = (mp_obj_dict_t*)&machine_module_globals,
480480
};
481481

‎stmhal/mpconfigport.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ extern const struct _mp_obj_module_t mp_module_usocket;
115115
extern const struct _mp_obj_module_t mp_module_network;
116116

117117
#define MICROPY_PORT_BUILTIN_MODULES \
118-
{ MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&machine_module }, \
118+
{ MP_OBJ_NEW_QSTR(MP_QSTR_umachine), (mp_obj_t)&machine_module }, \
119119
{ MP_OBJ_NEW_QSTR(MP_QSTR_pyb), (mp_obj_t)&pyb_module }, \
120120
{ MP_OBJ_NEW_QSTR(MP_QSTR_stm), (mp_obj_t)&stm_module }, \
121121
{ MP_OBJ_NEW_QSTR(MP_QSTR_uos), (mp_obj_t)&mp_module_uos }, \
@@ -139,7 +139,7 @@ extern const struct _mp_obj_module_t mp_module_network;
139139

140140
// extra constants
141141
#define MICROPY_PORT_CONSTANTS \
142-
{ MP_OBJ_NEW_QSTR(MP_QSTR_machine), (mp_obj_t)&machine_module }, \
142+
{ MP_OBJ_NEW_QSTR(MP_QSTR_umachine), (mp_obj_t)&machine_module }, \
143143
{ MP_OBJ_NEW_QSTR(MP_QSTR_pyb), (mp_obj_t)&pyb_module }, \
144144
{ MP_OBJ_NEW_QSTR(MP_QSTR_stm), (mp_obj_t)&stm_module }, \
145145

‎stmhal/qstrdefsport.h‎

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

2929
Q(help)
3030
Q(pyb)
31-
Q(machine)
31+
Q(umachine)
3232
Q(unique_id)
3333
Q(bootloader)
3434
Q(hard_reset)

‎unix/modmachine.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ uintptr_t machine_mem_get_write_addr(mp_obj_t addr_o, uint align) {
7777
}
7878

7979
STATIC const mp_rom_map_elem_t machine_module_globals_table[] = {
80-
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_machine) },
80+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_umachine) },
8181

8282
{ MP_ROM_QSTR(MP_QSTR_mem8), MP_ROM_PTR(&machine_mem8_obj) },
8383
{ MP_ROM_QSTR(MP_QSTR_mem16), MP_ROM_PTR(&machine_mem16_obj) },
@@ -88,7 +88,7 @@ STATIC MP_DEFINE_CONST_DICT(machine_module_globals, machine_module_globals_table
8888

8989
const mp_obj_module_t mp_module_machine = {
9090
.base = { &mp_type_module },
91-
.name = MP_QSTR_machine,
91+
.name = MP_QSTR_umachine,
9292
.globals = (mp_obj_dict_t*)&machine_module_globals,
9393
};
9494

‎unix/mpconfigport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ extern const struct _mp_obj_module_t mp_module_jni;
172172
MICROPY_PY_JNI_DEF \
173173
MICROPY_PY_TIME_DEF \
174174
MICROPY_PY_SOCKET_DEF \
175-
{ MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
175+
{ MP_ROM_QSTR(MP_QSTR_umachine), MP_ROM_PTR(&mp_module_machine) }, \
176176
{ MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_os) }, \
177177
MICROPY_PY_USELECT_DEF \
178178
MICROPY_PY_TERMIOS_DEF \

0 commit comments

Comments
 (0)