diff options
Diffstat (limited to 'wifi/1.4/default/hidl_struct_util.cpp')
| -rw-r--r-- | wifi/1.4/default/hidl_struct_util.cpp | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/wifi/1.4/default/hidl_struct_util.cpp b/wifi/1.4/default/hidl_struct_util.cpp index 6eeb6422e5..35c683984d 100644 --- a/wifi/1.4/default/hidl_struct_util.cpp +++ b/wifi/1.4/default/hidl_struct_util.cpp @@ -316,7 +316,7 @@ legacy_hal::wifi_latency_mode convertHidlLatencyModeToLegacy( bool convertLegacyWifiMacInfoToHidl( const legacy_hal::WifiMacInfo& legacy_mac_info, - V1_2::IWifiChipEventCallback::RadioModeInfo* hidl_radio_mode_info) { + IWifiChipEventCallback::RadioModeInfo* hidl_radio_mode_info) { if (!hidl_radio_mode_info) { return false; } @@ -325,8 +325,17 @@ bool convertLegacyWifiMacInfoToHidl( hidl_radio_mode_info->radioId = legacy_mac_info.wlan_mac_id; // Convert from bitmask of bands in the legacy HAL to enum value in // the HIDL interface. - if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_2_4_BAND && - legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_5_0_BAND) { + if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_6_0_BAND && + legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_5_0_BAND && + legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_2_4_BAND) { + hidl_radio_mode_info->bandInfo = WifiBand::BAND_24GHZ_5GHZ_6GHZ; + } else if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_6_0_BAND && + legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_5_0_BAND) { + hidl_radio_mode_info->bandInfo = WifiBand::BAND_5GHZ_6GHZ; + } else if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_6_0_BAND) { + hidl_radio_mode_info->bandInfo = WifiBand::BAND_6GHZ; + } else if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_2_4_BAND && + legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_5_0_BAND) { hidl_radio_mode_info->bandInfo = WifiBand::BAND_24GHZ_5GHZ; } else if (legacy_mac_info.mac_band & legacy_hal::WLAN_MAC_2_4_BAND) { hidl_radio_mode_info->bandInfo = WifiBand::BAND_24GHZ; @@ -348,15 +357,14 @@ bool convertLegacyWifiMacInfoToHidl( bool convertLegacyWifiMacInfosToHidl( const std::vector<legacy_hal::WifiMacInfo>& legacy_mac_infos, - std::vector<V1_2::IWifiChipEventCallback::RadioModeInfo>* - hidl_radio_mode_infos) { + std::vector<IWifiChipEventCallback::RadioModeInfo>* hidl_radio_mode_infos) { if (!hidl_radio_mode_infos) { return false; } *hidl_radio_mode_infos = {}; for (const auto& legacy_mac_info : legacy_mac_infos) { - V1_2::IWifiChipEventCallback::RadioModeInfo hidl_radio_mode_info; + IWifiChipEventCallback::RadioModeInfo hidl_radio_mode_info; if (!convertLegacyWifiMacInfoToHidl(legacy_mac_info, &hidl_radio_mode_info)) { return false; @@ -449,21 +457,21 @@ bool convertLegacyGscanCapabilitiesToHidl( return true; } -legacy_hal::wifi_band convertHidlWifiBandToLegacy(WifiBand band) { +legacy_hal::wifi_band convertHidlWifiBandToLegacy(V1_0::WifiBand band) { switch (band) { - case WifiBand::BAND_UNSPECIFIED: + case V1_0::WifiBand::BAND_UNSPECIFIED: return legacy_hal::WIFI_BAND_UNSPECIFIED; - case WifiBand::BAND_24GHZ: + case V1_0::WifiBand::BAND_24GHZ: return legacy_hal::WIFI_BAND_BG; - case WifiBand::BAND_5GHZ: + case V1_0::WifiBand::BAND_5GHZ: return legacy_hal::WIFI_BAND_A; - case WifiBand::BAND_5GHZ_DFS: + case V1_0::WifiBand::BAND_5GHZ_DFS: return legacy_hal::WIFI_BAND_A_DFS; - case WifiBand::BAND_5GHZ_WITH_DFS: + case V1_0::WifiBand::BAND_5GHZ_WITH_DFS: return legacy_hal::WIFI_BAND_A_WITH_DFS; - case WifiBand::BAND_24GHZ_5GHZ: + case V1_0::WifiBand::BAND_24GHZ_5GHZ: return legacy_hal::WIFI_BAND_ABG; - case WifiBand::BAND_24GHZ_5GHZ_WITH_DFS: + case V1_0::WifiBand::BAND_24GHZ_5GHZ_WITH_DFS: return legacy_hal::WIFI_BAND_ABG_WITH_DFS; }; CHECK(false); |