diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-17 22:11:48 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-17 22:11:48 +0100 |
commit | 1e935d8689f3d15dc3bd06f08f2a0305b7e1c7f4 (patch) | |
tree | 785c4600c8f0e1d2f807b2593c96ad45002da722 /unix/modffi.c | |
parent | 729f7b42d65c016c9d5f27fb8a8122869f06c129 (diff) | |
parent | 4abaa1b12b81cfe2fb45d5b2fa36a282c15c328d (diff) | |
download | micropython-1e935d8689f3d15dc3bd06f08f2a0305b7e1c7f4.tar.gz micropython-1e935d8689f3d15dc3bd06f08f2a0305b7e1c7f4.zip |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'unix/modffi.c')
-rw-r--r-- | unix/modffi.c | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/unix/modffi.c b/unix/modffi.c index f2bd6fcecf..fd48aa17ec 100644 --- a/unix/modffi.c +++ b/unix/modffi.c @@ -365,11 +365,26 @@ mp_obj_t mod_ffi_as_bytearray(mp_obj_t ptr, mp_obj_t size) { } MP_DEFINE_CONST_FUN_OBJ_2(mod_ffi_as_bytearray_obj, mod_ffi_as_bytearray); +STATIC const mp_map_elem_t mp_module_ffi_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_ffi) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mod_ffi_open_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_callback), (mp_obj_t)&mod_ffi_callback_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_as_bytearray), (mp_obj_t)&mod_ffi_as_bytearray_obj }, +}; -void ffi_init() { - mp_obj_t m = mp_obj_new_module(QSTR_FROM_STR_STATIC("ffi")); - mp_store_attr(m, MP_QSTR_open, (mp_obj_t)&mod_ffi_open_obj); - mp_store_attr(m, QSTR_FROM_STR_STATIC("callback"), (mp_obj_t)&mod_ffi_callback_obj); - // there would be as_bytes, but bytes currently is value, not reference type! - mp_store_attr(m, QSTR_FROM_STR_STATIC("as_bytearray"), (mp_obj_t)&mod_ffi_as_bytearray_obj); -} +STATIC const mp_obj_dict_t mp_module_ffi_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = sizeof(mp_module_ffi_globals_table) / sizeof(mp_map_elem_t), + .alloc = sizeof(mp_module_ffi_globals_table) / sizeof(mp_map_elem_t), + .table = (mp_map_elem_t*)mp_module_ffi_globals_table, + }, +}; + +const mp_obj_module_t mp_module_ffi = { + .base = { &mp_type_module }, + .name = MP_QSTR_ffi, + .globals = (mp_obj_dict_t*)&mp_module_ffi_globals, +}; |