aboutsummaryrefslogtreecommitdiff
path: root/stmhal
diff options
context:
space:
mode:
authorDamien George2014-10-12 23:35:38 +0100
committerDamien George2014-10-12 23:35:38 +0100
commit4b71c056efef42d8bb81b980e0fd53ec0597249d (patch)
tree68e075237bbf752f3d1289349d87ff9b897629fe /stmhal
parent29f56826218b3df81eeeaa6e1cdc36890a836e87 (diff)
moduzlib: Fix fn prototype and some code style; use it in stmhal port.
Diffstat (limited to 'stmhal')
-rw-r--r--stmhal/mpconfigport.h4
-rw-r--r--stmhal/qstrdefsport.h1
2 files changed, 4 insertions, 1 deletions
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
index 591681605..a63263132 100644
--- a/stmhal/mpconfigport.h
+++ b/stmhal/mpconfigport.h
@@ -57,7 +57,7 @@
#define MICROPY_PY_IO (1)
#define MICROPY_PY_IO_FILEIO (1)
#define MICROPY_PY_UCTYPES (1)
-#define MICROPY_PY_ZLIBD (1)
+#define MICROPY_PY_UZLIB (1)
#define MICROPY_PY_UJSON (1)
#define MICROPY_PY_URE (1)
@@ -77,6 +77,7 @@ extern const struct _mp_obj_fun_builtin_t mp_builtin_open_obj;
extern const struct _mp_obj_module_t pyb_module;
extern const struct _mp_obj_module_t stm_module;
extern const struct _mp_obj_module_t mp_module_ure;
+extern const struct _mp_obj_module_t mp_module_uzlib;
extern const struct _mp_obj_module_t mp_module_ujson;
extern const struct _mp_obj_module_t mp_module_uos;
extern const struct _mp_obj_module_t mp_module_utime;
@@ -95,6 +96,7 @@ extern const struct _mp_obj_module_t mp_module_network;
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_re), (mp_obj_t)&mp_module_ure }, \
+ { MP_OBJ_NEW_QSTR(MP_QSTR_zlib), (mp_obj_t)&mp_module_uzlib }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_json), (mp_obj_t)&mp_module_ujson }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&mp_module_uos }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_utime }, \
diff --git a/stmhal/qstrdefsport.h b/stmhal/qstrdefsport.h
index 2cb586b0b..075cfe2f7 100644
--- a/stmhal/qstrdefsport.h
+++ b/stmhal/qstrdefsport.h
@@ -73,6 +73,7 @@ Q(elapsed_micros)
// for module weak links
Q(re)
+Q(zlib)
Q(json)
// for file class