From 4563c5d672f605c493996a652b9e3e588a8596dd Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 12 Dec 2016 19:58:32 +0800 Subject: discover: add handler reference to struct discover_context Since the device handler provides the status message functions, we need a pointer to it for device discovery (which we use a struct discover_context for). This change adds a 'handler' member to struct discover_context, to allow status reporting. Since we now have a handler, there's no need for the network pointer, so provide an accessor function instead. Signed-off-by: Jeremy Kerr Signed-off-by: Samuel Mendoza-Jonas --- discover/device-handler.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'discover/device-handler.h') diff --git a/discover/device-handler.h b/discover/device-handler.h index fe8a3b0..874133d 100644 --- a/discover/device-handler.h +++ b/discover/device-handler.h @@ -54,12 +54,12 @@ struct discover_boot_option { struct discover_context { + struct device_handler *handler; struct parser *parser; struct event *event; struct discover_device *device; struct list boot_options; struct pb_url *conf_url; - struct network *network; void *test_data; }; @@ -79,6 +79,8 @@ void device_handler_destroy(struct device_handler *devices); int device_handler_get_device_count(const struct device_handler *handler); const struct discover_device *device_handler_get_device( const struct device_handler *handler, unsigned int index); +struct network *device_handler_get_network( + const struct device_handler *handler); struct discover_device *discover_device_create(struct device_handler *handler, const char *uuid, const char *id); -- cgit v1.2.1