diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 1 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_hal.h | 59 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_logger.h | 3 |
3 files changed, 57 insertions, 6 deletions
diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 531a737..cf03f78 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -287,6 +287,7 @@ protected: bool mStrategyMutedByDevice[NUM_STRATEGIES]; // strategies muted because of incompatible // device selection. See checkDeviceMuteStrategies() uint32_t mDirectOpenCount; // number of clients using this output (direct outputs only) + bool mForceRouting; // Next routing for this output will be forced as current device routed is null }; // descriptor for audio inputs. Used to maintain current configuration of each opened audio input diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h index 128d030..2a99a43 100644 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@ -17,6 +17,10 @@ #ifndef __WIFI_HAL_H__ #define __WIFI_HAL_H__ +#ifdef __cplusplus +extern "C" +{ +#endif #include <stdint.h> /* WiFi Common definitions */ @@ -72,10 +76,8 @@ typedef byte oui[3]; typedef int64_t wifi_timestamp; // In microseconds (us) typedef int64_t wifi_timespan; // In nanoseconds (ns) -struct wifi_info; -typedef wifi_info *wifi_handle; -struct wifi_interface_info; -typedef wifi_interface_info *wifi_interface_handle; +typedef struct wifi_info *wifi_handle; +typedef struct wifi_interface_info *wifi_interface_handle; /* Initialize/Cleanup */ @@ -156,6 +158,55 @@ wifi_error wifi_set_nodfs_flag(wifi_interface_handle handle, u32 nodfs); #include "wifi_logger.h" #include "wifi_config.h" #include "wifi_nan.h" +//wifi HAL function pointer table +typedef struct { + wifi_error (* wifi_initialize) (wifi_handle *); + void (* wifi_cleanup) (wifi_handle, wifi_cleaned_up_handler); + void (*wifi_event_loop)(wifi_handle); + void (* wifi_get_error_info) (wifi_error , const char **); + wifi_error (* wifi_get_supported_feature_set) (wifi_interface_handle, feature_set *); + wifi_error (* wifi_get_concurrency_matrix) (wifi_interface_handle, int, feature_set *, int *); + wifi_error (* wifi_set_scanning_mac_oui) (wifi_interface_handle, unsigned char *); + wifi_error (* wifi_get_supported_channels)(wifi_handle, int *, wifi_channel *); + wifi_error (* wifi_is_epr_supported)(wifi_handle); + wifi_error (* wifi_get_ifaces) (wifi_handle , int *, wifi_interface_handle **); + wifi_error (* wifi_get_iface_name) (wifi_interface_handle, char *name, size_t); + wifi_error (* wifi_set_iface_event_handler) (wifi_request_id,wifi_interface_handle , + wifi_event_handler); + wifi_error (* wifi_reset_iface_event_handler) (wifi_request_id, wifi_interface_handle); + wifi_error (* wifi_start_gscan) (wifi_request_id, wifi_interface_handle, wifi_scan_cmd_params, + wifi_scan_result_handler); + wifi_error (* wifi_stop_gscan)(wifi_request_id, wifi_interface_handle); + wifi_error (* wifi_get_cached_gscan_results)(wifi_interface_handle, byte, int, + wifi_cached_scan_results *, int *); + wifi_error (* wifi_set_bssid_hotlist)(wifi_request_id, wifi_interface_handle, + wifi_bssid_hotlist_params, wifi_hotlist_ap_found_handler); + wifi_error (* wifi_reset_bssid_hotlist)(wifi_request_id, wifi_interface_handle); + wifi_error (* wifi_set_significant_change_handler)(wifi_request_id, wifi_interface_handle, + wifi_significant_change_params, wifi_significant_change_handler); + wifi_error (* wifi_reset_significant_change_handler)(wifi_request_id, wifi_interface_handle); + wifi_error (* wifi_get_gscan_capabilities)(wifi_interface_handle, wifi_gscan_capabilities *); + wifi_error (* wifi_set_link_stats) (wifi_interface_handle, wifi_link_layer_params); + wifi_error (* wifi_get_link_stats) (wifi_request_id,wifi_interface_handle, + wifi_stats_result_handler); + wifi_error (* wifi_clear_link_stats)(wifi_interface_handle,u32, u32 *, u8, u8 *); + wifi_error (* wifi_get_valid_channels)(wifi_interface_handle,int, int, wifi_channel *, int *); + wifi_error (* wifi_rtt_range_request)(wifi_request_id, wifi_interface_handle, unsigned, + wifi_rtt_config[], wifi_rtt_event_handler); + wifi_error (* wifi_rtt_range_cancel)(wifi_request_id, wifi_interface_handle, unsigned, + mac_addr[]); + wifi_error (* wifi_get_rtt_capabilities)(wifi_interface_handle, wifi_rtt_capabilities *); + wifi_error (* wifi_set_nodfs_flag)(wifi_interface_handle, u32); + wifi_error (* wifi_start_logging)(wifi_interface_handle, u32, u32, u32, u32, u8 *, + wifi_ring_buffer_data_handler); + wifi_error (* wifi_set_epno_list)(int, wifi_interface_info *, int, wifi_epno_network *, + wifi_epno_handler); + wifi_error (* wifi_set_country_code)(wifi_interface_handle, const char *); +} wifi_hal_fn; +wifi_error init_wifi_vendor_hal_func_table(wifi_hal_fn *fn); +#ifdef __cplusplus +} +#endif #endif diff --git a/include/hardware_legacy/wifi_logger.h b/include/hardware_legacy/wifi_logger.h index fb4edbb..f125a20 100644 --- a/include/hardware_legacy/wifi_logger.h +++ b/include/hardware_legacy/wifi_logger.h @@ -266,7 +266,7 @@ wifi_error wifi_get_ring_data(wifi_request_id id, * min_data_size: minimum data size in buffer for driver to invoke on_ring_buffer_data, ignore if zero
*/
-wifi_error wifi_start_logging(wifi_request_id id, wifi_interface_handle iface, u32 verbose_level, u32 flags, u32 max_interval_sec, u32 min_data_size, u8 *buffer_name, wifi_ring_buffer_data_handler handler);
+wifi_error wifi_start_logging(wifi_interface_handle iface, u32 verbose_level, u32 flags, u32 max_interval_sec, u32 min_data_size, u8 *buffer_name, wifi_ring_buffer_data_handler handler);
/* api to get the status of all ring buffers supported by driver */
wifi_error wifi_get_ring_buffers_status(wifi_request_id id,
@@ -290,7 +290,6 @@ wifi_error wifi_get_firmware_version(wifi_request_id id, wifi_error wifi_get_driver_version(wifi_request_id id,
wifi_interface_handle iface, char **buffer, int *buffer_size);
-
/* Feature set */
enum {
WIFI_LOGGER_MEMORY_DUMP_SUPPORTED = (1 << (0)), // Memory dump of FW
|