Skip to content

Commit

Permalink
Initial commit with custom sdkconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
Aircoookie committed Mar 9, 2022
1 parent 80b39e6 commit c427990
Show file tree
Hide file tree
Showing 144 changed files with 681 additions and 323 deletions.
2 changes: 1 addition & 1 deletion tools/platformio-build.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
],

LIBS=[
"-lgcc", "-lwps", "-lulp", "-lmbedtls", "-lnewlib", "-lespnow", "-llog", "-lsdmmc", "-lasio", "-lbtdm_app", "-lpp", "-lpthread", "-lcoexist", "-lhal", "-lxtensa-debug-module", "-lfatfs", "-lesp32-camera", "-lesp_event", "-lnet80211", "-lc_nano", "-lmqtt", "-lexpat", "-lefuse", "-lopenssl", "-lethernet", "-lesp_https_server", "-lvfs", "-lprotobuf-c", "-lapp_trace", "-lc", "-lesp_ringbuf", "-ltcpip_adapter", "-lcore", "-lsoc", "-lfreertos", "-lesp_http_client", "-lwpa2", "-lmicro-ecc", "-lnghttp", "-lsmartconfig", "-lesp_https_ota", "-lspiffs", "-lcxx", "-ltcp_transport", "-lbootloader_support", "-lesp_adc_cal", "-ldl", "-llibsodium", "-lesp_http_server", "-lrtc", "-lspi_flash", "-lmesh", "-lprotocomm", "-llwip", "-ljson", "-lwear_levelling", "-lm", "-lwpa", "-lfb_gfx", "-ljsmn", "-lunity", "-lbt", "-lphy", "-lnvs_flash", "-lesp_websocket_client", "-lcat_face_detect", "-lapp_update", "-lespcoredump", "-lwpa_supplicant", "-lwifi_provisioning", "-lcoap", "-ldriver", "-lfreemodbus", "-lconsole", "-lheap", "-lmdns", "-lmfn", "-lsmartconfig_ack", "-lhuman_face_detect", "-lcolor_detect", "-lesp32", "-lesp-tls", "-lstdc++"
"-lgcc", "-lapp_trace", "-lapp_update", "-lasio", "-lbootloader_support", "-lbt", "-lbtdm_app", "-lc", "-lcat_face_detect", "-lcoap", "-lcoexist", "-lcolor_detect", "-lconsole", "-lcore", "-lcxx", "-lc_nano", "-ldl", "-ldriver", "-lefuse", "-lesp-tls", "-lesp32-camera", "-lesp32", "-lespcoredump", "-lespnow", "-lesp_adc_cal", "-lesp_event", "-lesp_https_ota", "-lesp_https_server", "-lesp_http_client", "-lesp_http_server", "-lesp_ringbuf", "-lesp_websocket_client", "-lethernet", "-lexpat", "-lfatfs", "-lfb_gfx", "-lfreemodbus", "-lfreertos", "-lhal", "-lheap", "-lhuman_face_detect", "-ljsmn", "-ljson", "-llibsodium", "-llog", "-llwip", "-lm", "-lmbedtls", "-lmdns", "-lmesh", "-lmfn", "-lmicro-ecc", "-lmqtt", "-lnet80211", "-lnewlib", "-lnghttp", "-lnvs_flash", "-lopenssl", "-lphy", "-lpp", "-lprotobuf-c", "-lprotocomm", "-lpthread", "-lrtc", "-lsdmmc", "-lsmartconfig", "-lsmartconfig_ack", "-lsoc", "-lspiffs", "-lspi_flash", "-ltcpip_adapter", "-ltcp_transport", "-lulp", "-lunity", "-lvfs", "-lwear_levelling", "-lwifi_provisioning", "-lwpa", "-lwpa2", "-lwpa_supplicant", "-lwps", "-lxtensa-debug-module", "-lstdc++"
],

LIBSOURCE_DIRS=[
Expand Down
Binary file modified tools/sdk/bin/bootloader_dio_40m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_dio_80m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_dout_40m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_dout_80m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_qio_40m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_qio_80m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_qout_40m.bin
Binary file not shown.
Binary file modified tools/sdk/bin/bootloader_qout_80m.bin
Binary file not shown.
15 changes: 15 additions & 0 deletions tools/sdk/include/bootloader_support/bootloader_flash_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#pragma once

#include "sdkconfig.h"
#include "esp_image_format.h"

#ifdef __cplusplus
Expand Down Expand Up @@ -66,6 +67,20 @@ void bootloader_flash_gpio_config(const esp_image_header_t* pfhdr);
*/
void bootloader_flash_dummy_config(const esp_image_header_t* pfhdr);

/**
* @brief Return the pin number used for custom SPI flash and/or SPIRAM WP pin
*
* Can be determined by eFuse values in most cases, or overriden in configuration
*
* This value is only meaningful if the other SPI flash pins are overriden via eFuse.
*
* This value is only meaningful if flash is set to QIO or QOUT mode, or if
* SPIRAM is enabled.
*
* @return Pin number to use, or -1 if the default should be kept
*/
int bootloader_flash_get_wp_pin(void);

#ifdef __cplusplus
}
#endif
23 changes: 23 additions & 0 deletions tools/sdk/include/bt/esp_gap_ble_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,15 @@ typedef struct {
advertising reports for each packet received */
} esp_ble_scan_params_t;

/// connection parameters information
typedef struct {
uint16_t interval; /*!< connection interval */
uint16_t latency; /*!< Slave latency for the connection in number of connection events. Range: 0x0000 to 0x01F3 */
uint16_t timeout; /*!< Supervision timeout for the LE Link. Range: 0x000A to 0x0C80.
Mandatory Range: 0x000A to 0x0C80 Time = N * 10 msec
Time Range: 100 msec to 32 seconds */
} esp_gap_conn_params_t;

/// Connection update parameters
typedef struct {
esp_bd_addr_t bda; /*!< Bluetooth device address */
Expand Down Expand Up @@ -1257,6 +1266,20 @@ esp_err_t esp_ble_gap_disconnect(esp_bd_addr_t remote_device);
*
*/
esp_err_t esp_gap_ble_set_authorization(esp_bd_addr_t bd_addr, bool authorize);

/**
* @brief This function is called to read the connection
* parameters information of the device
*
* @param[in] bd_addr: BD address of the peer device.
* @param[out] conn_params: the connection parameters information
*
* @return - ESP_OK : success
* - other : failed
*
*/
esp_err_t esp_ble_get_current_conn_params(esp_bd_addr_t bd_addr, esp_gap_conn_params_t *conn_params);

#ifdef __cplusplus
}
#endif
Expand Down
11 changes: 11 additions & 0 deletions tools/sdk/include/bt/esp_gatt_defs.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,17 @@ typedef enum {
ESP_GATT_WRITE_TYPE_RSP, /*!< Gatt write attribute need remote response */
} esp_gatt_write_type_t;

/**
* @brief Connection parameters information
*/
typedef struct {
uint16_t interval; /*!< connection interval */
uint16_t latency; /*!< Slave latency for the connection in number of connection events. Range: 0x0000 to 0x01F3 */
uint16_t timeout; /*!< Supervision timeout for the LE Link. Range: 0x000A to 0x0C80.
Mandatory Range: 0x000A to 0x0C80 Time = N * 10 msec
Time Range: 100 msec to 32 seconds */
} esp_gatt_conn_params_t;

#define ESP_GATT_IF_NONE 0xff /*!< If callback report gattc_if/gatts_if as this macro, means this event is not correspond to any app */

typedef uint8_t esp_gatt_if_t; /*!< Gatt interface type, different application on GATT client use different gatt_if */
Expand Down
1 change: 1 addition & 0 deletions tools/sdk/include/bt/esp_gattc_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ typedef union {
struct gattc_connect_evt_param {
uint16_t conn_id; /*!< Connection id */
esp_bd_addr_t remote_bda; /*!< Remote bluetooth device address */
esp_gatt_conn_params_t conn_params; /*!< current connection parameters */
} connect; /*!< Gatt client callback param of ESP_GATTC_CONNECT_EVT */

/**
Expand Down
1 change: 1 addition & 0 deletions tools/sdk/include/bt/esp_gatts_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ typedef union {
struct gatts_connect_evt_param {
uint16_t conn_id; /*!< Connection id */
esp_bd_addr_t remote_bda; /*!< Remote bluetooth device address */
esp_gatt_conn_params_t conn_params; /*!< current Connection parameters */
} connect; /*!< Gatt server callback param of ESP_GATTS_CONNECT_EVT */

/**
Expand Down
12 changes: 9 additions & 3 deletions tools/sdk/include/config/sdkconfig.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@
#define CONFIG_D0WD_PSRAM_CS_IO 16
#define CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER 1
#define CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE 1
#define CONFIG_BTDM_CONTROLLER_MODEM_SLEEP 1
#define CONFIG_SPIFFS_CACHE 1
#define CONFIG_INT_WDT 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL 0
#define CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN 3
#define CONFIG_MBEDTLS_SSL_PROTO_TLS1 1
#define CONFIG_BT_STACK_NO_LOG 1
Expand Down Expand Up @@ -205,6 +206,7 @@
#define CONFIG_MBEDTLS_KEY_EXCHANGE_PSK 1
#define CONFIG_TCP_SYNMAXRTX 6
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA 1
#define CONFIG_MB_PORT_TASK_AFFINITY 0x0
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF 0
#define CONFIG_HEAP_POISONING_LIGHT 1
#define CONFIG_PYTHON "python"
Expand Down Expand Up @@ -275,6 +277,7 @@
#define CONFIG_SPIRAM_SIZE -1
#define CONFIG_ARDUINO_UDP_TASK_PRIORITY 3
#define CONFIG_MBEDTLS_SSL_SESSION_TICKETS 1
#define CONFIG_NEWLIB_NANO_FORMAT 1
#define CONFIG_SPIFFS_MAX_PARTITIONS 3
#define CONFIG_GC2145_SUPPORT 1
#define CONFIG_ESP_ERR_TO_NAME_LOOKUP 1
Expand All @@ -286,6 +289,7 @@
#define CONFIG_PPP_MPPE_SUPPORT 1
#define CONFIG_ENABLE_ARDUINO_DEPENDS 1
#define CONFIG_WARN_WRITE_STRINGS 1
#define CONFIG_BF20A6_SUPPORT 1
#define CONFIG_SPIFFS_OBJ_NAME_LEN 32
#define CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT 5
#define CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF 2
Expand Down Expand Up @@ -315,6 +319,7 @@
#define CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY 1
#define CONFIG_D0WD_PSRAM_CLK_IO 17
#define CONFIG_BT_SSP_ENABLED 1
#define CONFIG_SCCB_CLK_FREQ 100000
#define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
#define CONFIG_MONITOR_BAUD 115200
#define CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT -1
Expand Down Expand Up @@ -358,6 +363,7 @@
#define CONFIG_NT99141_SUPPORT 1
#define CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA 1
#define CONFIG_SPI_SLAVE_ISR_IN_IRAM 1
#define CONFIG_BF3005_SUPPORT 1
#define CONFIG_SYSTEM_EVENT_QUEUE_SIZE 32
#define CONFIG_BT_ACL_CONNECTIONS 4
#define CONFIG_FATFS_MAX_LFN 255
Expand All @@ -370,6 +376,7 @@
#define CONFIG_A2DP_ENABLE 1
#define CONFIG_MB_TIMER_GROUP 0
#define CONFIG_SPI_FLASH_ROM_DRIVER_PATCH 1
#define CONFIG_MB_PORT_TASK_AFFINITY_CPU0 1
#define CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS 5
#define CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE 1
#define CONFIG_SPIFFS_PAGE_SIZE 256
Expand All @@ -395,7 +402,6 @@
#define CONFIG_BLE_ADV_REPORT_DISCARD_THRSHOLD 20
#define CONFIG_BLUEDROID_PINNED_TO_CORE 0
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
#define CONFIG_ARDUINO_IDF_COMMIT "20aec9c113"
#define CONFIG_ARDUINO_IDF_COMMIT "cc5440f6a2"
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"
16 changes: 8 additions & 8 deletions tools/sdk/include/driver/driver/mcpwm.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,14 @@ typedef enum {
* @brief MCPWM deadtime types, used to generate deadtime, RED refers to rising edge delay and FED refers to falling edge delay
*/
typedef enum {
MCPWM_BYPASS_RED = 0, /*!<MCPWMXA = no change, MCPWMXB = falling edge delay*/
MCPWM_BYPASS_FED, /*!<MCPWMXA = rising edge delay, MCPWMXB = no change*/
MCPWM_ACTIVE_HIGH_MODE, /*!<MCPWMXA = rising edge delay, MCPWMXB = falling edge delay*/
MCPWM_ACTIVE_LOW_MODE, /*!<MCPWMXA = compliment of rising edge delay, MCPWMXB = compliment of falling edge delay*/
MCPWM_ACTIVE_HIGH_COMPLIMENT_MODE, /*!<MCPWMXA = rising edge delay, MCPWMXB = compliment of falling edge delay*/
MCPWM_ACTIVE_LOW_COMPLIMENT_MODE, /*!<MCPWMXA = compliment of rising edge delay, MCPWMXB = falling edge delay*/
MCPWM_ACTIVE_RED_FED_FROM_PWMXA, /*!<MCPWMXA = MCPWMXB = rising edge delay as well as falling edge delay, generated from MCPWMXA*/
MCPWM_ACTIVE_RED_FED_FROM_PWMXB, /*!<MCPWMXA = MCPWMXB = rising edge delay as well as falling edge delay, generated from MCPWMXB*/
MCPWM_BYPASS_RED = 0, /*!<MCPWMXA Out = MCPWMXA In with no delay, MCPWMXB Out = MCPWMXA In with falling edge delay*/
MCPWM_BYPASS_FED, /*!<MCPWMXA Out = MCPWMXA In with rising edge delay, MCPWMXB Out = MCPWMXB In with no delay*/
MCPWM_ACTIVE_HIGH_MODE, /*!<MCPWMXA Out = MCPWMXA In with rising edge delay, MCPWMXB Out = MCPWMXA In with falling edge delay*/
MCPWM_ACTIVE_LOW_MODE, /*!<MCPWMXA Out = MCPWMXA In with compliment of rising edge delay, MCPWMXB Out = MCPWMXA In with compliment of falling edge delay*/
MCPWM_ACTIVE_HIGH_COMPLIMENT_MODE, /*!<MCPWMXA Out = MCPWMXA In with rising edge delay, MCPWMXB = MCPWMXA In with compliment of falling edge delay*/
MCPWM_ACTIVE_LOW_COMPLIMENT_MODE, /*!<MCPWMXA Out = MCPWMXA In with compliment of rising edge delay, MCPWMXB Out = MCPWMXA In with falling edge delay*/
MCPWM_ACTIVE_RED_FED_FROM_PWMXA, /*!<MCPWMXA Out = MCPWMXB Out = MCPWMXA In with rising edge delay as well as falling edge delay*/
MCPWM_ACTIVE_RED_FED_FROM_PWMXB, /*!<MCPWMXA Out = MCPWMXB Out = MCPWMXB In with rising edge delay as well as falling edge delay*/
MCPWM_DEADTIME_TYPE_MAX,
} mcpwm_deadtime_type_t;

Expand Down
6 changes: 6 additions & 0 deletions tools/sdk/include/esp32-camera/sensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ typedef enum {
GC2145_PID = 0x2145,
GC032A_PID = 0x232a,
GC0308_PID = 0x9b,
BF3005_PID = 0x30,
BF20A6_PID = 0x20a6,
} camera_pid_t;

typedef enum {
Expand All @@ -38,6 +40,8 @@ typedef enum {
CAMERA_GC2145,
CAMERA_GC032A,
CAMERA_GC0308,
CAMERA_BF3005,
CAMERA_BF20A6,
CAMERA_MODEL_MAX,
CAMERA_NONE,
} camera_model_t;
Expand All @@ -52,6 +56,8 @@ typedef enum {
GC2145_SCCB_ADDR = 0x3C,// 0x78 >> 1
GC032A_SCCB_ADDR = 0x21,// 0x42 >> 1
GC0308_SCCB_ADDR = 0x21,// 0x42 >> 1
BF3005_SCCB_ADDR = 0x6E,
BF20A6_SCCB_ADDR = 0x6E,
} camera_sccb_addr_t;

typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion tools/sdk/include/esp32/esp_idf_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ extern "C" {
/** Minor version number (x.X.x) */
#define ESP_IDF_VERSION_MINOR 3
/** Patch version number (x.x.X) */
#define ESP_IDF_VERSION_PATCH 5
#define ESP_IDF_VERSION_PATCH 6

/**
* Macro to convert IDF version number into an integer
Expand Down
14 changes: 13 additions & 1 deletion tools/sdk/include/esp32/esp_mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ esp_err_t esp_mesh_stop(void);
* - If the packet is to the root ("to" parameter isn't NULL) or to external IP network, MESH_DATA_TODS should be set.
* - If the packet is from the root to an internal device, MESH_DATA_FROMDS should be set.
* - Specify whether this API is block or non-block, block by default
* - If needs non-block, MESH_DATA_NONBLOCK should be set.
* - If needs non-blocking, MESH_DATA_NONBLOCK should be set. Otherwise, may use esp_mesh_send_block_time() to specify a blocking time.
* - In the situation of the root change, MESH_DATA_DROP identifies this packet can be dropped by the new root
* for upstream data to external IP network, we try our best to avoid data loss caused by the root change, but
* there is a risk that the new root is running out of memory because most of memory is occupied by the pending data which
Expand Down Expand Up @@ -672,6 +672,18 @@ esp_err_t esp_mesh_stop(void);
esp_err_t esp_mesh_send(const mesh_addr_t *to, const mesh_data_t *data,
int flag, const mesh_opt_t opt[], int opt_count);

/**
* @brief Set blocking time of esp_mesh_send()
*
* @attention This API shall be called before mesh is started.
*
* @param[in] time_ms blocking time of esp_mesh_send(), unit:ms
*
* @return
* - ESP_OK
*/
esp_err_t esp_mesh_send_block_time(uint32_t time_ms);

/**
* @brief Receive a packet targeted to self over the mesh network
*
Expand Down
19 changes: 10 additions & 9 deletions tools/sdk/include/mbedtls/mbedtls/aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,17 +81,22 @@
#define MBEDTLS_AES_DECRYPT 0 /**< AES decryption. */

/* Error codes in range 0x0020-0x0022 */
#define MBEDTLS_ERR_AES_INVALID_KEY_LENGTH -0x0020 /**< Invalid key length. */
#define MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH -0x0022 /**< Invalid data input length. */
/** Invalid key length. */
#define MBEDTLS_ERR_AES_INVALID_KEY_LENGTH -0x0020
/** Invalid data input length. */
#define MBEDTLS_ERR_AES_INVALID_INPUT_LENGTH -0x0022

/* Error codes in range 0x0021-0x0025 */
#define MBEDTLS_ERR_AES_BAD_INPUT_DATA -0x0021 /**< Invalid input data. */
/** Invalid input data. */
#define MBEDTLS_ERR_AES_BAD_INPUT_DATA -0x0021

/* MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE is deprecated and should not be used. */
#define MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE -0x0023 /**< Feature not available. For example, an unsupported AES key size. */
/** Feature not available. For example, an unsupported AES key size. */
#define MBEDTLS_ERR_AES_FEATURE_UNAVAILABLE -0x0023

/* MBEDTLS_ERR_AES_HW_ACCEL_FAILED is deprecated and should not be used. */
#define MBEDTLS_ERR_AES_HW_ACCEL_FAILED -0x0025 /**< AES hardware accelerator failed. */
/** AES hardware accelerator failed. */
#define MBEDTLS_ERR_AES_HW_ACCEL_FAILED -0x0025

#if ( defined(__ARMCC_VERSION) || defined(_MSC_VER) ) && \
!defined(inline) && !defined(__cplusplus)
Expand Down Expand Up @@ -533,10 +538,6 @@ int mbedtls_aes_crypt_ofb( mbedtls_aes_context *ctx,
* \brief This function performs an AES-CTR encryption or decryption
* operation.
*
* This function performs the operation defined in the \p mode
* parameter (encrypt/decrypt), on the input data buffer
* defined in the \p input parameter.
*
* Due to the nature of CTR, you must use the same key schedule
* for both encryption and decryption operations. Therefore, you
* must use the context initialized with mbedtls_aes_setkey_enc()
Expand Down
3 changes: 2 additions & 1 deletion tools/sdk/include/mbedtls/mbedtls/arc4.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
#include <stddef.h>

/* MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED is deprecated and should not be used. */
#define MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED -0x0019 /**< ARC4 hardware accelerator failed. */
/** ARC4 hardware accelerator failed. */
#define MBEDTLS_ERR_ARC4_HW_ACCEL_FAILED -0x0019

#ifdef __cplusplus
extern "C" {
Expand Down
12 changes: 8 additions & 4 deletions tools/sdk/include/mbedtls/mbedtls/aria.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,16 +77,20 @@
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
#define MBEDTLS_ERR_ARIA_INVALID_KEY_LENGTH MBEDTLS_DEPRECATED_NUMERIC_CONSTANT( -0x005C )
#endif /* !MBEDTLS_DEPRECATED_REMOVED */
#define MBEDTLS_ERR_ARIA_BAD_INPUT_DATA -0x005C /**< Bad input data. */
/** Bad input data. */
#define MBEDTLS_ERR_ARIA_BAD_INPUT_DATA -0x005C

#define MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH -0x005E /**< Invalid data input length. */
/** Invalid data input length. */
#define MBEDTLS_ERR_ARIA_INVALID_INPUT_LENGTH -0x005E

/* MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE is deprecated and should not be used.
*/
#define MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE -0x005A /**< Feature not available. For example, an unsupported ARIA key size. */
/** Feature not available. For example, an unsupported ARIA key size. */
#define MBEDTLS_ERR_ARIA_FEATURE_UNAVAILABLE -0x005A

/* MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED is deprecated and should not be used. */
#define MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED -0x0058 /**< ARIA hardware accelerator failed. */
/** ARIA hardware accelerator failed. */
#define MBEDTLS_ERR_ARIA_HW_ACCEL_FAILED -0x0058

#ifdef __cplusplus
extern "C" {
Expand Down
21 changes: 14 additions & 7 deletions tools/sdk/include/mbedtls/mbedtls/asn1.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,20 @@
* ASN1 is a standard to specify data structures.
* \{
*/
#define MBEDTLS_ERR_ASN1_OUT_OF_DATA -0x0060 /**< Out of data when parsing an ASN1 data structure. */
#define MBEDTLS_ERR_ASN1_UNEXPECTED_TAG -0x0062 /**< ASN1 tag was of an unexpected value. */
#define MBEDTLS_ERR_ASN1_INVALID_LENGTH -0x0064 /**< Error when trying to determine the length or invalid length. */
#define MBEDTLS_ERR_ASN1_LENGTH_MISMATCH -0x0066 /**< Actual length differs from expected length. */
#define MBEDTLS_ERR_ASN1_INVALID_DATA -0x0068 /**< Data is invalid. (not used) */
#define MBEDTLS_ERR_ASN1_ALLOC_FAILED -0x006A /**< Memory allocation failed */
#define MBEDTLS_ERR_ASN1_BUF_TOO_SMALL -0x006C /**< Buffer too small when writing ASN.1 data structure. */
/** Out of data when parsing an ASN1 data structure. */
#define MBEDTLS_ERR_ASN1_OUT_OF_DATA -0x0060
/** ASN1 tag was of an unexpected value. */
#define MBEDTLS_ERR_ASN1_UNEXPECTED_TAG -0x0062
/** Error when trying to determine the length or invalid length. */
#define MBEDTLS_ERR_ASN1_INVALID_LENGTH -0x0064
/** Actual length differs from expected length. */
#define MBEDTLS_ERR_ASN1_LENGTH_MISMATCH -0x0066
/** Data is invalid. (not used) */
#define MBEDTLS_ERR_ASN1_INVALID_DATA -0x0068
/** Memory allocation failed */
#define MBEDTLS_ERR_ASN1_ALLOC_FAILED -0x006A
/** Buffer too small when writing ASN.1 data structure. */
#define MBEDTLS_ERR_ASN1_BUF_TOO_SMALL -0x006C

/* \} name */

Expand Down
6 changes: 4 additions & 2 deletions tools/sdk/include/mbedtls/mbedtls/base64.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@

#include <stddef.h>

#define MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL -0x002A /**< Output buffer too small. */
#define MBEDTLS_ERR_BASE64_INVALID_CHARACTER -0x002C /**< Invalid character in input. */
/** Output buffer too small. */
#define MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL -0x002A
/** Invalid character in input. */
#define MBEDTLS_ERR_BASE64_INVALID_CHARACTER -0x002C

#ifdef __cplusplus
extern "C" {
Expand Down

0 comments on commit c427990

Please sign in to comment.