Skip to content

Commit a58abd0

Browse files
bjarki-andreasennashif
bjarki-andreasen
authored and
nashif
committed
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 <[email protected]>
1 parent 717474d commit a58abd0

File tree

1 file changed

+13
-90
lines changed

1 file changed

+13
-90
lines changed

‎drivers/modem/modem_cellular.c

Lines changed: 13 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -2118,12 +2118,6 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
21182118
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
21192119
}; \
21202120
\
2121-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2122-
inst, \
2123-
gnss_pipe, \
2124-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2125-
); \
2126-
\
21272121
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
21282122
inst, \
21292123
user_pipe_0, \
@@ -2138,9 +2132,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
21382132
\
21392133
MODEM_CELLULAR_DEFINE_USER_PIPES( \
21402134
inst, \
2141-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2142-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2143-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2135+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
2136+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
21442137
); \
21452138
\
21462139
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,
21742167
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
21752168
}; \
21762169
\
2177-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2178-
inst, \
2179-
gnss_pipe, \
2180-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2181-
); \
2182-
\
21832170
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
21842171
inst, \
21852172
user_pipe_0, \
@@ -2194,9 +2181,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
21942181
\
21952182
MODEM_CELLULAR_DEFINE_USER_PIPES( \
21962183
inst, \
2197-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2198-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2199-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2184+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
2185+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
22002186
); \
22012187
\
22022188
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,
22302216
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
22312217
}; \
22322218
\
2233-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2234-
inst, \
2235-
gnss_pipe, \
2236-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2237-
); \
2238-
\
22392219
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
22402220
inst, \
22412221
user_pipe_0, \
@@ -2250,9 +2230,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
22502230
\
22512231
MODEM_CELLULAR_DEFINE_USER_PIPES( \
22522232
inst, \
2253-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2254-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2255-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2233+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
2234+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
22562235
); \
22572236
\
22582237
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,
22982277
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
22992278
); \
23002279
\
2301-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2302-
inst, \
2303-
user_pipe_1, \
2304-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2305-
); \
2306-
\
23072280
MODEM_CELLULAR_DEFINE_USER_PIPES( \
23082281
inst, \
23092282
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
23102283
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2311-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
23122284
); \
23132285
\
23142286
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,
23542326
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
23552327
); \
23562328
\
2357-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2358-
inst, \
2359-
user_pipe_1, \
2360-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2361-
); \
2362-
\
23632329
MODEM_CELLULAR_DEFINE_USER_PIPES( \
23642330
inst, \
2365-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2366-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2367-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2331+
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 4), \
2332+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
23682333
); \
23692334
\
23702335
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,
23992364
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
24002365
}; \
24012366
\
2402-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2403-
inst, \
2404-
gnss_pipe, \
2405-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2406-
); \
2407-
\
24082367
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
24092368
inst, \
24102369
user_pipe_0, \
@@ -2419,9 +2378,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
24192378
\
24202379
MODEM_CELLULAR_DEFINE_USER_PIPES( \
24212380
inst, \
2422-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2423-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2424-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2381+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
2382+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
24252383
); \
24262384
\
24272385
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,
24552413
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
24562414
}; \
24572415
\
2458-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2459-
inst, \
2460-
gnss_pipe, \
2461-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2462-
); \
2463-
\
24642416
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
24652417
inst, \
24662418
user_pipe_0, \
24672419
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
24682420
); \
24692421
\
2470-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2471-
inst, \
2472-
user_pipe_1, \
2473-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2474-
); \
2475-
\
24762422
MODEM_CELLULAR_DEFINE_USER_PIPES( \
24772423
inst, \
2478-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2479-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2480-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2424+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
24812425
); \
24822426
\
24832427
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,
25162460
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
25172461
); \
25182462
\
2519-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2520-
inst, \
2521-
user_pipe_0, \
2522-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2523-
); \
2524-
\
2525-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2526-
inst, \
2527-
user_pipe_1, \
2528-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2529-
); \
2530-
\
25312463
MODEM_CELLULAR_DEFINE_USER_PIPES( \
25322464
inst, \
25332465
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2534-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2535-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
25362466
); \
25372467
\
25382468
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,
25662496
.ppp = &MODEM_CELLULAR_INST_NAME(ppp, inst), \
25672497
}; \
25682498
\
2569-
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
2570-
inst, \
2571-
gnss_pipe, \
2572-
CONFIG_MODEM_CELLULAR_USER_PIPE_BUFFER_SIZES \
2573-
); \
2574-
\
25752499
MODEM_CELLULAR_DEFINE_USER_PIPE_DATA( \
25762500
inst, \
25772501
user_pipe_0, \
@@ -2586,9 +2510,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script,
25862510
\
25872511
MODEM_CELLULAR_DEFINE_USER_PIPES( \
25882512
inst, \
2589-
MODEM_CELLULAR_INIT_USER_PIPE(inst, gnss_pipe, 3), \
2590-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 4), \
2591-
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 5), \
2513+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_0, 3), \
2514+
MODEM_CELLULAR_INIT_USER_PIPE(inst, user_pipe_1, 4), \
25922515
); \
25932516
\
25942517
static const struct modem_cellular_config MODEM_CELLULAR_INST_NAME(config, inst) = { \

0 commit comments

Comments
 (0)