X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fcommon%2Fdiscover-client.c;h=b1ef440a9127e927f3e6456fb25688248f05ecc7;hp=47c57cb11bc69d49e69467cbe0b259e8c07069c5;hb=47a9f94bb346817b6767d5dac578a43beee47c1f;hpb=e48a0d17214a832cfcc42d937a26a4bbf732c25a

diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c
index 47c57cb..b1ef440 100644
--- a/ui/common/discover-client.c
+++ b/ui/common/discover-client.c
@@ -10,7 +10,7 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
-#include <log.h>
+#include <log/log.h>
 
 #include "ui/common/discover-client.h"
 #include "pb-protocol/pb-protocol.h"
@@ -33,7 +33,7 @@ static int discover_client_destructor(void *arg)
 }
 
 struct discover_client* discover_client_init(
-	const struct discover_client_ops *ops)
+	const struct discover_client_ops *ops, void *cb_arg)
 {
 	struct discover_client *client;
 	struct sockaddr_un addr;
@@ -43,6 +43,7 @@ struct discover_client* discover_client_init(
 		return NULL;
 
 	memcpy(&client->ops, ops, sizeof(client->ops));
+	client->ops.cb_arg = cb_arg;
 
 	client->fd = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (!client->fd < 0) {
@@ -80,7 +81,7 @@ void discover_client_destroy(struct discover_client *client)
 	talloc_free(client);
 }
 
-static void add_device(struct discover_client *client, struct device *device)
+static void device_add(struct discover_client *client, struct device *device)
 {
 	client->n_devices++;
 	client->devices = talloc_realloc(client, client->devices,
@@ -89,10 +90,10 @@ static void add_device(struct discover_client *client, struct device *device)
 	client->devices[client->n_devices - 1] = device;
 	talloc_steal(client, device);
 
-	client->ops.add_device(device, client->ops.cb_arg);
+	client->ops.device_add(device, client->ops.cb_arg);
 }
 
-static void remove_device(struct discover_client *client, const char *id)
+static void device_remove(struct discover_client *client, const char *id)
 {
 	struct device *device = NULL;
 	int i;
@@ -107,10 +108,6 @@ static void remove_device(struct discover_client *client, const char *id)
 	if (!device)
 		return;
 
-	client->ops.remove_device(device, client->ops.cb_arg);
-
-	talloc_free(device);
-
 	/* remove the device from the client's device array */
 	client->n_devices--;
 	memmove(&client->devices[i], &client->devices[i+1],
@@ -118,6 +115,10 @@ static void remove_device(struct discover_client *client, const char *id)
 	client->devices = talloc_realloc(client, client->devices,
 			struct device *, client->n_devices);
 
+	/* notify the UI */
+	client->ops.device_remove(device, client->ops.cb_arg);
+
+	talloc_free(device);
 }
 
 int discover_client_process(struct discover_client *client)
@@ -139,7 +140,7 @@ int discover_client_process(struct discover_client *client)
 			return 0;
 		}
 
-		add_device(client, dev);
+		device_add(client, dev);
 		break;
 	case PB_PROTOCOL_ACTION_REMOVE:
 		dev_id = pb_protocol_deserialise_string(client, message);
@@ -147,7 +148,7 @@ int discover_client_process(struct discover_client *client)
 			pb_log("%s: no device id?\n", __func__);
 			return 0;
 		}
-		remove_device(client, dev_id);
+		device_remove(client, dev_id);
 		break;
 	default:
 		pb_log("%s: unknown action %d\n", __func__, message->action);
@@ -156,3 +157,18 @@ int discover_client_process(struct discover_client *client)
 
 	return 0;
 }
+
+/* accessors for discovered devices */
+int discover_client_device_count(struct discover_client *client)
+{
+	return client->n_devices;
+}
+
+struct device *discover_client_get_device(struct discover_client *client,
+		int index)
+{
+	if (index < 0 || index >= client->n_devices)
+		return NULL;
+
+	return client->devices[index];
+}