From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============7128919958136880972==" MIME-Version: 1.0 From: Florian Steinel Subject: [PATCH 1/1] Huawei E176: Mark primary and secondary device at ofono.rules TODO: Fix sim_add detection, add E1552 idProduct to ofono.rules Date: Sun, 30 May 2010 15:47:21 +0200 Message-ID: <20100530134721.GA14827@h02.hostsharing.net> List-Id: To: ofono@ofono.org --===============7128919958136880972== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable --- plugins/ofono.rules | 15 +++++++++++ plugins/udev.c | 70 ++++++++++++++++++++++-------------------------= ---- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/plugins/ofono.rules b/plugins/ofono.rules index 0575362..abae06a 100644 --- a/plugins/ofono.rules +++ b/plugins/ofono.rules @@ -1,11 +1,26 @@ # do not edit this file, it will be overwritten on update = ACTION!=3D"add|change", GOTO=3D"ofono_end" + +SUBSYSTEM!=3D"tty", GOTO=3D"ofono_typ_end" +KERNEL!=3D"ttyUSB[0-9]*", GOTO=3D"ofono_typ_end" + +# HUAWEI E176 +ENV{ID_VENDOR_ID}=3D=3D"12d1", ENV{ID_MODEL_ID}=3D=3D"1003", ENV{ID_IFACE}= =3D=3D"00", ENV{OFONO_TYP}=3D"PRIMARY" +ENV{ID_VENDOR_ID}=3D=3D"12d1", ENV{ID_MODEL_ID}=3D=3D"1003", ENV{ID_IFACE}= =3D=3D"01", ENV{OFONO_TYP}=3D"SECONDARY" +# HUAWEI E1552 +# TODO: Add ID_MODEL_ID aka idProduct for E1552 +#ENV{ID_VENDOR_ID}=3D=3D"12d1", ENV{ID_MODEL_ID}=3D=3D"1003", ENV{ID_IFACE= }=3D=3D"00", ENV{OFONO_TYP}=3D"PRIMARY" +#ENV{ID_VENDOR_ID}=3D=3D"12d1", ENV{ID_MODEL_ID}=3D=3D"1003", ENV{ID_IFACE= }=3D=3D"02", ENV{OFONO_TYP}=3D"SECONDARY" + +LABEL=3D"ofono_typ_end" + SUBSYSTEM!=3D"usb", GOTO=3D"ofono_end" ENV{DEVTYPE}!=3D"usb_device", GOTO=3D"ofono_end" = # HUAWEI Technology ATTRS{idVendor}=3D=3D"12d1", ENV{OFONO_DRIVER}=3D"huawei" +# HUAWEI EM770 ATTRS{idVendor}=3D=3D"12d1", ATTRS{idProduct}=3D=3D"1404", ENV{OFONO_DRIVE= R}=3D"em770" = # Novatel Wireless diff --git a/plugins/udev.c b/plugins/udev.c index bdac4fd..d52a758 100644 --- a/plugins/udev.c +++ b/plugins/udev.c @@ -89,24 +89,6 @@ static const char *get_serial(struct udev_device *udev_d= evice) return serial; } = -static const char *get_usb_num(struct udev_device *udev_device) -{ - struct udev_list_entry *entry; - const char *num =3D NULL; - - entry =3D udev_device_get_properties_list_entry(udev_device); - while (entry) { - const char *name =3D udev_list_entry_get_name(entry); - - if (g_strcmp0(name, "ID_USB_INTERFACE_NUM") =3D=3D 0) - num =3D udev_list_entry_get_value(entry); - - entry =3D udev_list_entry_get_next(entry); - } - - return num; -} - #define MODEM_DEVICE "ModemDevice" #define DATA_DEVICE "DataDevice" #define GPS_DEVICE "GPSDevice" @@ -219,7 +201,8 @@ static void add_hso(struct ofono_modem *modem, static void add_huawei(struct ofono_modem *modem, struct udev_device *udev_device) { - const char *devnode, *num; + struct udev_list_entry *entry; + const char *devnode, *serial_typ =3D NULL; int primary, secondary; = primary =3D ofono_modem_get_integer(modem, "PrimaryRegistered"); @@ -228,32 +211,39 @@ static void add_huawei(struct ofono_modem *modem, if (primary && secondary) return; = - num =3D get_usb_num(udev_device); + entry =3D udev_device_get_properties_list_entry(udev_device); + while (entry) { + const char *name =3D udev_list_entry_get_name(entry); = - /* - * Here is is assumed that that usb port number 0 is the control - * port and port 2 is the event port. This assumption will surely - * be false with some devices and better heuristics is needed. - */ - if (g_strcmp0(num, "00") =3D=3D 0) { - if (primary !=3D 0) - return; + if (g_strcmp0(name, "OFONO_TYP") =3D=3D 0) { + serial_typ =3D udev_list_entry_get_value(entry); = - devnode =3D udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, "Device", devnode); + if (g_strcmp0(serial_typ, "PRIMARY") =3D=3D 0) { + if (primary !=3D 0) + return; = - primary =3D 1; - ofono_modem_set_integer(modem, "PrimaryRegistered", primary); - } else if (g_strcmp0(num, "02") =3D=3D 0) { - if (secondary !=3D 0) - return; + devnode =3D udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "Device", devnode); = - devnode =3D udev_device_get_devnode(udev_device); - ofono_modem_set_string(modem, "SecondaryDevice", devnode); + primary =3D 1; + ofono_modem_set_integer(modem, "PrimaryRegistered", primary); + } + + if (g_strcmp0(serial_typ, "SECONDARY") =3D=3D 0) { + if (secondary !=3D 0) + return; + + devnode =3D udev_device_get_devnode(udev_device); + ofono_modem_set_string(modem, "SecondaryDevice", devnode); + + secondary =3D 1; + ofono_modem_set_integer(modem, "SecondaryRegistered", + secondary); + } = - secondary =3D 1; - ofono_modem_set_integer(modem, "SecondaryRegistered", - secondary); + } + + entry =3D udev_list_entry_get_next(entry); } = if (primary && secondary) -- = 1.6.4.4 --===============7128919958136880972==--