Skip to contentSkip to conversation

drx-k: Fix QAM Annex C selection

PATCH In review Mauro Carvalho Chehab 2 participants 2 messages Jul 24, 2011 – Jul 26, 2011 Media (V4L/DVB)

lore
Share & tools
lore

Mauro Carvalho Chehab

author
#0 lore raw

PATCH 1/1 drx-k: Fix QAM Annex C selection

Ralph/Oliver,

As I said before,the DRX-K logic to select DVB-C annex A seems wrong.

Basically, it sets Annex A at setEnvParameters, but this var is not used anywhere. However, as setParamParameters[2] is not used, I suspect that this is a typo.

The enclosed patch fixes it, but, on my tests here with devices with drx-3913k and drx-3926k, DVB-C is not working with the drxk_a3.mc firmware. So, I'm not sure if the devices I have don't support that firmware, or if the DVB-C code is broken or is not supported by such firmware.

I'm getting the drxk_a3.mc via Documentation/dvb/get_dvb_firmware from:
http://l4m-daten.de/files/DDTuner.zip

With the firmware I'm using, SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM only accepts 1 parameter.

So, I can't actually test it.

Could you please double-check it?

Thanks!
Mauro

-

Fix the DRX-K logic to select DVB-C annex A

setEnvParameters, but this var is not used anywhere. However, as setParamParameters[2] is not used, it seems to be a typo.

The enclosed patch fixes it.

This patch was not tested.

While here, corrects a bad identation at the fallback code for other types of firmware.

Signed-off-by Mauro Carvalho Chehab <[email protected]>
drivers/media/dvb/frontends/drxk_hard.c +5 -7
index b3dbe82..d420464 100644
@@ -5384,8 +5384,6 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,
 		  s32 tunerFreqOffset)
 {
 	int status;
-	u8 parameterLen;
-	u16 setEnvParameters[5] = { 0, 0, 0, 0, 0 };
 	u16 setParamParameters[4] = { 0, 0, 0, 0 };
 	u16 cmdResult;
 

@@ -5416,13 +5414,12 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,
 		goto error;
 
 	/* Env parameters */
-	setEnvParameters[2] = QAM_TOP_ANNEX_A;	/* Annex */
+	setParamParameters[2] = QAM_TOP_ANNEX_A;	/* Annex */
 	if (state->m_OperationMode == OM_QAM_ITU_C)
-		setEnvParameters[2] = QAM_TOP_ANNEX_C;	/* Annex */
+		setParamParameters[2] = QAM_TOP_ANNEX_C;	/* Annex */
 	setParamParameters[3] |= (QAM_MIRROR_AUTO_ON);
 	/* check for LOCKRANGE Extented */
 	/* setParamParameters[3] |= QAM_LOCKRANGE_NORMAL; */
-	parameterLen = 4;
 
 	/* Set params */
 	switch (state->param.u.qam.modulation) {

@@ -5453,6 +5450,7 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,
 
 	status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 4, setParamParameters, 1, &cmdResult);
 	if (status < 0) {
+		u16 setEnvParameters[5] = { 0, 0, 0, 0, 0 };
 		/* Fall-back to the simpler call */
 		setParamParameters[0] = QAM_TOP_ANNEX_A;
 		if (state->m_OperationMode == OM_QAM_ITU_C)

@@ -5461,8 +5459,8 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,
 			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)
-		goto error;
+		if (status < 0)
+			goto error;
 
 		setParamParameters[0] = state->m_Constellation; /* constellation     */
 		setParamParameters[1] = DRXK_QAM_I12_J17;       /* interleave mode   */
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · On Sunday 24 July 2011 14:11:36 Mauro Carvalho Chehab wrote:

Ralph/Oliver,

As I said before,the DRX-K logic to select DVB-C annex A seems wrong.

Basically, it sets Annex A at setEnvParameters, but this var is not used anywhere. However, as setParamParameters[2] is not used, I suspect that this is a typo.

Yes, it is a typo.
It has no impact for Annex A, and nobody uses Annex C here.

Acked-by Oliver Endriss <[email protected]>
Quoted 8 lines

The enclosed patch fixes it, but, on my tests here with devices with drx-3913k and drx-3926k, DVB-C is not working with the drxk_a3.mc firmware. So, I'm not sure if the devices I have don't support that firmware, or if the DVB-C code is broken or is not supported by such firmware.

I'm getting the drxk_a3.mc via Documentation/dvb/get_dvb_firmware from:
http://l4m-daten.de/files/DDTuner.zip

This firmware is guaranteed to work for the drx-3913k spin A3 only.

Quoted 6 lines

With the firmware I'm using, SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM only accepts 1 parameter.

So, I can't actually test it.

Could you please double-check it?

Please note that the interface may be different for other versions of the chip or firmware. So you have to be very careful, when you add support for other DRXK chips.

Quoted 9 lines

Fix the DRX-K logic to select DVB-C annex A

setEnvParameters, but this var is not used anywhere. However, as setParamParameters[2] is not used, it seems to be a typo.

The enclosed patch fixes it.

This patch was not tested.
...

drivers/media/dvb/frontends/drxk_hard.c static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz, · line 5455

Quoted 5 lines
drivers/media/dvb/frontends/drxk_hard.c +1 -0
 	status = scu_command(state, SCU_RAM_COMMAND_STANDARD_QAM | SCU_RAM_COMMAND_CMD_DEMOD_SET_PARAM, 4, setParamParameters, 1, &cmdResult);
 	if (status < 0) {
+		u16 setEnvParameters[5] = { 0, 0, 0, 0, 0 };
 		/* Fall-back to the simpler call */
 		setParamParameters[0] = QAM_TOP_ANNEX_A;

                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Imho this line is a typo, too.
You can remove it, as setParamParameters[0] is initialised below.

drivers/media/dvb/frontends/drxk_hard.c static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz, · line 5465

Quoted 11 lines
drivers/media/dvb/frontends/drxk_hard.c +2 -2
 		if (state->m_OperationMode == OM_QAM_ITU_C)

@@ -5461,8 +5459,8 @@ static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz,
 			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)
-		goto error;
+		if (status < 0)
+			goto error;
 
 		setParamParameters[0] = state->m_Constellation; /* constellation     */

                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

drivers/media/dvb/frontends/drxk_hard.c static int SetQAM(struct drxk_state *state, u16 IntermediateFreqkHz, · line 5466

Quoted 1 line
drivers/media/dvb/frontends/drxk_hard.c +0 -0
 		setParamParameters[1] = DRXK_QAM_I12_J17;       /* interleave mode   */

CU
Oliver

Signature · 5 lines
----------------------------------------------------------------
VDR Remote Plugin 0.4.0: http://www.escape-edv.de/endriss/vdr/
4 MByte Mod: http://www.escape-edv.de/endriss/dvb-mem-mod/
Full-TS Mod: http://www.escape-edv.de/endriss/dvb-full-ts-mod/
----------------------------------------------------------------