Skip to content

Commit 65b7c19

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'fix/esp_netif_docs_v5.4' into 'release/v5.4'
fix(docs): Remove esp_netif doxygen groups (v5.4) See merge request espressif/esp-idf!42778
2 parents ba3d150 + 0598576 commit 65b7c19

2 files changed

Lines changed: 4 additions & 143 deletions

File tree

components/esp_netif/include/esp_netif.h

Lines changed: 2 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@
1818
extern "C" {
1919
#endif
2020

21-
/**
22-
* @defgroup ESP_NETIF_INIT_API ESP-NETIF Initialization API
23-
* @brief Initialization and deinitialization of underlying TCP/IP stack and esp-netif instances
24-
*
25-
*/
26-
27-
/** @addtogroup ESP_NETIF_INIT_API
28-
* @{
29-
*/
30-
3121
/**
3222
* @brief Initialize the underlying TCP/IP stack
3323
*
@@ -97,30 +87,6 @@ esp_err_t esp_netif_set_driver_config(esp_netif_t *esp_netif,
9787
*/
9888
esp_err_t esp_netif_attach(esp_netif_t *esp_netif, esp_netif_iodriver_handle driver_handle);
9989

100-
/**
101-
* @}
102-
*/
103-
104-
/**
105-
* @defgroup ESP_NETIF_DATA_IO_API ESP-NETIF Input Output API
106-
* @brief Input and Output functions to pass data packets from communication media (IO driver)
107-
* to TCP/IP stack.
108-
*
109-
* These functions are usually not directly called from user code, but installed, or registered
110-
* as callbacks in either IO driver on one hand or TCP/IP stack on the other. More specifically
111-
* esp_netif_receive is typically called from io driver on reception callback to input the packets
112-
* to TCP/IP stack. Similarly esp_netif_transmit is called from the TCP/IP stack whenever
113-
* a packet ought to output to the communication media.
114-
*
115-
* @note These IO functions are registered (installed) automatically for default interfaces
116-
* (interfaces with the keys such as WIFI_STA_DEF, WIFI_AP_DEF, ETH_DEF). Custom interface
117-
* has to register these IO functions when creating interface using @ref esp_netif_new
118-
*
119-
*/
120-
121-
/** @addtogroup ESP_NETIF_DATA_IO_API
122-
* @{
123-
*/
12490

12591
/**
12692
* @brief Passes the raw packets from communication media to the appropriate TCP/IP stack
@@ -165,20 +131,7 @@ esp_err_t esp_netif_tx_rx_event_enable(esp_netif_t *esp_netif);
165131
*/
166132
esp_err_t esp_netif_tx_rx_event_disable(esp_netif_t *esp_netif);
167133

168-
/**
169-
* @}
170-
*/
171134

172-
/**
173-
* @defgroup ESP_NETIF_LIFECYCLE ESP-NETIF Lifecycle control
174-
* @brief These APIS define basic building blocks to control network interface lifecycle, i.e.
175-
* start, stop, set_up or set_down. These functions can be directly used as event handlers
176-
* registered to follow the events from communication media.
177-
*/
178-
179-
/** @addtogroup ESP_NETIF_LIFECYCLE
180-
* @{
181-
*/
182135

183136
/**
184137
* @brief Default building block for network interface action upon IO driver start event
@@ -369,19 +322,6 @@ esp_err_t esp_netif_join_ip6_multicast_group(esp_netif_t *esp_netif, const esp_i
369322
*/
370323
esp_err_t esp_netif_leave_ip6_multicast_group(esp_netif_t *esp_netif, const esp_ip6_addr_t *addr);
371324

372-
/**
373-
* @}
374-
*/
375-
376-
/**
377-
* @defgroup ESP_NETIF_GET_SET ESP-NETIF Runtime configuration
378-
* @brief Getters and setters for various TCP/IP related parameters
379-
*/
380-
381-
/** @addtogroup ESP_NETIF_GET_SET
382-
* @{
383-
*/
384-
385325
/**
386326
* @brief Set the mac address for the interface instance
387327
@@ -578,18 +518,6 @@ esp_err_t esp_netif_napt_enable(esp_netif_t *esp_netif);
578518
*/
579519
esp_err_t esp_netif_napt_disable(esp_netif_t *esp_netif);
580520

581-
/**
582-
* @}
583-
*/
584-
585-
/**
586-
* @defgroup ESP_NETIF_NET_DHCP ESP-NETIF DHCP Settings
587-
* @brief Network stack related interface to DHCP client and server
588-
*/
589-
590-
/** @addtogroup ESP_NETIF_NET_DHCP
591-
* @{
592-
*/
593521

594522
/**
595523
* @brief Set or Get DHCP server option
@@ -754,18 +682,7 @@ esp_err_t esp_netif_dhcps_stop(esp_netif_t *esp_netif);
754682
*/
755683
esp_err_t esp_netif_dhcps_get_clients_by_mac(esp_netif_t *esp_netif, int num, esp_netif_pair_mac_ip_t *mac_ip_pair);
756684

757-
/**
758-
* @}
759-
*/
760685

761-
/**
762-
* @defgroup ESP_NETIF_NET_DNS ESP-NETIF DNS Settings
763-
* @brief Network stack related interface to NDS
764-
*/
765-
766-
/** @addtogroup ESP_NETIF_NET_DNS
767-
* @{
768-
*/
769686

770687
/**
771688
* @brief Set DNS Server information
@@ -822,18 +739,9 @@ esp_err_t esp_netif_set_dns_info(esp_netif_t *esp_netif, esp_netif_dns_type_t ty
822739
*/
823740
esp_err_t esp_netif_get_dns_info(esp_netif_t *esp_netif, esp_netif_dns_type_t type, esp_netif_dns_info_t *dns);
824741

825-
/**
826-
* @}
827-
*/
828742

829-
/**
830-
* @defgroup ESP_NETIF_NET_IP ESP-NETIF IP address related interface
831-
* @brief Network stack related interface to IP
832-
*/
833743

834-
/** @addtogroup ESP_NETIF_NET_IP
835-
* @{
836-
*/
744+
837745
#if CONFIG_LWIP_IPV6
838746
/**
839747
* @brief Create interface link-local IPv6 address
@@ -992,18 +900,9 @@ esp_err_t esp_netif_str_to_ip4(const char *src, esp_ip4_addr_t *dst);
992900
*/
993901
esp_err_t esp_netif_str_to_ip6(const char *src, esp_ip6_addr_t *dst);
994902

995-
/**
996-
* @}
997-
*/
998903

999-
/**
1000-
* @defgroup ESP_NETIF_CONVERT ESP-NETIF Conversion utilities
1001-
* @brief ESP-NETIF conversion utilities to related keys, flags, implementation handle
1002-
*/
1003904

1004-
/** @addtogroup ESP_NETIF_CONVERT
1005-
* @{
1006-
*/
905+
1007906

1008907
/**
1009908
* @brief Gets media driver handle for this esp-netif instance
@@ -1071,18 +970,6 @@ int esp_netif_get_route_prio(esp_netif_t *esp_netif);
1071970
*/
1072971
int32_t esp_netif_get_event_id(esp_netif_t *esp_netif, esp_netif_ip_event_type_t event_type);
1073972

1074-
/**
1075-
* @}
1076-
*/
1077-
1078-
/**
1079-
* @defgroup ESP_NETIF_LIST ESP-NETIF List of interfaces
1080-
* @brief APIs to enumerate all registered interfaces
1081-
*/
1082-
1083-
/** @addtogroup ESP_NETIF_LIST
1084-
* @{
1085-
*/
1086973

1087974
/**
1088975
* @brief Iterates over list of interfaces. Returns first netif if NULL given as parameter
@@ -1154,13 +1041,6 @@ void esp_netif_netstack_buf_ref(void *netstack_buf);
11541041
*/
11551042
void esp_netif_netstack_buf_free(void *netstack_buf);
11561043

1157-
/**
1158-
* @}
1159-
*/
1160-
1161-
/** @addtogroup ESP_NETIF_TCPIP_EXEC
1162-
* @{
1163-
*/
11641044

11651045
/**
11661046
* @brief TCPIP thread safe callback used with esp_netif_tcpip_exec()
@@ -1175,10 +1055,6 @@ typedef esp_err_t (*esp_netif_callback_fn)(void *ctx);
11751055
*/
11761056
esp_err_t esp_netif_tcpip_exec(esp_netif_callback_fn fn, void *ctx);
11771057

1178-
/**
1179-
* @}
1180-
*/
1181-
11821058
#ifdef __cplusplus
11831059
}
11841060
#endif

components/esp_netif/include/esp_netif_sntp.h

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2022-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -16,17 +16,6 @@
1616
extern "C" {
1717
#endif
1818

19-
/**
20-
* @defgroup ESP_NETIF_SNTP_API ESP-NETIF SNTP API
21-
* @brief SNTP API for underlying TCP/IP stack
22-
*
23-
*/
24-
25-
/** @addtogroup ESP_NETIF_SNTP_API
26-
* @{
27-
*/
28-
29-
3019
/**
3120
* @brief Time sync notification function
3221
*/
@@ -101,7 +90,7 @@ void esp_netif_sntp_deinit(void);
10190
/**
10291
* @brief Wait for time sync event
10392
* @param tout Specified timeout in RTOS ticks
104-
* @return ESP_TIMEOUT if sync event didn't came withing the timeout
93+
* @return ESP_TIMEOUT if sync event didn't came within the timeout
10594
* ESP_ERR_NOT_FINISHED if the sync event came, but we're in smooth update mode and still in progress (SNTP_SYNC_STATUS_IN_PROGRESS)
10695
* ESP_OK if time sync'ed
10796
*/
@@ -118,10 +107,6 @@ esp_err_t esp_netif_sntp_sync_wait(TickType_t tout);
118107
*/
119108
esp_err_t esp_netif_sntp_reachability(unsigned int index, unsigned int *reachability);
120109

121-
/**
122-
* @}
123-
*/
124-
125110
#ifdef __cplusplus
126111
}
127112
#endif

0 commit comments

Comments
 (0)