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

shared-bindings: Stop using negative length at all. Having uint and int mixed is confusing.

Browse Source
This commit is contained in:
Scott Shawcroft 2016-11-28 19:57:05 -08:00
parent bda6ee9a14
commit d2aa05a9fe
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shared-bindings/nativeio/I2C.c
View File

@ -146,17 +146,17 @@ STATIC mp_obj_t nativeio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_ar
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE); mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_WRITE);
int32_t end = args[ARG_end].u_int; uint32_t end = args[ARG_end].u_int;
if (end < 0) { if (end < 0) {
end += bufinfo.len; end += bufinfo.len;
} }
uint32_t len = end - args[ARG_start].u_int; uint32_t start = args[ARG_start].u_int;
if (len > (int32_t) bufinfo.len) { uint32_t len = end - start;
len = bufinfo.len; if (end < start) {
} else if (len < 0) {
len = 0; len = 0;
} else if (len > bufinfo.len) {
len = bufinfo.len;
} }
int32_t start = args[ARG_start].u_int;
common_hal_nativeio_i2c_read(self, args[ARG_address].u_int, ((uint8_t*)bufinfo.buf) + start, len); common_hal_nativeio_i2c_read(self, args[ARG_address].u_int, ((uint8_t*)bufinfo.buf) + start, len);
return mp_const_none; return mp_const_none;
} }
@ -195,17 +195,17 @@ STATIC mp_obj_t nativeio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;
mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ); mp_get_buffer_raise(args[ARG_buffer].u_obj, &bufinfo, MP_BUFFER_READ);
int32_t end = args[ARG_end].u_int; uint32_t end = args[ARG_end].u_int;
if (end < 0) { if (end < 0) {
end += bufinfo.len; end += bufinfo.len;
} }
uint32_t len = end - args[ARG_start].u_int; uint32_t start = args[ARG_start].u_int;
if (len > (int32_t) bufinfo.len) { uint32_t len = end - start;
len = bufinfo.len; if (end < start) {
} else if (len < 0) {
len = 0; len = 0;
} else if (len > bufinfo.len) {
len = bufinfo.len;
} }
int32_t start = args[ARG_start].u_int;
// do the transfer // do the transfer
bool ok = common_hal_nativeio_i2c_write(self, args[ARG_address].u_int, bool ok = common_hal_nativeio_i2c_write(self, args[ARG_address].u_int,