summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/uapi/sound/audio_effects.h6
-rw-r--r--sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c1236
-rw-r--r--sound/soc/msm/qdsp6v2/q6asm.c19
3 files changed, 597 insertions, 664 deletions
diff --git a/include/uapi/sound/audio_effects.h b/include/uapi/sound/audio_effects.h
index 6565acff4073..147e877db71e 100644
--- a/include/uapi/sound/audio_effects.h
+++ b/include/uapi/sound/audio_effects.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015, 2017 The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -159,8 +159,12 @@
#define PBE_ENABLE_PARAM_LEN 1
#define PBE_CONFIG_PARAM_LEN 28
+/* Command Payload length and size for Non-IID commands */
#define COMMAND_PAYLOAD_LEN 3
#define COMMAND_PAYLOAD_SZ (COMMAND_PAYLOAD_LEN * sizeof(uint32_t))
+/* Command Payload length and size for IID commands */
+#define COMMAND_IID_PAYLOAD_LEN 4
+#define COMMAND_IID_PAYLOAD_SZ (COMMAND_IID_PAYLOAD_LEN * sizeof(uint32_t))
#define MAX_INBAND_PARAM_SZ 4096
#define Q27_UNITY (1 << 27)
#define Q8_UNITY (1 << 8)
diff --git a/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c b/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c
index 1286d3185780..37c43253a5bd 100644
--- a/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c
+++ b/sound/soc/msm/qdsp6v2/msm-audio-effects-q6-v2.c
@@ -16,6 +16,7 @@
#include <sound/compress_params.h>
#include <sound/msm-audio-effects-q6-v2.h>
#include <sound/devdep_params.h>
+#include <sound/q6common.h>
#define MAX_ENABLE_CMD_SIZE 32
@@ -61,44 +62,35 @@ int msm_audio_effects_enable_extn(struct audio_client *ac,
struct msm_nt_eff_all_config *effects,
bool flag)
{
- uint32_t updt_params[MAX_ENABLE_CMD_SIZE] = {0};
- uint32_t params_length;
+ u32 flag_param = flag ? 1 : 0;
+ struct param_hdr_v3 param_hdr = {0};
int rc = 0;
pr_debug("%s\n", __func__);
- if (!ac) {
- pr_err("%s: cannot set audio effects\n", __func__);
- return -EINVAL;
- }
- params_length = 0;
- updt_params[0] = AUDPROC_MODULE_ID_VIRTUALIZER;
- updt_params[1] = AUDPROC_PARAM_ID_ENABLE;
- updt_params[2] = VIRTUALIZER_ENABLE_PARAM_SZ;
- updt_params[3] = flag;
- params_length += COMMAND_PAYLOAD_SZ + VIRTUALIZER_ENABLE_PARAM_SZ;
+ param_hdr.module_id = AUDPROC_MODULE_ID_VIRTUALIZER;
+ param_hdr.instance_id = INSTANCE_ID_0;
+ param_hdr.param_id = AUDPROC_PARAM_ID_ENABLE;
+ param_hdr.param_size = VIRTUALIZER_ENABLE_PARAM_SZ;
if (effects->virtualizer.enable_flag)
- q6asm_send_audio_effects_params(ac, (char *)&updt_params[0],
- params_length);
- memset(updt_params, 0, MAX_ENABLE_CMD_SIZE);
- params_length = 0;
- updt_params[0] = AUDPROC_MODULE_ID_BASS_BOOST;
- updt_params[1] = AUDPROC_PARAM_ID_ENABLE;
- updt_params[2] = BASS_BOOST_ENABLE_PARAM_SZ;
- updt_params[3] = flag;
- params_length += COMMAND_PAYLOAD_SZ + BASS_BOOST_ENABLE_PARAM_SZ;
+ rc = q6asm_pack_and_set_pp_param_in_band(ac, param_hdr,
+ (u8 *) &flag_param);
+
+ param_hdr.module_id = AUDPROC_MODULE_ID_BASS_BOOST;
+ param_hdr.instance_id = INSTANCE_ID_0;
+ param_hdr.param_id = AUDPROC_PARAM_ID_ENABLE;
+ param_hdr.param_size = BASS_BOOST_ENABLE_PARAM_SZ;
if (effects->bass_boost.enable_flag)
- q6asm_send_audio_effects_params(ac, (char *)&updt_params[0],
- params_length);
- memset(updt_params, 0, MAX_ENABLE_CMD_SIZE);
- params_length = 0;
- updt_params[0] = AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
- updt_params[1] = AUDPROC_PARAM_ID_ENABLE;
- updt_params[2] = EQ_ENABLE_PARAM_SZ;
- updt_params[3] = flag;
- params_length += COMMAND_PAYLOAD_SZ + EQ_ENABLE_PARAM_SZ;
+ rc = q6asm_pack_and_set_pp_param_in_band(ac, param_hdr,
+ (u8 *) &flag_param);
+
+ param_hdr.module_id = AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
+ param_hdr.instance_id = INSTANCE_ID_0;
+ param_hdr.param_id = AUDPROC_PARAM_ID_ENABLE;
+ param_hdr.param_size = EQ_ENABLE_PARAM_SZ;
if (effects->equalizer.enable_flag)
- q6asm_send_audio_effects_params(ac, (char *)&updt_params[0],
- params_length);
+ rc = q6asm_pack_and_set_pp_param_in_band(ac, param_hdr,
+ (u8 *) &flag_param);
+
return rc;
}
@@ -108,25 +100,32 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
{
long *param_max_offset = values + MAX_PP_PARAMS_SZ - 1;
char *params = NULL;
+ u8 *updt_params;
int rc = 0;
int devices = GET_NEXT(values, param_max_offset, rc);
int num_commands = GET_NEXT(values, param_max_offset, rc);
- int *updt_params, i, prev_enable_flag;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ int i, prev_enable_flag;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u8 *param_data = NULL;
+ u32 packed_data_size = 0;
pr_debug("%s\n", __func__);
if (!ac || (devices == -EINVAL) || (num_commands == -EINVAL)) {
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
pr_debug("%s: device: %d\n", __func__, devices);
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ param_hdr.module_id = AUDPROC_MODULE_ID_VIRTUALIZER;
+ param_hdr.instance_id = INSTANCE_ID_0;
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -148,23 +147,19 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s:VIRT ENABLE prev:%d, new:%d\n", __func__,
prev_enable_flag, virtualizer->enable_flag);
- if (prev_enable_flag != virtualizer->enable_flag) {
- params_length += COMMAND_PAYLOAD_SZ +
- VIRTUALIZER_ENABLE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VIRT ENABLE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_VIRTUALIZER;
- *updt_params++ =
+ if (prev_enable_flag == virtualizer->enable_flag)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ VIRTUALIZER_ENABLE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VIRT ENABLE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
AUDPROC_PARAM_ID_VIRTUALIZER_ENABLE;
- *updt_params++ =
- VIRTUALIZER_ENABLE_PARAM_SZ;
- *updt_params++ =
- virtualizer->enable_flag;
- }
+ param_hdr.param_size = VIRTUALIZER_ENABLE_PARAM_SZ;
+ param_data = (u8 *) &virtualizer->enable_flag;
break;
case VIRTUALIZER_STRENGTH:
if (length != 1 || index_offset != 0) {
@@ -176,23 +171,19 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: VIRT STRENGTH val: %d\n",
__func__, virtualizer->strength);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- VIRTUALIZER_STRENGTH_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VIRT STRENGTH", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_VIRTUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_VIRTUALIZER_STRENGTH;
- *updt_params++ =
- VIRTUALIZER_STRENGTH_PARAM_SZ;
- *updt_params++ =
- virtualizer->strength;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ VIRTUALIZER_STRENGTH_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VIRT STRENGTH", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_VIRTUALIZER_STRENGTH;
+ param_hdr.param_size = VIRTUALIZER_STRENGTH_PARAM_SZ;
+ param_data = (u8 *) &virtualizer->strength;
break;
case VIRTUALIZER_OUT_TYPE:
if (length != 1 || index_offset != 0) {
@@ -204,23 +195,19 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: VIRT OUT_TYPE val:%d\n",
__func__, virtualizer->out_type);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- VIRTUALIZER_OUT_TYPE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VIRT OUT_TYPE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_VIRTUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_VIRTUALIZER_OUT_TYPE;
- *updt_params++ =
- VIRTUALIZER_OUT_TYPE_PARAM_SZ;
- *updt_params++ =
- virtualizer->out_type;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ VIRTUALIZER_OUT_TYPE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VIRT OUT_TYPE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_VIRTUALIZER_OUT_TYPE;
+ param_hdr.param_size = VIRTUALIZER_OUT_TYPE_PARAM_SZ;
+ param_data = (u8 *) &virtualizer->out_type;
break;
case VIRTUALIZER_GAIN_ADJUST:
if (length != 1 || index_offset != 0) {
@@ -232,32 +219,40 @@ int msm_audio_effects_virtualizer_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: VIRT GAIN_ADJUST val:%d\n",
__func__, virtualizer->gain_adjust);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- VIRTUALIZER_GAIN_ADJUST_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VIRT GAIN_ADJUST", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_VIRTUALIZER;
- *updt_params++ =
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ VIRTUALIZER_GAIN_ADJUST_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VIRT GAIN_ADJUST", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
AUDPROC_PARAM_ID_VIRTUALIZER_GAIN_ADJUST;
- *updt_params++ =
- VIRTUALIZER_GAIN_ADJUST_PARAM_SZ;
- *updt_params++ =
- virtualizer->gain_adjust;
- }
+ param_hdr.param_size = VIRTUALIZER_GAIN_ADJUST_PARAM_SZ;
+ param_data = (u8 *) &virtualizer->gain_adjust;
break;
default:
pr_err("%s: Invalid command to set config\n", __func__);
- break;
+ continue;
+ }
+ if (rc)
+ goto invalid_config;
+
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ param_data, &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
}
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
else
pr_debug("%s: did not send pp params\n", __func__);
invalid_config:
@@ -271,25 +266,32 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
{
long *param_max_offset = values + MAX_PP_PARAMS_SZ - 1;
char *params = NULL;
+ u8 *updt_params;
int rc = 0;
int devices = GET_NEXT(values, param_max_offset, rc);
int num_commands = GET_NEXT(values, param_max_offset, rc);
- int *updt_params, i, prev_enable_flag;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ int i, prev_enable_flag;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u8 *param_data = NULL;
+ u32 packed_data_size = 0;
pr_debug("%s\n", __func__);
if (!ac || (devices == -EINVAL) || (num_commands == -EINVAL)) {
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
pr_debug("%s: device: %d\n", __func__, devices);
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ param_hdr.module_id = AUDPROC_MODULE_ID_REVERB;
+ param_hdr.instance_id = INSTANCE_ID_0;
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -311,23 +313,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s:REVERB_ENABLE prev:%d,new:%d\n", __func__,
prev_enable_flag, reverb->enable_flag);
- if (prev_enable_flag != reverb->enable_flag) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_ENABLE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_ENABLE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_ENABLE;
- *updt_params++ =
- REVERB_ENABLE_PARAM_SZ;
- *updt_params++ =
- reverb->enable_flag;
- }
+ if (prev_enable_flag == reverb->enable_flag)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_ENABLE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_ENABLE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_ENABLE;
+ param_hdr.param_size = REVERB_ENABLE_PARAM_SZ;
+ param_data = (u8 *) &reverb->enable_flag;
break;
case REVERB_MODE:
if (length != 1 || index_offset != 0) {
@@ -339,23 +336,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_MODE val:%d\n",
__func__, reverb->mode);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_MODE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_MODE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_MODE;
- *updt_params++ =
- REVERB_MODE_PARAM_SZ;
- *updt_params++ =
- reverb->mode;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_MODE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_MODE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_MODE;
+ param_hdr.param_size = REVERB_MODE_PARAM_SZ;
+ param_data = (u8 *) &reverb->mode;
break;
case REVERB_PRESET:
if (length != 1 || index_offset != 0) {
@@ -367,23 +359,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_PRESET val:%d\n",
__func__, reverb->preset);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_PRESET_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_PRESET", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_PRESET;
- *updt_params++ =
- REVERB_PRESET_PARAM_SZ;
- *updt_params++ =
- reverb->preset;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_PRESET_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_PRESET", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_PRESET;
+ param_hdr.param_size = REVERB_PRESET_PARAM_SZ;
+ param_data = (u8 *) &reverb->preset;
break;
case REVERB_WET_MIX:
if (length != 1 || index_offset != 0) {
@@ -395,23 +382,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_WET_MIX val:%d\n",
__func__, reverb->wet_mix);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_WET_MIX_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_WET_MIX", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_WET_MIX;
- *updt_params++ =
- REVERB_WET_MIX_PARAM_SZ;
- *updt_params++ =
- reverb->wet_mix;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_WET_MIX_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_WET_MIX", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_WET_MIX;
+ param_hdr.param_size = REVERB_WET_MIX_PARAM_SZ;
+ param_data = (u8 *) &reverb->wet_mix;
break;
case REVERB_GAIN_ADJUST:
if (length != 1 || index_offset != 0) {
@@ -423,23 +405,19 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_GAIN_ADJUST val:%d\n",
__func__, reverb->gain_adjust);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_GAIN_ADJUST_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_GAIN_ADJUST", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_GAIN_ADJUST;
- *updt_params++ =
- REVERB_GAIN_ADJUST_PARAM_SZ;
- *updt_params++ =
- reverb->gain_adjust;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_GAIN_ADJUST_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_GAIN_ADJUST", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_REVERB_GAIN_ADJUST;
+ param_hdr.param_size = REVERB_GAIN_ADJUST_PARAM_SZ;
+ param_data = (u8 *) &reverb->gain_adjust;
break;
case REVERB_ROOM_LEVEL:
if (length != 1 || index_offset != 0) {
@@ -451,23 +429,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_ROOM_LEVEL val:%d\n",
__func__, reverb->room_level);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_ROOM_LEVEL_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_ROOM_LEVEL", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_ROOM_LEVEL;
- *updt_params++ =
- REVERB_ROOM_LEVEL_PARAM_SZ;
- *updt_params++ =
- reverb->room_level;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_ROOM_LEVEL_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_ROOM_LEVEL", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_ROOM_LEVEL;
+ param_hdr.param_size = REVERB_ROOM_LEVEL_PARAM_SZ;
+ param_data = (u8 *) &reverb->room_level;
break;
case REVERB_ROOM_HF_LEVEL:
if (length != 1 || index_offset != 0) {
@@ -479,23 +452,19 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_ROOM_HF_LEVEL val%d\n",
__func__, reverb->room_hf_level);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_ROOM_HF_LEVEL_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_ROOM_HF_LEVEL", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_ROOM_HF_LEVEL;
- *updt_params++ =
- REVERB_ROOM_HF_LEVEL_PARAM_SZ;
- *updt_params++ =
- reverb->room_hf_level;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_ROOM_HF_LEVEL_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_ROOM_HF_LEVEL", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_REVERB_ROOM_HF_LEVEL;
+ param_hdr.param_size = REVERB_ROOM_HF_LEVEL_PARAM_SZ;
+ param_data = (u8 *) &reverb->room_hf_level;
break;
case REVERB_DECAY_TIME:
if (length != 1 || index_offset != 0) {
@@ -507,23 +476,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_DECAY_TIME val:%d\n",
__func__, reverb->decay_time);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_DECAY_TIME_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_DECAY_TIME", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_DECAY_TIME;
- *updt_params++ =
- REVERB_DECAY_TIME_PARAM_SZ;
- *updt_params++ =
- reverb->decay_time;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_DECAY_TIME_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_DECAY_TIME", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_DECAY_TIME;
+ param_hdr.param_size = REVERB_DECAY_TIME_PARAM_SZ;
+ param_data = (u8 *) &reverb->decay_time;
break;
case REVERB_DECAY_HF_RATIO:
if (length != 1 || index_offset != 0) {
@@ -535,23 +499,19 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_DECAY_HF_RATIO val%d\n",
__func__, reverb->decay_hf_ratio);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_DECAY_HF_RATIO_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_DECAY_HF_RATIO", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_DECAY_HF_RATIO;
- *updt_params++ =
- REVERB_DECAY_HF_RATIO_PARAM_SZ;
- *updt_params++ =
- reverb->decay_hf_ratio;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_DECAY_HF_RATIO_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_DECAY_HF_RATIO", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_REVERB_DECAY_HF_RATIO;
+ param_hdr.param_size = REVERB_DECAY_HF_RATIO_PARAM_SZ;
+ param_data = (u8 *) &reverb->decay_hf_ratio;
break;
case REVERB_REFLECTIONS_LEVEL:
if (length != 1 || index_offset != 0) {
@@ -563,23 +523,20 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_REFLECTIONS_LEVEL val:%d\n",
__func__, reverb->reflections_level);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_REFLECTIONS_LEVEL_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_REFLECTIONS_LEVEL", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_REFLECTIONS_LEVEL_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_REFLECTIONS_LEVEL", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
AUDPROC_PARAM_ID_REVERB_REFLECTIONS_LEVEL;
- *updt_params++ =
+ param_hdr.param_size =
REVERB_REFLECTIONS_LEVEL_PARAM_SZ;
- *updt_params++ =
- reverb->reflections_level;
- }
+ param_data = (u8 *) &reverb->reflections_level;
break;
case REVERB_REFLECTIONS_DELAY:
if (length != 1 || index_offset != 0) {
@@ -591,23 +548,20 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_REFLECTIONS_DELAY val:%d\n",
__func__, reverb->reflections_delay);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_REFLECTIONS_DELAY_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_REFLECTIONS_DELAY", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_REFLECTIONS_DELAY_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_REFLECTIONS_DELAY", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
AUDPROC_PARAM_ID_REVERB_REFLECTIONS_DELAY;
- *updt_params++ =
+ param_hdr.param_size =
REVERB_REFLECTIONS_DELAY_PARAM_SZ;
- *updt_params++ =
- reverb->reflections_delay;
- }
+ param_data = (u8 *) &reverb->reflections_delay;
break;
case REVERB_LEVEL:
if (length != 1 || index_offset != 0) {
@@ -619,23 +573,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_LEVEL val:%d\n",
__func__, reverb->level);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_LEVEL_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_LEVEL", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_LEVEL;
- *updt_params++ =
- REVERB_LEVEL_PARAM_SZ;
- *updt_params++ =
- reverb->level;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_LEVEL_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_LEVEL", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_LEVEL;
+ param_hdr.param_size = REVERB_LEVEL_PARAM_SZ;
+ param_data = (u8 *) &reverb->level;
break;
case REVERB_DELAY:
if (length != 1 || index_offset != 0) {
@@ -647,23 +596,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s:REVERB_DELAY val:%d\n",
__func__, reverb->delay);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_DELAY_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_DELAY", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_DELAY;
- *updt_params++ =
- REVERB_DELAY_PARAM_SZ;
- *updt_params++ =
- reverb->delay;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_DELAY_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_DELAY", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_DELAY;
+ param_hdr.param_size = REVERB_DELAY_PARAM_SZ;
+ param_data = (u8 *) &reverb->delay;
break;
case REVERB_DIFFUSION:
if (length != 1 || index_offset != 0) {
@@ -675,23 +619,18 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_DIFFUSION val:%d\n",
__func__, reverb->diffusion);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_DIFFUSION_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_DIFFUSION", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_DIFFUSION;
- *updt_params++ =
- REVERB_DIFFUSION_PARAM_SZ;
- *updt_params++ =
- reverb->diffusion;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_DIFFUSION_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_DIFFUSION", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_DIFFUSION;
+ param_hdr.param_size = REVERB_DIFFUSION_PARAM_SZ;
+ param_data = (u8 *) &reverb->diffusion;
break;
case REVERB_DENSITY:
if (length != 1 || index_offset != 0) {
@@ -703,32 +642,39 @@ int msm_audio_effects_reverb_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: REVERB_DENSITY val:%d\n",
__func__, reverb->density);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- REVERB_DENSITY_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "REVERB_DENSITY", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_REVERB;
- *updt_params++ =
- AUDPROC_PARAM_ID_REVERB_DENSITY;
- *updt_params++ =
- REVERB_DENSITY_PARAM_SZ;
- *updt_params++ =
- reverb->density;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ REVERB_DENSITY_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "REVERB_DENSITY", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_REVERB_DENSITY;
+ param_hdr.param_size = REVERB_DENSITY_PARAM_SZ;
+ param_data = (u8 *) &reverb->density;
break;
default:
pr_err("%s: Invalid command to set config\n", __func__);
- break;
+ continue;
}
+ if (rc)
+ goto invalid_config;
+
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ param_data, &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
+ }
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
else
pr_debug("%s: did not send pp params\n", __func__);
invalid_config:
@@ -742,25 +688,32 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac,
{
long *param_max_offset = values + MAX_PP_PARAMS_SZ - 1;
char *params = NULL;
+ u8 *updt_params;
int rc = 0;
int devices = GET_NEXT(values, param_max_offset, rc);
int num_commands = GET_NEXT(values, param_max_offset, rc);
- int *updt_params, i, prev_enable_flag;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ int i, prev_enable_flag;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u8 *param_data = NULL;
+ u32 packed_data_size = 0;
pr_debug("%s\n", __func__);
if (!ac || (devices == -EINVAL) || (num_commands == -EINVAL)) {
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
pr_debug("%s: device: %d\n", __func__, devices);
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ param_hdr.module_id = AUDPROC_MODULE_ID_BASS_BOOST;
+ param_hdr.instance_id = INSTANCE_ID_0;
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -783,23 +736,18 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac,
pr_debug("%s: BASS_BOOST_ENABLE prev:%d new:%d\n",
__func__, prev_enable_flag,
bass_boost->enable_flag);
- if (prev_enable_flag != bass_boost->enable_flag) {
- params_length += COMMAND_PAYLOAD_SZ +
- BASS_BOOST_ENABLE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "BASS_BOOST_ENABLE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_BASS_BOOST;
- *updt_params++ =
- AUDPROC_PARAM_ID_BASS_BOOST_ENABLE;
- *updt_params++ =
- BASS_BOOST_ENABLE_PARAM_SZ;
- *updt_params++ =
- bass_boost->enable_flag;
- }
+ if (prev_enable_flag == bass_boost->enable_flag)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ BASS_BOOST_ENABLE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "BASS_BOOST_ENABLE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_BASS_BOOST_ENABLE;
+ param_hdr.param_size = BASS_BOOST_ENABLE_PARAM_SZ;
+ param_data = (u8 *) &bass_boost->enable_flag;
break;
case BASS_BOOST_MODE:
if (length != 1 || index_offset != 0) {
@@ -811,23 +759,18 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: BASS_BOOST_MODE val:%d\n",
__func__, bass_boost->mode);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- BASS_BOOST_MODE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "BASS_BOOST_MODE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_BASS_BOOST;
- *updt_params++ =
- AUDPROC_PARAM_ID_BASS_BOOST_MODE;
- *updt_params++ =
- BASS_BOOST_MODE_PARAM_SZ;
- *updt_params++ =
- bass_boost->mode;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ BASS_BOOST_MODE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "BASS_BOOST_MODE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_BASS_BOOST_MODE;
+ param_hdr.param_size = BASS_BOOST_MODE_PARAM_SZ;
+ param_data = (u8 *) &bass_boost->mode;
break;
case BASS_BOOST_STRENGTH:
if (length != 1 || index_offset != 0) {
@@ -839,32 +782,40 @@ int msm_audio_effects_bass_boost_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: BASS_BOOST_STRENGTH val:%d\n",
__func__, bass_boost->strength);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- BASS_BOOST_STRENGTH_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "BASS_BOOST_STRENGTH", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_BASS_BOOST;
- *updt_params++ =
- AUDPROC_PARAM_ID_BASS_BOOST_STRENGTH;
- *updt_params++ =
- BASS_BOOST_STRENGTH_PARAM_SZ;
- *updt_params++ =
- bass_boost->strength;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ BASS_BOOST_STRENGTH_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "BASS_BOOST_STRENGTH", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_BASS_BOOST_STRENGTH;
+ param_hdr.param_size = BASS_BOOST_STRENGTH_PARAM_SZ;
+ param_data = (u8 *) &bass_boost->strength;
break;
default:
pr_err("%s: Invalid command to set config\n", __func__);
- break;
+ continue;
}
+ if (rc)
+ goto invalid_config;
+
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ param_data, &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
+ }
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
else
pr_debug("%s: did not send pp params\n", __func__);
invalid_config:
@@ -878,25 +829,32 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac,
{
long *param_max_offset = values + MAX_PP_PARAMS_SZ - 1;
char *params = NULL;
+ u8 *updt_params;
int rc = 0;
int devices = GET_NEXT(values, param_max_offset, rc);
int num_commands = GET_NEXT(values, param_max_offset, rc);
- int *updt_params, i, j, prev_enable_flag;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ int i, prev_enable_flag;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u8 *param_data = NULL;
+ u32 packed_data_size = 0;
pr_debug("%s\n", __func__);
if (!ac || (devices == -EINVAL) || (num_commands == -EINVAL)) {
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
pr_debug("%s: device: %d\n", __func__, devices);
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ param_hdr.module_id = AUDPROC_MODULE_ID_PBE;
+ param_hdr.instance_id = INSTANCE_ID_0;
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -917,23 +875,18 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac,
prev_enable_flag = pbe->enable_flag;
pbe->enable_flag =
GET_NEXT(values, param_max_offset, rc);
- if (prev_enable_flag != pbe->enable_flag) {
- params_length += COMMAND_PAYLOAD_SZ +
- PBE_ENABLE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "PBE_ENABLE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_PBE;
- *updt_params++ =
- AUDPROC_PARAM_ID_PBE_ENABLE;
- *updt_params++ =
- PBE_ENABLE_PARAM_SZ;
- *updt_params++ =
- pbe->enable_flag;
- }
+ if (prev_enable_flag == pbe->enable_flag)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ PBE_ENABLE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "PBE_ENABLE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_PBE_ENABLE;
+ param_hdr.param_size = PBE_ENABLE_PARAM_SZ;
+ param_data = (u8 *) &pbe->enable_flag;
break;
case PBE_CONFIG:
pr_debug("%s: PBE_PARAM length %u\n", __func__, length);
@@ -944,37 +897,38 @@ int msm_audio_effects_pbe_handler(struct audio_client *ac,
rc = -EINVAL;
goto invalid_config;
}
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ + length;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "PBE_PARAM", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_PBE;
- *updt_params++ =
- AUDPROC_PARAM_ID_PBE_PARAM_CONFIG;
- *updt_params++ =
- length;
- for (j = 0; j < length; ) {
- j += sizeof(*updt_params);
- *updt_params++ =
- GET_NEXT(
- values,
- param_max_offset,
- rc);
- }
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length =
+ params_length + COMMAND_IID_PAYLOAD_SZ + length;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "PBE_PARAM", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_PBE_PARAM_CONFIG;
+ param_hdr.param_size = length;
+ param_data = (u8 *) values;
break;
default:
pr_err("%s: Invalid command to set config\n", __func__);
- break;
+ continue;
+ }
+ if (rc)
+ goto invalid_config;
+
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ param_data, &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
}
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
invalid_config:
kfree(params);
return rc;
@@ -986,25 +940,35 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
{
long *param_max_offset = values + MAX_PP_PARAMS_SZ - 1;
char *params = NULL;
+ u8 *updt_params = NULL;
int rc = 0;
int devices = GET_NEXT(values, param_max_offset, rc);
int num_commands = GET_NEXT(values, param_max_offset, rc);
- int *updt_params, i, prev_enable_flag;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ int i, prev_enable_flag;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u8 *param_data = NULL;
+ u32 packed_data_size = 0;
+ u8 *eq_config_data = NULL;
+ u32 *updt_config_data = NULL;
+ int config_param_length;
pr_debug("%s\n", __func__);
if (!ac || (devices == -EINVAL) || (num_commands == -EINVAL)) {
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
pr_debug("%s: device: %d\n", __func__, devices);
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ param_hdr.module_id = AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
+ param_hdr.instance_id = INSTANCE_ID_0;
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -1028,23 +992,18 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: EQ_ENABLE prev:%d new:%d\n", __func__,
prev_enable_flag, eq->enable_flag);
- if (prev_enable_flag != eq->enable_flag) {
- params_length += COMMAND_PAYLOAD_SZ +
- EQ_ENABLE_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "EQ_ENABLE", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_EQ_ENABLE;
- *updt_params++ =
- EQ_ENABLE_PARAM_SZ;
- *updt_params++ =
- eq->enable_flag;
- }
+ if (prev_enable_flag == eq->enable_flag)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ EQ_ENABLE_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "EQ_ENABLE", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_EQ_ENABLE;
+ param_hdr.param_size = EQ_ENABLE_PARAM_SZ;
+ param_data = (u8 *) &eq->enable_flag;
break;
case EQ_CONFIG:
if (length < EQ_CONFIG_PARAM_LEN || index_offset != 0) {
@@ -1093,43 +1052,46 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
eq->per_band_cfg[idx].quality_factor =
GET_NEXT(values, param_max_offset, rc);
}
- if (command_config_state == CONFIG_SET) {
- int config_param_length = EQ_CONFIG_PARAM_SZ +
- (EQ_CONFIG_PER_BAND_PARAM_SZ*
- eq->config.num_bands);
- params_length += COMMAND_PAYLOAD_SZ +
- config_param_length;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "EQ_CONFIG", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_EQ_CONFIG;
- *updt_params++ =
- config_param_length;
- *updt_params++ =
- eq->config.eq_pregain;
- *updt_params++ =
- eq->config.preset_id;
- *updt_params++ =
- eq->config.num_bands;
- for (idx = 0; idx < MAX_EQ_BANDS; idx++) {
- if (eq->per_band_cfg[idx].band_idx < 0)
- continue;
- *updt_params++ =
+ if (command_config_state != CONFIG_SET)
+ break;
+ config_param_length = EQ_CONFIG_PARAM_SZ +
+ (EQ_CONFIG_PER_BAND_PARAM_SZ *
+ eq->config.num_bands);
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ config_param_length;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "EQ_CONFIG", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_EQ_CONFIG;
+ param_hdr.param_size = config_param_length;
+
+ if (!eq_config_data)
+ eq_config_data = kzalloc(config_param_length,
+ GFP_KERNEL);
+ else
+ memset(eq_config_data, 0, config_param_length);
+ if (!eq_config_data)
+ return -ENOMEM;
+ param_data = eq_config_data;
+ updt_config_data = (u32 *) eq_config_data;
+ *updt_config_data++ = eq->config.eq_pregain;
+ *updt_config_data++ = eq->config.preset_id;
+ *updt_config_data++ = eq->config.num_bands;
+ for (idx = 0; idx < MAX_EQ_BANDS; idx++) {
+ if (eq->per_band_cfg[idx].band_idx < 0)
+ continue;
+ *updt_config_data++ =
eq->per_band_cfg[idx].filter_type;
- *updt_params++ =
+ *updt_config_data++ =
eq->per_band_cfg[idx].freq_millihertz;
- *updt_params++ =
+ *updt_config_data++ =
eq->per_band_cfg[idx].gain_millibels;
- *updt_params++ =
+ *updt_config_data++ =
eq->per_band_cfg[idx].quality_factor;
- *updt_params++ =
+ *updt_config_data++ =
eq->per_band_cfg[idx].band_idx;
- }
}
break;
case EQ_BAND_INDEX:
@@ -1147,23 +1109,18 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
eq->band_index = idx;
pr_debug("%s: EQ_BAND_INDEX val:%d\n",
__func__, eq->band_index);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- EQ_BAND_INDEX_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "EQ_BAND_INDEX", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_EQ_BAND_INDEX;
- *updt_params++ =
- EQ_BAND_INDEX_PARAM_SZ;
- *updt_params++ =
- eq->band_index;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ EQ_BAND_INDEX_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "EQ_BAND_INDEX", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id = AUDPROC_PARAM_ID_EQ_BAND_INDEX;
+ param_hdr.param_size = EQ_BAND_INDEX_PARAM_SZ;
+ param_data = (u8 *) &eq->band_index;
break;
case EQ_SINGLE_BAND_FREQ:
if (length != 1 || index_offset != 0) {
@@ -1179,36 +1136,45 @@ int msm_audio_effects_popless_eq_handler(struct audio_client *ac,
GET_NEXT(values, param_max_offset, rc);
pr_debug("%s: EQ_SINGLE_BAND_FREQ idx:%d, val:%d\n",
__func__, eq->band_index, eq->freq_millihertz);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- EQ_SINGLE_BAND_FREQ_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "EQ_SINGLE_BAND_FREQ", rc);
- if (rc != 0)
- goto invalid_config;
- *updt_params++ =
- AUDPROC_MODULE_ID_POPLESS_EQUALIZER;
- *updt_params++ =
- AUDPROC_PARAM_ID_EQ_SINGLE_BAND_FREQ;
- *updt_params++ =
- EQ_SINGLE_BAND_FREQ_PARAM_SZ;
- *updt_params++ =
- eq->freq_millihertz;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ EQ_SINGLE_BAND_FREQ_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "EQ_SINGLE_BAND_FREQ", rc);
+ if (rc != 0)
+ break;
+ param_hdr.param_id =
+ AUDPROC_PARAM_ID_EQ_SINGLE_BAND_FREQ;
+ param_hdr.param_size = EQ_SINGLE_BAND_FREQ_PARAM_SZ;
+ param_data = (u8 *) &eq->freq_millihertz;
break;
default:
pr_err("%s: Invalid command to set config\n", __func__);
- break;
+ continue;
+ }
+ if (rc)
+ goto invalid_config;
+
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ param_data, &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
}
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
else
pr_debug("%s: did not send pp params\n", __func__);
invalid_config:
kfree(params);
+ kfree(eq_config_data);
return rc;
}
@@ -1220,8 +1186,13 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac,
int devices;
int num_commands;
char *params = NULL;
- int *updt_params, i;
- uint32_t params_length = (MAX_INBAND_PARAM_SZ);
+ u8 *updt_params;
+ int i;
+ uint32_t vol_gain_2ch = 0;
+ uint32_t max_params_length = 0;
+ uint32_t params_length = 0;
+ struct param_hdr_v3 param_hdr = {0};
+ u32 packed_data_size = 0;
long *param_max_offset;
int rc = 0;
@@ -1238,13 +1209,14 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac,
pr_err("%s: cannot set audio effects\n", __func__);
return -EINVAL;
}
- params = kzalloc(params_length, GFP_KERNEL);
+ params = kzalloc(MAX_INBAND_PARAM_SZ, GFP_KERNEL);
if (!params) {
pr_err("%s, params memory alloc failed\n", __func__);
return -ENOMEM;
}
- updt_params = (int *)params;
- params_length = 0;
+ updt_params = (u8 *) params;
+ /* Set MID and IID once at top and only update param specific fields*/
+ q6asm_set_soft_volume_module_instance_ids(instance, &param_hdr);
for (i = 0; i < num_commands; i++) {
uint32_t command_id =
GET_NEXT(values, param_max_offset, rc);
@@ -1266,43 +1238,15 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac,
vol->right_gain =
GET_NEXT(values, param_max_offset, rc);
vol->master_gain = 0x2000;
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- SOFT_VOLUME_GAIN_2CH_PARAM_SZ;
- params_length += COMMAND_PAYLOAD_SZ +
- SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VOLUME/VOLUME2_GAIN_2CH",
- rc);
- if (rc != 0)
- goto invalid_config;
- if (instance == SOFT_VOLUME_INSTANCE_2)
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL2;
- else
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL;
- *updt_params++ =
- ASM_PARAM_ID_VOL_CTRL_LR_CHANNEL_GAIN;
- *updt_params++ =
- SOFT_VOLUME_GAIN_2CH_PARAM_SZ;
- *updt_params++ =
- (vol->left_gain << 16) |
- vol->right_gain;
- if (instance == SOFT_VOLUME_INSTANCE_2)
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL2;
- else
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL;
- *updt_params++ =
- ASM_PARAM_ID_VOL_CTRL_MASTER_GAIN;
- *updt_params++ =
- SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
- *updt_params++ =
- vol->master_gain;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ SOFT_VOLUME_GAIN_2CH_PARAM_SZ +
+ COMMAND_IID_PAYLOAD_SZ +
+ SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VOLUME/VOLUME2_GAIN_2CH", rc);
break;
case SOFT_VOLUME_GAIN_MASTER:
case SOFT_VOLUME2_GAIN_MASTER:
@@ -1315,53 +1259,57 @@ static int __msm_audio_effects_volume_handler(struct audio_client *ac,
vol->right_gain = 0x2000;
vol->master_gain =
GET_NEXT(values, param_max_offset, rc);
- if (command_config_state == CONFIG_SET) {
- params_length += COMMAND_PAYLOAD_SZ +
- SOFT_VOLUME_GAIN_2CH_PARAM_SZ;
- params_length += COMMAND_PAYLOAD_SZ +
- SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
- CHECK_PARAM_LEN(params_length,
- MAX_INBAND_PARAM_SZ,
- "VOLUME/VOLUME2_GAIN_MASTER",
- rc);
- if (rc != 0)
- goto invalid_config;
- if (instance == SOFT_VOLUME_INSTANCE_2)
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL2;
- else
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL;
- *updt_params++ =
- ASM_PARAM_ID_VOL_CTRL_LR_CHANNEL_GAIN;
- *updt_params++ =
- SOFT_VOLUME_GAIN_2CH_PARAM_SZ;
- *updt_params++ =
- (vol->left_gain << 16) |
- vol->right_gain;
- if (instance == SOFT_VOLUME_INSTANCE_2)
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL2;
- else
- *updt_params++ =
- ASM_MODULE_ID_VOL_CTRL;
- *updt_params++ =
- ASM_PARAM_ID_VOL_CTRL_MASTER_GAIN;
- *updt_params++ =
- SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
- *updt_params++ =
- vol->master_gain;
- }
+ if (command_config_state != CONFIG_SET)
+ break;
+ max_params_length = params_length +
+ COMMAND_IID_PAYLOAD_SZ +
+ SOFT_VOLUME_GAIN_2CH_PARAM_SZ +
+ COMMAND_IID_PAYLOAD_SZ +
+ SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
+ CHECK_PARAM_LEN(max_params_length, MAX_INBAND_PARAM_SZ,
+ "VOLUME/VOLUME2_GAIN_MASTER", rc);
break;
default:
pr_err("%s: Invalid command id: %d to set config\n",
__func__, command_id);
- break;
+ continue;
+ }
+ if (rc)
+ continue;
+
+ /* Set Volume Control for Left/Right */
+ param_hdr.param_id = ASM_PARAM_ID_VOL_CTRL_LR_CHANNEL_GAIN;
+ param_hdr.param_size = SOFT_VOLUME_GAIN_2CH_PARAM_SZ;
+ vol_gain_2ch = (vol->left_gain << 16) | vol->right_gain;
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ (u8 *) &vol_gain_2ch,
+ &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
}
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
+
+ /* Set Master Volume Control */
+ param_hdr.param_id = ASM_PARAM_ID_VOL_CTRL_MASTER_GAIN;
+ param_hdr.param_size = SOFT_VOLUME_GAIN_MASTER_PARAM_SZ;
+ rc = q6common_pack_pp_params(updt_params, &param_hdr,
+ (u8 *) &vol->master_gain,
+ &packed_data_size);
+ if (rc) {
+ pr_err("%s: Failed to pack params, error %d\n",
+ __func__, rc);
+ goto invalid_config;
+ }
+
+ updt_params += packed_data_size;
+ params_length += packed_data_size;
}
if (params_length && (rc == 0))
- q6asm_send_audio_effects_params(ac, params,
- params_length);
+ q6asm_set_pp_params(ac, NULL, params, params_length);
invalid_config:
kfree(params);
return rc;
diff --git a/sound/soc/msm/qdsp6v2/q6asm.c b/sound/soc/msm/qdsp6v2/q6asm.c
index 7f9981f0d8c7..5f0a61fb9081 100644
--- a/sound/soc/msm/qdsp6v2/q6asm.c
+++ b/sound/soc/msm/qdsp6v2/q6asm.c
@@ -8048,25 +8048,6 @@ fail_cmd:
return -EINVAL;
}
-
-int q6asm_send_audio_effects_params(struct audio_client *ac, char *params,
- uint32_t params_length)
-{
- int rc;
-
- pr_debug("%s:\n", __func__);
-
- /*
- * Leave function as wrapper for use by effects. Params must be properly
- * packed. Use q6common_pack_pp_param to pack params correctly.
- */
- rc = q6asm_set_pp_params(ac, NULL, params, params_length);
- if (rc)
- pr_err("%s: audio effects set-params send failed\n", __func__);
-
- return rc;
-}
-
int q6asm_send_mtmx_strtr_window(struct audio_client *ac,
struct asm_session_mtmx_strtr_param_window_v2_t *window_param,
uint32_t param_id)
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-21 20:54:07 +0000