summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-06 02:27:29 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-05-06 02:28:49 +0300
commit33b3a6905d30157efa8393893fd11a5104834354 (patch)
tree8cfa43b414029a50fca161b20b3271ebcac997cf
parentf9e54e0ea53c774c4458c4af11764e5b929a2b33 (diff)
downloadmicropython-33b3a6905d30157efa8393893fd11a5104834354.tar.gz
micropython-33b3a6905d30157efa8393893fd11a5104834354.zip
stmhal: pyb: Use gc() function as defined by standard module "gc".
TODO: Get rid of this compatibility define and rely on standard module.
-rw-r--r--stmhal/gccollect.c7
-rw-r--r--stmhal/gccollect.h2
-rw-r--r--stmhal/modpyb.c2
3 files changed, 2 insertions, 9 deletions
diff --git a/stmhal/gccollect.c b/stmhal/gccollect.c
index 81405da095..79082e2f2e 100644
--- a/stmhal/gccollect.c
+++ b/stmhal/gccollect.c
@@ -72,10 +72,3 @@ void gc_collect(void) {
printf(" 1=" UINT_FMT " 2=" UINT_FMT " m=" UINT_FMT "\n", info.num_1block, info.num_2block, info.max_block);
}
}
-
-static mp_obj_t pyb_gc(void) {
- gc_collect();
- return mp_const_none;
-}
-
-MP_DEFINE_CONST_FUN_OBJ_0(pyb_gc_obj, pyb_gc);
diff --git a/stmhal/gccollect.h b/stmhal/gccollect.h
index 03353056a2..df563d3899 100644
--- a/stmhal/gccollect.h
+++ b/stmhal/gccollect.h
@@ -40,4 +40,4 @@ extern uint32_t _ram_end;
void gc_collect(void);
-MP_DECLARE_CONST_FUN_OBJ(pyb_gc_obj);
+MP_DECLARE_CONST_FUN_OBJ(gc_collect_obj);
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index 010eb07c70..c8d9a5d802 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -305,7 +305,7 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = {
{ MP_OBJ_NEW_QSTR(MP_QSTR_info), (mp_obj_t)&pyb_info_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_unique_id), (mp_obj_t)&pyb_unique_id_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_freq), (mp_obj_t)&pyb_freq_obj },
- { MP_OBJ_NEW_QSTR(MP_QSTR_gc), (mp_obj_t)&pyb_gc_obj },
+ { MP_OBJ_NEW_QSTR(MP_QSTR_gc), (mp_obj_t)&gc_collect_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_repl_info), (mp_obj_t)&pyb_set_repl_info_obj },
{ MP_OBJ_NEW_QSTR(MP_QSTR_wfi), (mp_obj_t)&pyb_wfi_obj },