commit 974a40d3c133b78db7e99404873336638f3f17b0
author Ben Romberger <bromberg@codeaurora.org> Mon Jul 18 15:08:21 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:15:21 2011 -0700
tree e1bb4a8bc5734a49fff53ed431724c12bc80a726
parent d2e2c49df21f0925749844fd6638b6317cd0ca12

msm: audio: qdsp6v2: Change RTAC to use topology

This changes real-time audio calibration (RTAC) to use
topology ID's instead of device ID's.

Signed-off-by: Ben Romberger <bromberg@codeaurora.org>

include/linux/msm_audio_acdb.h

diff --git a/include/linux/msm_audio_acdb.h b/include/linux/msm_audio_acdb.h
index 546c57a..3d756c2 100644
--- a/include/linux/msm_audio_acdb.h
+++ b/include/linux/msm_audio_acdb.h
@@ -48,28 +48,26 @@
 };
 
 /* For Real-Time Audio Calibration */
-#define AUDIO_GET_RTAC_DEV_CTRL_INFO	_IOR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+16), unsigned)
 #define AUDIO_GET_RTAC_ADM_INFO		_IOR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+17), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+16), unsigned)
 #define AUDIO_GET_RTAC_VOICE_INFO	_IOR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+18), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+17), unsigned)
 #define AUDIO_GET_RTAC_ADM_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+19), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+18), unsigned)
 #define AUDIO_SET_RTAC_ADM_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+20), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+19), unsigned)
 #define AUDIO_GET_RTAC_ASM_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+21), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+20), unsigned)
 #define AUDIO_SET_RTAC_ASM_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+22), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+21), unsigned)
 #define AUDIO_GET_RTAC_CVS_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+23), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+22), unsigned)
 #define AUDIO_SET_RTAC_CVS_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+24), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+23), unsigned)
 #define AUDIO_GET_RTAC_CVP_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+25), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+24), unsigned)
 #define AUDIO_SET_RTAC_CVP_CAL	_IOWR(AUDIO_IOCTL_MAGIC, \
-			(AUDIO_MAX_COMMON_IOCTL_NUM+26), unsigned)
+			(AUDIO_MAX_COMMON_IOCTL_NUM+25), unsigned)
 
 
 #endif /* __MSM_AUDIO_ACDB_H */