Skip to contentSkip to conversation

cx22702.c, 2.6.13-rc3 and a pci Hauppauge Nova-T DVB-T TV card

PATCH Andrew Benton 4 participants 9 messages Jul 15, 2005 Media (V4L/DVB)

lore
Share & tools
lore
#0 lore raw

Hello,
My pci TV card (a Hauppauge Nova-T DVB-T) works fine with a 2.6.13-rc2 kernel but won't work with a 2.6.13-rc3 by a process of elimination I've found that if I reverse this part of the 2.6.13-rc3 patch the card works fine. Please do not include this in the 2.6.13 kernel.

drivers/media/dvb/frontends/cx22702.c +0 -0
@@ -76,7 +76,6 @@ static u8 init_tab [] = {
	0x49, 0x56,
	0x6b, 0x1e,
	0xc8, 0x02,
-	0xf8, 0x02,
	0xf9, 0x00,
	0xfa, 0x00,
	0xfb, 0x00,
@@ -347,10 +346,11 @@ static int cx22702_init (struct dvb_fron
	for (i=0; i<sizeof(init_tab); i+=2)
		cx22702_writereg (state, init_tab[i], init_tab[i+1]);

+ cx22702_writereg (state, 0xf8, (state->config->output_mode << 1) & 0x02);

	/* init PLL */
	if (state->config->pll_init) {
-	        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe);
+		cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) & 0xfe);
		state->config->pll_init(fe);
		cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1);
	}
#1 lore raw
Quoted 4 lines · Andrew Benton

My pci TV card (a Hauppauge Nova-T DVB-T) works fine with a 2.6.13-rc2 kernel but won't work with a 2.6.13-rc3 by a process of elimination I've found that if I reverse this part of the 2.6.13-rc3 patch the card works fine. Please do not include this in the 2.6.13 kernel.

Reversing this patch is not the right fix as it would break support for the cxusb.c driver. I guess the output_mode needs to be set for the Hauppauge Nova-T DVB-T (cx88-dvb.c). cx88-dvb.c is in video4linux CVS, not DVB CVS.

Patrick, can you send a patch for this?

Johannes

Quoted 25 lines
drivers/media/dvb/frontends/cx22702.c +2 -2
@@ -76,7 +76,6 @@ static u8 init_tab [] = {
 	0x49, 0x56,
 	0x6b, 0x1e,
 	0xc8, 0x02,
-	0xf8, 0x02,
 	0xf9, 0x00,
 	0xfa, 0x00,
 	0xfb, 0x00,
@@ -347,10 +346,11 @@ static int cx22702_init (struct dvb_fron
 	for (i=0; i<sizeof(init_tab); i+=2)
 		cx22702_writereg (state, init_tab[i], init_tab[i+1]);
 
+	cx22702_writereg (state, 0xf8, (state->config->output_mode << 1) & 0x02);
 
 	/* init PLL */
 	if (state->config->pll_init) {
-	        cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) &0xfe);
+		cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) & 0xfe);
 		state->config->pll_init(fe);
 		cx22702_writereg (state, 0x0D, cx22702_readreg(state,0x0D) | 1);
 	}
#2 lore raw
Quoted 6 lines · Johannes Stezenbach
Quoted 4 lines · Andrew Benton

My pci TV card (a Hauppauge Nova-T DVB-T) works fine with a 2.6.13-rc2 kernel but won't work with a 2.6.13-rc3 by a process of elimination I've found that if I reverse this part of the 2.6.13-rc3 patch the card works fine. Please do not include this in the 2.6.13 kernel.

Quoted 6 lines

Reversing this patch is not the right fix as it would break support for the cxusb.c driver. I guess the output_mode needs to be set for the Hauppauge Nova-T DVB-T (cx88-dvb.c). cx88-dvb.c is in video4linux CVS, not DVB CVS.

Patrick, can you send a patch for this?

Hmm, yes. When I changed the cx22702-driver to make it work with the cxusb-driver, I added another field to the struct cx22702_config to determine the output type.

I was well aware that this breaks support for the PCI cards, that's why I created a patch for the cx88-dvb.c and posted it the v4l-mailing list and ask for inclusion.

This was the Mail:
http://www.linuxtv.org/pipermail/linux-dvb/2005-June/002383.html

This is the patch:
Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v retrieving revision 1.42

cx88-dvb.c +2 -0
diff -u -3 -p -r1.42 cx88-dvb.c
@@ -166,12 +166,14 @@ static int mt352_pll_set(struct dvb_fron
 
 static struct mt352_config dvico_fusionhdtv = {
 	.demod_address = 0x0F,
+	.output_mode   = CX22702_SERIAL_OUTPUT,
 	.demod_init    = dvico_fusionhdtv_demod_init,
 	.pll_set       = mt352_pll_set,
 };
 
 static struct mt352_config dntv_live_dvbt_config = {
 	.demod_address = 0x0f,
+	.output_mode   = CX22702_SERIAL_OUTPUT,
 	.demod_init    = dntv_live_dvbt_demod_init,
 	.pll_set       = mt352_pll_set,
 };

Please include. Thanks

best regards,
Patrick.

--
Mail: [email protected]
WWW: http://www.wi-bw.tfh-wildau.de/~pboettch/

#3 lore raw

Patrick,

We'll include it at V4L.

Mauro.

Quoted 53 lines · Patrick Boettcher

Hmm, yes. When I changed the cx22702-driver to make it work with the cxusb-driver, I added another field to the struct cx22702_config to determine the output type.

I was well aware that this breaks support for the PCI cards, that's why I created a patch for the cx88-dvb.c and posted it the v4l-mailing list and ask for inclusion.

This was the Mail:
http://www.linuxtv.org/pipermail/linux-dvb/2005-June/002383.html

This is the patch:
Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v retrieving revision 1.42
diff -u -3 -p -r1.42 cx88-dvb.c

cx88-dvb.c 15 Jul 2005 11:06:22 -0000 renamed from cx88-dvb.c 12 Jul 2005 15:44:55 -0000 1.42 +2 -0
@@ -166,12 +166,14 @@ static int mt352_pll_set(struct dvb_fron
 
 static struct mt352_config dvico_fusionhdtv = {
     .demod_address = 0x0F,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .demod_init    = dvico_fusionhdtv_demod_init,
     .pll_set       = mt352_pll_set,
 };
 
 static struct mt352_config dntv_live_dvbt_config = {
     .demod_address = 0x0f,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .demod_init    = dntv_live_dvbt_demod_init,
     .pll_set       = mt352_pll_set,
 };

Please include. Thanks

best regards,
Patrick.

Signature · 7 lines
  Mail: [email protected]
  WWW:  http://www.wi-bw.tfh-wildau.de/~pboettch/

-- 
video4linux-list mailing list
Unsubscribe mailto:[email protected]?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list
#4 lore raw
In reply to Patrick Boettcher
Quoted 50 lines · Patrick Boettcher
Quoted 6 lines · Johannes Stezenbach
Quoted 4 lines · Andrew Benton

My pci TV card (a Hauppauge Nova-T DVB-T) works fine with a 2.6.13-rc2 kernel but won't work with a 2.6.13-rc3 by a process of elimination I've found that if I reverse this part of the 2.6.13-rc3 patch the card works fine. Please do not include this in the 2.6.13 kernel.

Quoted 6 lines

Reversing this patch is not the right fix as it would break support for the cxusb.c driver. I guess the output_mode needs to be set for the Hauppauge Nova-T DVB-T (cx88-dvb.c). cx88-dvb.c is in video4linux CVS, not DVB CVS.

Patrick, can you send a patch for this?

Hmm, yes. When I changed the cx22702-driver to make it work with the cxusb-driver, I added another field to the struct cx22702_config to determine the output type.

I was well aware that this breaks support for the PCI cards, that's why I created a patch for the cx88-dvb.c and posted it the v4l-mailing list and ask for inclusion.

This was the Mail:
http://www.linuxtv.org/pipermail/linux-dvb/2005-June/002383.html

This is the patch:
Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v retrieving revision 1.42
diff -u -3 -p -r1.42 cx88-dvb.c

cx88-dvb.c 15 Jul 2005 11:06:22 -0000 renamed from cx88-dvb.c 12 Jul 2005 15:44:55 -0000 1.42 +2 -0
@@ -166,12 +166,14 @@ static int mt352_pll_set(struct dvb_fron
 
 static struct mt352_config dvico_fusionhdtv = {
     .demod_address = 0x0F,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .demod_init    = dvico_fusionhdtv_demod_init,
     .pll_set       = mt352_pll_set,
 };
 
 static struct mt352_config dntv_live_dvbt_config = {
     .demod_address = 0x0f,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .demod_init    = dntv_live_dvbt_demod_init,
     .pll_set       = mt352_pll_set,
 };
Quoted 12 lines

Please include. Thanks

best regards,
Patrick.

Signature · 2 lines
  Mail: [email protected]
  WWW:  http://www.wi-bw.tfh-wildau.de/~pboettch/

Hi, I tried the patch but unfortunately the kernel didn't compile, it ended like this

CC drivers/media/video/cx88/cx88-blackbird.o
CC drivers/media/video/cx88/cx88-dvb.o
drivers/media/video/cx88/cx88-dvb.c:169: error: unknown field output_mode' specified in initializer drivers/media/video/cx88/cx88-dvb.c:176: error: unknown field output_mode' specified in initializer make[4]: *** [drivers/media/video/cx88/cx88-dvb.o] Error 1
make[3]: *** [drivers/media/video/cx88] Error 2
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2
andy:~$

#5 lore raw
Quoted 6 lines · Andrew Benton

Hi, I tried the patch but unfortunately the kernel didn't compile, it ended like this

CC drivers/media/video/cx88/cx88-blackbird.o
CC drivers/media/video/cx88/cx88-dvb.o
drivers/media/video/cx88/cx88-dvb.c:169: error: unknown field output_mode' specified in initializer drivers/media/video/cx88/cx88-dvb.c:176: error: unknown field output_mode' specified in initializer

Yes, I was in a hurry *slap* and made a mistake.

This one is correct (revert the other one):

Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v retrieving revision 1.42

cx88-dvb.c +2 -0
diff -u -3 -p -r1.42 cx88-dvb.c
@@ -180,12 +180,14 @@ static struct mt352_config dntv_live_dvb
 #if CONFIG_DVB_CX22702
 static struct cx22702_config connexant_refboard_config = {
 	.demod_address = 0x43,
+	.output_mode   = CX22702_SERIAL_OUTPUT,
 	.pll_address   = 0x60,
 	.pll_desc      = &dvb_pll_thomson_dtt7579,
 };
 
 static struct cx22702_config hauppauge_novat_config = {
 	.demod_address = 0x43,
+	.output_mode   = CX22702_SERIAL_OUTPUT,
 	.pll_address   = 0x61,
 	.pll_desc      = &dvb_pll_thomson_dtt759x,
 };

Sorry,
Patrick.

#6 lore raw

Patrick,

Quoted 13 lines · Patrick Boettcher
Quoted 9 lines · Andrew Benton

Hi, I tried the patch but unfortunately the kernel didn't compile, it ended like this

CC drivers/media/video/cx88/cx88-blackbird.o
CC drivers/media/video/cx88/cx88-dvb.o
drivers/media/video/cx88/cx88-dvb.c:169: error: unknown field output_mode' specified in initializer drivers/media/video/cx88/cx88-dvb.c:176: error: unknown field output_mode' specified in initializer

Quoted 3 lines

Yes, I was in a hurry *slap* and made a mistake.

This one is correct (revert the other one):

I've already included this on V4L tree.

On V4L, we do provide support for older 2.6 releases (so, we have some
ifdefs to provide backport compatibility that are removed by a script before submiting patchsets).
If I understand well your patch, it is to be applied after 2.6.12
version. Am I right?

Mauro.

#7 lore raw
Quoted 20 lines · Mauro Carvalho Chehab

Patrick,

Quoted 13 lines · Patrick Boettcher
Quoted 9 lines · Andrew Benton

Hi, I tried the patch but unfortunately the kernel didn't compile, it ended like this

CC drivers/media/video/cx88/cx88-blackbird.o
CC drivers/media/video/cx88/cx88-dvb.o
drivers/media/video/cx88/cx88-dvb.c:169: error: unknown field output_mode' specified in initializer drivers/media/video/cx88/cx88-dvb.c:176: error: unknown field output_mode' specified in initializer

Quoted 3 lines

Yes, I was in a hurry *slap* and made a mistake.

This one is correct (revert the other one):

Quoted 7 lines

I've already included this on V4L tree.

On V4L, we do provide support for older 2.6 releases (so, we have some
ifdefs to provide backport compatibility that are removed by a script before submiting patchsets).
If I understand well your patch, it is to be applied after 2.6.12
version. Am I right?

Yes. 2.6.13-rc1 introduced the cxusb-driver in the kernel and along with it the change in the cx22702.

The cx22702.c from video4linux-CVS is not compatible anymore. Not sure how you will handle this? (Throw away the cx22702.c and get it from dvb-kernel ;) )

best regards,
Patrick.

--
Mail: [email protected]
WWW: http://www.wi-bw.tfh-wildau.de/~pboettch/

#8 lore raw
In reply to Patrick Boettcher
Quoted 36 lines · Patrick Boettcher
Quoted 6 lines · Andrew Benton

Hi, I tried the patch but unfortunately the kernel didn't compile, it ended like this

CC drivers/media/video/cx88/cx88-blackbird.o
CC drivers/media/video/cx88/cx88-dvb.o
drivers/media/video/cx88/cx88-dvb.c:169: error: unknown field output_mode' specified in initializer drivers/media/video/cx88/cx88-dvb.c:176: error: unknown field output_mode' specified in initializer

Yes, I was in a hurry *slap* and made a mistake.

This one is correct (revert the other one):

Index: cx88-dvb.c
===================================================================
RCS file: /cvs/video4linux/video4linux/cx88-dvb.c,v retrieving revision 1.42
diff -u -3 -p -r1.42 cx88-dvb.c

cx88-dvb.c 15 Jul 2005 11:33:48 -0000 renamed from cx88-dvb.c 12 Jul 2005 15:44:55 -0000 1.42 +2 -0
@@ -180,12 +180,14 @@ static struct mt352_config dntv_live_dvb
 #if CONFIG_DVB_CX22702
 static struct cx22702_config connexant_refboard_config = {
     .demod_address = 0x43,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .pll_address   = 0x60,
     .pll_desc      = &dvb_pll_thomson_dtt7579,
 };
 
 static struct cx22702_config hauppauge_novat_config = {
     .demod_address = 0x43,
+    .output_mode   = CX22702_SERIAL_OUTPUT,
     .pll_address   = 0x61,
     .pll_desc      = &dvb_pll_thomson_dtt759x,
 };
Quoted 4 lines

Sorry,
Patrick.

Thankyou, that patch works very well.