path: root/discover/device-handler.h
diff options
authorJeremy Kerr <>2013-09-19 17:16:53 +0800
committerJeremy Kerr <>2013-09-19 21:36:33 +0800
commitf611bde3f182e9a4befb48a0160d1831708aca67 (patch)
treecacf467246c85c491bf91b3fe46c448c5fdbab94 /discover/device-handler.h
parent4926cde5c97d09794ec33cca1321bb05a8d43304 (diff)
discover: Remove unnecessary event passing
Currently, we pass "events" between the udev, user-event and device-handler layers. These events all get sent through device_handler_event, then de-multiplexed to an appropriate handler, depending on their source. Instead, just export relevant device_handler functions, and have the (old) event sources call these functions directly. This also means we can include a lot more of the device hander code in the parser tests. Signed-off-by: Jeremy Kerr <>
Diffstat (limited to 'discover/device-handler.h')
1 files changed, 35 insertions, 6 deletions
diff --git a/discover/device-handler.h b/discover/device-handler.h
index e71212c..1d78a49 100644
--- a/discover/device-handler.h
+++ b/discover/device-handler.h
@@ -1,6 +1,8 @@
+#include <stdbool.h>
#include <list/list.h>
struct device_handler;
@@ -21,19 +23,23 @@ enum conf_method {
struct discover_device {
struct device *device;
char **links;
int n_links;
- char *uuid;
- char *label;
+ const char *uuid;
+ const char *label;
- char *mount_path;
- char *device_path;
+ const char *mount_path;
+ const char *device_path;
+ bool notified;
struct list boot_options;
+ struct list params;
struct discover_boot_option {
@@ -67,14 +73,32 @@ 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 device *discover_context_device(struct discover_context *ctx);
+struct discover_device *discover_device_create(struct device_handler *handler,
+ const char *id);
+void device_handler_add_device(struct device_handler *handler,
+ struct discover_device *device);
+int device_handler_discover(struct device_handler *handler,
+ struct discover_device *dev, enum conf_method method);
+int device_handler_conf(struct device_handler *handler,
+ struct discover_device *dev, struct pb_url *url,
+ enum conf_method method);
+void device_handler_remove(struct device_handler *handler,
+ struct discover_device *device);
+struct discover_context *device_handler_discover_context_create(
+ struct device_handler *handler,
+ struct discover_device *device);
+void device_handler_discover_context_commit(struct device_handler *handler,
+ struct discover_context *ctx);
struct discover_boot_option *discover_boot_option_create(
struct discover_context *ctx,
struct discover_device *dev);
void discover_context_add_boot_option(struct discover_context *ctx,
struct discover_boot_option *opt);
-int device_handler_event(struct device_handler *handler, struct event *event);
+int device_handler_user_event(struct device_handler *handler,
+ struct event *event);
struct discover_device *device_lookup_by_name(struct device_handler *handler,
const char *name);
@@ -85,6 +109,11 @@ struct discover_device *device_lookup_by_label(struct device_handler *handler,
struct discover_device *device_lookup_by_id(struct device_handler *handler,
const char *id);
+void discover_device_set_param(struct discover_device *device,
+ const char *name, const char *value);
+const char *discover_device_get_param(struct discover_device *device,
+ const char *name);
void device_handler_boot(struct device_handler *handler,
struct boot_command *cmd);
void device_handler_cancel_default(struct device_handler *handler);
OpenPOWER on IntegriCloud