#ifndef __WIFI_HAL_COMMON_H__
#define __WIFI_HAL_COMMON_H__
+#ifdef LOG_TAG
+#undef LOG_TAG
+#endif
#define LOG_TAG "WifiHAL"
#include <utils/Log.h>
GSCAN_ATTRIBUTE_SCAN_FLAGS,
GSCAN_ATTRIBUTE_SCAN_BUCKET_BIT,
- /* remaining reserved for additional attributes */
-
- GSCAN_ATTRIBUTE_SSID = 40,
- GSCAN_ATTRIBUTE_BSSID,
- GSCAN_ATTRIBUTE_CHANNEL,
- GSCAN_ATTRIBUTE_RSSI,
- GSCAN_ATTRIBUTE_TIMESTAMP,
- GSCAN_ATTRIBUTE_RTT,
- GSCAN_ATTRIBUTE_RTTSD,
-
- /* remaining reserved for additional attributes */
-
- GSCAN_ATTRIBUTE_HOTLIST_BSSIDS = 50,
- GSCAN_ATTRIBUTE_RSSI_LOW,
- GSCAN_ATTRIBUTE_RSSI_HIGH,
- GSCAN_ATTRIBUTE_HOTLIST_ELEM,
- GSCAN_ATTRIBUTE_HOTLIST_FLUSH,
- GSCAN_ATTRIBUTE_CHANNEL_NUMBER,
-
/* remaining reserved for additional attributes */
GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE = 60,
GSCAN_ATTRIBUTE_LOST_AP_SAMPLE_SIZE,
ANDROID_NL80211_SUBCMD_LSTATS_RANGE_START = 0x1200,
ANDROID_NL80211_SUBCMD_LSTATS_RANGE_END = 0x12FF,
+ /* define all Logger related commands between 0x1400 and 0x14FF */
+ ANDROID_NL80211_SUBCMD_DEBUG_RANGE_START = 0x1400,
+ ANDROID_NL80211_SUBCMD_DEBUG_RANGE_END = 0x14FF,
+
/* define all wifi offload related commands between 0x1400 and 0x14FF */
ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_START = 0x1400,
ANDROID_NL80211_SUBCMD_WIFI_OFFLOAD_RANGE_END = 0x14FF,
+ /* Range for NAN commands */
+ ANDROID_NL80211_SUBCMD_NAN_RANGE_START = 0x1500,
+ ANDROID_NL80211_SUBCMD_NAN_RANGE_END = 0x15FF,
/* This is reserved for future usage */
+ /* define all APF related commands between 0x1600 and 0x16FF */
+ ANDROID_NL80211_SUBCMD_APF_RANGE_START = 0x1600,
+ ANDROID_NL80211_SUBCMD_APF_RANGE_END = 0x16FF,
+
} ANDROID_VENDOR_SUB_COMMAND;
typedef enum {
SLSI_NL80211_VENDOR_SUBCMD_ADD_GSCAN,
SLSI_NL80211_VENDOR_SUBCMD_DEL_GSCAN,
SLSI_NL80211_VENDOR_SUBCMD_GET_SCAN_RESULTS,
+ /**********Deprecated now due to fapi updates.Do not remove*/
SLSI_NL80211_VENDOR_SUBCMD_SET_BSSID_HOTLIST,
SLSI_NL80211_VENDOR_SUBCMD_RESET_BSSID_HOTLIST,
SLSI_NL80211_VENDOR_SUBCMD_GET_HOTLIST_RESULTS,
SLSI_NL80211_VENDOR_SUBCMD_SET_SIGNIFICANT_CHANGE,
SLSI_NL80211_VENDOR_SUBCMD_RESET_SIGNIFICANT_CHANGE,
+ /******************************************/
SLSI_NL80211_VENDOR_SUBCMD_SET_GSCAN_OUI,
SLSI_NL80211_VENDOR_SUBCMD_SET_NODFS,
- /*Add any GSCAN subcmds before this*/
SLSI_NL80211_VENDOR_SUBCMD_START_KEEP_ALIVE_OFFLOAD,
SLSI_NL80211_VENDOR_SUBCMD_STOP_KEEP_ALIVE_OFFLOAD,
SLSI_NL80211_VENDOR_SUBCMD_SET_BSSID_BLACKLIST,
SLSI_NL80211_VENDOR_SUBCMD_LLS_GET_INFO,
SLSI_NL80211_VENDOR_SUBCMD_LLS_CLEAR_INFO,
SLSI_NL80211_VENDOR_SUBCMD_GET_FEATURE_SET,
- SLSI_NL80211_VENDOR_SUBCMD_SET_COUNTRY_CODE
+ SLSI_NL80211_VENDOR_SUBCMD_SET_COUNTRY_CODE,
+ SLSI_NL80211_VENDOR_SUBCMD_CONFIGURE_ND_OFFLOAD,
+ SLSI_NL80211_VENDOR_SUBCMD_GET_ROAMING_CAPABILITIES,
+ SLSI_NL80211_VENDOR_SUBCMD_SET_ROAMING_STATE,
+ SLSI_NL80211_VENDOR_SUBCMD_SET_LATENCY_MODE,
+
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_ENABLE = ANDROID_NL80211_SUBCMD_NAN_RANGE_START,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DISABLE,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_PUBLISH,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_PUBLISHCANCEL,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_SUBSCRIBE,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_SUBSCRIBECANCEL,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_TXFOLLOWUP,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_CONFIG,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_CAPABILITIES,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DATA_INTERFACE_CREATE,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DATA_INTERFACE_DELETE,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DATA_REQUEST_INITIATOR,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DATA_INDICATION_RESPONSE,
+ SLSI_NL80211_VENDOR_SUBCMD_NAN_DATA_END,
+ SLSI_NL80211_VENDOR_SUBCMD_RTT_GET_CAPABILITIES = ANDROID_NL80211_SUBCMD_RTT_RANGE_START,
+ SLSI_NL80211_VENDOR_SUBCMD_RTT_RANGE_START,
+ SLSI_NL80211_VENDOR_SUBCMD_RTT_RANGE_CANCEL,
+
+ SLSI_NL80211_VENDOR_SUBCMD_APF_SET_FILTER = ANDROID_NL80211_SUBCMD_APF_RANGE_START,
+ SLSI_NL80211_VENDOR_SUBCMD_APF_GET_CAPABILITIES,
+ SLSI_NL80211_VENDOR_SUBCMD_APF_READ_FILTER
} WIFI_SUB_COMMAND;
typedef enum {
+ /**********Deprecated now due to fapi updates.Do not remove*/
GSCAN_EVENT_SIGNIFICANT_CHANGE_RESULTS ,
GSCAN_EVENT_HOTLIST_RESULTS_FOUND,
+ /******************************************/
GSCAN_EVENT_SCAN_RESULTS_AVAILABLE,
GSCAN_EVENT_FULL_SCAN_RESULTS,
GSCAN_EVENT_COMPLETE_SCAN,
+ /**********Deprecated now due to fapi updates.Do not remove*/
GSCAN_EVENT_HOTLIST_RESULTS_LOST,
+ /******************************************/
WIFI_SUBCMD_KEY_MGMT_ROAM_AUTH, /* Handled by supplicant. not in Wifi-HAL */
WIFI_HANGED_EVENT,
WIFI_EPNO_EVENT,
WIFI_HOTSPOT_MATCH,
- WIFI_RSSI_REPORT_EVENT
+ WIFI_RSSI_REPORT_EVENT,
+ ENHANCE_LOGGER_RING_EVENT,
+ ENHANCE_LOGGER_MEM_DUMP_EVENT,
+ /* NAN events start */
+ SLSI_NAN_EVENT_RESPONSE = 13,
+ SLSI_NAN_EVENT_PUBLISH_TERMINATED,
+ SLSI_NAN_EVENT_MATCH,
+ SLSI_NAN_EVENT_MATCH_EXPIRED,
+ SLSI_NAN_EVENT_SUBSCRIBE_TERMINATED,
+ SLSI_NAN_EVENT_FOLLOWUP,
+ SLSI_NAN_EVENT_DISCOVERY_ENGINE,
+ SLSI_NAN_EVENT_DISABLED,
+ SLSI_RTT_RESULT_EVENT,
+ SLSI_RTT_EVENT_COMPLETE,
+ WIFI_ACS_EVENT, /* Handled by supplicant. not in Wifi-HAL */
+ SLSI_NL80211_VENDOR_FORWARD_BEACON,
+ SLSI_NL80211_VENDOR_FORWARD_BEACON_ABORT,
+ SLSI_NAN_EVENT_TRANSMIT_FOLLOWUP_STATUS,
+ /* NAN DATA PATH EVENTS*/
+ SLSI_NAN_EVENT_NDP_REQ = 24,
+ SLSI_NAN_EVENT_NDP_CFM,
+ SLSI_NAN_EVENT_NDP_END
} WIFI_EVENT;
interface_info **interfaces; // array of interfaces
int num_interfaces; // number of interfaces
+ WifiCommand *nanCmd;
// add other details
} hal_info;
wifi_handle getWifiHandle(hal_info *info);
wifi_interface_handle getIfaceHandle(interface_info *info);
-
+void wifi_set_nan_cmd(wifi_handle handle, WifiCommand *cmd);
+void wifi_reset_nan_cmd(wifi_handle handle);
+WifiCommand *wifi_get_nan_cmd(wifi_handle handle);
// some common macros
#define min(x, y) ((x) < (y) ? (x) : (y))
#define max(x, y) ((x) > (y) ? (x) : (y))
+#define NULL_CHECK_RETURN(ptr, str, ret) \
+ do { \
+ if (!(ptr)) { \
+ ALOGE("%s(): null pointer - #ptr (%s)\n", __FUNCTION__, str); \
+ return ret; \
+ } \
+ } while (0)
#endif
projects / GitHub / LineageOS / android_hardware_samsung_slsi_scsc_wifibt_wifi_hal.git / blobdiff