diff options
Diffstat (limited to 'wifi_hal/common.h')
| -rwxr-xr-x | wifi_hal/common.h | 48 |
1 files changed, 4 insertions, 44 deletions
diff --git a/wifi_hal/common.h b/wifi_hal/common.h index 98801b2..568b5bd 100755 --- a/wifi_hal/common.h +++ b/wifi_hal/common.h @@ -52,7 +52,6 @@ const uint32_t GOOGLE_OUI = 0x001A11; #define NMR2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5], (a)[6], (a)[7] #define NMRSTR "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x" -#define NAN_MASTER_RANK_LEN 8 /* @@ -89,14 +88,14 @@ typedef enum { ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START = 0x1400, ANDROID_NL80211_SUBCMD_DEBUG_RANGE_END = 0x14FF, - /* define all wifi offload related commands between 0x1600 and 0x16FF */ - ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START = 0x1600, - ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_END = 0x16FF, - /* define all NAN related commands between 0x1700 and 0x17FF */ ANDROID_NL80211_SUBCMD_NAN_RANGE_START = 0x1700, ANDROID_NL80211_SUBCMD_NAN_RANGE_END = 0x17FF, + /* define all wifi offload related commands between 0x1600 and 0x16FF */ + ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START = 0x1600, + ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_END = 0x16FF, + /* define all Android Packet Filter related commands between 0x1800 and 0x18FF */ ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_START = 0x1800, ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_END = 0x18FF, @@ -150,26 +149,6 @@ typedef enum { GSCAN_SUBCMD_MAX, - /* NAN related */ - NAN_SUBCMD_ENABLE = ANDROID_NL80211_SUBCMD_NAN_RANGE_START, - NAN_SUBCMD_DISABLE, /* 0x1701 */ - NAN_SUBCMD_PUBLISH, /* 0x1702 */ - NAN_SUBCMD_SUBSCRIBE, /* 0x1703 */ - NAN_SUBCMD_PUBLISH_CANCEL, /* 0x1704 */ - NAN_SUBCMD_SUBSCRIBE_CANCEL, /* 0x1705 */ - NAN_SUBCMD_TRANSMIT_FOLLOWUP, /* 0x1706 */ - NAN_SUBCMD_CONFIG, /* 0x1707 */ - NAN_SUBCMD_TCA, /* 0x1708 */ - NAN_SUBCMD_STATS, /* 0x1709 */ - NAN_SUBCMD_GET_CAPABILITIES, /* 0x170A */ - NAN_SUBCMD_DATA_PATH_IFACE_CREATE, /* 0x170B */ - NAN_SUBCMD_DATA_PATH_IFACE_DELETE, /* 0x170C */ - NAN_SUBCMD_DATA_PATH_REQUEST, /* 0x170D */ - NAN_SUBCMD_DATA_PATH_RESPONSE, /* 0x170E */ - NAN_SUBCMD_DATA_PATH_END, /* 0x170F */ - NAN_SUBCMD_DATA_PATH_SEC_INFO, /* 0x1710 */ - NAN_SUBCMD_VERSION_INFO, /* 0x1711 */ - NAN_SUBCMD_ENABLE_MERGE, /* 0x1712 */ APF_SUBCMD_GET_CAPABILITIES = ANDROID_NL80211_SUBCMD_PKT_FILTER_RANGE_START, APF_SUBCMD_SET_FILTER, WIFI_SUBCMD_TX_POWER_SCENARIO = ANDROID_NL80211_SUBCMD_TX_POWER_RANGE_START, @@ -196,26 +175,8 @@ typedef enum { * BRCM specific events should be placed after the Generic events * in order to match between the DHD and HAL */ - NAN_EVENT_ENABLED = 15, - NAN_EVENT_DISABLED = 16, - NAN_EVENT_SUBSCRIBE_MATCH = 17, - NAN_EVENT_PUBLISH_REPLIED_IND = 18, - NAN_EVENT_PUBLISH_TERMINATED = 19, - NAN_EVENT_SUBSCRIBE_TERMINATED = 20, - NAN_EVENT_DE_EVENT = 21, - NAN_EVENT_FOLLOWUP = 22, - NAN_EVENT_TRANSMIT_FOLLOWUP_IND = 23, - NAN_EVENT_DATA_REQUEST = 24, - NAN_EVENT_DATA_CONFIRMATION = 25, - NAN_EVENT_DATA_END = 26, - NAN_EVENT_BEACON = 27, - NAN_EVENT_SDF = 28, - NAN_EVENT_TCA = 29, - NAN_EVENT_SUBSCRIBE_UNMATCH = 30, - NAN_EVENT_UNKNOWN, ROAM_EVENT_START, GOOGLE_FILE_DUMP_EVENT = 37, - NAN_ASYNC_RESPONSE_DISABLED = 40 } WIFI_EVENT; typedef void (*wifi_internal_event_handler) (wifi_handle handle, int events); @@ -321,7 +282,6 @@ hal_info *getHalInfo(wifi_interface_handle handle); wifi_handle getWifiHandle(hal_info *info); wifi_interface_handle getIfaceHandle(interface_info *info); wifi_error wifi_cancel_cmd(wifi_request_id id, wifi_interface_handle iface); -wifi_error nan_deinit_handler(); wifi_error wifi_start_hal(wifi_interface_handle iface); wifi_error wifi_stop_hal(wifi_interface_handle iface); wifi_interface_handle wifi_get_wlan_interface(wifi_handle info, |