diff options
author | Mitchell Wills <mwills@google.com> | 2016-05-26 13:10:56 -0700 |
---|---|---|
committer | Mitchell Wills <mwills@google.com> | 2016-05-26 13:13:37 -0700 |
commit | 564211e861e1ac0aa3bd02d92b8c4e12b96d2fbd (patch) | |
tree | 9883fc766e8ea05c6a58efc20a6db767c7d6397a | |
parent | 0a5a892506f1d23fac8de2c79d7e36cb0e5f3831 (diff) | |
download | libhardware_legacy-nougat-dev.tar.gz |
Remove const integers from HAL and define undefined structsandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr0.5-releasenougat-devnougat-cts-releasenougat-bugfix-release
Bug: 28984011
Change-Id: I6edfe547fbad127db9cbff654b96a476140d9f05
-rw-r--r-- | include/hardware_legacy/gscan.h | 16 | ||||
-rw-r--r-- | 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; |