From f6966a3c5e5c003101a6fd92425e602c845cbc2c Mon Sep 17 00:00:00 2001
From: Aki Niemi <aki.niemi@nokia.com>
Date: Tue, 28 Sep 2010 10:33:36 +0300
Subject: [PATCH] Add udev support for ISI modems

---
 plugins/isigen.c    |  5 ++---
 plugins/n900.c      |  2 +-
 plugins/ofono.rules | 13 +++++++++++++
 plugins/udev.c      | 23 +++++++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/plugins/isigen.c b/plugins/isigen.c
index 1c6b26ca..dee2b46e 100644
--- a/plugins/isigen.c
+++ b/plugins/isigen.c
@@ -253,17 +253,16 @@ static void phonet_status_cb(GIsiModem *idx,
 		g_isi_verify(isi->client, reachable_cb, isi);
 	else if (st == PN_LINK_DOWN)
 		set_power_by_mtc_state(isi, MTC_STATE_NONE);
-	else if (st == PN_LINK_REMOVED)
-		ofono_modem_remove(modem);
 }
 
 static int isigen_probe(struct ofono_modem *modem)
 {
 	struct isi_data *isi;
-	char const *ifname = ofono_modem_get_string(modem, "Interface");
+	const char *ifname = ofono_modem_get_string(modem, "Interface");
 	unsigned address = ofono_modem_get_integer(modem, "Address");
 	GIsiModem *idx;
 	GPhonetNetlink *link;
+
 	if (ifname == NULL)
 		return -EINVAL;
 
diff --git a/plugins/n900.c b/plugins/n900.c
index bc40443d..9c1b9b33 100644
--- a/plugins/n900.c
+++ b/plugins/n900.c
@@ -392,7 +392,7 @@ static int n900_probe(struct ofono_modem *modem)
 	struct isi_data *isi;
 
 	if (ifname == NULL)
-		ifname = "phonet0";
+		return -EINVAL;
 
 	DBG("(%p) with %s", modem, ifname);
 
diff --git a/plugins/ofono.rules b/plugins/ofono.rules
index 590c0f22..65177577 100644
--- a/plugins/ofono.rules
+++ b/plugins/ofono.rules
@@ -337,6 +337,19 @@ ATTRS{idVendor}=="12d1", ATTRS{idProduct}=="1486", ENV{OFONO_IFACE_NUM}=="02", E
 
 LABEL="ofono_tty_end"
 
+# ISI/Phonet drivers
+SUBSYSTEM!="net", GOTO="ofono_isi_end"
+ATTRS{type}!="820", GOTO="ofono_isi_end"
+KERNELS=="gadget", GOTO="ofono_isi_end"
+
+# Generic / PC Suite mode
+SUBSYSTEMS=="usb", ENV{OFONO_DRIVER}="isigen", ENV{OFONO_ISI_ADDRESS}="16"
+
+# Nokia N900 modem
+SUBSYSTEMS=="hsi", ENV{OFONO_DRIVER}="n900", ENV{OFONO_ISI_ADDRESS}="108"
+
+LABEL="ofono_isi_end"
+
 SUBSYSTEM!="usb", GOTO="ofono_end"
 ENV{DEVTYPE}!="usb_device", GOTO="ofono_end"
 
diff --git a/plugins/udev.c b/plugins/udev.c
index b793ab5c..0464ce02 100644
--- a/plugins/udev.c
+++ b/plugins/udev.c
@@ -25,6 +25,7 @@
 
 #include <errno.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 #include <libudev.h>
 
@@ -424,6 +425,24 @@ static void add_nokia(struct ofono_modem *modem,
 	}
 }
 
+static void add_isi(struct ofono_modem *modem,
+			struct udev_device *udev_device)
+{
+    const char *ifname, *addr;
+
+	DBG("modem %p", modem);
+
+	ifname = udev_device_get_sysname(udev_device);
+	ofono_modem_set_string(modem, "Interface", ifname);
+
+	DBG("Interface=%s", ifname);
+
+	addr = udev_device_get_property_value(udev_device, "OFONO_ISI_ADDRESS");
+	ofono_modem_set_integer(modem, "Address", atoi(addr));
+
+	ofono_modem_register(modem);
+}
+
 static void add_modem(struct udev_device *udev_device)
 {
 	struct ofono_modem *modem;
@@ -504,6 +523,10 @@ done:
 		add_novatel(modem, udev_device);
 	else if (g_strcmp0(driver, "nokia") == 0)
 		add_nokia(modem, udev_device);
+	else if (g_strcmp0(driver, "isigen") == 0)
+		add_isi(modem, udev_device);
+	else if (g_strcmp0(driver, "n900") == 0)
+		add_isi(modem, udev_device);
 }
 
 static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)