Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

HidlUtils: remove temporary conversion functions

Browse Source 
Remove temporary conversion functions and update
the code that was using them.

Bug: 142480271
Test: m
Change-Id: Idf36dbac398efbc03bd6da68c79f6fb1ddc24e9c
This commit is contained in:
Mikhail Naganov
2020-12-14 23:18:30 +00:00
parent 335317f9a8
commit 35a3a77811
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
audio/common/all-versions/default/HidlUtils.h
View File

@@ -76,19 +76,7 @@ struct HidlUtils {
const char* halDeviceAddress, DeviceAddress* device); const char* halDeviceAddress, DeviceAddress* device);
#endif #endif
#if MAJOR_VERSION <= 6 #if MAJOR_VERSION >= 7
// Temporary versions for compatibility with forks of the default implementation.
// Will be removed, do not use!
static status_t audioConfigFromHal(const audio_config_t& halConfig, AudioConfig* config) {
return audioConfigFromHal(halConfig, false /*isInput--ignored*/, config);
}
static std::unique_ptr<audio_port_config[]> audioPortConfigsToHal(
const hidl_vec<AudioPortConfig>& configs) {
std::unique_ptr<audio_port_config[]> halConfigs;
(void)audioPortConfigsToHal(configs, &halConfigs);
return halConfigs;
}
#else // V7 and above
static status_t audioChannelMaskFromHal(audio_channel_mask_t halChannelMask, bool isInput, static status_t audioChannelMaskFromHal(audio_channel_mask_t halChannelMask, bool isInput,
AudioChannelMask* channelMask); AudioChannelMask* channelMask);
static status_t audioChannelMasksFromHal(const std::vector<std::string>& halChannelMasks, static status_t audioChannelMasksFromHal(const std::vector<std::string>& halChannelMasks,
@@ -138,7 +126,7 @@ struct HidlUtils {
struct audio_port_config_device_ext* device, struct audio_port_config_device_ext* device,
struct audio_port_config_mix_ext* mix, struct audio_port_config_mix_ext* mix,
struct audio_port_config_session_ext* session); struct audio_port_config_session_ext* session);
#endif #endif // MAJOR_VERSION >= 7
// V4 and below have DeviceAddress defined in the 'core' interface. // V4 and below have DeviceAddress defined in the 'core' interface.
// To avoid duplicating code, the implementations of deviceAddressTo/FromHal // To avoid duplicating code, the implementations of deviceAddressTo/FromHal