+++ /dev/null
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __WIFI_HAL_ROAM_H__
-#define __WIFI_HAL_ROAM_H__
-
-#include "wifi_hal.h"
-
-#define MAX_BLACKLIST_BSSID 16
-#define MAX_WHITELIST_SSID 8
-#define MAX_SSID_LENGTH 32
-
-typedef struct {
- u32 max_blacklist_size;
- u32 max_whitelist_size;
-} wifi_roaming_capabilities;
-
-typedef enum {
- ROAMING_DISABLE,
- ROAMING_ENABLE
-} fw_roaming_state_t;
-
-typedef struct {
- u32 length;
- char ssid_str[MAX_SSID_LENGTH];
-} ssid_t;
-
-typedef struct {
- u32 num_blacklist_bssid; // Number of bssids valid in blacklist_bssid[].
- mac_addr blacklist_bssid[MAX_BLACKLIST_BSSID]; // List of bssids which should not be considered
- // for romaing by firmware/driver.
- u32 num_whitelist_ssid; // Number of ssids valid in whitelist_ssid[].
- ssid_t whitelist_ssid[MAX_WHITELIST_SSID]; // List of ssids to which firmware/driver can
- // consider to roam to.
-} wifi_roaming_config;
-
-/* Get the chipset roaming capabilities. */
-wifi_error wifi_get_roaming_capabilities(wifi_interface_handle handle,
- wifi_roaming_capabilities *caps);
-/* Enable/disable firmware roaming */
-wifi_error wifi_enable_firmware_roaming(wifi_interface_handle handle,
- fw_roaming_state_t state);
-
-/* Pass down the blacklist BSSID and whitelist SSID to firmware. */
-wifi_error wifi_configure_roaming(wifi_interface_handle handle,
- wifi_roaming_config *roaming_config);
-
-#endif /* __WIFI_HAL_ROAM_H__ */
+++ /dev/null
-
-#include "wifi_hal.h"
-
-#ifndef _TDLS_H_
-#define _TDLS_H_
-
-typedef enum {
- WIFI_TDLS_DISABLED = 1, /* TDLS is not enabled, default status for all STAs */
- WIFI_TDLS_ENABLED, /* TDLS is enabled, but not yet tried */
- WIFI_TDLS_ESTABLISHED, /* Direct link is established */
- WIFI_TDLS_ESTABLISHED_OFF_CHANNEL, /* Direct link is established using MCC */
- WIFI_TDLS_DROPPED, /* Direct link was established,
- * but is temporarily dropped now */
- WIFI_TDLS_FAILED /* TDLS permanent failed. Inform error to upper layer
- * and go back to WIFI_TDLS_DISABLED */
-} wifi_tdls_state;
-
-typedef enum {
- WIFI_TDLS_SUCCESS, /* Success */
- WIFI_TDLS_UNSPECIFIED = -1, /* Unspecified reason */
- WIFI_TDLS_NOT_SUPPORTED = -2, /* Remote side doesn't support TDLS */
- WIFI_TDLS_UNSUPPORTED_BAND = -3, /* Remote side doesn't support this band */
- WIFI_TDLS_NOT_BENEFICIAL = -4, /* Going to AP is better than going direct */
- WIFI_TDLS_DROPPED_BY_REMOTE = -5 /* Remote side doesn't want it anymore */
-} wifi_tdls_reason;
-
-typedef struct {
- int channel; /* channel hint, in channel number (NOT frequency ) */
- int global_operating_class; /* operating class to use */
- int max_latency_ms; /* max latency that can be tolerated by apps */
- int min_bandwidth_kbps; /* bandwidth required by apps, in kilo bits per second */
-} wifi_tdls_params;
-
-typedef struct {
- int channel;
- int global_operating_class;
- wifi_tdls_state state;
- wifi_tdls_reason reason;
-} wifi_tdls_status;
-
-typedef struct {
- int max_concurrent_tdls_session_num; /* Maximum TDLS session number can be supported by the
- * Firmware and hardware*/
- int is_global_tdls_supported; /* 1 -- support, 0 -- not support */
- int is_per_mac_tdls_supported; /* 1 -- support, 0 -- not support */
- int is_off_channel_tdls_supported; /* 1 -- support, 0 -- not support */
-} wifi_tdls_capabilities;
-
-typedef struct {
- /* on_tdls_state_changed - reports state of TDLS link to framework
- * Report this event when the state of TDLS link changes */
- void (*on_tdls_state_changed)(mac_addr addr, wifi_tdls_status status);
-} wifi_tdls_handler;
-
-
-/* wifi_enable_tdls - enables TDLS-auto mode for a specific route
- *
- * params specifies hints, which provide more information about
- * why TDLS is being sought. The firmware should do its best to
- * honor the hints before downgrading regular AP link
- * If upper layer has no specific values, this should be NULL
- *
- * handler is used to inform the upper layer about the status change and the corresponding reason
- */
-wifi_error wifi_enable_tdls(wifi_interface_handle iface, mac_addr addr,
- wifi_tdls_params *params, wifi_tdls_handler handler);
-
-/* wifi_disable_tdls - disables TDLS-auto mode for a specific route
- *
- * This terminates any existing TDLS with addr device, and frees the
- * device resources to make TDLS connections on new routes.
- *
- * DON'T fire any more events on 'handler' specified in earlier call to
- * wifi_enable_tdls after this action.
- */
-wifi_error wifi_disable_tdls(wifi_interface_handle iface, mac_addr addr);
-
-/* wifi_get_tdls_status - allows getting the status of TDLS for a specific route */
-wifi_error wifi_get_tdls_status(wifi_interface_handle iface, mac_addr addr,
- wifi_tdls_status *status);
-
-/* return the current HW + Firmware combination's TDLS capabilities */
-wifi_error wifi_get_tdls_capabilities(wifi_interface_handle iface,
- wifi_tdls_capabilities *capabilities);
-#endif
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "gscan.h"
#include "link_layer_stats.h"
#include "rtt.h"
-#include "tdls.h"
#include "wifi_logger.h"
#include "wifi_config.h"
#include "wifi_nan.h"
#include "wifi_offload.h"
-#include "roam.h"
//wifi HAL function pointer table
typedef struct {
wifi_error (* wifi_get_logger_supported_feature_set)(wifi_interface_handle iface,
unsigned int *support);
wifi_error (* wifi_get_ring_data)(wifi_interface_handle iface, char *ring_name);
- wifi_error (* wifi_enable_tdls)(wifi_interface_handle, mac_addr, wifi_tdls_params *,
- wifi_tdls_handler);
+
+ // TDLS features: not used
+ wifi_error (* wifi_enable_tdls)(wifi_interface_handle, mac_addr, void *, void *);
wifi_error (* wifi_disable_tdls)(wifi_interface_handle, mac_addr);
- wifi_error (*wifi_get_tdls_status) (wifi_interface_handle, mac_addr, wifi_tdls_status *);
+ wifi_error (*wifi_get_tdls_status) (wifi_interface_handle, mac_addr, void *);
wifi_error (*wifi_get_tdls_capabilities)(wifi_interface_handle iface,
- wifi_tdls_capabilities *capabilities);
+ void *capabilities);
wifi_error (* wifi_get_driver_version)(wifi_interface_handle iface, char *buffer,
int buffer_size);
wifi_error (* wifi_set_passpoint_list)(wifi_request_id id, wifi_interface_handle iface,
wifi_error (*wifi_read_packet_filter)(wifi_interface_handle handle,
u32 src_offset, u8 *host_dst,
u32 length);
+
+ // NOT USED
wifi_error (*wifi_get_roaming_capabilities)(wifi_interface_handle handle,
- wifi_roaming_capabilities *caps);
+ void *caps);
wifi_error (*wifi_enable_firmware_roaming)(wifi_interface_handle handle,
- fw_roaming_state_t state);
+ int state);
wifi_error (*wifi_configure_roaming)(wifi_interface_handle handle,
- wifi_roaming_config *roaming_config);
+ void *roaming_config);
wifi_error (*wifi_set_radio_mode_change_handler)(wifi_request_id id, wifi_interface_handle
iface, wifi_radio_mode_change_handler eh);
wifi_error (*wifi_set_latency_mode)(wifi_interface_handle iface,
/*
- * Copyright (C) 2016 The Android Open Source Project
+ * Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
projects / platform / core / connectivity / nan-manager.git / commitdiff