diff options
| author | Scott Shawcroft <scott.shawcroft@gmail.com> | 2016-11-28 19:48:48 -0800 |
|---|---|---|
| committer | Scott Shawcroft <scott.shawcroft@gmail.com> | 2016-11-28 19:48:48 -0800 |
| commit | bda6ee9a144b47784a8596951c30d5cbbad3cbd6 (patch) | |
| tree | 5f81534bda6ad95043dc4d17153241c15fa154a1 | |
| parent | 55c8c91e07c18c9e2d4ede8b41a16d88d2fe5ea4 (diff) | |
shared-bindings: Stop using max and min because C doesn't define them.
| -rw-r--r-- | shared-bindings/nativeio/I2C.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/shared-bindings/nativeio/I2C.c b/shared-bindings/nativeio/I2C.c index d0ef55d6f..17065de71 100644 --- a/shared-bindings/nativeio/I2C.c +++ b/shared-bindings/nativeio/I2C.c @@ -150,7 +150,12 @@ STATIC mp_obj_t nativeio_i2c_readfrom_into(size_t n_args, const mp_obj_t *pos_ar if (end < 0) { end += bufinfo.len; } - uint32_t len = max(0, min((int32_t) bufinfo.len, end - args[ARG_start].u_int)); + uint32_t len = end - args[ARG_start].u_int; + if (len > (int32_t) bufinfo.len) { + len = bufinfo.len; + } else if (len < 0) { + len = 0; + } 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); return mp_const_none; @@ -194,7 +199,12 @@ STATIC mp_obj_t nativeio_i2c_writeto(size_t n_args, const mp_obj_t *pos_args, mp if (end < 0) { end += bufinfo.len; } - uint32_t len = max(0, min((int32_t) bufinfo.len, end - args[ARG_start].u_int)); + uint32_t len = end - args[ARG_start].u_int; + if (len > (int32_t) bufinfo.len) { + len = bufinfo.len; + } else if (len < 0) { + len = 0; + } int32_t start = args[ARG_start].u_int; // do the transfer |
