fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-24 17:10:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gsm: handle different modem init sequences more elegantly

Browse source 
Change the encoding on the channel to binary too, since modems usually don't
send UTF-8.
This commit is contained in:
Sjoerd Simons 2009-01-16 16:40:59 -05:00 • committed by Dan Williams
parent 94575f511d
commit c96333de17
2 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/nm-gsm-device.c
View file

@ -67,10 +67,20 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
/* Various possible init sequences */
const gchar *modem_init_sequences[] = {
"ATZ E0 V1 X4 &C1 +FCLASS=0",
"ATZ E0 V1 &C1",
"AT&F E0 V1 X4 &C1 +FCLASS=0",
"AT&F E0 V1 &C1",
"AT&F E0 V1",
NULL
};
static void enter_pin (NMGsmDevice *device, NMGsmSecret secret_type, gboolean retry);
static void manual_registration (NMGsmDevice *device);
static void automatic_registration (NMGsmDevice *device);
static void init_modem (NMSerialDevice *device, gpointer user_data);
static void init_modem (NMSerialDevice *device);
NMGsmDevice *
nm_gsm_device_new (const char *udi,
@ -497,13 +507,14 @@ init_full_done (NMSerialDevice *device,
static void
init_modem_full (NMGsmDevice *device)
{
NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device);
const char *responses[] = { "OK", "ERROR", "ERR", NULL };
/* Send E0 too because some devices turn echo back on after CPIN which
* just breaks stuff since echo-ed commands are interpreted as replies.
* rh #456770
*/
modem_wait_for_reply (device, "ATZ E0 V1 X4 &C1 +FCLASS=0", 10, responses, responses, init_full_done, NULL);
modem_wait_for_reply (device, modem_init_sequences[priv->init_tries], 10, responses, responses, init_full_done, NULL);
}
static void
@ -648,7 +659,6 @@ init_done (NMSerialDevice *device,
switch (reply_index) {
case 0:
priv->init_tries = 0;
check_pin (NM_GSM_DEVICE (device));
break;
case -1:
@ -658,35 +668,27 @@ init_done (NMSerialDevice *device,
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED);
break;
default:
switch (priv->init_tries) {
case 0:
nm_warning ("Trying alternate modem initialization");
init_modem (device, "ATZ E0 V1 &C1");
break;
case 1:
nm_warning ("Trying second alternate modem initialization");
init_modem (device, "AT&F E0 V1");
break;
default:
priv->init_tries++;
if (modem_init_sequences[priv->init_tries] != NULL) {
nm_warning ("Trying alternate modem initialization (%d)",
priv->init_tries);
init_modem (device);
} else {
nm_warning ("Modem initialization failed");
nm_device_state_changed (NM_DEVICE (device),
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED);
break;
}
priv->init_tries++;
return;
break;
}
}
static void
init_modem (NMSerialDevice *device, gpointer user_data)
init_modem (NMSerialDevice *device)
{
NMGsmDevicePrivate *priv = NM_GSM_DEVICE_GET_PRIVATE (device);
const char *responses[] = { "OK", "ERROR", "ERR", NULL };
const char *init_string = user_data;
if (!init_string)
init_string = "ATZ E0 V1 X4 &C1 +FCLASS=0";
const char *init_string = modem_init_sequences[priv->init_tries];
modem_wait_for_reply (NM_GSM_DEVICE (device), init_string, 10, responses, responses, init_done, NULL);
}
@ -707,7 +709,7 @@ real_act_stage1_prepare (NMDevice *device, NMDeviceStateReason *reason)
NM_GSM_DEVICE_GET_PRIVATE (device)->init_tries = 0;
id = nm_serial_device_flash (serial_device, 100, init_modem, NULL);
id = nm_serial_device_flash (serial_device, 100, (NMSerialFlashFn) init_modem, NULL);
if (!id)
*reason = NM_DEVICE_STATE_REASON_UNKNOWN;

1
src/nm-serial-device.c
View file

@ -416,6 +416,7 @@ nm_serial_device_open (NMSerialDevice *device,
}
priv->channel = g_io_channel_unix_new (priv->fd);
g_io_channel_set_encoding (priv->channel, NULL, NULL);
return TRUE;
}