diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 1 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_hal.h | 29 | ||||
| -rw-r--r-- | include/hardware_legacy/wifi_logger.h | 1 |
3 files changed, 25 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 0755834..63db82b 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,7 +158,6 @@ 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 *); @@ -200,6 +201,21 @@ typedef struct { 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_error (* wifi_get_firmware_memory_dump)( wifi_interface_handle iface, + wifi_firmware_memory_dump_handler handler); + wifi_error (* wifi_set_log_handler)(wifi_request_id id, wifi_interface_handle iface, + wifi_ring_buffer_data_handler handler); + wifi_error (* wifi_set_alert_handler)(wifi_request_id id, wifi_interface_handle iface, + wifi_alert_handler handler); + wifi_error (* wifi_get_firmware_version)( wifi_interface_handle iface, char **buffer, + int *buffer_size); + wifi_error (* wifi_get_ring_buffers_status)(wifi_interface_handle iface, + u32 *num_rings, wifi_ring_buffer_status **status); + 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_get_driver_version)(wifi_interface_handle iface, char **buffer, + int *buffer_size); wifi_error (* wifi_enable_tdls)(wifi_interface_handle, mac_addr, wifi_tdls_params *, wifi_tdls_handler); wifi_error (* wifi_disable_tdls)(wifi_interface_handle, mac_addr); @@ -208,6 +224,9 @@ typedef struct { wifi_tdls_capabilities *capabilities); } 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 b91bfa2..ee8353f 100644 --- a/include/hardware_legacy/wifi_logger.h +++ b/include/hardware_legacy/wifi_logger.h @@ -303,7 +303,6 @@ wifi_error wifi_get_firmware_version(wifi_interface_handle iface, char **buffer, /* api to collect a driver version string */
wifi_error wifi_get_driver_version(wifi_interface_handle iface, char **buffer, int *buffer_size);
-
/* Feature set */
enum {
WIFI_LOGGER_MEMORY_DUMP_SUPPORTED = (1 << (0)), // Memory dump of FW
|