From aaf7e33db53954cc5a8c87e0cc6f3264fcc62b51 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 4 Jan 2009 02:57:15 +0100
Subject: [PATCH] Don't list devices without drivers

---
 src/connman.h |   2 +
 src/device.c  | 120 ++++++++++++++++++++++++++++++++++++++++------------------
 src/element.c |   4 ++
 3 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/src/connman.h b/src/connman.h
index cb5f72a..889a827 100644
--- a/src/connman.h
+++ b/src/connman.h
@@ -144,6 +144,8 @@ static inline void __connman_udev_cleanup(void)
 int __connman_device_init(void);
 void __connman_device_cleanup(void);
 
+connman_bool_t __connman_device_has_driver(struct connman_device *device);
+
 #include <connman/network.h>
 
 int __connman_network_init(void);
diff --git a/src/device.c b/src/device.c
index c972c08..e809573 100644
--- a/src/device.c
+++ b/src/device.c
@@ -42,6 +42,8 @@ struct connman_device {
 	struct connman_device_driver *driver;
 	void *driver_data;
 
+	connman_bool_t registered;
+
 	GHashTable *networks;
 };
 
@@ -464,6 +466,8 @@ static int register_interface(struct connman_element *element)
 		return -EIO;
 	}
 
+	device->registered = TRUE;
+
 	emit_devices_signal();
 
 	return 0;
@@ -471,8 +475,12 @@ static int register_interface(struct connman_element *element)
 
 static void unregister_interface(struct connman_element *element)
 {
+	struct connman_device *device = element->device;
+
 	DBG("element %p name %s", element, element->name);
 
+	device->registered = FALSE;
+
 	emit_devices_signal();
 
 	g_dbus_unregister_interface(connection, element->path,
@@ -510,6 +518,77 @@ static void device_disable(struct connman_device *device)
 		device->driver->disable(device);
 }
 
+static int setup_device(struct connman_device *device)
+{
+	int err;
+
+	DBG("device %p", device);
+
+	err = register_interface(&device->element);
+	if (err < 0) {
+		if (device->driver->remove)
+			device->driver->remove(device);
+		device->driver = NULL;
+		return err;
+	}
+
+	device_enable(device);
+
+	return 0;
+}
+
+static void probe_driver(struct connman_element *element, gpointer user_data)
+{
+	struct connman_device_driver *driver = user_data;
+
+	DBG("element %p name %s", element, element->name);
+
+	if (element->device == NULL)
+		return;
+
+	if (driver->probe(element->device) < 0)
+		return;
+
+	element->device->driver = driver;
+
+	setup_device(element->device);
+}
+
+static void remove_device(struct connman_device *device)
+{
+	DBG("device %p", device);
+
+	device_disable(device);
+
+	unregister_interface(&device->element);
+
+	if (device->driver->remove)
+		device->driver->remove(device);
+
+	device->driver = NULL;
+}
+
+static void remove_driver(struct connman_element *element, gpointer user_data)
+{
+	struct connman_device_driver *driver = user_data;
+
+	DBG("element %p name %s", element, element->name);
+
+	if (element->device == NULL)
+		return;
+
+	if (element->device->driver == driver)
+		remove_device(element->device);
+}
+
+connman_bool_t __connman_device_has_driver(struct connman_device *device)
+{
+	if (device->driver == NULL)
+		return FALSE;
+
+	return device->registered;
+}
+
 static GSList *driver_list = NULL;
 
 static gint compare_priority(gconstpointer a, gconstpointer b)
@@ -535,30 +614,12 @@ int connman_device_driver_register(struct connman_device_driver *driver)
 	driver_list = g_slist_insert_sorted(driver_list, driver,
 							compare_priority);
 
-	//__connman_driver_rescan(&device_driver);
+	__connman_element_foreach(NULL, CONNMAN_ELEMENT_TYPE_DEVICE,
+						probe_driver, driver);
 
 	return 0;
 }
 
-static void remove_driver(struct connman_element *element, gpointer user_data)
-{
-	struct connman_device_driver *driver = user_data;
-
-	DBG("element %p name %s", element, element->name);
-
-	if (element->device == NULL)
-		return;
-
-	if (element->device->driver == driver) {
-		device_disable(element->device);
-
-		if (driver->remove)
-			driver->remove(element->device);
-
-		element->device->driver = NULL;
-	}
-}
-
 /**
  * connman_device_driver_unregister:
  * @driver: device driver definition
@@ -1044,7 +1105,6 @@ static int device_probe(struct connman_element *element)
 {
 	struct connman_device *device = element->device;
 	GSList *list;
-	int err;
 
 	DBG("element %p name %s", element, element->name);
 
@@ -1068,16 +1128,7 @@ static int device_probe(struct connman_element *element)
 	if (device->driver == NULL)
 		return -ENODEV;
 
-	err = register_interface(element);
-	if (err < 0) {
-		if (device->driver->remove)
-			device->driver->remove(device);
-		return err;
-	}
-
-	device_enable(device);
-
-	return 0;
+	return setup_device(device);
 }
 
 static void device_remove(struct connman_element *element)
@@ -1092,12 +1143,7 @@ static void device_remove(struct connman_element *element)
 	if (device->driver == NULL)
 		return;
 
-	device_disable(device);
-
-	unregister_interface(element);
-
-	if (device->driver->remove)
-		device->driver->remove(device);
+	remove_device(device);
 }
 
 static struct connman_driver device_driver = {
diff --git a/src/element.c b/src/element.c
index 31eb9a5..2599e66 100644
--- a/src/element.c
+++ b/src/element.c
@@ -676,6 +676,10 @@ static gboolean append_path(GNode *node, gpointer user_data)
 					filter->type != element->type)
 		return FALSE;
 
+	if (filter->type == CONNMAN_ELEMENT_TYPE_DEVICE &&
+			__connman_device_has_driver(element->device) == FALSE)
+		return FALSE;
+
 	dbus_message_iter_append_basic(filter->iter,
 				DBUS_TYPE_OBJECT_PATH, &element->path);
 
-- 
2.7.4