Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
4b71c056
Commit
4b71c056
authored
Oct 12, 2014
by
Damien George
Browse files
moduzlib: Fix fn prototype and some code style; use it in stmhal port.
parent
29f56826
Changes
3
Hide whitespace changes
Inline
Side-by-side
extmod/moduzlib.c
View file @
4b71c056
...
...
@@ -48,8 +48,7 @@
#define DEBUG_printf(...) (void)0
#endif
STATIC
int
mod_uzlib_grow_buf
(
TINF_DATA
*
d
,
unsigned
alloc_req
)
{
STATIC
int
mod_uzlib_grow_buf
(
TINF_DATA
*
d
,
unsigned
alloc_req
)
{
if
(
alloc_req
<
256
)
{
alloc_req
=
256
;
}
...
...
@@ -59,7 +58,7 @@ STATIC int mod_uzlib_grow_buf(TINF_DATA *d, unsigned alloc_req)
return
0
;
}
STATIC
mp_obj_t
mod_uzlib_decompress
(
uint
n_args
,
mp_obj_t
*
args
)
{
STATIC
mp_obj_t
mod_uzlib_decompress
(
mp_
uint
_t
n_args
,
const
mp_obj_t
*
args
)
{
mp_obj_t
data
=
args
[
0
];
mp_buffer_info_t
bufinfo
;
mp_get_buffer_raise
(
data
,
&
bufinfo
,
MP_BUFFER_READ
);
...
...
@@ -112,4 +111,4 @@ const mp_obj_module_t mp_module_uzlib = {
#include
"uzlib/tinfzlib.c"
#include
"uzlib/adler32.c"
#endif //MICROPY_PY_UZLIB
#endif //
MICROPY_PY_UZLIB
stmhal/mpconfigport.h
View file @
4b71c056
...
...
@@ -57,7 +57,7 @@
#define MICROPY_PY_IO (1)
#define MICROPY_PY_IO_FILEIO (1)
#define MICROPY_PY_UCTYPES (1)
#define MICROPY_PY_ZLIB
D
(1)
#define MICROPY_PY_
U
ZLIB (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 }, \
...
...
stmhal/qstrdefsport.h
View file @
4b71c056
...
...
@@ -73,6 +73,7 @@ Q(elapsed_micros)
// for module weak links
Q
(
re
)
Q
(
zlib
)
Q
(
json
)
// for file class
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment