ports: Convert from using stmhal's input() to core provided version.

dpgeorge · dpgeorge · commit 6ff0ecfffcea · 2017-06-01T16:02:49.000+10:00
diff --git a/cc3200/application.mk b/cc3200/application.mk
@@ -151,7 +151,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\
 	
 APP_STM_SRC_C = $(addprefix stmhal/,\
 	bufhelper.c \
-	input.c \
 	irq.c \
 	pybstdio.c \
 	)
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
@@ -80,6 +80,7 @@
 #define MICROPY_VFS_FAT                             (1)
 #define MICROPY_PY_ASYNC_AWAIT (0)
 #define MICROPY_PY_ALL_SPECIAL_METHODS              (1)
+#define MICROPY_PY_BUILTINS_INPUT                   (1)
 #define MICROPY_PY_BUILTINS_HELP                    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT               cc3200_help_text
 #ifndef DEBUG
@@ -142,7 +143,6 @@
 
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj },  \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open),  (mp_obj_t)&mp_builtin_open_obj },   \
 
 // extra built in modules to add to the list of known ones
diff --git a/esp8266/Makefile b/esp8266/Makefile
@@ -94,7 +94,6 @@ SRC_C = \
 
 STM_SRC_C = $(addprefix stmhal/,\
 	pybstdio.c \
-	input.c \
 	)
 
 EXTMOD_SRC_C = $(addprefix extmod/,\
diff --git a/esp8266/mpconfigport.h b/esp8266/mpconfigport.h
@@ -39,6 +39,7 @@
 #define MICROPY_PY_BUILTINS_SLICE   (1)
 #define MICROPY_PY_BUILTINS_SLICE_ATTRS (1)
 #define MICROPY_PY_BUILTINS_PROPERTY (1)
+#define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT esp_help_text
 #define MICROPY_PY_BUILTINS_HELP_MODULES (1)
@@ -147,7 +148,6 @@ void *esp_native_code_commit(void*, size_t);
 
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
 
 // extra built in modules to add to the list of known ones
diff --git a/stmhal/Makefile b/stmhal/Makefile
@@ -147,7 +147,6 @@ SRC_C = \
 	gccollect.c \
 	pybstdio.c \
 	help.c \
-	input.c \
 	machine_i2c.c \
 	modmachine.c \
 	modpyb.c \
diff --git a/stmhal/input.c b/stmhal/input.c
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
@@ -87,6 +87,7 @@
 #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
 #define MICROPY_PY_BUILTINS_COMPILE (1)
 #define MICROPY_PY_BUILTINS_EXECFILE (1)
+#define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_POW3    (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT stmhal_help_text
@@ -159,7 +160,6 @@
 
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
     { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
 
 // extra built in modules to add to the list of known ones
diff --git a/teensy/Makefile b/teensy/Makefile
@@ -93,7 +93,6 @@ SRC_C = \
 
 STM_SRC_C = $(addprefix stmhal/,\
 	gccollect.c \
-	input.c \
 	irq.c \
 	pin.c \
 	pin_named_pins.c \
diff --git a/teensy/mpconfigport.h b/teensy/mpconfigport.h
@@ -14,6 +14,7 @@
 #define MICROPY_FLOAT_IMPL          (MICROPY_FLOAT_IMPL_FLOAT)
 #define MICROPY_OPT_COMPUTED_GOTO   (1)
 
+#define MICROPY_PY_BUILTINS_INPUT   (1)
 #define MICROPY_PY_BUILTINS_HELP    (1)
 #define MICROPY_PY_BUILTINS_HELP_TEXT teensy_help_text
 
@@ -31,7 +32,6 @@
 
 // extra built in names to add to the global namespace
 #define MICROPY_PORT_BUILTINS \
-    { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
 
 // extra built in modules to add to the list of known ones
 extern const struct _mp_obj_module_t os_module;

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\`
`151`	`151`
`152`	`152`	`APP_STM_SRC_C = $(addprefix stmhal/,\`
`153`	`153`	`bufhelper.c \`
`154`		`- input.c \`
`155`	`154`	`irq.c \`
`156`	`155`	`pybstdio.c \`
`157`	`156`	`)`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,6 @@ SRC_C = \`
`94`	`94`
`95`	`95`	`STM_SRC_C = $(addprefix stmhal/,\`
`96`	`96`	`pybstdio.c \`
`97`		`- input.c \`
`98`	`97`	`)`
`99`	`98`
`100`	`99`	`EXTMOD_SRC_C = $(addprefix extmod/,\`