X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=1f8938f295b322e68b2df19fb7eeadd8146b1ca1;hp=90d92968bd024fd5e7dd38ada6c8eb9a2840abab;hb=b118597194815910897ccf86d77b8b5a066adf5a;hpb=9057583b8b37d07eb9af2fd48674f1732fecda17

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 90d9296..1f8938f 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -24,6 +24,8 @@ struct device_handler {
 
 	struct device *devices;
 	int n_devices;
+
+	struct list contexts;
 };
 
 struct discover_context {
@@ -43,7 +45,6 @@ struct mount_map {
 	char *mount_point;
 };
 
-static struct list contexts;
 
 static struct boot_option options[] = {
 	{
@@ -60,8 +61,6 @@ 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,
@@ -280,11 +279,12 @@ static int umount_device(struct discover_context *ctx)
 	return 0;
 }
 
-static struct discover_context *find_context(const char *id)
+static struct discover_context *find_context(struct device_handler *handler,
+		const char *id)
 {
 	struct discover_context *ctx;
 
-	list_for_each_entry(&contexts, ctx, list) {
+	list_for_each_entry(&handler->contexts, ctx, list) {
 		if (!strcmp(ctx->id, id))
 			return ctx;
 	}
@@ -311,7 +311,7 @@ static int handle_add_event(struct device_handler *handler,
 	int rc;
 
 	/* create our context */
-	ctx = talloc(NULL, struct discover_context);
+	ctx = talloc(handler, struct discover_context);
 	ctx->event = event;
 	ctx->mount_path = NULL;
 	ctx->links = NULL;
@@ -334,7 +334,7 @@ static int handle_add_event(struct device_handler *handler,
 		return 0;
 	}
 
-	list_add(&contexts, &ctx->list);
+	list_add(&handler->contexts, &ctx->list);
 
 	talloc_set_destructor(ctx, destroy_context);
 
@@ -346,7 +346,7 @@ static int handle_remove_event(struct device_handler *handler,
 {
 	struct discover_context *ctx;
 
-	ctx = find_context(event->device);
+	ctx = find_context(handler, event->device);
 	if (!ctx)
 		return 0;
 
@@ -376,26 +376,28 @@ int device_handler_event(struct device_handler *handler,
 struct device_handler *device_handler_init(struct discover_server *server)
 {
 	struct device_handler *handler;
+	int i;
 
 	handler = talloc(NULL, struct device_handler);
 	handler->devices = NULL;
 	handler->n_devices = 0;
 
-	list_init(&contexts);
+	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);
+
 	return handler;
 }
 
-void device_handler_destroy(struct device_handler *devices)
+void device_handler_destroy(struct device_handler *handler)
 {
-	struct discover_context *ctx, *n;
-
-	talloc_free(devices);
-
-	list_for_each_entry_safe(&contexts, ctx, n, list)
-		talloc_free(ctx);
+	talloc_free(handler);
 }