Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

Commit b78bad3

Browse files
author
iwahdan88
committed
esp32: update to QSTR Defs
1 parent f1c7fde commit b78bad3

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

esp32/mp_pycom_err.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#define MP_MBEDTLS_ERR_NET_UNKNOWN_HOST MBEDTLS_ERR_NET_UNKNOWN_HOST
2626
#define MP_MBEDTLS_ERR_NET_BUFFER_TOO_SMALL MBEDTLS_ERR_NET_BUFFER_TOO_SMALL
2727
#define MP_MBEDTLS_ERR_NET_INVALID_CONTEXT MBEDTLS_ERR_NET_INVALID_CONTEXT
28-
#define MP_MBEDTLS_ERR_NET_POLL_FAILED MBEDTLS_ERR_NET_POLL_FAILED
29-
#define MP_MBEDTLS_ERR_NET_BAD_INPUT_DATA MBEDTLS_ERR_NET_BAD_INPUT_DATA
3028

3129
#define MP_ERR_MEM ERR_MEM
3230
#define MP_ERR_BUF ERR_BUF
@@ -119,7 +117,5 @@
119117
#define MP_MBEDTLS_ERR_SSL_UNEXPECTED_RECORD MBEDTLS_ERR_SSL_UNEXPECTED_RECORD /* < Record header looks valid but is not expected. */
120118
#define MP_MBEDTLS_ERR_SSL_NON_FATAL MBEDTLS_ERR_SSL_NON_FATAL /* < The alert message received indicates a non-fatal error. */
121119
#define MP_MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH /* < Couldn't set the hash for verifying CertificateVerify */
122-
#define MP_MBEDTLS_ERR_SSL_CONTINUE_PROCESSING MBEDTLS_ERR_SSL_CONTINUE_PROCESSING /* < Internal-only message signaling that further message-processing should be done */
123-
#define MP_MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS /* < The asynchronous operation is not completed yet. */
124120

125121
#endif /* ESP32_MP_PYCOM_ERR_H_ */

esp32/mpconfigport.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
#define __INCLUDED_MPCONFIGPORT_H
4141

4242
#include <stdint.h>
43+
#include "mp_pycom_err.h"
4344

4445
// options to control how Micro Python is built
4546
#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_A)
@@ -248,7 +249,7 @@ extern const struct _mp_obj_module_t mp_module_uqueue;
248249

249250
#define _assert(expr) ((expr) ? (void)0 : __assert_func(__FILE__, __LINE__, __func__, #expr))
250251

251-
#define MICROPY_PY_UERRNO_LIST \
252+
#define ERRNO_LIST \
252253
X(EPERM) \
253254
X(ENOENT) \
254255
X(EIO) \
@@ -284,8 +285,6 @@ extern const struct _mp_obj_module_t mp_module_uqueue;
284285
X(MBEDTLS_ERR_NET_UNKNOWN_HOST) \
285286
X(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL) \
286287
X(MBEDTLS_ERR_NET_INVALID_CONTEXT) \
287-
X(MBEDTLS_ERR_NET_POLL_FAILED) \
288-
X(MBEDTLS_ERR_NET_BAD_INPUT_DATA) \
289288
X(ERR_MEM) \
290289
X(ERR_BUF) \
291290
X(ERR_TIMEOUT) \
@@ -373,8 +372,6 @@ extern const struct _mp_obj_module_t mp_module_uqueue;
373372
X(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD) \
374373
X(MBEDTLS_ERR_SSL_NON_FATAL) \
375374
X(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH) \
376-
X(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING) \
377-
X(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS) \
378375

379376
#include "mpconfigboard.h"
380377

esp32/qstrdefsport.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Q(MBEDTLS_ERR_NET_CONN_RESET)
2323
Q(MBEDTLS_ERR_NET_UNKNOWN_HOST)
2424
Q(MBEDTLS_ERR_NET_BUFFER_TOO_SMALL)
2525
Q(MBEDTLS_ERR_NET_INVALID_CONTEXT)
26-
Q(MBEDTLS_ERR_NET_POLL_FAILED)
27-
Q(MBEDTLS_ERR_NET_BAD_INPUT_DATA)
2826
Q(ERR_MEM)
2927
Q(ERR_BUF)
3028
Q(ERR_TIMEOUT)
@@ -112,5 +110,3 @@ Q(MBEDTLS_ERR_SSL_CLIENT_RECONNECT)
112110
Q(MBEDTLS_ERR_SSL_UNEXPECTED_RECORD)
113111
Q(MBEDTLS_ERR_SSL_NON_FATAL)
114112
Q(MBEDTLS_ERR_SSL_INVALID_VERIFY_HASH)
115-
Q(MBEDTLS_ERR_SSL_CONTINUE_PROCESSING)
116-
Q(MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS)

py/moduerrno.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
// This list could be defined per port in mpconfigport.h to tailor it to a
3636
// specific port's needs. But for now we have a common list.
37+
#ifndef ERRNO_LIST
3738
#define ERRNO_LIST \
3839
X(EPERM) \
3940
X(ENOENT) \
@@ -60,6 +61,7 @@
6061
X(EALREADY) \
6162
X(EINPROGRESS) \
6263

64+
#endif
6365
STATIC const mp_rom_map_elem_t errorcode_table[] = {
6466
#define X(e) { MP_ROM_INT(MP_ ## e), MP_ROM_QSTR(MP_QSTR_## e) },
6567
ERRNO_LIST

0 commit comments

Comments
 (0)