diff options
| author | Jimmy Chen <jimmycmchen@google.com> | 2020-09-04 15:10:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-04 15:10:36 +0000 |
| commit | b1fb1ef3063e204e9bb569810b19ad47056f7950 (patch) | |
| tree | 077121c53abce35931b29f901303b6a5ef53f0e9 /wifi/1.5/default/hidl_struct_util.h | |
| parent | 27ac2a9d4df152c02cf1c11710faf029822212e7 (diff) | |
| parent | 5cbf6276f5ccd0c8a7d3b6f979a3b2f557c5c229 (diff) | |
Merge changes from topic "60ghz-3-google-hal-60ghz"
* changes:
Wifi: support 60GHz (Wigig) band
Wifi: add new chip capability WIGIG
Diffstat (limited to 'wifi/1.5/default/hidl_struct_util.h')
| -rw-r--r-- | wifi/1.5/default/hidl_struct_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/1.5/default/hidl_struct_util.h b/wifi/1.5/default/hidl_struct_util.h index b6567ff809..c6dc692367 100644 --- a/wifi/1.5/default/hidl_struct_util.h +++ b/wifi/1.5/default/hidl_struct_util.h @@ -22,10 +22,10 @@ #include <android/hardware/wifi/1.0/IWifiChip.h> #include <android/hardware/wifi/1.0/types.h> #include <android/hardware/wifi/1.2/types.h> -#include <android/hardware/wifi/1.3/IWifiChip.h> #include <android/hardware/wifi/1.3/types.h> #include <android/hardware/wifi/1.4/IWifiChipEventCallback.h> #include <android/hardware/wifi/1.4/types.h> +#include <android/hardware/wifi/1.5/IWifiChip.h> #include "wifi_legacy_hal.h" @@ -45,7 +45,7 @@ using namespace android::hardware::wifi::V1_0; // Chip conversion methods. bool convertLegacyFeaturesToHidlChipCapabilities( - uint32_t legacy_feature_set, uint32_t legacy_logger_feature_set, + uint64_t legacy_feature_set, uint32_t legacy_logger_feature_set, uint32_t* hidl_caps); bool convertLegacyDebugRingBufferStatusToHidl( const legacy_hal::wifi_ring_buffer_status& legacy_status, |