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

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

Merge "adm: undo echo reference rx value reset after open"

parents 88d4c621 aa92070b

dsp/q6adm.c

+0 −8
Original line number Diff line number Diff line
@@ -2963,8 +2963,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
			open_v8.endpoint_id_1 = tmp_port;

			open_v8.endpoint_id_2 = 0xFFFF;

			open_v8.endpoint_id_3 = 0xFFFF;





			open_v8.topology_id = topology;

			open_v8.reserved = 0;
@@ -3003,7 +3001,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
				if (this_adm.ec_ref_rx_bit_width != 0) {

					ep2_payload.bit_width =

						this_adm.ec_ref_rx_bit_width;

					this_adm.ec_ref_rx_bit_width = 0;

				} else {

					ep2_payload.bit_width = bit_width;

				}
@@ -3011,7 +3008,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
				if (this_adm.ec_ref_rx_sampling_rate != 0) {

					ep2_payload.sample_rate =

					this_adm.ec_ref_rx_sampling_rate;

					this_adm.ec_ref_rx_sampling_rate = 0;

				} else {

					ep2_payload.sample_rate = rate;

				}
@@ -3079,7 +3075,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 


			if (this_adm.ec_ref_rx && (path != 1)) {

				open.endpoint_id_2 = this_adm.ec_ref_rx;

				this_adm.ec_ref_rx = -1;

			}



			open.topology_id = topology;
@@ -3111,12 +3106,10 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
				open_v6.hdr.pkt_size = sizeof(open_v6);

				open_v6.dev_num_channel_eid2 =

					this_adm.num_ec_ref_rx_chans;

				this_adm.num_ec_ref_rx_chans = 0;



				if (this_adm.ec_ref_rx_bit_width != 0) {

					open_v6.bit_width_eid2 =

						this_adm.ec_ref_rx_bit_width;

					this_adm.ec_ref_rx_bit_width = 0;

				} else {

					open_v6.bit_width_eid2 = bit_width;

				}
@@ -3124,7 +3117,6 @@ int adm_open(int port_id, int path, int rate, int channel_mode, int topology, 
				if (this_adm.ec_ref_rx_sampling_rate != 0) {

					open_v6.sample_rate_eid2 =

					       this_adm.ec_ref_rx_sampling_rate;

					this_adm.ec_ref_rx_sampling_rate = 0;

				} else {

					open_v6.sample_rate_eid2 = rate;

				}