discover-client: interact directly with waitset

[petitboot] / ui / common / discover-client.h

diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h
index 6e768d9f9c50b463a296d6fab9a1d235f0a3faf6..6d5d1c483ac33b6c3bace0b3b457d4c6721cb6a6 100644 (file)
--- a/ui/common/discover-client.h
+++ b/ui/common/discover-client.h
@@ -2,6 +2,7 @@
 #define _DISCOVER_CLIENT_H
 
 #include <types/types.h>
 #define _DISCOVER_CLIENT_H
 
 #include <types/types.h>

+#include <waiter/waiter.h>

 
 struct discover_client;
 
 
 struct discover_client;
 


@@ -24,22 +25,11 @@ struct discover_client_ops {
        void *cb_arg;
 };
 
        void *cb_arg;
 };
 

-struct discover_client *discover_client_init(
+struct discover_client *discover_client_init(struct waitset *waitset,

        const struct discover_client_ops *ops, void *cb_arg);
 
        const struct discover_client_ops *ops, void *cb_arg);
 

-int discover_client_get_fd(const struct discover_client *client);
-

 void discover_client_destroy(struct discover_client *client);
 
 void discover_client_destroy(struct discover_client *client);
 

-/**
- * Process data from the server.
- *
- * Will read from the client socket, and call device_add on any discovered
- * devices.
- * 
- */
-int discover_client_process(struct discover_client *client);
-

 /**
  * Get the number of devices that the discover client has stored. This
  * is the set of devices that have been added and not removed
 /**
  * Get the number of devices that the discover client has stored. This
  * is the set of devices that have been added and not removed