diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2010-10-01 15:18:06 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2010-10-01 15:18:06 +0200 |
| commit | 7a77b292e318e749ebc690644b9beead674a37ba (patch) | |
| tree | 013196dcb471d41786c8c59357d06b9af3900e54 | |
| parent | 0aae76c7aa040860fb5671b9e901e221f5ed05dc (diff) | |
| download | ofono-7a77b292e318e749ebc690644b9beead674a37ba.tar.bz2 | |
ifx: Remove support for OFONO_IFX_MODEL option
The Infineon modem model is now auto-detected, so there is no longer
any need to specify it in the udev configuration rules.
| -rw-r--r-- | plugins/ifx.c | 9 | ||||
| -rw-r--r-- | plugins/udev.c | 4 |
2 files changed, 2 insertions, 11 deletions
diff --git a/plugins/ifx.c b/plugins/ifx.c index 33d465e1..f48faa5a 100644 --- a/plugins/ifx.c +++ b/plugins/ifx.c @@ -472,7 +472,7 @@ error: static int ifx_enable(struct ofono_modem *modem) { struct ifx_data *data = ofono_modem_get_data(modem); - const char *device, *ldisc, *model, *audio, *loopback; + const char *device, *ldisc, *audio, *loopback; GAtSyntax *syntax; GAtChat *chat; @@ -484,13 +484,6 @@ static int ifx_enable(struct ofono_modem *modem) DBG("%s", device); - model = ofono_modem_get_string(modem, "Model"); - if (g_strcmp0(model, "XMM6260") == 0) { - data->audio_source = 4; - data->audio_dest = 3; - data->audio_context = 0; - } - audio = ofono_modem_get_string(modem, "AudioSetting"); if (g_strcmp0(audio, "FULL_DUPLEX") == 0) data->audio_setting = "0,0,0,0,0,0,0,0,0"; diff --git a/plugins/udev.c b/plugins/udev.c index 8298821a..211e9646 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -227,9 +227,7 @@ static void add_ifx(struct ofono_modem *modem, const char *name = udev_list_entry_get_name(entry); const char *value = udev_list_entry_get_value(entry); - if (g_str_equal(name, "OFONO_IFX_MODEL") == TRUE) - ofono_modem_set_string(modem, "Model", value); - else if (g_str_equal(name, "OFONO_IFX_LDISC") == TRUE) + if (g_str_equal(name, "OFONO_IFX_LDISC") == TRUE) ofono_modem_set_string(modem, "LineDiscipline", value); else if (g_str_equal(name, "OFONO_IFX_AUDIO") == TRUE) ofono_modem_set_string(modem, "AudioSetting", value); |