X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Fconnman.git;a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=155f8464a90bcd360ecb4649b1d852eacda17865;hp=7e947117fea24499a117a21e0c6f3260f675f9c7;hb=a48fa9fdffe415e9a6f703776b5db795e242ac23;hpb=d04bfa0350781ebfb8cbb2e64fabdfb2f36cd302 diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index 7e94711..155f846 100644 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -69,7 +69,7 @@ extern "C" { #define G_SUPPLICANT_KEYMGMT_WPA_EAP (1 << 7) #define G_SUPPLICANT_KEYMGMT_WPA_EAP_256 (1 << 8) #define G_SUPPLICANT_KEYMGMT_WPS (1 << 9) -#if defined TIZEN_EXT_WIFI_MESH +#if defined TIZEN_EXT #define G_SUPPLICANT_KEYMGMT_SAE (1 << 10) #endif @@ -122,8 +122,6 @@ typedef enum { #if defined TIZEN_EXT G_SUPPLICANT_SECURITY_FT_PSK, G_SUPPLICANT_SECURITY_FT_IEEE8021X, -#endif -#if defined TIZEN_EXT_WIFI_MESH G_SUPPLICANT_SECURITY_SAE, #endif } GSupplicantSecurity; @@ -135,6 +133,16 @@ typedef enum { G_SUPPLICANT_EAP_KEYMGMT_CCKM, G_SUPPLICANT_EAP_KEYMGMT_OKC, } GSupplicantEapKeymgmt; + +typedef enum { + G_SUPPLICANT_MODE_IEEE80211_UNKNOWN, + G_SUPPLICANT_MODE_IEEE80211B, + G_SUPPLICANT_MODE_IEEE80211BG, + G_SUPPLICANT_MODE_IEEE80211BGN, + G_SUPPLICANT_MODE_IEEE80211A, + G_SUPPLICANT_MODE_IEEE80211AN, + G_SUPPLICANT_MODE_IEEE80211ANAC, +} GSupplicantPhy_mode; #endif typedef enum { @@ -211,8 +219,6 @@ struct _GSupplicantSSID { GSupplicantEapKeymgmt eap_keymgmt; const char *phase1; const char *pac_file; -#endif -#if defined TIZEN_EXT_WIFI_MESH uint16_t ieee80211w; #endif }; @@ -288,6 +294,11 @@ typedef void (*GSupplicantInterfaceCallback) (int result, GSupplicantInterface *interface, void *user_data); +#if defined TIZEN_EXT +typedef void (*GSupplicantMaxSpeedCallback) (int result, + int maxspeed, void *user_data); +#endif + void g_supplicant_interface_cancel(GSupplicantInterface *interface); int g_supplicant_interface_create(const char *ifname, const char *driver, @@ -302,6 +313,12 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); +#if defined TIZEN_EXT +int g_supplicant_interface_signalpoll(GSupplicantInterface *interface, + GSupplicantMaxSpeedCallback callback, + void *user_data); +#endif + int g_supplicant_interface_p2p_find(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); @@ -347,6 +364,9 @@ void g_supplicant_interface_set_data(GSupplicantInterface *interface, void *data); void *g_supplicant_interface_get_data(GSupplicantInterface *interface); const char *g_supplicant_interface_get_ifname(GSupplicantInterface *interface); +#if defined TIZEN_EXT +bool g_supplicant_interface_get_is_5_0_ghz_supported(GSupplicantInterface *interface); +#endif const char *g_supplicant_interface_get_driver(GSupplicantInterface *interface); GSupplicantState g_supplicant_interface_get_state(GSupplicantInterface *interface); const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface); @@ -447,6 +467,7 @@ void *g_supplicant_network_get_wifi_vsie(GSupplicantNetwork *network); const unsigned char *g_supplicant_network_get_countrycode(GSupplicantNetwork *network); void *g_supplicant_network_get_bssid_list(GSupplicantNetwork *network); +GSupplicantPhy_mode g_supplicant_network_get_phy_mode(GSupplicantNetwork *network); #endif struct _GSupplicantCallbacks {