cc3200: Convert to using uPy internal errno numbers.

dpgeorge · dpgeorge · commit 8bb8e97dfe26 · 2017-02-22T12:58:11.000+11:00
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
@@ -276,7 +276,7 @@ STATIC int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp
             ret |= MP_STREAM_POLL_HUP;
         }
     } else {
-        *_errno = EINVAL;
+        *_errno = MP_EINVAL;
         ret = MP_STREAM_ERROR;
     }
     return ret;
@@ -519,7 +519,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
     int _errno;
     mp_int_t ret = wlan_socket_recv(self, (byte*)vstr.buf, len, &_errno);
     if (ret < 0) {
-        if (_errno == EAGAIN && self->sock_base.has_timeout) {
+        if (_errno == MP_EAGAIN && self->sock_base.has_timeout) {
             mp_raise_msg(&mp_type_TimeoutError, "timed out");
         }
         mp_raise_OSError(-_errno);
@@ -565,7 +565,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
     int _errno;
     mp_int_t ret = wlan_socket_recvfrom(self, (byte*)vstr.buf, vstr.len, ip, &port, &_errno);
     if (ret < 0) {
-        if (_errno == EAGAIN && self->sock_base.has_timeout) {
+        if (_errno == MP_EAGAIN && self->sock_base.has_timeout) {
             mp_raise_msg(&mp_type_TimeoutError, "timed out");
         }
         mp_raise_OSError(-_errno);
diff --git a/cc3200/mods/pybuart.c b/cc3200/mods/pybuart.c
@@ -596,8 +596,8 @@ STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, i
 
     // wait for first char to become available
     if (!uart_rx_wait(self)) {
-        // return EAGAIN error to indicate non-blocking (then read() method returns None)
-        *errcode = EAGAIN;
+        // return MP_EAGAIN error to indicate non-blocking (then read() method returns None)
+        *errcode = MP_EAGAIN;
         return MP_STREAM_ERROR;
     }
 
@@ -639,7 +639,7 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a
             ret |= MP_STREAM_POLL_WR;
         }
     } else {
-        *errcode = EINVAL;
+        *errcode = MP_EINVAL;
         ret = MP_STREAM_ERROR;
     }
     return ret;
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
@@ -75,6 +75,7 @@
 #define MICROPY_STREAMS_NON_BLOCK                   (1)
 #define MICROPY_MODULE_WEAK_LINKS                   (1)
 #define MICROPY_CAN_OVERRIDE_BUILTINS               (1)
+#define MICROPY_USE_INTERNAL_ERRNO                  (1)
 #define MICROPY_VFS                                 (1)
 #define MICROPY_VFS_FAT                             (1)
 #define MICROPY_PY_ASYNC_AWAIT (0)

Original file line number	Diff line number	Diff line change
`@@ -596,8 +596,8 @@ STATIC mp_uint_t pyb_uart_read(mp_obj_t self_in, void *buf_in, mp_uint_t size, i`
`596`	`596`
`597`	`597`	`// wait for first char to become available`
`598`	`598`	`if (!uart_rx_wait(self)) {`
`599`		`- // return EAGAIN error to indicate non-blocking (then read() method returns None)`
`600`		`- *errcode = EAGAIN;`
	`599`	`+ // return MP_EAGAIN error to indicate non-blocking (then read() method returns None)`
	`600`	`+ *errcode = MP_EAGAIN;`
`601`	`601`	`return MP_STREAM_ERROR;`
`602`	`602`	`}`
`603`	`603`
`@@ -639,7 +639,7 @@ STATIC mp_uint_t pyb_uart_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t a`
`639`	`639`	`ret \|= MP_STREAM_POLL_WR;`
`640`	`640`	`}`
`641`	`641`	`} else {`
`642`		`- *errcode = EINVAL;`
	`642`	`+ *errcode = MP_EINVAL;`
`643`	`643`	`ret = MP_STREAM_ERROR;`
`644`	`644`	`}`
`645`	`645`	`return ret;`