drivers: modem: cellular: correct user DLCI channels
The supported modems don't have the same number or assignment of DLCI channels. For example, the NRF91_SLM only has DLCI channel 3 assigned to GNSS tunneling, where the ublox sara r5 has DLCI 3 assigned to an additional AT channel, and DLCI 4 assigned to GNSS tunneling. This commit updates the creation and assignment of DLCI channels and pipelinks to match the capabilties of each modem. Signed-off-by: Bjarki Arge Andreasen <bjarki@arge-andreasen.me>
This commit is contained in:
Bjarki Arge Andreasen
Anas Nashif
parent
717474dddb
commit
a58abd0450
1 changed files with 13 additions and 90 deletions
|
|
@ -2118,12 +2118,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
|
|
@ -2138,9 +2132,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2174,12 +2167,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
|
|
@ -2194,9 +2181,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2230,12 +2216,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
|
|
@ -2250,9 +2230,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2298,17 +2277,10 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_1, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2354,17 +2326,10 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_1, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2399,12 +2364,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
|
|
@ -2419,9 +2378,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2455,29 +2413,15 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_1, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2516,23 +2460,9 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_1, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
@ -2566,12 +2496,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
|
||||
}; \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
gnss_pipe, \
|
||||
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
|
||||
); \
|
||||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
|
||||
inst, \
|
||||
user_pipe_0, \
|
||||
|
|
@ -2586,9 +2510,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
|
|||
\
|
||||
MODEM_CELLULAR_DEFINE_USER_PIPES( \
|
||||
inst, \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
|
||||
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
|
||||
); \
|
||||
\
|
||||
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \
|
||||
|
|
|
|||
Loading…
Reference in a new issue