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.
This commit is contained in:
Marcel Holtmann 2010-10-01 15:18:06 +02:00
parent 0aae76c7aa
commit 7a77b292e3
2 changed files with 2 additions and 11 deletions

View File

@ -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";

View File

@ -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);