adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

modem: modem_cellular: make modem_cellular_config structure constant

Browse source 
Remove redundant `const` qualifiers in `struct modem_cellular_config` and
add `const` to the declaration to ensure the structure resides
in read-only memory (rodata).

Signed-off-by: Pisit Sawangvonganan <pisit@ndrsolution.com>
This commit is contained in:
Pisit Sawangvonganan 2024-05-12 16:22:37 +07:00 committed by Anas Nashif
parent 09fc2dab43
commit eff80ae5bc
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
drivers/modem/modem_cellular.c
View file

@ -134,13 +134,13 @@ struct modem_cellular_data {
struct modem_cellular_config { struct modem_cellular_config {
const struct device *uart; const struct device *uart;
const struct gpio_dt_spec power_gpio; struct gpio_dt_spec power_gpio;
const struct gpio_dt_spec reset_gpio; struct gpio_dt_spec reset_gpio;
const uint16_t power_pulse_duration_ms; uint16_t power_pulse_duration_ms;
const uint16_t reset_pulse_duration_ms; uint16_t reset_pulse_duration_ms;
const uint16_t startup_time_ms; uint16_t startup_time_ms;
const uint16_t shutdown_time_ms; uint16_t shutdown_time_ms;
const bool autostarts; bool autostarts;
const struct modem_chat_script *init_chat_script; const struct modem_chat_script *init_chat_script;
const struct modem_chat_script *dial_chat_script; const struct modem_chat_script *dial_chat_script;
const struct modem_chat_script *periodic_chat_script; const struct modem_chat_script *periodic_chat_script;
@ -2089,7 +2089,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2118,7 +2118,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2147,7 +2147,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2176,7 +2176,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2205,7 +2205,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2234,7 +2234,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2264,7 +2264,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2293,7 +2293,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2321,7 +2321,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \
@ -2350,7 +2350,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \ .ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
}; \ }; \
\ \
static struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \ static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
.uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \ .uart = DEVICE_DT_GET(DT_INST_BUS(inst)), \
.power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \ .power_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_power_gpios, {}), \
.reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \ .reset_gpio = GPIO_DT_SPEC_INST_GET_OR(inst, mdm_reset_gpios, {}), \