dbus: Share common initialization code for both old and new interface

[mech_eap.git] / wpa_supplicant / dbus / dbus_new.h

diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h
index 7ec4560..699fa4e 100644 (file)
--- a/wpa_supplicant/dbus/dbus_new.h
+++ b/wpa_supplicant/dbus/dbus_new.h
@@ -22,6 +22,7 @@ struct wpa_ssid;
 struct wps_event_m2d;
 struct wps_event_fail;
 struct wps_credential;
+enum wpa_states;
 
 enum wpas_dbus_prop {
        WPAS_DBUS_PROP_AP_SCAN,
@@ -31,11 +32,6 @@ enum wpas_dbus_prop {
 };
 
 struct wpas_dbus_callbacks {
-       struct ctrl_iface_dbus_new_priv * (*dbus_ctrl_init)(
-               struct wpa_global *global);
-
-       void (*dbus_ctrl_deinit)(struct ctrl_iface_dbus_new_priv *iface);
-
        void (*signal_interface_created)(struct wpa_supplicant *wpa_s);
        void (*signal_interface_removed)(struct wpa_supplicant *wpa_s);
 
@@ -127,6 +123,9 @@ struct wpas_dbus_callbacks {
 struct wpas_dbus_callbacks * wpas_dbus_get_callbacks(void);
 const char * wpas_dbus_get_path(struct wpa_supplicant *wpa_s);
 
+int wpas_dbus_ctrl_iface_init(struct wpas_dbus_priv *priv);
+void wpas_dbus_ctrl_iface_deinit(struct wpas_dbus_priv *iface);
+
 #else /* CONFIG_CTRL_IFACE_DBUS_NEW */
 
 static inline struct wpas_dbus_callbacks * wpas_dbus_get_callbacks(void)