Skip to content

Commit 99c88f4

Browse files
committed
IDF release/v4.4 e104dd7f27
1 parent 21d3f31 commit 99c88f4

File tree

230 files changed

+692
-550
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+692
-550
lines changed

platform.txt

Lines changed: 3 additions & 3 deletions
Large diffs are not rendered by default.

tools/platformio-build-esp32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@
303303
"UNITY_INCLUDE_CONFIG_H",
304304
"WITH_POSIX",
305305
"_GNU_SOURCE",
306-
("IDF_VER", '\\"v4.4-beta1-150-gff3922d217\\"'),
306+
("IDF_VER", '\\"v4.4-beta1-177-ge104dd7f27\\"'),
307307
"ESP_PLATFORM",
308308
"_POSIX_READER_WRITER_LOCKS",
309309
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
"UNITY_INCLUDE_CONFIG_H",
294294
"WITH_POSIX",
295295
"_GNU_SOURCE",
296-
("IDF_VER", '\\"v4.4-beta1-150-gff3922d217\\"'),
296+
("IDF_VER", '\\"v4.4-beta1-177-ge104dd7f27\\"'),
297297
"ESP_PLATFORM",
298298
"_POSIX_READER_WRITER_LOCKS",
299299
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
"UNITY_INCLUDE_CONFIG_H",
291291
"WITH_POSIX",
292292
"_GNU_SOURCE",
293-
("IDF_VER", '\\"v4.4-beta1-150-gff3922d217\\"'),
293+
("IDF_VER", '\\"v4.4-beta1-177-ge104dd7f27\\"'),
294294
"ESP_PLATFORM",
295295
"_POSIX_READER_WRITER_LOCKS",
296296
"ARDUINO_ARCH_ESP32",

tools/sdk/esp32/include/app_trace/include/esp_app_trace_util.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ typedef struct {
6868
*/
6969
static inline void esp_apptrace_lock_init(esp_apptrace_lock_t *lock)
7070
{
71-
vPortCPUInitializeMutex(&lock->mux);
71+
portMUX_INITIALIZE(&lock->mux);
7272
lock->int_state = 0;
7373
}
7474

tools/sdk/esp32/include/config/sdkconfig.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@
291291
#define CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 1
292292
#define CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN 752
293293
#define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM 32
294+
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
294295
#define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
295296
#define CONFIG_FATFS_CODEPAGE_850 1
296297
#define CONFIG_FATFS_CODEPAGE 850
@@ -676,5 +677,5 @@
676677
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
677678
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
678679
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
679-
#define CONFIG_ARDUINO_IDF_COMMIT "ff3922d217"
680+
#define CONFIG_ARDUINO_IDF_COMMIT "e104dd7f27"
680681
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/include/esp_hw_support/include/soc/spinlock.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ static inline void __attribute__((always_inline)) spinlock_initialize(spinlock_t
5252

5353
/**
5454
* @brief Top level spinlock acquire function, spins until get the lock
55+
*
56+
* This function will:
57+
* - Save current interrupt state, then disable interrupts
58+
* - Spin until lock is acquired or until timeout occurs
59+
* - Restore interrupt state
60+
*
61+
* @note Spinlocks alone do no constitute true critical sections (as this
62+
* function reenables interrupts once the spinlock is acquired). For critical
63+
* sections, use the interface provided by the operating system.
5564
* @param lock - target spinlock object
5665
* @param timeout - cycles to wait, passing SPINLOCK_WAIT_FOREVER blocs indefinitely
5766
*/
@@ -125,6 +134,15 @@ static inline bool __attribute__((always_inline)) spinlock_acquire(spinlock_t *l
125134

126135
/**
127136
* @brief Top level spinlock unlock function, unlocks a previously locked spinlock
137+
*
138+
* This function will:
139+
* - Save current interrupt state, then disable interrupts
140+
* - Release the spinlock
141+
* - Restore interrupt state
142+
*
143+
* @note Spinlocks alone do no constitute true critical sections (as this
144+
* function reenables interrupts once the spinlock is acquired). For critical
145+
* sections, use the interface provided by the operating system.
128146
* @param lock - target, locked before, spinlock object
129147
*/
130148
static inline void __attribute__((always_inline)) spinlock_release(spinlock_t *lock)

tools/sdk/esp32/include/esp_netif/include/esp_netif_defaults.h

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#ifndef _ESP_NETIF_DEFAULTS_H
168
#define _ESP_NETIF_DEFAULTS_H
@@ -37,6 +29,7 @@ extern "C" {
3729
.route_prio = 100 \
3830
} \
3931

32+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
4033
#define ESP_NETIF_INHERENT_DEFAULT_WIFI_AP() \
4134
{ \
4235
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_SERVER | ESP_NETIF_FLAG_AUTOUP), \
@@ -48,6 +41,7 @@ extern "C" {
4841
.if_desc = "ap", \
4942
.route_prio = 10 \
5043
};
44+
#endif
5145

5246
#define ESP_NETIF_INHERENT_DEFAULT_ETH() \
5347
{ \
@@ -108,6 +102,7 @@ extern "C" {
108102
.stack = ESP_NETIF_NETSTACK_DEFAULT_ETH, \
109103
}
110104

105+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
111106
/**
112107
* @brief Default configuration reference of WIFI AP
113108
*/
@@ -117,6 +112,7 @@ extern "C" {
117112
.driver = NULL, \
118113
.stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP, \
119114
}
115+
#endif
120116

121117
/**
122118
* @brief Default configuration reference of WIFI STA
@@ -154,10 +150,12 @@ extern "C" {
154150
*/
155151
#define ESP_NETIF_BASE_DEFAULT_WIFI_STA &_g_esp_netif_inherent_sta_config
156152

153+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
157154
/**
158155
* @brief Default base config (esp-netif inherent) of WIFI AP
159156
*/
160157
#define ESP_NETIF_BASE_DEFAULT_WIFI_AP &_g_esp_netif_inherent_ap_config
158+
#endif
161159

162160
/**
163161
* @brief Default base config (esp-netif inherent) of ethernet interface
@@ -177,7 +175,9 @@ extern "C" {
177175

178176
#define ESP_NETIF_NETSTACK_DEFAULT_ETH _g_esp_netif_netstack_default_eth
179177
#define ESP_NETIF_NETSTACK_DEFAULT_WIFI_STA _g_esp_netif_netstack_default_wifi_sta
178+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
180179
#define ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP _g_esp_netif_netstack_default_wifi_ap
180+
#endif
181181
#define ESP_NETIF_NETSTACK_DEFAULT_PPP _g_esp_netif_netstack_default_ppp
182182
#define ESP_NETIF_NETSTACK_DEFAULT_SLIP _g_esp_netif_netstack_default_slip
183183
#define ESP_NETIF_NETSTACK_DEFAULT_OPENTHREAD _g_esp_netif_netstack_default_openthread
@@ -190,7 +190,9 @@ extern "C" {
190190
//
191191
extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_eth;
192192
extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_wifi_sta;
193+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
193194
extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_wifi_ap;
195+
#endif
194196
extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_ppp;
195197
extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_slip;
196198

@@ -200,12 +202,16 @@ extern const esp_netif_netstack_config_t *_g_esp_netif_netstack_default_slip;
200202
// common behavioural patterns for common interfaces such as STA, AP, ETH, PPP
201203
//
202204
extern const esp_netif_inherent_config_t _g_esp_netif_inherent_sta_config;
205+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
203206
extern const esp_netif_inherent_config_t _g_esp_netif_inherent_ap_config;
207+
#endif
204208
extern const esp_netif_inherent_config_t _g_esp_netif_inherent_eth_config;
205209
extern const esp_netif_inherent_config_t _g_esp_netif_inherent_ppp_config;
206210
extern const esp_netif_inherent_config_t _g_esp_netif_inherent_slip_config;
207211

212+
#ifdef CONFIG_ESP_WIFI_SOFTAP_SUPPORT
208213
extern const esp_netif_ip_info_t _g_esp_netif_soft_ap_ip;
214+
#endif
209215

210216
#if CONFIG_OPENTHREAD_ENABLED
211217
/**

tools/sdk/esp32/include/esp_wifi/include/esp_private/wifi_os_adapter.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2018-2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157
#ifndef ESP_WIFI_OS_ADAPTER_H_
168
#define ESP_WIFI_OS_ADAPTER_H_

tools/sdk/esp32/include/esp_wifi/include/esp_wifi.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
7-
// http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
1+
/*
2+
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
146

157

168
/* Notes about WiFi Programming
@@ -275,7 +267,7 @@ esp_err_t esp_wifi_deinit(void);
275267
* @brief Set the WiFi operating mode
276268
*
277269
* Set the WiFi operating mode as station, soft-AP or station+soft-AP,
278-
* The default mode is soft-AP mode.
270+
* The default mode is station mode.
279271
*
280272
* @param mode WiFi operating mode
281273
*

0 commit comments

Comments
 (0)