X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=0f876658b5a2331750ceeced591bfca53e81f042;hp=98194ad46cea86434b9fdf8217b8876106cbbe16;hb=1d8d12aceeb41c2cde4736fe4c9926cbc9cf38d4;hpb=01ed46e3e38a06120736d77c210ed0b165b0c7ce

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 98194ad..0f87665 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -8,11 +8,13 @@
 
 #include <talloc/talloc.h>
 #include <list/list.h>
+#include <log/log.h>
 #include <pb-protocol/pb-protocol.h>
 
 #include "device-handler.h"
+#include "discover-server.h"
+#include "parser.h"
 #include "udev.h"
-#include "log.h"
 #include "paths.h"
 
 #define MOUNT_BIN "/bin/mount"
@@ -28,18 +30,6 @@ struct device_handler {
 	struct list contexts;
 };
 
-struct discover_context {
-	char *id;
-	char *device_path;
-	char *mount_path;
-	struct udev_event *event;
-	struct device *device;
-	char **links;
-	int n_links;
-
-	struct list_item list;
-};
-
 struct mount_map {
 	char *device_path;
 	char *mount_point;
@@ -61,12 +51,11 @@ static struct device device = {
 	.name = "meep",
 	.description = "meep description",
 	.icon_file = "meep.png",
-	.n_options = 1,
-	.options = options,
 };
 
-int device_handler_get_current_devices(struct device_handler *handler,
-		struct device **devices)
+int device_handler_get_current_devices(
+		struct device_handler *handler __attribute__((unused)),
+		const struct device **devices)
 
 {
 	*devices = &device;
@@ -238,8 +227,11 @@ static int mount_device(struct discover_context *ctx)
 		goto out_rmdir;
 	}
 
-	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+	if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {
+		pb_log("%s: mount failed (%d): %s\n", __func__,
+			WEXITSTATUS(status), ctx->event->device);
 		goto out_rmdir;
+	}
 
 	setup_device_links(ctx);
 	return 0;
@@ -331,15 +323,23 @@ static int handle_add_event(struct device_handler *handler,
 
 	rc = mount_device(ctx);
 	if (rc) {
-		pb_log("mount_device failed for %s\n", event->device);
 		talloc_free(ctx);
 		return 0;
 	}
 
 	list_add(&handler->contexts, &ctx->list);
-
 	talloc_set_destructor(ctx, destroy_context);
 
+	/* set up the top-level device */
+	ctx->device = talloc_zero(ctx, struct device);
+	ctx->device->id = talloc_strdup(ctx->device, ctx->id);
+	list_init(&ctx->device->boot_options);
+
+	/* run the parsers */
+	iterate_parsers(ctx);
+
+	discover_server_notify_add(handler->server, ctx->device);
+
 	return 0;
 }
 
@@ -352,6 +352,8 @@ static int handle_remove_event(struct device_handler *handler,
 	if (!ctx)
 		return 0;
 
+	discover_server_notify_remove(handler->server, ctx->device);
+
 	talloc_free(ctx);
 
 	return 0;
@@ -378,16 +380,26 @@ int device_handler_event(struct device_handler *handler,
 struct device_handler *device_handler_init(struct discover_server *server)
 {
 	struct device_handler *handler;
+	unsigned int i;
 
 	handler = talloc(NULL, struct device_handler);
 	handler->devices = NULL;
 	handler->n_devices = 0;
+	handler->server = server;
 
 	list_init(&handler->contexts);
 
 	/* set up our mount point base */
 	mkdir_recursive(mount_base());
 
+	/* setup out test objects */
+	list_init(&device.boot_options);
+
+	for (i = 0; i < sizeof(options) / sizeof(options[0]); i++)
+		list_add(&device.boot_options, &options[i].list);
+
+	parser_init();
+
 	return handler;
 }