From 549c298b61e1bfc38268b7ce39de77dfb40a66c1 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 9 Aug 2011 18:33:06 +0200
Subject: [PATCH] udev: udev: Add automatic detection for Nokia data cards

---
 plugins/ofono.rules |  6 ------
 plugins/udev.c      | 30 ------------------------------
 plugins/udevng.c    | 43 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 95646dab..7288aa7d 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -87,12 +87,6 @@ ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130b", ENV{OFONO_DRIVER}="mbm"
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="130c", ENV{OFONO_DRIVER}="mbm"
 ATTRS{idVendor}=="0930", ATTRS{idProduct}=="1311", ENV{OFONO_DRIVER}="mbm"
 
-# Nokia Internet Stick CS-10
-ATTRS{idVendor}=="0421", ATTRS{idProduct}=="060e", ENV{OFONO_DRIVER}="nokia"
-
-# Nokia Internet Stick CS-17
-ATTRS{idVendor}=="0421", ATTRS{idProduct}=="0623", ENV{OFONO_DRIVER}="nokia"
-
 # Nokia CDMA Device
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="023e", ENV{OFONO_DRIVER}="nokiacdma"
 ATTRS{idVendor}=="0421", ATTRS{idProduct}=="00b6", ENV{OFONO_DRIVER}="nokiacdma"
diff --git a/plugins/udev.c b/plugins/udev.c
index a1e6146a..916a5b86 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -198,34 +198,6 @@ static void add_ifx(struct ofono_modem *modem,
 	ofono_modem_register(modem);
 }
 
-static void add_nokia(struct ofono_modem *modem,
-					struct udev_device *udev_device)
-{
-	const char *devnode, *intfnum;
-	int registered;
-
-	DBG("modem %p", modem);
-
-	registered = ofono_modem_get_integer(modem, "Registered");
-	if (registered != 0)
-		return;
-
-	intfnum = get_property(udev_device, "ID_USB_INTERFACE_NUM");
-
-	DBG("intfnum %s", intfnum);
-
-	if (g_strcmp0(intfnum, "02") == 0) {
-		devnode = udev_device_get_devnode(udev_device);
-		ofono_modem_set_string(modem, "Modem", devnode);
-	} else if (g_strcmp0(intfnum, "04") == 0) {
-		devnode = udev_device_get_devnode(udev_device);
-		ofono_modem_set_string(modem, "Control", devnode);
-
-		ofono_modem_set_integer(modem, "Registered", 1);
-		ofono_modem_register(modem);
-	}
-}
-
 static void add_isi(struct ofono_modem *modem,
 					struct udev_device *udev_device)
 {
@@ -439,8 +411,6 @@ done:
 		add_mbm(modem, udev_device);
 	else if (g_strcmp0(driver, "ifx") == 0)
 		add_ifx(modem, udev_device);
-	else if (g_strcmp0(driver, "nokia") == 0)
-		add_nokia(modem, udev_device);
 	else if (g_strcmp0(driver, "isiusb") == 0)
 		add_isi(modem, udev_device);
 	else if (g_strcmp0(driver, "u8500") == 0)
diff --git a/plugins/udevng.c b/plugins/udevng.c
index 6fb37c56..20a8f542 100644
--- a/plugins/udevng.c
+++ b/plugins/udevng.c
@@ -320,6 +320,46 @@ static gboolean setup_novatel(struct modem_info *modem)
 	return TRUE;
 }
 
+static gboolean setup_nokia(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, "10/0/0") == 0) {
+			if (g_strcmp0(info->number, "02") == 0)
+				mdm = info->devnode;
+			else if (g_strcmp0(info->number, "04") == 0)
+				aux = 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_zte(struct modem_info *modem)
 {
 	const char *aux = NULL, *mdm = NULL;
@@ -406,6 +446,7 @@ static struct {
 	{ "speedup",	setup_speedup	},
 	{ "alcatel",	setup_alcatel	},
 	{ "novatel",	setup_novatel	},
+	{ "nokia",	setup_nokia	},
 	{ "zte",	setup_zte	},
 	{ "samsung",	setup_samsung	},
 	{ }
@@ -583,6 +624,8 @@ static struct {
 	{ "alcatel",	"option",	"1bbb", "0017"	},
 	{ "novatel",	"option",	"1410"		},
 	{ "zte",	"option",	"19d2"		},
+	{ "nokia",	"option",	"0421", "060e"	},
+	{ "nokia",	"option",	"0421", "0623"	},
 	{ "samsung",    "option",       "04e8", "6889"  },
 	{ "samsung",    "kalmia"			},
 	{ }