X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=plugins%2Fsupplicant.h;h=fb49722bca0247551cacebc3a685b61c96ea66d8;hb=47225048709183a2e54fa3fea0e29b91db1ea537;hp=4543d1155fab9d35bb9f238e93975d5cb86785ca;hpb=991fe1e5f6458aa30ee82ad73b2f0411b74b1d3e;p=connman

diff --git a/plugins/supplicant.h b/plugins/supplicant.h
index 4543d11..fb49722 100644
--- a/plugins/supplicant.h
+++ b/plugins/supplicant.h
@@ -20,58 +20,20 @@
  */
 
 #include <connman/device.h>
-#include <connman/element.h>
+#include <connman/network.h>
 
-#define SUPPLICANT_NAME  "fi.epitest.hostap.WPASupplicant"
-#define SUPPLICANT_INTF  "fi.epitest.hostap.WPASupplicant"
-#define SUPPLICANT_PATH  "/fi/epitest/hostap/WPASupplicant"
-
-enum supplicant_state {
-	STATE_INACTIVE,
-	STATE_SCANNING,
-	STATE_ASSOCIATING,
-	STATE_ASSOCIATED,
-	STATE_4WAY_HANDSHAKE,
-	STATE_GROUP_HANDSHAKE,
-	STATE_COMPLETED,
-	STATE_DISCONNECTED,
-};
-
-struct supplicant_network {
-	gchar *identifier;
-	guint8 *ssid;
-	guint ssid_len;
-	guint16 capabilities;
-	gboolean adhoc;
-	gboolean has_wep;
-	gboolean has_wpa;
-	gboolean has_rsn;
-	gint32 quality;
-	gint32 noise;
-	gint32 level;
-	gint32 maxrate;
+struct supplicant_driver {
+	const char *name;
+	void (*probe) (void);
+	void (*remove) (void);
 };
 
-struct supplicant_callback {
-	void (*state_change) (struct connman_device *device,
-						enum supplicant_state state);
-	void (*clear_results) (struct connman_device *device);
-	void (*scan_result) (struct connman_device *device,
-					struct supplicant_network *network);
-};
-
-void __supplicant_activate(DBusConnection *conn);
-
-int __supplicant_init(DBusConnection *conn);
-void __supplicant_exit(void);
-
-int __supplicant_start(struct connman_device *device,
-					struct supplicant_callback *callback);
-int __supplicant_stop(struct connman_device *device);
+int supplicant_register(struct supplicant_driver *driver);
+void supplicant_unregister(struct supplicant_driver *driver);
 
-int __supplicant_scan(struct connman_device *device);
+int supplicant_start(struct connman_device *device);
+int supplicant_stop(struct connman_device *device);
+int supplicant_scan(struct connman_device *device);
 
-int __supplicant_connect(struct connman_element *element,
-				const unsigned char *ssid, int ssid_len,
-				const char *security, const char *passphrase);
-int __supplicant_disconnect(struct connman_element *element);
+int supplicant_connect(struct connman_network *network);
+int supplicant_disconnect(struct connman_network *network);