djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/uctypes: Use mp_binary_get_val helper when extracting value. 

It handles more cases than mp_binary_get_int.
This commit is contained in:
Damien George 2016-03-19 21:41:01 +00:00
parent 8d4d6731f5
commit 12154b1774
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extmod/moductypes.c
View File

@ -282,12 +282,9 @@ STATIC mp_obj_t uctypes_struct_sizeof(mp_obj_t obj_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(uctypes_struct_sizeof_obj, uctypes_struct_sizeof);
STATIC inline mp_obj_t get_unaligned(uint val_type, void *p, int big_endian) {
mp_int_t val = mp_binary_get_int(GET_SCALAR_SIZE(val_type), val_type & 1, big_endian, p);
if (val_type == UINT32) {
return mp_obj_new_int_from_uint(val);
} else {
return mp_obj_new_int(val);
}
char struct_type = big_endian ? '>' : '<';
static const char type2char[8] = "BbHhIiQq";
return mp_binary_get_val(struct_type, type2char[val_type], (byte**)&p);
}
STATIC inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {