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

Commit 5eee2bb2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] drxk: Add a fallback method for QAM parameter setting 



The QAM standard is set using this scu_command:
	SCU_RAM_COMMAND_STANDARD_QAM |
	SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM

The driver implements a version that has 4 parameters, however,
Terratec H5 needs to break this into two separate commands, otherwise,
DVB-C doesn't work.

With this fix, scan is now properly working and getting the
channel list:
>>> tune to: 609000000:INVERSION_AUTO:5217000:FEC_3_4:QAM_256
>>> tuning status == 0x00
>>> tuning status == 0x07
>>> tuning status == 0x1f

0x0093 0x0026: pmt_pid 0x0758 (null) -- SporTV2 (running, scrambled)
0x0093 0x0027: pmt_pid 0x0748 (null) -- SporTV (running, scrambled)
0x0093 0x0036: pmt_pid 0x0768 (null) -- FX (running, scrambled)
0x0093 0x0052: pmt_pid 0x0788 (null) -- The History Channel (running, scrambled)

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7558977a

drivers/media/dvb/frontends/drxk_hard.c

+17 −1
Original line number Original line Diff line number Diff line
@@ -5389,7 +5389,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz, 
{

{

	int status;

	int status;

	u8 parameterLen;

	u8 parameterLen;

	u16 setEnvParameters[5];

	u16 setEnvParameters[5] = { 0, 0, 0, 0, 0 };

	u16 setParamParameters[4] = { 0, 0, 0, 0 };

	u16 setParamParameters[4] = { 0, 0, 0, 0 };

	u16 cmdResult;

	u16 cmdResult;
@@ -5456,9 +5456,25 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz, 
	setParamParameters[1] = DRXK_QAM_I12_J17;	/* interleave mode   */

	setParamParameters[1] = DRXK_QAM_I12_J17;	/* interleave mode   */





	status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 4, setParamParameters, 1, &cmdResult);

	status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 4, setParamParameters, 1, &cmdResult);

	if (status < 0) {

		/* Fall-back to the simpler call */

		setParamParameters[0] = QAM_TOP_ANNEX_A;

		if (state->m_OperationMode == OM_QAM_ITU_C)

			setEnvParameters[0] = QAM_TOP_ANNEX_C;	/* Annex */

		else

			setEnvParameters[0] = 0;



		status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_ENV, 1, setEnvParameters, 1, &cmdResult);

	if (status < 0)

	if (status < 0)

		goto error;

		goto error;





		setParamParameters[0] = state->m_Constellation; /* constellation     */

		setParamParameters[1] = DRXK_QAM_I12_J17;       /* interleave mode   */



		status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 2, setParamParameters, 1, &cmdResult);

	}

	if (status < 0)

		goto error;





	/* STEP 3: enable the system in a mode where the ADC provides valid signal

	/* STEP 3: enable the system in a mode where the ADC provides valid signal

		setup constellation independent registers */

		setup constellation independent registers */