From 564211e861e1ac0aa3bd02d92b8c4e12b96d2fbd Mon Sep 17 00:00:00 2001 From: Mitchell Wills Date: Thu, 26 May 2016 13:10:56 -0700 Subject: Remove const integers from HAL and define undefined structs Bug: 28984011 Change-Id: I6edfe547fbad127db9cbff654b96a476140d9f05 --- include/hardware_legacy/gscan.h | 16 ++++++++-------- include/hardware_legacy/wifi_hal.h | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/hardware_legacy/gscan.h b/include/hardware_legacy/gscan.h index d72fccb..a5ceaba 100644 --- a/include/hardware_legacy/gscan.h +++ b/include/hardware_legacy/gscan.h @@ -15,14 +15,14 @@ typedef enum { WIFI_BAND_ABG_WITH_DFS = 7, // 2.4 GHz + 5 GHz with DFS } wifi_band; -const unsigned MAX_CHANNELS = 16; -const unsigned MAX_BUCKETS = 16; -const unsigned MAX_HOTLIST_APS = 128; -const unsigned MAX_SIGNIFICANT_CHANGE_APS = 64; -const unsigned MAX_EPNO_NETWORKS = 64; -const unsigned MAX_HOTLIST_SSID = 8; -const unsigned MAX_BLACKLIST_BSSID = 16; -const unsigned MAX_AP_CACHE_PER_SCAN = 32; +#define MAX_CHANNELS 16 +#define MAX_BUCKETS 16 +#define MAX_HOTLIST_APS 128 +#define MAX_SIGNIFICANT_CHANGE_APS 64 +#define MAX_EPNO_NETWORKS 64 +#define MAX_HOTLIST_SSID 8 +#define MAX_BLACKLIST_BSSID 16 +#define MAX_AP_CACHE_PER_SCAN 32 wifi_error wifi_get_valid_channels(wifi_interface_handle handle, int band, int max_channels, wifi_channel *channels, int *num_channels); diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h index 264d8f8..5fa003f 100644 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@ -76,6 +76,8 @@ typedef byte oui[3]; typedef int64_t wifi_timestamp; // In microseconds (us) typedef int64_t wifi_timespan; // In picoseconds (ps) +struct wifi_info; +struct wifi_interface_info; typedef struct wifi_info *wifi_handle; typedef struct wifi_interface_info *wifi_interface_handle; -- cgit v1.2.3