X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=6fa14f9dd07ffb8c82d9df94c3344a12ca3d9ff5;hp=a497147918d43232498d23eeb833b4101d1ec6c0;hb=7832d10c59cfe7f06e19bc6f0b6acaac1a552618;hpb=1cb9c56d6453bca28cacb5ab3fc134bb151fd6f0

diff --git a/discover/device-handler.c b/discover/device-handler.c
index a497147..6fa14f9 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -368,7 +368,7 @@ static int default_option_priority(struct discover_boot_option *opt)
 {
 	const struct config *config;
 	struct boot_priority *prio;
-	int i;
+	unsigned int i;
 
 	config = config_get();
 
@@ -589,7 +589,7 @@ void device_handler_add_device(struct device_handler *handler,
  * array, but has only just been initialised by the hotplug source.
  */
 int device_handler_discover(struct device_handler *handler,
-		struct discover_device *dev, enum conf_method method)
+		struct discover_device *dev)
 {
 	struct discover_context *ctx;
 	int rc;
@@ -604,7 +604,7 @@ int device_handler_discover(struct device_handler *handler,
 		goto out;
 
 	/* run the parsers. This will populate the ctx's boot_option list. */
-	iterate_parsers(ctx, method);
+	iterate_parsers(ctx);
 
 	/* add discovered stuff to the handler */
 	device_handler_discover_context_commit(handler, ctx);
@@ -615,18 +615,17 @@ out:
 	return 0;
 }
 
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
-		struct discover_device *dev, struct pb_url *url,
-		enum conf_method method)
+/* Incoming dhcp event */
+int device_handler_dhcp(struct device_handler *handler,
+		struct discover_device *dev, struct event *event)
 {
 	struct discover_context *ctx;
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
-	ctx->conf_url = url;
+	ctx->event = event;
 
-	iterate_parsers(ctx, method);
+	iterate_parsers(ctx);
 
 	device_handler_discover_context_commit(handler, ctx);
 
@@ -635,6 +634,25 @@ int device_handler_conf(struct device_handler *handler,
 	return 0;
 }
 
+/* incoming conf event */
+int device_handler_conf(struct device_handler *handler,
+		struct discover_device *dev, struct pb_url *url)
+{
+        struct discover_context *ctx;
+
+        /* create our context */
+        ctx = device_handler_discover_context_create(handler, dev);
+        ctx->conf_url = url;
+
+        iterate_parsers(ctx);
+
+        device_handler_discover_context_commit(handler, ctx);
+
+        talloc_free(ctx);
+
+        return 0;
+}
+
 static struct discover_boot_option *find_boot_option_by_id(
 		struct device_handler *handler, const char *id)
 {