cc3200: Make socket stream methods return POSIX error codes.

Daniel Campora · Daniel Campora · commit a243d6b05758 · 2015-07-16T22:39:35.000+02:00
diff --git a/cc3200/mods/modusocket.c b/cc3200/mods/modusocket.c
@@ -418,12 +418,24 @@ MP_DEFINE_CONST_DICT(socket_locals_dict, socket_locals_dict_table);
 
 STATIC mp_uint_t socket_read(mp_obj_t self_in, void *buf, mp_uint_t size, int *errcode) {
     mod_network_socket_obj_t *self = self_in;
-    return wlan_socket_recv(self, buf, size, errcode);
+    mp_int_t ret = wlan_socket_recv(self, buf, size, errcode);
+    if (ret < 0) {
+        ret = MP_STREAM_ERROR;
+        // needed to convert simplelink's negative error codes to POSIX
+        (*errcode) *= -1;
+    }
+    return ret;
 }
 
 STATIC mp_uint_t socket_write(mp_obj_t self_in, const void *buf, mp_uint_t size, int *errcode) {
     mod_network_socket_obj_t *self = self_in;
-    return wlan_socket_send(self, buf, size, errcode);
+    mp_int_t ret = wlan_socket_send(self, buf, size, errcode);
+    if (ret < 0) {
+        ret = MP_STREAM_ERROR;
+        // needed to convert simplelink's negative error codes to POSIX
+        (*errcode) *= -1;
+    }
+    return ret;
 }
 
 STATIC mp_uint_t socket_ioctl(mp_obj_t self_in, mp_uint_t request, mp_uint_t arg, int *errcode) {
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
@@ -1357,7 +1357,7 @@ int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t
         }
     } else {
         *_errno = EINVAL;
-        ret = -1;
+        ret = MP_STREAM_ERROR;
     }
     return ret;
 }

Original file line number	Diff line number	Diff line change
`@@ -1357,7 +1357,7 @@ int wlan_socket_ioctl (mod_network_socket_obj_t *s, mp_uint_t request, mp_uint_t`
`1357`	`1357`	`}`
`1358`	`1358`	`} else {`
`1359`	`1359`	`*_errno = EINVAL;`
`1360`		`- ret = -1;`
	`1360`	`+ ret = MP_STREAM_ERROR;`
`1361`	`1361`	`}`
`1362`	`1362`	`return ret;`
`1363`	`1363`	`}`