diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-19 02:18:19 +0100 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-19 02:18:19 +0100 |
commit | 27dd471098e5d27949826295e821df972d9af083 (patch) | |
tree | 05566c9cb594250aafd845512305ba0bcb9cce96 /py/binary.h | |
parent | 3d19137442447f2e02db55bcd78b4c83cdc259f7 (diff) | |
parent | 206dd2a905fc4bca89c0b1a8beb2c71516f2053f (diff) | |
download | micropython-27dd471098e5d27949826295e821df972d9af083.tar.gz micropython-27dd471098e5d27949826295e821df972d9af083.zip |
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/binary.h')
-rw-r--r-- | py/binary.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/py/binary.h b/py/binary.h index 538d6e7f29..46fb5b36b9 100644 --- a/py/binary.h +++ b/py/binary.h @@ -2,8 +2,9 @@ // (underlyingly they're same). #define BYTEARRAY_TYPECODE 0 -int mp_binary_get_size(char typecode); +int mp_binary_get_size(char struct_type, char val_type, uint *palign); mp_obj_t mp_binary_get_val_array(char typecode, void *p, int index); -mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr); void mp_binary_set_val_array(char typecode, void *p, int index, mp_obj_t val_in); void mp_binary_set_val_array_from_int(char typecode, void *p, int index, machine_int_t val); +mp_obj_t mp_binary_get_val(char struct_type, char val_type, byte **ptr); +void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte **ptr); |