sysmocom
/
ofono
mirror of git://git.sysmocom.de/ofono
11
0
Fork 0
Code Issues Releases Activity

quectel: EC21 needs aux channel to be the first mux channel 

The Quectel EC21 does only work correctly, if the mux channel used for
aux is the first mux channel. It does only put it's URC messages in the
first mux channel, so this has to be the aux channel in our case.
To be flexible on the mux order we introduce two arrays here, that then
contain the initialization data in their needed order.
Initialization data is then applied by for-looping over this array.
This commit is contained in:
Lars Poeschel 2020-05-29 14:43:47 +02:00 committed by Denis Kenzior
parent 2d991d8296
commit 1868dbf2b3
1 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
plugins/quectel.c
View File

@ -78,6 +78,27 @@ static const uint8_t gsm0710_terminate[] = {
0xf9, /* close flag */ 0xf9, /* close flag */
}; };
enum mux_type {
QUECTEL_MUX_TYPE_AUX = 0,
QUECTEL_MUX_TYPE_MODEM,
QUECTEL_MUX_TYPE_MAX,
};
struct mux_initialization_data {
enum mux_type mux_type;
char *chat_debug;
const char *n_gsm_key;
const char *n_gsm_value;
};
static const struct mux_initialization_data mux_order_default[] = {
{ QUECTEL_MUX_TYPE_MODEM, "Modem: ", "Modem", "/dev/gsmtty1"},
{ QUECTEL_MUX_TYPE_AUX, "Aux: ", "Aux", "/dev/gsmtty2"} };
static const struct mux_initialization_data mux_order_ec21[] = {
{ QUECTEL_MUX_TYPE_AUX, "Aux: ", "Aux", "/dev/gsmtty1"},
{ QUECTEL_MUX_TYPE_MODEM, "Modem: ", "Modem", "/dev/gsmtty2"} };
enum quectel_model { enum quectel_model {
QUECTEL_UNKNOWN, QUECTEL_UNKNOWN,
QUECTEL_UC15, QUECTEL_UC15,
@ -106,6 +127,7 @@ struct quectel_data {
struct l_timeout *init_timeout; struct l_timeout *init_timeout;
size_t init_count; size_t init_count;
guint init_cmd; guint init_cmd;
const struct mux_initialization_data *mux_order;
}; };
struct dbus_hw { struct dbus_hw {
@ -838,6 +860,7 @@ static GAtChat *create_chat(struct ofono_modem *modem, char *debug)
static void cmux_gatmux(struct ofono_modem *modem) static void cmux_gatmux(struct ofono_modem *modem)
{ {
struct quectel_data *data = ofono_modem_get_data(modem); struct quectel_data *data = ofono_modem_get_data(modem);
GAtChat *chat;
DBG("%p", modem); DBG("%p", modem);
@ -853,18 +876,21 @@ static void cmux_gatmux(struct ofono_modem *modem)
g_at_mux_start(data->mux); g_at_mux_start(data->mux);
data->modem = create_chat(modem, "Modem: "); for (int i = 0; i < QUECTEL_MUX_TYPE_MAX; i++) {
if (!data->modem) { chat = create_chat(modem, data->mux_order[i].chat_debug);
ofono_error("failed to create modem channel");
close_serial(modem); if (!chat) {
return; ofono_error("failed to create %schannel",
} data->mux_order[i].chat_debug);
close_serial(modem);
return;
}
if (data->mux_order[i].mux_type == QUECTEL_MUX_TYPE_AUX)
data->aux = chat;
else
data->modem = chat;
data->aux = create_chat(modem, "Aux: ");
if (!data->aux) {
ofono_error("failed to create aux channel");
close_serial(modem);
return;
} }
setup_aux(modem); setup_aux(modem);
@ -880,7 +906,9 @@ static void mux_ready_cb(struct l_timeout *timeout, void *user_data)
DBG("%p", modem); DBG("%p", modem);
/* check if the last (and thus all) virtual gsm tty's are created */ /* check if the last (and thus all) virtual gsm tty's are created */
ret = stat(ofono_modem_get_string(modem, "Modem"), &st); ret = stat(ofono_modem_get_string(modem,
data->mux_order[QUECTEL_MUX_TYPE_MAX - 1].n_gsm_key),
&st);
if (ret < 0) { if (ret < 0) {
if (data->mux_ready_count++ < 5) { if (data->mux_ready_count++ < 5) {
/* not ready yet; try again in 100 ms*/ /* not ready yet; try again in 100 ms*/
@ -957,8 +985,10 @@ static void cmux_ngsm(struct ofono_modem *modem)
* the kernel does not yet support mapping the underlying serial device * the kernel does not yet support mapping the underlying serial device
* to its virtual gsm ttys, so hard-code gsmtty1 gsmtty2 for now * to its virtual gsm ttys, so hard-code gsmtty1 gsmtty2 for now
*/ */
ofono_modem_set_string(modem, "Modem", "/dev/gsmtty1"); for (int i = 0; i < QUECTEL_MUX_TYPE_MAX; i++) {
ofono_modem_set_string(modem, "Aux", "/dev/gsmtty2"); ofono_modem_set_string(modem, data->mux_order[i].n_gsm_key,
data->mux_order[i].n_gsm_value);
}
/* wait for gsmtty devices to appear */ /* wait for gsmtty devices to appear */
if (!l_timeout_create_ms(100, mux_ready_cb, modem, NULL)) { if (!l_timeout_create_ms(100, mux_ready_cb, modem, NULL)) {
@ -1014,6 +1044,8 @@ static void cgmm_cb(int ok, GAtResult *result, void *user_data)
return; return;
} }
data->mux_order = mux_order_default;
if (strcmp(model, "UC15") == 0) { if (strcmp(model, "UC15") == 0) {
DBG("%p model UC15", modem); DBG("%p model UC15", modem);
data->vendor = OFONO_VENDOR_QUECTEL; data->vendor = OFONO_VENDOR_QUECTEL;
@ -1030,6 +1062,7 @@ static void cgmm_cb(int ok, GAtResult *result, void *user_data)
DBG("%p model EC21", modem); DBG("%p model EC21", modem);
data->vendor = OFONO_VENDOR_QUECTEL; data->vendor = OFONO_VENDOR_QUECTEL;
data->model = QUECTEL_EC21; data->model = QUECTEL_EC21;
data->mux_order = mux_order_ec21;
} else { } else {
ofono_warn("%p unknown model: '%s'", modem, model); ofono_warn("%p unknown model: '%s'", modem, model);
data->vendor = OFONO_VENDOR_QUECTEL; data->vendor = OFONO_VENDOR_QUECTEL;