Skip to content

Commit 5b2e801

Browse files
ananglrlubos
authored andcommitted
treewide: Update after removal of CONFIG_NET_SOCKETS_POSIX_NAMES
This deprecated option was finally removed. See Zephyr PR 82398. Remove references to it and, where needed, replace it with POSIX_API. Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
1 parent d94d873 commit 5b2e801

File tree

15 files changed

+14
-32
lines changed

15 files changed

+14
-32
lines changed

doc/zephyr/zephyr.doxyfile.in

-1
Original file line numberDiff line numberDiff line change
@@ -2448,7 +2448,6 @@ PREDEFINED = __DOXYGEN__ \
24482448
CONFIG_NET_L2_IEEE802154_MGMT \
24492449
CONFIG_NET_L2_IEEE802154_SECURITY \
24502450
CONFIG_NET_MGMT_EVENT \
2451-
CONFIG_NET_SOCKETS_POSIX_NAMES \
24522451
CONFIG_NET_TCP \
24532452
CONFIG_NET_UDP \
24542453
CONFIG_SCHED_CPU_MASK \

ext/curl/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ config NRF_CURL_PROMPTLESS
1010

1111
config NRF_CURL
1212
bool "Curl" if !NRF_CURL_PROMPTLESS
13-
depends on POSIX_API && !PTHREAD_IPC && !NET_SOCKETS_POSIX_NAMES && NEWLIB_LIBC
13+
depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC
1414
imply NEWLIB_LIBC_FLOAT_PRINTF
1515
help
1616
Curl support for NRF.

ext/iperf3/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config NRF_IPERF3_PROMPTLESS
1212

1313
config NRF_IPERF3
1414
bool "Iperf3 NRF integration" if !NRF_IPERF3_PROMPTLESS
15-
depends on POSIX_API && !PTHREAD_IPC && !NET_SOCKETS_POSIX_NAMES && NEWLIB_LIBC && CJSON_LIB
15+
depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC && CJSON_LIB
1616
help
1717
Enable Iperf3 NRF integration
1818

lib/nrf_modem_lib/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ menuconfig NRF_MODEM_LIB
99
select EXPERIMENTAL if SOC_NRF9280_CPUAPP
1010
select NRF_MODEM
1111
imply NET_SOCKETS_OFFLOAD
12-
imply NET_SOCKETS_POSIX_NAMES if !POSIX_API
1312
# The modem must be turned on to achieve low power consumption.
1413
# But disable it for ZTEST's as some tests have HW
1514
# resource-conflicts with NRF_MODEM_LIB.

lib/nrf_modem_lib/sanity.c

+4
Original file line numberDiff line numberDiff line change
@@ -161,19 +161,23 @@ BUILD_ASSERT(NRF_SPROTO_DTLS1v2 == IPPROTO_DTLS_1_2, "Socket value not aligned w
161161
BUILD_ASSERT(SOL_TLS == NRF_SOL_SECURE, "Socket value not aligned with modemlib.");
162162
BUILD_ASSERT(SOL_SOCKET == NRF_SOL_SOCKET, "Socket value not aligned with modemlib.");
163163

164+
#if defined(CONFIG_POSIX_API)
164165
BUILD_ASSERT(MSG_DONTWAIT == NRF_MSG_DONTWAIT, "Socket value not aligned with modemlib.");
165166
BUILD_ASSERT(MSG_PEEK == NRF_MSG_PEEK, "Socket value not aligned with modemlib.");
166167
BUILD_ASSERT(MSG_WAITALL == NRF_MSG_WAITALL, "Socket value not aligned with modemlib.");
168+
#endif
167169

168170
BUILD_ASSERT(AI_CANONNAME == NRF_AI_CANONNAME, "Socket value not aligned with modemlib.");
169171
BUILD_ASSERT(AI_NUMERICSERV == NRF_AI_NUMERICSERV, "Socket value not aligned with modemlib.");
170172
BUILD_ASSERT(AI_PDNSERV == NRF_AI_PDNSERV, "Socket value not aligned with modemlib.");
171173

174+
#if defined(CONFIG_POSIX_API)
172175
BUILD_ASSERT(POLLIN == NRF_POLLIN, "Socket value not aligned with modemlib.");
173176
BUILD_ASSERT(POLLOUT == NRF_POLLOUT, "Socket value not aligned with modemlib.");
174177
BUILD_ASSERT(POLLERR == NRF_POLLERR, "Socket value not aligned with modemlib.");
175178
BUILD_ASSERT(POLLHUP == NRF_POLLHUP, "Socket value not aligned with modemlib.");
176179
BUILD_ASSERT(POLLNVAL == NRF_POLLNVAL, "Socket value not aligned with modemlib.");
180+
#endif
177181

178182
BUILD_ASSERT(DNS_EAI_ADDRFAMILY == NRF_EAI_ADDRFAMILY, "Socket value not aligned with modemlib.");
179183
BUILD_ASSERT(DNS_EAI_AGAIN == NRF_EAI_AGAIN, "Socket value not aligned with modemlib.");

samples/cellular/modem_shell/prj.conf

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ CONFIG_NETWORKING=y
6969
CONFIG_NET_NATIVE=n
7070
CONFIG_NET_SOCKETS=y
7171
CONFIG_NET_SOCKETS_OFFLOAD=y
72-
CONFIG_NET_SOCKETS_POSIX_NAMES=n
7372
CONFIG_NET_IPV4=y
7473
CONFIG_NET_IPV6=y
7574

samples/cellular/modem_shell/src/gnss/gnss_supl_support.c

-4
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,11 @@
77
#include <stdio.h>
88
#include <zephyr/kernel.h>
99
#include <zephyr/logging/log.h>
10-
#if !defined(CONFIG_NET_SOCKETS_POSIX_NAMES)
1110
#include <zephyr/posix/unistd.h>
1211
#include <zephyr/posix/netdb.h>
1312
#include <zephyr/posix/sys/time.h>
1413
#include <zephyr/posix/sys/socket.h>
1514
#include <zephyr/posix/arpa/inet.h>
16-
#else
17-
#include <zephyr/net/socket.h>
18-
#endif
1915
#include <supl_session.h>
2016

2117
#include "mosh_print.h"

samples/wifi/shell/sample.yaml

-13
Original file line numberDiff line numberDiff line change
@@ -224,19 +224,6 @@ tests:
224224
- ci_build
225225
- sysbuild
226226
- ci_samples_wifi
227-
sample.nrf7002.shell.posix_names:
228-
sysbuild: true
229-
build_only: true
230-
extra_args:
231-
- CONFIG_POSIX_API=n
232-
- CONIFG_NET_SOCKETS_POSIX_NAMES=y
233-
integration_platforms:
234-
- nrf7002dk/nrf5340/cpuapp
235-
platform_allow: nrf7002dk/nrf5340/cpuapp
236-
tags:
237-
- ci_build
238-
- sysbuild
239-
- ci_samples_wifi
240227
sample.nrf7002_ns.shell:
241228
sysbuild: true
242229
build_only: true

subsys/net/lib/mqtt_helper/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
menuconfig MQTT_HELPER
77
bool "MQTT helper library"
8-
select NET_SOCKETS_POSIX_NAMES if !POSIX_API
98
select MQTT_LIB
109
help
1110
Convenience library that simplifies Zephyr MQTT API and socket handling.

tests/subsys/net/lib/downloader/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ target_compile_options(app
3838
-DCONFIG_DOWNLOADER_MAX_FILENAME_SIZE=256
3939
-DCONFIG_DOWNLOADER_TRANSPORT_PARAMS_SIZE=256
4040
-DCONFIG_DOWNLOADER_STACK_SIZE=2048
41-
-DCONFIG_NET_SOCKETS_POSIX_NAMES=y
41+
-DCONFIG_POSIX_API=y
4242
-DCONFIG_NET_IPV6=y
4343
-DCONFIG_NET_IPV4=y
4444
-DCONFIG_COAP_MAX_RETRANSMIT=2

tests/subsys/net/lib/mqtt_helper/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ target_include_directories(app PRIVATE ${ZEPHYR_NRF_MODULE_DIR}/include/zephyr/n
3030
# Options that cannot be passed through Kconfig fragments.
3131
target_compile_options(app PRIVATE
3232
-DCONFIG_MQTT_LIB_TLS=1
33-
-DCONFIG_NET_SOCKETS_POSIX_NAMES=1
33+
-DCONFIG_POSIX_API=1
3434
-DCONFIG_MQTT_HELPER_HOSTNAME="test-some-hostname.com"
3535
-DCONFIG_MQTT_HELPER_STATIC_IP_ADDRESS=""
3636
-DCONFIG_MQTT_HELPER_PORT=8883

tests/subsys/net/lib/nrf_cloud/cloud/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ if (CONFIG_NRF_CLOUD_MQTT OR CONFIG_NRF_CLOUD_FOTA OR CONFIG_NRF_MODEM_LIB)
5252
)
5353

5454
# This code file has functions/structs/variables defined when
55-
# NET_SOCKETS_POSIX_NAMES=y in zephyr/net/socket.h, so
56-
# it needs to be excluded when NET_SOCKETS_POSIX_NAMES=n
55+
# POSIX_API=y in zephyr/net/socket.h, so it needs to be excluded
56+
# when POSIX_API=n
5757
set_source_files_properties(
5858
${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/src/downloader.c
5959
DIRECTORY ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/
@@ -64,7 +64,7 @@ if (CONFIG_NRF_CLOUD_MQTT OR CONFIG_NRF_CLOUD_FOTA OR CONFIG_NRF_MODEM_LIB)
6464

6565
if (CONFIG_NRF_MODEM_LIB)
6666

67-
# Similarly, these files need to be excluded when NET_SOCKETS_POSIX_NAMES=n
67+
# Similarly, these files need to be excluded when POSIX_API=n
6868
set_source_files_properties(
6969
${ZEPHYR_NRF_MODULE_DIR}/lib/nrf_modem_lib/sanity.c
7070
${ZEPHYR_NRF_MODULE_DIR}/lib/nrf_modem_lib/nrf9x_sockets.c

tests/subsys/net/lib/nrf_cloud/cloud/prj.conf

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ CONFIG_ZTEST=y
1010
# Network
1111
CONFIG_NETWORKING=y
1212

13-
# Disable sockets and POSIX wrappers
13+
# Disable sockets
1414
CONFIG_NET_SOCKETS=n
15-
CONFIG_NET_SOCKETS_POSIX_NAMES=n
1615

1716
# Dependencies
1817
CONFIG_NEWLIB_LIBC=y

tests/subsys/net/lib/nrf_cloud/fota_common/prj.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CONFIG_NRF_CLOUD_MQTT=y
1111

1212
CONFIG_NETWORKING=y
1313
CONFIG_NET_SOCKETS=y
14-
CONFIG_NET_SOCKETS_POSIX_NAMES=y
14+
CONFIG_POSIX_API=y
1515
CONFIG_NRF_MODEM_LIB=y
1616
CONFIG_NRF_CLOUD_CONNECTION_POLL_THREAD=n
1717
CONFIG_FLASH=y

tests/subsys/net/lib/nrf_provisioning/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ elseif(CONFIG_NRF_PROVISIONING_COAP)
4242
-DCONFIG_COAP_CLIENT_MESSAGE_HEADER_SIZE=48
4343
-DCONFIG_COAP_CLIENT_MESSAGE_SIZE=512
4444
-DCONFIG_COAP_CLIENT_STACK_SIZE=1024
45-
-DCONFIG_NET_SOCKETS_POSIX_NAMES=y
45+
-DCONFIG_POSIX_API=y
4646
-DCONFIG_MODEM_INFO_BUFFER_SIZE=128
4747
-DCONFIG_COAP_CLIENT_MAX_REQUESTS=2
4848
-DCONFIG_COAP_CLIENT_BLOCK_SIZE=256

0 commit comments

Comments
 (0)