Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6cf944a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: improve DTS Eagle driver for all possible i/p"

parents b6953a13 221322c3

include/sound/q6adm-v2.h

+2 −2
Original line number Diff line number Diff line
@@ -57,10 +57,10 @@ int srs_trumedia_open(int port_id, int copp_idx, __s32 srs_tech_id, 
		      void *srs_params);



int adm_dts_eagle_set(int port_id, int copp_idx, int param_id,

		      void *data, int size);

		      void *data, uint32_t size);



int adm_dts_eagle_get(int port_id, int copp_idx, int param_id,

		      void *data, int size);

		      void *data, uint32_t size);



int adm_get_params(int port_id, int copp_idx, uint32_t module_id,

		   uint32_t param_id, uint32_t params_length, char *params);

include/sound/q6asm-v2.h

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2015, 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
@@ -401,9 +401,9 @@ int q6asm_set_volume(struct audio_client *ac, int volume); 
int q6asm_set_volume_v2(struct audio_client *ac, int volume, int instance);



/* DTS Eagle Params */

int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, int size,

int q6asm_dts_eagle_set(struct audio_client *ac, int param_id, uint32_t size,

			void *data, struct param_outband *po, int m_id);

int q6asm_dts_eagle_get(struct audio_client *ac, int param_id, int size,

int q6asm_dts_eagle_get(struct audio_client *ac, int param_id, uint32_t size,

			void *data, struct param_outband *po, int m_id);



/* Set SoftPause Params */

include/uapi/sound/devdep_params.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2015, 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
@@ -61,7 +61,7 @@ struct dolby_param_license { 


struct dts_eagle_param_desc {

	uint32_t id;

	int32_t size;

	uint32_t size;

	int32_t offset;

	uint32_t device;

} __packed;

sound/soc/msm/qdsp6v2/msm-dts-eagle.c

+129 −91

File changed.

Preview size limit exceeded, changes collapsed.

sound/soc/msm/qdsp6v2/q6adm.c

+19 −11

File changed.

Preview size limit exceeded, changes collapsed.