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

atmodem: rename OFONO_VENDOR_QUECTEL_M95 

Other serial connected modems (i.e the MC60 model) from is AT-compatible
with the M95 model, so rename the M95 vendor id to be common for both.
This commit is contained in:
Martin Hundebøll 2019-07-16 21:10:48 +02:00 committed by Denis Kenzior
parent 8905150bda
commit 8be2adc908
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/atmodem/sim.c
View File

@ -1217,7 +1217,7 @@ static void at_pin_retries_query(struct ofono_sim *sim,
at_qpinc_cb, cbd, g_free) > 0) at_qpinc_cb, cbd, g_free) > 0)
return; return;
break; break;
case OFONO_VENDOR_QUECTEL_M95: case OFONO_VENDOR_QUECTEL_SERIAL:
if (g_at_chat_send(sd->chat, "AT+QTRPIN", qtrpin_prefix, if (g_at_chat_send(sd->chat, "AT+QTRPIN", qtrpin_prefix,
at_qtrpin_cb, cbd, g_free) > 0) at_qtrpin_cb, cbd, g_free) > 0)
return; return;
@ -1354,7 +1354,7 @@ static void at_pin_send_cb(gboolean ok, GAtResult *result,
case OFONO_VENDOR_HUAWEI: case OFONO_VENDOR_HUAWEI:
case OFONO_VENDOR_SIMCOM: case OFONO_VENDOR_SIMCOM:
case OFONO_VENDOR_SIERRA: case OFONO_VENDOR_SIERRA:
case OFONO_VENDOR_QUECTEL_M95: case OFONO_VENDOR_QUECTEL_SERIAL:
/* /*
* On ZTE modems, after pin is entered, SIM state is checked * On ZTE modems, after pin is entered, SIM state is checked
* by polling CPIN as their modem doesn't provide unsolicited * by polling CPIN as their modem doesn't provide unsolicited

4
drivers/atmodem/sms.c
View File

@ -339,7 +339,7 @@ static inline void at_ack_delivery(struct ofono_sms *sms)
case OFONO_VENDOR_GEMALTO: case OFONO_VENDOR_GEMALTO:
snprintf(buf, sizeof(buf), "AT+CNMA=1"); snprintf(buf, sizeof(buf), "AT+CNMA=1");
break; break;
case OFONO_VENDOR_QUECTEL_M95: case OFONO_VENDOR_QUECTEL_SERIAL:
snprintf(buf, sizeof(buf), "AT+CNMA"); snprintf(buf, sizeof(buf), "AT+CNMA");
break; break;
default: default:
@ -1289,7 +1289,7 @@ static void at_csms_query_cb(gboolean ok, GAtResult *result,
goto out; goto out;
switch (data->vendor) { switch (data->vendor) {
case OFONO_VENDOR_QUECTEL_M95: case OFONO_VENDOR_QUECTEL_SERIAL:
g_at_result_iter_next_number(&iter, &status_min); g_at_result_iter_next_number(&iter, &status_min);
g_at_result_iter_next_number(&iter, &status_max); g_at_result_iter_next_number(&iter, &status_max);
if (status_min <= 1 && 1 <= status_max) if (status_min <= 1 && 1 <= status_max)

2
drivers/atmodem/vendor.h
View File

@ -44,7 +44,7 @@ enum ofono_vendor {
OFONO_VENDOR_WAVECOM_Q2XXX, OFONO_VENDOR_WAVECOM_Q2XXX,
OFONO_VENDOR_ALCATEL, OFONO_VENDOR_ALCATEL,
OFONO_VENDOR_QUECTEL, OFONO_VENDOR_QUECTEL,
OFONO_VENDOR_QUECTEL_M95, OFONO_VENDOR_QUECTEL_SERIAL,
OFONO_VENDOR_UBLOX, OFONO_VENDOR_UBLOX,
OFONO_VENDOR_XMM, OFONO_VENDOR_XMM,
OFONO_VENDOR_GEMALTO, OFONO_VENDOR_GEMALTO,

2
plugins/quectel.c
View File

@ -330,7 +330,7 @@ static void cgmm_cb(int ok, GAtResult *result, void *user_data)
data->vendor = OFONO_VENDOR_QUECTEL; data->vendor = OFONO_VENDOR_QUECTEL;
} else if (strcmp(model, "Quectel_M95") == 0) { } else if (strcmp(model, "Quectel_M95") == 0) {
DBG("%p model M95", modem); DBG("%p model M95", modem);
data->vendor = OFONO_VENDOR_QUECTEL_M95; data->vendor = OFONO_VENDOR_QUECTEL_SERIAL;
} 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;