Skip to content

Commit a0a3de6

Browse files
author
Daniel Campora
committed
cc3200: Translate simplelink's socket error numbers to POSIX values.
1 parent 5685b56 commit a0a3de6

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

‎cc3200/mods/modusocket.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ STATIC mp_obj_t socket_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_
156156
// create the socket
157157
int _errno;
158158
if (wlan_socket_socket(s, &_errno) != 0) {
159-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
159+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
160160
}
161161

162162
return s;
@@ -181,7 +181,7 @@ STATIC mp_obj_t socket_bind(mp_obj_t self_in, mp_obj_t addr_in) {
181181
// call the NIC to bind the socket
182182
int _errno;
183183
if (wlan_socket_bind(self, ip, port, &_errno) != 0) {
184-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
184+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
185185
}
186186
return mp_const_none;
187187
}
@@ -193,7 +193,7 @@ STATIC mp_obj_t socket_listen(mp_obj_t self_in, mp_obj_t backlog) {
193193

194194
int _errno;
195195
if (wlan_socket_listen(self, mp_obj_get_int(backlog), &_errno) != 0) {
196-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
196+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
197197
}
198198
return mp_const_none;
199199
}
@@ -213,7 +213,7 @@ STATIC mp_obj_t socket_accept(mp_obj_t self_in) {
213213
mp_uint_t port;
214214
int _errno;
215215
if (wlan_socket_accept(self, socket2, ip, &port, &_errno) != 0) {
216-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
216+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
217217
}
218218

219219
// add the socket to the list
@@ -241,7 +241,7 @@ STATIC mp_obj_t socket_connect(mp_obj_t self_in, mp_obj_t addr_in) {
241241
if (!self->sock_base.cert_req && _errno == SL_ESECSNOVERIFY) {
242242
return mp_const_none;
243243
}
244-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
244+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
245245
}
246246
return mp_const_none;
247247
}
@@ -255,7 +255,7 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) {
255255
int _errno;
256256
mp_int_t ret = wlan_socket_send(self, bufinfo.buf, bufinfo.len, &_errno);
257257
if (ret < 0) {
258-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
258+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
259259
}
260260
return mp_obj_new_int_from_uint(ret);
261261
}
@@ -273,7 +273,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) {
273273
if (_errno == EAGAIN && self->sock_base.has_timeout) {
274274
nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, "timed out"));
275275
}
276-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
276+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
277277
}
278278
if (ret == 0) {
279279
return mp_const_empty_bytes;
@@ -300,7 +300,7 @@ STATIC mp_obj_t socket_sendto(mp_obj_t self_in, mp_obj_t data_in, mp_obj_t addr_
300300
int _errno;
301301
mp_int_t ret = wlan_socket_sendto(self, bufinfo.buf, bufinfo.len, ip, port, &_errno);
302302
if (ret < 0) {
303-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
303+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
304304
}
305305
return mp_obj_new_int(ret);
306306
}
@@ -319,7 +319,7 @@ STATIC mp_obj_t socket_recvfrom(mp_obj_t self_in, mp_obj_t len_in) {
319319
if (_errno == EAGAIN && self->sock_base.has_timeout) {
320320
nlr_raise(mp_obj_new_exception_msg(&mp_type_TimeoutError, "timed out"));
321321
}
322-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
322+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
323323
}
324324
mp_obj_t tuple[2];
325325
if (ret == 0) {
@@ -357,7 +357,7 @@ STATIC mp_obj_t socket_setsockopt(mp_uint_t n_args, const mp_obj_t *args) {
357357

358358
int _errno;
359359
if (wlan_socket_setsockopt(self, level, opt, optval, optlen, &_errno) != 0) {
360-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
360+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
361361
}
362362
return mp_const_none;
363363
}
@@ -377,7 +377,7 @@ STATIC mp_obj_t socket_settimeout(mp_obj_t self_in, mp_obj_t timeout_in) {
377377
}
378378
int _errno;
379379
if (wlan_socket_settimeout(self, timeout, &_errno) != 0) {
380-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(_errno)));
380+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-_errno)));
381381
}
382382
return mp_const_none;
383383
}
@@ -462,7 +462,7 @@ STATIC mp_obj_t mod_usocket_getaddrinfo(mp_obj_t host_in, mp_obj_t port_in) {
462462
uint8_t out_ip[MOD_NETWORK_IPV4ADDR_BUF_SIZE];
463463
int32_t result = wlan_gethostbyname(host, hlen, out_ip, AF_INET);
464464
if (result < 0) {
465-
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(result)));
465+
nlr_raise(mp_obj_new_exception_arg1(&mp_type_OSError, MP_OBJ_NEW_SMALL_INT(-result)));
466466
}
467467
mp_obj_tuple_t *tuple = mp_obj_new_tuple(5, NULL);
468468
tuple->items[0] = MP_OBJ_NEW_SMALL_INT(AF_INET);

0 commit comments

Comments
 (0)