mirror of git://git.sysmocom.de/ofono
udev: Use semi-automatic detection for SpeedUp devices
This commit is contained in:
Marcel Holtmann
parent
98baf8c482
commit
41c8b30ce6
|
|
@ -14,28 +14,20 @@ ATTRS{idVendor}=="1bc7", ATTRS{idProduct}=="1004", ENV{ID_USB_INTERFACE_NUM}=="0
|
|||
ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_ALCATEL_TYPE}="aux"
|
||||
ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="0017", ENV{ID_USB_INTERFACE_NUM}=="05", ENV{OFONO_ALCATEL_TYPE}="modem"
|
||||
|
||||
# 4G Systems W14
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9603", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9603", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
|
||||
# 4G Systems P14
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9605", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9605", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
|
||||
# SpeedUp 9800
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="modem"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{ID_USB_INTERFACE_NUM}=="02", ENV{OFONO_LABEL}="aux"
|
||||
|
||||
# SpeedUp 7300
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_LABEL}="modem"
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9e00", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="aux"
|
||||
|
||||
# SpeedUp
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="modem"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1005", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
|
||||
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_SPEEDUP_TYPE}="modem"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_SPEEDUP_TYPE}="aux"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008", ENV{ID_USB_INTERFACE_NUM}=="03", ENV{OFONO_LABEL}="modem"
|
||||
ATTRS{idVendor}=="2020", ATTRS{idProduct}=="1008", ENV{ID_USB_INTERFACE_NUM}=="01", ENV{OFONO_LABEL}="aux"
|
||||
|
||||
# Olive
|
||||
ATTRS{idVendor}=="201e", ATTRS{idProduct}=="2009", ENV{ID_USB_INTERFACE_NUM}=="00", ENV{OFONO_HUAWEI_TYPE}="Modem"
|
||||
|
|
@ -68,12 +60,6 @@ ATTRS{serial}=="1234567890ABCDEF", ENV{ID_SERIAL_SHORT}=""
|
|||
# Alcatel X220L
|
||||
ATTRS{idVendor}=="1bbb", ATTRS{idProduct}=="0017", ENV{OFONO_DRIVER}="alcatel"
|
||||
|
||||
# 4G Systems W14
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9603", ENV{OFONO_DRIVER}="speedup"
|
||||
|
||||
# 4G Systems P14
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9605", ENV{OFONO_DRIVER}="speedup"
|
||||
|
||||
# Speed Up 9800
|
||||
ATTRS{idVendor}=="1c9e", ATTRS{idProduct}=="9800", ENV{OFONO_DRIVER}="speedup"
|
||||
|
||||
|
|
|
|||
|
|
@ -369,58 +369,6 @@ static void add_telit(struct ofono_modem *modem,
|
|||
}
|
||||
}
|
||||
|
||||
static void add_speedup(struct ofono_modem *modem,
|
||||
struct udev_device *udev_device)
|
||||
{
|
||||
struct udev_list_entry *entry;
|
||||
const char *devnode, *type;
|
||||
|
||||
int ppp, aux;
|
||||
|
||||
DBG("modem %p", modem);
|
||||
|
||||
ppp = ofono_modem_get_integer(modem, "ModemRegistered");
|
||||
aux = ofono_modem_get_integer(modem, "AuxRegistered");
|
||||
|
||||
if (ppp && aux)
|
||||
return;
|
||||
|
||||
entry = udev_device_get_properties_list_entry(udev_device);
|
||||
while (entry) {
|
||||
const char *name = udev_list_entry_get_name(entry);
|
||||
type = udev_list_entry_get_value(entry);
|
||||
|
||||
if (g_str_equal(name, "OFONO_SPEEDUP_TYPE") != TRUE) {
|
||||
entry = udev_list_entry_get_next(entry);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (g_str_equal(type, "modem") == TRUE) {
|
||||
if (ppp != 0)
|
||||
return;
|
||||
|
||||
devnode = udev_device_get_devnode(udev_device);
|
||||
ofono_modem_set_string(modem, "Modem", devnode);
|
||||
ppp = 1;
|
||||
ofono_modem_set_integer(modem, "ModemRegistered", ppp);
|
||||
} else if (g_str_equal(type, "aux") == TRUE) {
|
||||
if (aux != 0)
|
||||
return;
|
||||
|
||||
devnode = udev_device_get_devnode(udev_device);
|
||||
ofono_modem_set_string(modem, "Aux", devnode);
|
||||
|
||||
aux = 1;
|
||||
ofono_modem_set_integer(modem, "AuxRegistered", aux);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
if (ppp && aux)
|
||||
ofono_modem_register(modem);
|
||||
}
|
||||
|
||||
static void add_modem(struct udev_device *udev_device)
|
||||
{
|
||||
struct ofono_modem *modem;
|
||||
|
|
@ -509,10 +457,6 @@ done:
|
|||
add_nokiacdma(modem, udev_device);
|
||||
else if (g_strcmp0(driver, "linktop") == 0)
|
||||
add_linktop(modem, udev_device);
|
||||
else if (g_strcmp0(driver, "speedup") == 0)
|
||||
add_speedup(modem, udev_device);
|
||||
else if (g_strcmp0(driver, "speedupcdma") == 0)
|
||||
add_speedup(modem, udev_device);
|
||||
}
|
||||
|
||||
static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
|
||||
|
|
|
|||
|
|
@ -198,6 +198,48 @@ static gboolean setup_huawei(struct modem_info *modem)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean setup_speedup(struct modem_info *modem)
|
||||
{
|
||||
const char *aux = NULL, *mdm = NULL;
|
||||
GSList *list;
|
||||
|
||||
DBG("%s", modem->syspath);
|
||||
|
||||
for (list = modem->devices; list; list = list->next) {
|
||||
struct device_info *info = list->data;
|
||||
|
||||
DBG("%s %s %s %s", info->devnode, info->interface,
|
||||
info->number, info->label);
|
||||
|
||||
if (g_strcmp0(info->label, "aux") == 0) {
|
||||
aux = info->devnode;
|
||||
if (mdm != NULL)
|
||||
break;
|
||||
} else if (g_strcmp0(info->label, "modem") == 0) {
|
||||
mdm = info->devnode;
|
||||
if (aux != NULL)
|
||||
break;
|
||||
} else if (g_strcmp0(info->interface, "255/255/255") == 0) {
|
||||
if (g_strcmp0(info->number, "01") == 0)
|
||||
aux = info->devnode;
|
||||
else if (g_strcmp0(info->number, "02") == 0)
|
||||
mdm = info->devnode;
|
||||
else if (g_strcmp0(info->number, "03") == 0)
|
||||
mdm = info->devnode;
|
||||
}
|
||||
}
|
||||
|
||||
if (aux == NULL || mdm == NULL)
|
||||
return FALSE;
|
||||
|
||||
DBG("aux=%s modem=%s", aux, mdm);
|
||||
|
||||
ofono_modem_set_string(modem->modem, "Aux", aux);
|
||||
ofono_modem_set_string(modem->modem, "Modem", mdm);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean setup_novatel(struct modem_info *modem)
|
||||
{
|
||||
const char *aux = NULL, *mdm = NULL;
|
||||
|
|
@ -320,6 +362,8 @@ static struct {
|
|||
{ "sierra", setup_sierra },
|
||||
{ "huawei", setup_huawei },
|
||||
{ "huaweicdma", setup_huawei },
|
||||
{ "speedupcdma",setup_speedup },
|
||||
{ "speedup", setup_speedup },
|
||||
{ "novatel", setup_novatel },
|
||||
{ "zte", setup_zte },
|
||||
{ "samsung", setup_samsung },
|
||||
|
|
@ -491,6 +535,7 @@ static struct {
|
|||
{ "huawei", "option", "12d1" },
|
||||
{ "huaweicdma", "option", "12d1", "140b" },
|
||||
{ "huaweicdma", "option", "201e" },
|
||||
{ "speedup", "option", "1c9e" },
|
||||
{ "novatel", "option", "1410" },
|
||||
{ "zte", "option", "19d2" },
|
||||
{ "samsung", "option", "04e8", "6889" },
|
||||
|
|
|
|||
Loading…
Reference in New Issue