applications: serial_lte_modem: Fix SLM in upmerge.

- Change posix names to zsock.
- Remove CONFIG_x_NRF_HW_ASYNC usage.
- Correct size for the external flash.

Signed-off-by: Markus Lassila <[email protected]>

Author: MarkusLassila

applications/serial_lte_modem/boards/nrf9131ek_nrf9131_ns.conf

@@ -8,7 +8,5 @@
 # This file is merged with prj.conf in the application folder, and options
 # set here will take precedence if they are present in both files.
 
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
 CONFIG_SLM_POWER_PIN=28
 CONFIG_SLM_INDICATE_PIN=0

applications/serial_lte_modem/boards/nrf9151dk_nrf9151_ns.conf

@@ -8,16 +8,10 @@
 # This file is merged with prj.conf in the application folder, and options
 # set here will take precedence if they are present in both files.
 
-# Use UART_0 (when working with PC terminal)
-# unmask the following config
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
+# When working with PC terminal, unmask the following config.
 CONFIG_SLM_POWER_PIN=8
 CONFIG_SLM_INDICATE_PIN=0
 
-# Use UART_2 (when working with external MCU)
-# unmask the following config
-#CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-#CONFIG_UART_2_NRF_HW_ASYNC=y
+# When working with external MCU, unmask the following config.
 #CONFIG_SLM_POWER_PIN=31
 #CONFIG_SLM_INDICATE_PIN=30

applications/serial_lte_modem/boards/nrf9160dk_nrf9160_ns.conf

@@ -8,16 +8,10 @@
 # This file is merged with prj.conf in the application folder, and options
 # set here will take precedence if they are present in both files.
 
-# Use UART_0 (when working with PC terminal)
-# unmask the following config
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
+# When working with PC terminal, unmask the following config.
 CONFIG_SLM_POWER_PIN=6
 CONFIG_SLM_INDICATE_PIN=2
 
-# Use UART_2 (when working with external MCU)
-# unmask the following config
-#CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-#CONFIG_UART_2_NRF_HW_ASYNC=y
+# When working with external MCU, unmask the following config.
 #CONFIG_SLM_POWER_PIN=31
 #CONFIG_SLM_INDICATE_PIN=30

applications/serial_lte_modem/boards/nrf9161dk_nrf9161_ns.conf

@@ -8,16 +8,10 @@
 # This file is merged with prj.conf in the application folder, and options
 # set here will take precedence if they are present in both files.
 
-# Use UART_0 (when working with PC terminal)
-# unmask the following config
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
+# When working with PC terminal, unmask the following config.
 CONFIG_SLM_POWER_PIN=8
 CONFIG_SLM_INDICATE_PIN=0
 
-# Use UART_2 (when working with external MCU)
-# unmask the following config
-#CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-#CONFIG_UART_2_NRF_HW_ASYNC=y
+# When working with external MCU, unmask the following config.
 #CONFIG_SLM_POWER_PIN=31
 #CONFIG_SLM_INDICATE_PIN=30

applications/serial_lte_modem/boards/thingy91_nrf9160_ns.conf

@@ -9,8 +9,6 @@
 # set here will take precedence if they are present in both files.
 
 # Configuration related to external sensors.
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
 CONFIG_SLM_POWER_PIN=26
 
 # Increase buffer space as hardware flow control is not used with Thingy:91.

applications/serial_lte_modem/boards/thingy91x_nrf9151_ns.conf

@@ -9,8 +9,6 @@
 # set here will take precedence if they are present in both files.
 
 # Configuration related to external sensors.
-CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-CONFIG_UART_0_NRF_HW_ASYNC=y
 CONFIG_SLM_POWER_PIN=26
 
 # Increase buffer space as hardware flow control is not necessarily used with Thingy:91 X.

applications/serial_lte_modem/doc/SOCKET_AT_commands.rst

@@ -1235,7 +1235,8 @@ Response syntax
 
 * The ``<error>`` value is an error code when the poll fails.
 * The ``<handle>`` value is an integer. It is the handle of a socket that have events returned, so-called ``revents``.
-* The ``<revents>`` value is a hexadecimal string. It represents the returned events, which could be a combination of POLLIN, POLLERR, POLLHUP and POLLNVAL.
+* The ``<revents>`` value is a hexadecimal string.
+  It represents the returned events, which could be a combination of ``ZSOCK_POLLIN``, ``ZSOCK_POLLERR``, ``ZSOCK_POLLHUP`` and ``ZSOCK_POLLNVAL``.
 
 Examples
 ~~~~~~~~

applications/serial_lte_modem/doc/slm_description.rst

@@ -455,17 +455,11 @@ To connect with an external MCU using UART_2, change the configuration files for
 
       * In the :file:`nrf9151dk_nrf9151_ns.conf` file::
 
-          # Use UART_0 (when working with PC terminal)
-          # unmask the following config
-          #CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-          #CONFIG_UART_0_NRF_HW_ASYNC=y
+          # When working with PC terminal, unmask the following config.
           #CONFIG_SLM_POWER_PIN=8
           #CONFIG_SLM_INDICATE_PIN=0
 
-          # Use UART_2 (when working with external MCU)
-          # unmask the following config
-          CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-          CONFIG_UART_2_NRF_HW_ASYNC=y
+          # When working with external MCU, unmask the following config.
           CONFIG_SLM_POWER_PIN=31
           CONFIG_SLM_INDICATE_PIN=30
 
@@ -496,17 +490,11 @@ To connect with an external MCU using UART_2, change the configuration files for
 
       * In the :file:`nrf9161dk_nrf9161_ns.conf` file::
 
-          # Use UART_0 (when working with PC terminal)
-          # unmask the following config
-          #CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-          #CONFIG_UART_0_NRF_HW_ASYNC=y
+          # When working with PC terminal, unmask the following config.
           #CONFIG_SLM_POWER_PIN=8
           #CONFIG_SLM_INDICATE_PIN=0
 
-          # Use UART_2 (when working with external MCU)
-          # unmask the following config
-          CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-          CONFIG_UART_2_NRF_HW_ASYNC=y
+          # When working with external MCU, unmask the following config.
           CONFIG_SLM_POWER_PIN=31
           CONFIG_SLM_INDICATE_PIN=30
 
@@ -538,17 +526,11 @@ To connect with an external MCU using UART_2, change the configuration files for
 
       * In the :file:`nrf9160dk_nrf9160_ns.conf` file::
 
-          # Use UART_0 (when working with PC terminal)
-          # unmask the following config
-          #CONFIG_UART_0_NRF_HW_ASYNC_TIMER=2
-          #CONFIG_UART_0_NRF_HW_ASYNC=y
+          # When working with PC terminal, unmask the following config.
           #CONFIG_SLM_POWER_PIN=6
           #CONFIG_SLM_INDICATE_PIN=2
 
-          # Use UART_2 (when working with external MCU)
-          # unmask the following config
-          CONFIG_UART_2_NRF_HW_ASYNC_TIMER=2
-          CONFIG_UART_2_NRF_HW_ASYNC=y
+          # When working with external MCU, unmask the following config.
           CONFIG_SLM_POWER_PIN=31
           CONFIG_SLM_INDICATE_PIN=30
 

applications/serial_lte_modem/overlay-full_fota.conf

@@ -18,6 +18,7 @@ CONFIG_MBEDTLS_LEGACY_CRYPTO_C=y
 CONFIG_MBEDTLS_SHA256_C=y
 CONFIG_FMFU_FDEV=y
 CONFIG_ZCBOR=y
+CONFIG_STREAM_FLASH_INSPECT=n
 
 # Enable full FOTA support
 CONFIG_SLM_FULL_FOTA=y

applications/serial_lte_modem/src/http_c/slm_at_httpc.c

@@ -130,7 +130,7 @@ static int headers_cb(int sock, struct http_request *req, void *user_data)
 
 	len = strlen(httpc.headers);
 	while (offset < len) {
-		ret = send(sock, httpc.headers + offset, len - offset, 0);
+		ret = zsock_send(sock, httpc.headers + offset, len - offset, 0);
 		if (ret < 0) {
 			LOG_ERR("send header fail: %d", -errno);
 			return -errno;
@@ -153,7 +153,7 @@ int do_send_payload(const uint8_t *data, int len)
 
 	/* Start to send payload */
 	while (offset < len) {
-		ret = send(httpc.fd, data + offset, len - offset, 0);
+		ret = zsock_send(httpc.fd, data + offset, len - offset, 0);
 		if (ret < 0) {
 			LOG_ERR("Fail to send payload: %d, sent: %d", ret, offset);
 			httpc.total_sent = -errno;
@@ -223,12 +223,12 @@ static int do_http_connect(void)
 
 	/* Open socket */
 	if (httpc.sec_tag == INVALID_SEC_TAG) {
-		ret = socket(httpc.family, SOCK_STREAM, IPPROTO_TCP);
+		ret = zsock_socket(httpc.family, SOCK_STREAM, IPPROTO_TCP);
 	} else {
-		ret = socket(httpc.family, SOCK_STREAM, IPPROTO_TLS_1_2);
+		ret = zsock_socket(httpc.family, SOCK_STREAM, IPPROTO_TLS_1_2);
 	}
 	if (ret < 0) {
-		LOG_ERR("socket() failed: %d", -errno);
+		LOG_ERR("zsock_socket() failed: %d", -errno);
 		return ret;
 	}
 	httpc.fd = ret;
@@ -244,62 +244,63 @@ static int do_http_connect(void)
 		int tls_native = 1;
 
 		/* Must be the first socket option to set. */
-		ret = setsockopt(httpc.fd, SOL_TLS, TLS_NATIVE, &tls_native, sizeof(tls_native));
+		ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_NATIVE, &tls_native,
+				       sizeof(tls_native));
 		if (ret) {
 			ret = errno;
 			goto exit_cli;
 		}
 #endif
 		sec_tag_t sec_tag_list[] = { httpc.sec_tag };
 
-		ret = setsockopt(httpc.fd, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag_list,
+		ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_SEC_TAG_LIST, sec_tag_list,
 				 sizeof(sec_tag_t));
 		if (ret) {
-			LOG_ERR("setsockopt(TLS_SEC_TAG_LIST) error: %d", -errno);
+			LOG_ERR("zsock_setsockopt(TLS_SEC_TAG_LIST) error: %d", -errno);
 			ret = -errno;
 			goto exit_cli;
 		}
-		ret = setsockopt(httpc.fd, SOL_TLS, TLS_PEER_VERIFY, &httpc.peer_verify,
+		ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_PEER_VERIFY, &httpc.peer_verify,
 				 sizeof(httpc.peer_verify));
 		if (ret) {
-			LOG_ERR("setsockopt(TLS_PEER_VERIFY) error: %d", -errno);
+			LOG_ERR("zsock_setsockopt(TLS_PEER_VERIFY) error: %d", -errno);
 			ret = -errno;
 			goto exit_cli;
 		}
 		if (httpc.hostname_verify) {
-			ret = setsockopt(httpc.fd, SOL_TLS, TLS_HOSTNAME, httpc.host,
+			ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_HOSTNAME, httpc.host,
 					 strlen(httpc.host));
 		} else {
-			ret = setsockopt(httpc.fd, SOL_TLS, TLS_HOSTNAME, NULL, 0);
+			ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_HOSTNAME, NULL, 0);
 		}
 		if (ret) {
-			LOG_ERR("setsockopt(TLS_HOSTNAME) error: %d", -errno);
+			LOG_ERR("zsock_setsockopt(TLS_HOSTNAME) error: %d", -errno);
 			ret = -errno;
 			goto exit_cli;
 		}
 		if (!IS_ENABLED(CONFIG_SLM_NATIVE_TLS)) {
 			int session_cache = TLS_SESSION_CACHE_ENABLED;
 
-			ret = setsockopt(httpc.fd, SOL_TLS, TLS_SESSION_CACHE, &session_cache,
+			ret = zsock_setsockopt(httpc.fd, SOL_TLS, TLS_SESSION_CACHE, &session_cache,
 					 sizeof(session_cache));
 			if (ret) {
-				LOG_ERR("setsockopt(TLS_SESSION_CACHE) error: %d", -errno);
+				LOG_ERR("zsock_setsockopt(TLS_SESSION_CACHE) error: %d", -errno);
 				ret = -errno;
 				goto exit_cli;
 			}
 		}
 	}
 
 	LOG_DBG("Configuring socket timeout (%lld s)", timeo.tv_sec);
-	ret = setsockopt(httpc.fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo));
+	ret = zsock_setsockopt(httpc.fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo));
 	if (ret) {
-		LOG_ERR("setsockopt(SO_SNDTIMEO) error: %d", -errno);
+		LOG_ERR("zsock_setsockopt(SO_SNDTIMEO) error: %d", -errno);
 		ret = -errno;
 		goto exit_cli;
 	}
-	ret = setsockopt(httpc.fd, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
+	ret = zsock_setsockopt(httpc.fd, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
 	if (ret) {
-		LOG_ERR("setsockopt(SO_SNDTIMEO) error: %d", -errno);
+		LOG_ERR("zsock_setsockopt(SO_SNDTIMEO) error: %d", -errno);
 		ret = -errno;
 		goto exit_cli;
 	}
@@ -310,13 +311,13 @@ static int do_http_connect(void)
 		goto exit_cli;
 	}
 	if (sa.sa_family == AF_INET) {
-		ret = connect(httpc.fd, &sa, sizeof(struct sockaddr_in));
+		ret = zsock_connect(httpc.fd, &sa, sizeof(struct sockaddr_in));
 	} else {
-		ret = connect(httpc.fd, &sa, sizeof(struct sockaddr_in6));
+		ret = zsock_connect(httpc.fd, &sa, sizeof(struct sockaddr_in6));
 	}
 
 	if (ret) {
-		LOG_ERR("connect() failed: %d", -errno);
+		LOG_ERR("zsock_connect() failed: %d", -errno);
 		ret = -errno;
 		goto exit_cli;
 	}
@@ -325,7 +326,7 @@ static int do_http_connect(void)
 	return 0;
 
 exit_cli:
-	close(httpc.fd);
+	zsock_close(httpc.fd);
 	httpc.fd = INVALID_SOCKET;
 	rsp_send("\r\n#XHTTPCCON: 0\r\n");
 
@@ -338,10 +339,10 @@ static int do_http_disconnect(void)
 	if (httpc.fd == INVALID_SOCKET) {
 		return 0;
 	}
-	int ret = close(httpc.fd);
+	int ret = zsock_close(httpc.fd);
 
 	if (ret) {
-		LOG_WRN("close() failed: %d", -errno);
+		LOG_WRN("zsock_close() failed: %d", -errno);
 		ret = -errno;
 	}
 	httpc.fd = INVALID_SOCKET;