drivers: modem: Sim7080 modem driver refactor

drivers/modem/CMakeLists.txt

@@ -31,9 +31,7 @@ if (CONFIG_MODEM_HL7800)
   zephyr_library_sources(hl7800.c)
 endif()
 
-if (CONFIG_MODEM_SIM7080)
-	zephyr_library_sources(simcom-sim7080.c)
-endif()
+add_subdirectory(simcom)
 
 zephyr_library_sources_ifdef(CONFIG_MODEM_CELLULAR modem_cellular.c)
 zephyr_library_sources_ifdef(CONFIG_MODEM_AT_USER_PIPE modem_at_user_pipe.c)

drivers/modem/Kconfig

@@ -135,6 +135,7 @@ config MODEM_CMD_HANDLER
 config MODEM_CMD_HANDLER_MAX_PARAM_COUNT
 	int "Maximum number of params parsed per command"
 	depends on MODEM_CMD_HANDLER
+	default 14 if MODEM_SIM7080
 	default 6
 	help
 	  This option sets the maximum number of parameters which may be
@@ -194,6 +195,6 @@ source "drivers/modem/Kconfig.cellular"
 source "drivers/modem/Kconfig.at_shell"
 
 source "drivers/modem/Kconfig.hl7800"
-source "drivers/modem/Kconfig.simcom-sim7080"
+source "drivers/modem/simcom/Kconfig"
 
 endif # MODEM

drivers/modem/simcom/CMakeLists.txt

@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Metratec GmbH.
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+add_subdirectory_ifdef(CONFIG_MODEM_SIM7080 sim7080)
+# zephyr-keep-sorted-stop

drivers/modem/simcom/Kconfig

@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Metratec GmbH.
+# SPDX-License-Identifier: Apache-2.0
+
+# zephyr-keep-sorted-start
+source "drivers/modem/simcom/sim7080/Kconfig"
+# zephyr-keep-sorted-stop

drivers/modem/simcom/sim7080/CMakeLists.txt

@@ -0,0 +1,18 @@
+# Copyright (c) 2025 Metratec GmbH.
+# SPDX-License-Identifier: Apache-2.0
+
+zephyr_library()
+
+zephyr_library_include_directories(${ZEPHYR_BASE}/drivers/modem)
+zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/net/ip)
+zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/net/lib/sockets)
+zephyr_library_sources(
+    sim7080.c
+    sim7080_pdp.c
+    sim7080_dns.c
+    sim7080_sock.c
+    sim7080_sms.c
+    sim7080_ftp.c
+    sim7080_gps.c
+    sim7080_meas.c
+    sim7080_utils.c)

drivers/modem/Kconfig.simcom-sim7080 → drivers/modem/simcom/sim7080/Kconfig

@@ -49,6 +49,28 @@ config MODEM_SIMCOM_SIM7080_APN
 	  context. This value is specific to the network provider and may
 	  need to be changed.
 
+config MODEM_SIMCOM_SIM7080_BAUDRATE
+	int "Baudrate for modem UART"
+	default 115200
+	help
+		Set this to the baudrate the uart is using. On first startup
+		the modem is configured to use autobaud. The driver will then
+		configure the modem to use a fixed baudrate for faster startups.
+
+config MODEM_SIMCOM_SIM7080_DNS_DEFAULT_RECOUNT
+	int "Retry count for a DNS query"
+	range 0 10
+	default 10
+	help
+		The number of retries for a DNS lookup
+
+config MODEM_SIMCOM_SIM7080_DNS_DEFAULT_TIMEOUT
+	int "Timeout for a DNS query"
+	range 0 60000
+	default 20000
+	help
+		The timeout for DNS queries in milliseconds
+
 choice MODEM_SIMCOM_SIM7080_RAT
 	bool "Radio Access Technology Mode"
 	default MODEM_SIMCOM_SIM7080_RAT_NB1
@@ -70,4 +92,20 @@ config MODEM_SIMCOM_SIM7080_RAT_GSM
 
 endchoice
 
+choice
+	bool "Modem Boot Type"
+	default MODEM_SIMCOM_SIM7080_BOOT_TYPE_NORMAL
+
+config MODEM_SIMCOM_SIM7080_BOOT_TYPE_NORMAL
+	bool "Normal boot"
+	help
+		Boot the modem and attach to network
+
+config MODEM_SIMCOM_SIM7080_BOOT_TYPE_CONSTRAINED
+	bool "Constrained boot"
+	help
+		Check if the modem is operational and then power off
+
+endchoice
+
 endif # MODEM_SIM7080