atmodem: Change cinterion prefix to gemalto

This commit is contained in:
Giacinto Cifelli 2018-10-26 07:11:04 +02:00 committed by Denis Kenzior
parent a429950f2f
commit 713585963f
1 changed files with 8 additions and 8 deletions

View File

@ -178,7 +178,7 @@ static int option_parse_tech(GAtResult *result)
return tech; return tech;
} }
static int cinterion_parse_tech(GAtResult *result) static int gemalto_parse_tech(GAtResult *result)
{ {
int tech = -1; int tech = -1;
GAtResultIter iter; GAtResultIter iter;
@ -234,13 +234,13 @@ static void at_creg_cb(gboolean ok, GAtResult *result, gpointer user_data)
cb(&error, status, lac, ci, tech, cbd->data); cb(&error, status, lac, ci, tech, cbd->data);
} }
static void cinterion_query_tech_cb(gboolean ok, GAtResult *result, static void gemalto_query_tech_cb(gboolean ok, GAtResult *result,
gpointer user_data) gpointer user_data)
{ {
struct tech_query *tq = user_data; struct tech_query *tq = user_data;
int tech; int tech;
tech = cinterion_parse_tech(result); tech = gemalto_parse_tech(result);
ofono_netreg_status_notify(tq->netreg, ofono_netreg_status_notify(tq->netreg,
tq->status, tq->lac, tq->ci, tech); tq->status, tq->lac, tq->ci, tech);
@ -879,7 +879,7 @@ static void telit_ciev_notify(GAtResult *result, gpointer user_data)
ofono_netreg_strength_notify(netreg, strength); ofono_netreg_strength_notify(netreg, strength);
} }
static void cinterion_ciev_notify(GAtResult *result, gpointer user_data) static void gemalto_ciev_notify(GAtResult *result, gpointer user_data)
{ {
struct ofono_netreg *netreg = user_data; struct ofono_netreg *netreg = user_data;
struct netreg_data *nd = ofono_netreg_get_data(netreg); struct netreg_data *nd = ofono_netreg_get_data(netreg);
@ -1562,7 +1562,7 @@ static void creg_notify(GAtResult *result, gpointer user_data)
case OFONO_VENDOR_GEMALTO: case OFONO_VENDOR_GEMALTO:
if (g_at_chat_send(nd->chat, "AT^SMONI", if (g_at_chat_send(nd->chat, "AT^SMONI",
smoni_prefix, smoni_prefix,
cinterion_query_tech_cb, tq, g_free) > 0) gemalto_query_tech_cb, tq, g_free) > 0)
return; return;
break; break;
} }
@ -2033,10 +2033,10 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
break; break;
case OFONO_VENDOR_GEMALTO: case OFONO_VENDOR_GEMALTO:
/* /*
* We can't set rssi bounds from Cinterion responses * We can't set rssi bounds from Gemalto responses
* so set them up to specified values here * so set them up to specified values here
* *
* Cinterion rssi signal strength specified as: * Gemalto rssi signal strength specified as:
* 0 <= -112dBm * 0 <= -112dBm
* 1 - 4 signal strengh in 15 dB steps * 1 - 4 signal strengh in 15 dB steps
* 5 >= -51 dBm * 5 >= -51 dBm
@ -2050,7 +2050,7 @@ static void at_creg_set_cb(gboolean ok, GAtResult *result, gpointer user_data)
g_at_chat_send(nd->chat, "AT^SIND=\"rssi\",1", none_prefix, g_at_chat_send(nd->chat, "AT^SIND=\"rssi\",1", none_prefix,
NULL, NULL, NULL); NULL, NULL, NULL);
g_at_chat_register(nd->chat, "+CIEV:", g_at_chat_register(nd->chat, "+CIEV:",
cinterion_ciev_notify, FALSE, netreg, NULL); gemalto_ciev_notify, FALSE, netreg, NULL);
break; break;
case OFONO_VENDOR_NOKIA: case OFONO_VENDOR_NOKIA:
case OFONO_VENDOR_SAMSUNG: case OFONO_VENDOR_SAMSUNG: