diff options
| author | Prerepa Viswanadham <dham@google.com> | 2015-03-24 14:47:37 -0700 |
|---|---|---|
| committer | Prerepa Viswanadham <dham@google.com> | 2015-03-24 14:47:37 -0700 |
| commit | c7e2d9db534fc54e0de566f0a14676e25a6b2d92 (patch) | |
| tree | b4e04c2a7d453d33b69ca43b8ac3e46ebd2fa767 /include/hardware_legacy/wifi_hal.h | |
| parent | 08ab34364c299414453ae198cd52e32d39024139 (diff) | |
| parent | 5e7b7e506d54a2d4cf9a5e12bde61db985f130bc (diff) | |
| download | hardware_libhardware_legacy-c7e2d9db534fc54e0de566f0a14676e25a6b2d92.zip hardware_libhardware_legacy-c7e2d9db534fc54e0de566f0a14676e25a6b2d92.tar.gz hardware_libhardware_legacy-c7e2d9db534fc54e0de566f0a14676e25a6b2d92.tar.bz2 | |
Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge
Change-Id: I836d0614625d2b311131cbbf1943087dc4c9bb7e
Diffstat (limited to 'include/hardware_legacy/wifi_hal.h')
| -rw-r--r-- | include/hardware_legacy/wifi_hal.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/include/hardware_legacy/wifi_hal.h b/include/hardware_legacy/wifi_hal.h index 9653719..4098cd4 100644 --- a/include/hardware_legacy/wifi_hal.h +++ b/include/hardware_legacy/wifi_hal.h @@ -26,14 +26,14 @@ extern "C" /* WiFi Common definitions */ /* channel operating width */ typedef enum { - WIFI_CHAN_WIDTH_20 = 0, - WIFI_CHAN_WIDTH_40 = 1, - WIFI_CHAN_WIDTH_80 = 2, - WIFI_CHAN_WIDTH_160 = 3, - WIFI_CHAN_WIDTH_80P80 = 4, - WIFI_CHAN_WIDTH_5 = 5, - WIFI_CHAN_WIDTH_10 = 6, - WIFI_CHAN_WIDTH_INVALID = -1 + WIFI_CHAN_WIDTH_20 = 0, + WIFI_CHAN_WIDTH_40 = 1, + WIFI_CHAN_WIDTH_80 = 2, + WIFI_CHAN_WIDTH_160 = 3, + WIFI_CHAN_WIDTH_80P80 = 4, + WIFI_CHAN_WIDTH_5 = 5, + WIFI_CHAN_WIDTH_10 = 6, + WIFI_CHAN_WIDTH_INVALID = -1 } wifi_channel_width; typedef int wifi_radio; @@ -65,7 +65,9 @@ typedef unsigned char u8; typedef signed char s8; typedef uint16_t u16; typedef uint32_t u32; +typedef int32_t s32; typedef uint64_t u64; +typedef int64_t s64; typedef int wifi_request_id; typedef int wifi_channel; // indicates channel frequency in MHz typedef int wifi_rssi; @@ -110,6 +112,7 @@ void wifi_get_error_info(wifi_error err, const char **msg); // return a pointer // Add more features here + typedef int feature_set; #define IS_MASK_SET(mask, flags) ((flags & mask) == mask) @@ -126,7 +129,7 @@ wifi_error wifi_get_supported_feature_set(wifi_interface_handle handle, feature_ * all other combinations are invalid! */ wifi_error wifi_get_concurrency_matrix(wifi_interface_handle handle, int set_size_max, - feature_set set[], int *set_size); + feature_set set[], int *set_size); /* multiple interface support */ |