diff options
| author | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2012-11-18 20:46:23 -0800 |
| commit | 90b17dc3aca5efbed34a82972db73de71b724fe3 (patch) | |
| tree | 9acc413d20b5520ad4f5f96786e46718d5dbb7fb /modules/usbaudio/audio_hw.c | |
| parent | bb992a86df645482167013634a8c1de1a3109344 (diff) | |
| parent | c55d7ac337641c7ad9ff734169e65553fbb40787 (diff) | |
| download | hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.zip hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.gz hardware_libhardware-90b17dc3aca5efbed34a82972db73de71b724fe3.tar.bz2 | |
Merge branch 'jb-mr1-release' of https://android.googlesource.com/platform/hardware/libhardware into HEAD
Conflicts:
include/hardware/fb.h
include/hardware/hwcomposer.h
modules/audio/audio_hw.c
Change-Id: Ib37d49cb600bf0cd062847f9c0eb3841bae13f74
Diffstat (limited to 'modules/usbaudio/audio_hw.c')
| -rw-r--r-- | modules/usbaudio/audio_hw.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c index 9283016..f33c343 100644 --- a/modules/usbaudio/audio_hw.c +++ b/modules/usbaudio/audio_hw.c @@ -379,11 +379,6 @@ static int adev_close(hw_device_t *device) return 0; } -static uint32_t adev_get_supported_devices(const struct audio_hw_device *dev) -{ - return AUDIO_DEVICE_OUT_ALL_USB; -} - static int adev_open(const hw_module_t* module, const char* name, hw_device_t** device) { @@ -398,11 +393,10 @@ static int adev_open(const hw_module_t* module, const char* name, return -ENOMEM; adev->hw_device.common.tag = HARDWARE_DEVICE_TAG; - adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_1_0; + adev->hw_device.common.version = AUDIO_DEVICE_API_VERSION_2_0; adev->hw_device.common.module = (struct hw_module_t *) module; adev->hw_device.common.close = adev_close; - adev->hw_device.get_supported_devices = adev_get_supported_devices; adev->hw_device.init_check = adev_init_check; adev->hw_device.set_voice_volume = adev_set_voice_volume; adev->hw_device.set_master_volume = adev_set_master_volume; |