msm: audio: qdsp6v2: Removed ifdef's from RTAC code
When real-time audio calibration (RTAC) is used a separate
set of void functions defined in the header file is used.
All ifdef references for RTAC were removed from all other
files.
Signed-off-by: Ben Romberger <bromberg@codeaurora.org>
diff --git a/arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h b/arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h
index 863fe97..d864fb8 100644
--- a/arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h
+++ b/arch/arm/mach-msm/include/mach/qdsp6v2/rtac.h
@@ -14,10 +14,6 @@
#ifndef __RTAC_H__
#define __RTAC_H__
-#ifdef CONFIG_MSM8X60_RTAC
-
-#include <mach/qdsp6v2/q6voice.h>
-
/* Voice Modes */
#define RTAC_CVP 0
#define RTAC_CVS 1
@@ -25,8 +21,9 @@
void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id);
void rtac_remove_adm_device(u32 port_id, u32 popp_id);
-void rtac_add_voice(struct voice_data *v);
-void rtac_remove_voice(struct voice_data *v);
+void rtac_add_voice(u32 cvs_handle, u32 cvp_handle, u32 rx_afe_port,
+ u32 tx_afe_port);
+void rtac_remove_voice(u32 cvs_handle);
void rtac_set_adm_handle(void *handle);
bool rtac_make_adm_callback(uint32_t *payload, u32 payload_size);
void rtac_copy_adm_payload_to_user(void *payload, u32 payload_size);
@@ -39,6 +36,3 @@
void rtac_copy_voice_payload_to_user(void *payload, u32 payload_size);
#endif
-
-#endif
-
diff --git a/arch/arm/mach-msm/qdsp6v2/Makefile b/arch/arm/mach-msm/qdsp6v2/Makefile
index eaf9e69..e3e3679f 100644
--- a/arch/arm/mach-msm/qdsp6v2/Makefile
+++ b/arch/arm/mach-msm/qdsp6v2/Makefile
@@ -1,5 +1,6 @@
+obj-y += rtac.o
+
ifdef CONFIG_ARCH_MSM8X60
-obj-$(CONFIG_MSM8X60_RTAC) += rtac.o
obj-y += audio_dev_ctl.o
obj-y += board-msm8x60-audio.o
obj-$(CONFIG_TIMPANI_CODEC) += snddev_icodec.o
diff --git a/arch/arm/mach-msm/qdsp6v2/q6voice.c b/arch/arm/mach-msm/qdsp6v2/q6voice.c
index de6f646..c3bf9d2 100644
--- a/arch/arm/mach-msm/qdsp6v2/q6voice.c
+++ b/arch/arm/mach-msm/qdsp6v2/q6voice.c
@@ -22,11 +22,13 @@
#include <linux/completion.h>
#include <linux/wait.h>
#include <linux/mutex.h>
+
#include <mach/qdsp6v2/audio_dev_ctl.h>
#include <mach/dal.h>
#include <mach/qdsp6v2/q6voice.h>
#include <mach/qdsp6v2/rtac.h>
#include <mach/qdsp6v2/audio_acdb.h>
+
#include "q6core.h"
@@ -107,9 +109,7 @@
common.apr_cvs = apr_cvs;
else
common.apr_q6_cvs = apr_cvs;
-#ifdef CONFIG_MSM8X60_RTAC
rtac_set_voice_handle(RTAC_CVS, apr_cvs);
-#endif
}
static void *voice_get_apr_cvp(void)
@@ -136,9 +136,7 @@
common.apr_cvp = apr_cvp;
else
common.apr_q6_cvp = apr_cvp;
-#ifdef CONFIG_MSM8X60_RTAC
rtac_set_voice_handle(RTAC_CVP, apr_cvp);
-#endif
}
static u16 voice_get_mvm_handle(struct voice_data *v)
@@ -1333,9 +1331,7 @@
pr_err("%s: wait_event timeout\n", __func__);
goto fail;
}
-#ifdef CONFIG_MSM8X60_RTAC
- rtac_remove_voice(v);
-#endif
+ rtac_remove_voice(v->cvs_handle);
return 0;
fail:
@@ -1426,9 +1422,8 @@
if (is_voip_session(v->session_id))
voice_send_netid_timing_cmd(v);
-#ifdef CONFIG_MSM8X60_RTAC
- rtac_add_voice(v);
-#endif
+ rtac_add_voice(v->cvs_handle, v->cvp_handle,
+ v->dev_rx.dev_port_id, v->dev_tx.dev_port_id);
return 0;
fail:
@@ -1722,9 +1717,9 @@
if (is_voip_session(v->session_id))
voice_send_netid_timing_cmd(v);
-#ifdef CONFIG_MSM8X60_RTAC
- rtac_add_voice(v);
-#endif
+ rtac_add_voice(v->cvs_handle, v->cvp_handle,
+ v->dev_rx.dev_port_id, v->dev_tx.dev_port_id);
+
return 0;
fail:
return -EINVAL;
@@ -1792,10 +1787,7 @@
pr_err("%s: wait_event timeout\n", __func__);
goto fail;
}
-
-#ifdef CONFIG_MSM8X60_RTAC
- rtac_remove_voice(v);
-#endif
+ rtac_remove_voice(v->cvs_handle);
cvp_handle = 0;
voice_set_cvp_handle(v, cvp_handle);
@@ -2691,11 +2683,9 @@
v->cvs_state = CMD_STATUS_SUCCESS;
wake_up(&v->cvs_wait);
-#ifdef CONFIG_MSM8X60_RTAC
} else if (ptr[0] == VOICE_CMD_SET_PARAM) {
rtac_make_voice_callback(RTAC_CVS, ptr,
data->payload_size);
-#endif
} else if (ptr[0] == VSS_ISTREAM_CMD_START_PLAYBACK) {
pr_debug("%s: START_PLAYBACK resp 0x%x\n",
__func__, ptr[1]);
@@ -2768,12 +2758,9 @@
} else {
pr_err("%s: ul_cb is NULL\n", __func__);
}
-#ifdef CONFIG_MSM8X60_RTAC
} else if (data->opcode == VOICE_EVT_GET_PARAM_ACK) {
rtac_make_voice_callback(RTAC_CVS, data->payload,
data->payload_size);
-#endif
-
} else {
pr_debug("%s: Unknown opcode 0x%x\n", __func__, data->opcode);
}
@@ -2862,20 +2849,16 @@
pr_debug("%s: cmd = 0x%x\n", __func__, ptr[0]);
v->cvp_state = CMD_STATUS_SUCCESS;
wake_up(&v->cvp_wait);
-#ifdef CONFIG_MSM8X60_RTAC
} else if (ptr[0] == VOICE_CMD_SET_PARAM) {
rtac_make_voice_callback(RTAC_CVP, ptr,
data->payload_size);
-#endif
} else
pr_debug("%s: not match cmd = 0x%x\n",
__func__, ptr[0]);
}
-#ifdef CONFIG_MSM8X60_RTAC
} else if (data->opcode == VOICE_EVT_GET_PARAM_ACK) {
rtac_make_voice_callback(RTAC_CVP, data->payload,
data->payload_size);
-#endif
}
return 0;
}
diff --git a/arch/arm/mach-msm/qdsp6v2/rtac.c b/arch/arm/mach-msm/qdsp6v2/rtac.c
index 372ff3f..b33d354 100644
--- a/arch/arm/mach-msm/qdsp6v2/rtac.c
+++ b/arch/arm/mach-msm/qdsp6v2/rtac.c
@@ -25,6 +25,28 @@
#include <sound/q6asm.h>
#include <sound/q6adm.h>
+#ifndef CONFIG_MSM8X60_RTAC
+
+void rtac_add_adm_device(u32 port_id, u32 copp_id, u32 path_id, u32 popp_id) {}
+void rtac_remove_adm_device(u32 port_id, u32 popp_id) {}
+void rtac_set_adm_handle(void *handle) {}
+bool rtac_make_adm_callback(uint32_t *payload, u32 payload_size)
+ {return false; }
+void rtac_set_asm_handle(u32 session_id, void *handle) {}
+bool rtac_make_asm_callback(u32 session_id, uint32_t *payload,
+ u32 payload_size) {return false; }
+void rtac_add_voice(u32 cvs_handle, u32 cvp_handle, u32 rx_afe_port,
+ u32 tx_afe_port) {}
+void rtac_remove_voice(u32 cvs_handle) {}
+void rtac_set_voice_handle(u32 mode, void *handle) {}
+bool rtac_make_voice_callback(u32 mode, uint32_t *payload,
+ u32 payload_size) {return false; }
+
+#else
+
+#define VOICE_CMD_SET_PARAM 0x00011006
+#define VOICE_CMD_GET_PARAM 0x00011007
+#define VOICE_EVT_GET_PARAM_ACK 0x00011008
/* Max size of payload (buf size - apr header) */
#define MAX_PAYLOAD_SIZE 4076
@@ -240,18 +262,20 @@
/* Voice Info */
-static void set_rtac_voice_data(int idx, struct voice_data *v)
+static void set_rtac_voice_data(int idx, u32 cvs_handle, u32 cvp_handle,
+ u32 rx_afe_port, u32 tx_afe_port)
{
rtac_voice_data.voice[idx].tx_topology_id = get_voice_tx_topology();
rtac_voice_data.voice[idx].rx_topology_id = get_voice_rx_topology();
- rtac_voice_data.voice[idx].tx_afe_port = v->dev_tx.dev_port_id;
- rtac_voice_data.voice[idx].rx_afe_port = v->dev_rx.dev_port_id;
- rtac_voice_data.voice[idx].cvs_handle = v->cvs_handle;
- rtac_voice_data.voice[idx].cvp_handle = v->cvp_handle;
+ rtac_voice_data.voice[idx].tx_afe_port = tx_afe_port;
+ rtac_voice_data.voice[idx].rx_afe_port = rx_afe_port;
+ rtac_voice_data.voice[idx].cvs_handle = cvs_handle;
+ rtac_voice_data.voice[idx].cvp_handle = cvp_handle;
}
-void rtac_add_voice(struct voice_data *v)
+void rtac_add_voice(u32 cvs_handle, u32 cvp_handle, u32 rx_afe_port,
+ u32 tx_afe_port)
{
u32 i = 0;
pr_debug("%s\n", __func__);
@@ -266,9 +290,10 @@
/* Check if device already added */
if (rtac_voice_data.num_of_voice_combos != 0) {
for (; i < rtac_voice_data.num_of_voice_combos; i++) {
- if (rtac_voice_data.voice[i].cvp_handle ==
- v->cvp_handle) {
- set_rtac_voice_data(i, v);
+ if (rtac_voice_data.voice[i].cvs_handle ==
+ cvs_handle) {
+ set_rtac_voice_data(i, cvs_handle, cvp_handle,
+ rx_afe_port, tx_afe_port);
goto done;
}
}
@@ -276,7 +301,8 @@
/* Add device */
rtac_voice_data.num_of_voice_combos++;
- set_rtac_voice_data(i, v);
+ set_rtac_voice_data(i, cvs_handle, cvp_handle,
+ rx_afe_port, tx_afe_port);
done:
mutex_unlock(&rtac_voice_mutex);
return;
@@ -291,7 +317,7 @@
}
}
-void rtac_remove_voice(struct voice_data *v)
+void rtac_remove_voice(u32 cvs_handle)
{
u32 i = 0;
pr_debug("%s\n", __func__);
@@ -299,7 +325,7 @@
mutex_lock(&rtac_voice_mutex);
/* look for device */
for (i = 0; i < rtac_voice_data.num_of_voice_combos; i++) {
- if (rtac_voice_data.voice[i].cvp_handle == v->cvp_handle) {
+ if (rtac_voice_data.voice[i].cvs_handle == cvs_handle) {
shift_voice_devices(i);
rtac_voice_data.num_of_voice_combos--;
memset(&rtac_voice_data.voice[
@@ -967,3 +993,5 @@
MODULE_DESCRIPTION("MSM 8x60 Real-Time Audio Calibration driver");
MODULE_LICENSE("GPL v2");
+
+#endif