Merge branch 'bugfix/add_header_files_for_wifi_os_adapter_5.0' into 'release/v5.0'

Fix(esp_wifi): Add the missing header file to the wifi header files 5.0

See merge request espressif/esp-idf!28211
This commit is contained in:
Jiang Jiang Jian
2024-01-03 16:41:07 +08:00
9 changed files with 33 additions and 36 deletions

View File

@ -8,6 +8,10 @@
#define ESP_WIFI_OS_ADAPTER_H_ #define ESP_WIFI_OS_ADAPTER_H_
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
#include <stddef.h>
#include "sdkconfig.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -14,6 +14,9 @@
During normal operation, you don't need to use any of these types or functions in this header. During normal operation, you don't need to use any of these types or functions in this header.
See esp_wifi.h & esp_wifi_types.h instead. See esp_wifi.h & esp_wifi_types.h instead.
*/ */
#include <stdint.h>
#include <stddef.h>
#include <stdbool.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -8,6 +8,7 @@
#define _ESP_WIFI_DEFAULT_H #define _ESP_WIFI_DEFAULT_H
#include "esp_netif.h" #include "esp_netif.h"
#include "esp_wifi_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

View File

@ -1,11 +1,17 @@
/* /*
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h>
#include "esp_err.h"
#include "esp_wifi_types.h"
#include "esp_netif_types.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

View File

@ -1,20 +1,16 @@
// Copyright 2010-2017 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2010-2024 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef SMARTCONFIG_ACK_H #ifndef SMARTCONFIG_ACK_H
#define SMARTCONFIG_ACK_H #define SMARTCONFIG_ACK_H
#include "esp_smartconfig.h"
#include "esp_err.h"
#include <stdint.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

View File

@ -1,19 +1,14 @@
// Copyright 2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2019-2024 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once #pragma once
#include <stdbool.h>
#include "sdkconfig.h"
#include <protocomm.h> #include <protocomm.h>
#include <protocomm_httpd.h> #include <protocomm_httpd.h>

View File

@ -621,7 +621,6 @@ components/esp_system/ubsan.c
components/esp_wifi/include/esp_private/esp_wifi_types_private.h components/esp_wifi/include/esp_private/esp_wifi_types_private.h
components/esp_wifi/include/esp_private/wifi_types.h components/esp_wifi/include/esp_private/wifi_types.h
components/esp_wifi/include/esp_smartconfig.h components/esp_wifi/include/esp_smartconfig.h
components/esp_wifi/include/smartconfig_ack.h
components/esp_wifi/src/lib_printf.c components/esp_wifi/src/lib_printf.c
components/esp_wifi/src/mesh_event.c components/esp_wifi/src/mesh_event.c
components/esp_wifi/src/smartconfig.c components/esp_wifi/src/smartconfig.c
@ -1220,7 +1219,6 @@ components/vfs/test/test_vfs_lwip.c
components/vfs/test/test_vfs_paths.c components/vfs/test/test_vfs_paths.c
components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h
components/wifi_provisioning/include/wifi_provisioning/scheme_console.h components/wifi_provisioning/include/wifi_provisioning/scheme_console.h
components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
components/wifi_provisioning/include/wifi_provisioning/wifi_scan.h components/wifi_provisioning/include/wifi_provisioning/wifi_scan.h
components/wifi_provisioning/proto-c/wifi_config.pb-c.c components/wifi_provisioning/proto-c/wifi_config.pb-c.c
components/wifi_provisioning/proto-c/wifi_config.pb-c.h components/wifi_provisioning/proto-c/wifi_config.pb-c.h

View File

@ -96,7 +96,6 @@ components/esp_hw_support/include/esp_private/esp_memprot_internal.h
### Here are the files that use CONFIG_XXX values but don't include sdkconfig.h ### Here are the files that use CONFIG_XXX values but don't include sdkconfig.h
# #
components/esp_wifi/include/esp_private/wifi_os_adapter.h
### To be fixed: headers that rely on implicit inclusion ### To be fixed: headers that rely on implicit inclusion
# #
components/esp_rom/include/esp32/rom/sha.h components/esp_rom/include/esp32/rom/sha.h
@ -113,11 +112,7 @@ components/esp_rom/include/esp32s3/rom/rtc.h
components/esp_rom/include/esp32h2/rom/rtc.h components/esp_rom/include/esp32h2/rom/rtc.h
components/esp_rom/include/esp32c2/rom/rtc.h components/esp_rom/include/esp32c2/rom/rtc.h
components/esp_ringbuf/include/freertos/ringbuf.h components/esp_ringbuf/include/freertos/ringbuf.h
components/esp_wifi/include/esp_wifi_crypto_types.h
components/esp_wifi/include/esp_coexist_internal.h components/esp_wifi/include/esp_coexist_internal.h
components/esp_wifi/include/esp_wifi_netif.h
components/esp_wifi/include/smartconfig_ack.h
components/esp_wifi/include/esp_wifi_default.h
components/esp_wifi/include/esp_coexist_adapter.h components/esp_wifi/include/esp_coexist_adapter.h
components/esp_event/include/esp_event_base.h components/esp_event/include/esp_event_base.h
components/esp_netif/include/esp_netif_sta_list.h components/esp_netif/include/esp_netif_sta_list.h
@ -131,7 +126,6 @@ components/openssl/include/openssl/ssl.h
components/ulp/include/ulp_common.h components/ulp/include/ulp_common.h
components/ulp/include/esp32s2/ulp_riscv.h components/ulp/include/esp32s2/ulp_riscv.h
components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h components/mbedtls/esp_crt_bundle/include/esp_crt_bundle.h
components/wifi_provisioning/include/wifi_provisioning/scheme_softap.h
components/usb/include/esp_private/usb_phy.h components/usb/include/esp_private/usb_phy.h
components/usb/include/usb/usb_types_stack.h components/usb/include/usb/usb_types_stack.h