* [PATCH][RESEND] New type of DTV2000H TV Card
@ 2008-02-06 23:22 Zbynek Hrabovsky
2008-06-13 18:18 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 8+ messages in thread
From: Zbynek Hrabovsky @ 2008-02-06 23:22 UTC (permalink / raw)
To: linux-kernel, video4linux-list
[-- Attachment #1: Type: text/plain, Size: 940 bytes --]
Hello all,
I bought Leadtek WinFast DTV2000H, but it didn't work. I found, that there are two types of this card. Type I (older), and type J (latest) ... and only type I is supported by the module.
Type J is not autodetected, and if you force card type (card = 51), DVB-T works, but there is no sound in analogue television. I know why (multiplexer, which is switching between the radio, TV, and external sound is driven by GPIO pins ... and setting of this pins is wrong), and I wrote a patch, which makes this card (DTV2000H type J) works.
With this patch, card is autodetected, I'm having sound in analogue television, I can switch between antenna, and cable signal input, and I can see video from external S-video and composite video input.
So ... I'm sending this patch to you. I think it will be good to add support for this card to the cx88xx module.
Bye,
Zbynek Hrabovsky, Brno, Czech Republic
PS .. sorry for my English.
[-- Attachment #2: DTV2000H_Patch.diff --]
[-- Type: text/x-patch, Size: 4908 bytes --]
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88-cards.c /usr/src/linux/drivers/media/video/cx88-patched/cx88-cards.c
--- /usr/src/linux/drivers/media/video/cx88/cx88-cards.c 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88-cards.c 2008-01-10 19:24:06.000000000 +0100
@@ -1205,7 +1205,7 @@
},
[CX88_BOARD_WINFAST_DTV2000H] = {
/* video inputs and radio still in testing */
- .name = "WinFast DTV2000 H",
+ .name = "WinFast DTV2000 H ver. I (old)",
.tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
@@ -1220,6 +1220,47 @@
.gpio3 = 0x02000000,
}},
.mpeg = CX88_MPEG_DVB,
+
+ },
+ [CX88_BOARD_WINFAST_DTV2000H_2] = {
+ /* this is just a try */
+ .name = "WinFast DTV2000 H ver. J (new)",
+ .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
+ .radio_type = UNSET,
+ .tuner_addr = ADDR_UNSET,
+ .radio_addr = ADDR_UNSET,
+ .tda9887_conf = TDA9887_PRESENT,
+ .input = {{
+ .type = CX88_VMUX_TELEVISION,
+ .vmux = 0,
+ .gpio0 = 0x00017300,
+ .gpio1 = 0x00008207,
+ .gpio2 = 0x00000000,
+ .gpio3 = 0x02000000,
+ },{
+ .type = CX88_VMUX_TELEVISION,
+ .vmux = 0,
+ .gpio0 = 0x00018300,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ },{
+ .type = CX88_VMUX_COMPOSITE1,
+ .vmux = 1,
+ .gpio0 = 0x00018301,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ },{
+ .type = CX88_VMUX_SVIDEO,
+ .vmux = 2,
+ .gpio0 = 0x00018301,
+ .gpio1 = 0x0000f207,
+ .gpio2 = 0x00017304,
+ .gpio3 = 0x02000000,
+ }},
+ .mpeg = CX88_MPEG_DVB,
+
},
[CX88_BOARD_GENIATECH_DVBS] = {
.name = "Geniatech DVB-S",
@@ -1601,6 +1642,10 @@
.subdevice = 0x665e,
.card = CX88_BOARD_WINFAST_DTV2000H,
},{
+ .subvendor = 0x107d,
+ .subdevice = 0x6f2b,
+ .card = CX88_BOARD_WINFAST_DTV2000H_2,
+ },{
.subvendor = 0x18ac,
.subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */
.card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q,
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88-core.c /usr/src/linux/drivers/media/video/cx88-patched/cx88-core.c
--- /usr/src/linux/drivers/media/video/cx88/cx88-core.c 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88-core.c 2008-01-07 22:55:16.000000000 +0100
@@ -631,6 +631,8 @@
msleep(10);
cx_write(MO_SRST_IO, 1);
+ printk("RESEEEEEEEEEEEEEEEEET !");
+
return 0;
}
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88-dvb.c /usr/src/linux/drivers/media/video/cx88-patched/cx88-dvb.c
--- /usr/src/linux/drivers/media/video/cx88/cx88-dvb.c 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88-dvb.c 2008-01-06 22:08:53.000000000 +0100
@@ -403,6 +403,7 @@
}
break;
case CX88_BOARD_WINFAST_DTV2000H:
+ case CX88_BOARD_WINFAST_DTV2000H_2:
case CX88_BOARD_HAUPPAUGE_HVR1100:
case CX88_BOARD_HAUPPAUGE_HVR1100LP:
case CX88_BOARD_HAUPPAUGE_HVR1300:
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88-input.c /usr/src/linux/drivers/media/video/cx88-patched/cx88-input.c
--- /usr/src/linux/drivers/media/video/cx88/cx88-input.c 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88-input.c 2008-01-06 22:10:13.000000000 +0100
@@ -230,6 +230,7 @@
ir->sampling = 1;
break;
case CX88_BOARD_WINFAST_DTV2000H:
+ case CX88_BOARD_WINFAST_DTV2000H_2:
ir_codes = ir_codes_winfast;
ir->gpio_addr = MO_GP0_IO;
ir->mask_keycode = 0x8f8;
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88-mpeg.c /usr/src/linux/drivers/media/video/cx88-patched/cx88-mpeg.c
--- /usr/src/linux/drivers/media/video/cx88/cx88-mpeg.c 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88-mpeg.c 2008-01-07 23:28:29.000000000 +0100
@@ -93,6 +93,7 @@
/* FIXME: this needs a review.
* also: move to cx88-blackbird + cx88-dvb source files? */
+ if ((core->board) == CX88_BOARD_WINFAST_DTV2000H_2) cx_write(MO_GP0_IO, 0x00017300);/*switch signal input to antena*/
dprintk( 1, "core->active_type_id = 0x%08x\n", core->active_type_id);
if ( (core->active_type_id == CX88_MPEG_DVB) &&
diff -Naur /usr/src/linux/drivers/media/video/cx88/cx88.h /usr/src/linux/drivers/media/video/cx88-patched/cx88.h
--- /usr/src/linux/drivers/media/video/cx88/cx88.h 2007-10-09 22:31:38.000000000 +0200
+++ /usr/src/linux/drivers/media/video/cx88-patched/cx88.h 2008-01-03 23:00:39.000000000 +0100
@@ -210,6 +210,8 @@
#define CX88_BOARD_TE_DTV_250_OEM_SWANN 55
#define CX88_BOARD_HAUPPAUGE_HVR1300 56
#define CX88_BOARD_ADSTECH_PTV_390 57
+#define CX88_BOARD_WINFAST_DTV2000H_2 58
+
enum cx88_itype {
CX88_VMUX_COMPOSITE1 = 1,
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-02-06 23:22 [PATCH][RESEND] New type of DTV2000H TV Card Zbynek Hrabovsky @ 2008-06-13 18:18 ` Mauro Carvalho Chehab 2008-06-13 21:09 ` André AUZI 2008-06-20 21:52 ` Zbynek Hrabovsky 0 siblings, 2 replies; 8+ messages in thread From: Mauro Carvalho Chehab @ 2008-06-13 18:18 UTC (permalink / raw) To: Zbynek Hrabovsky Cc: linux-kernel, video4linux-list, Nicolas Marot, nicolas, Michel Lespinasse On Thu, 7 Feb 2008 00:22:24 +0100 Zbynek Hrabovsky <hrabosh@t-email.cz> wrote: > Hello all, > > I bought Leadtek WinFast DTV2000H, but it didn't work. I found, that there are two types of this card. Type I (older), and type J (latest) ... and only type I is supported by the module. > > Type J is not autodetected, and if you force card type (card = 51), DVB-T works, but there is no sound in analogue television. I know why (multiplexer, which is switching between the radio, TV, and external sound is driven by GPIO pins ... and setting of this pins is wrong), and I wrote a patch, which makes this card (DTV2000H type J) works. > > With this patch, card is autodetected, I'm having sound in analogue television, I can switch between antenna, and cable signal input, and I can see video from external S-video and composite video input. > > So ... I'm sending this patch to you. I think it will be good to add support for this card to the cx88xx module. > > Bye, > Zbynek Hrabovsky, Brno, Czech Republic > > PS .. sorry for my English. Hi Zbynek, Sorry for not answering earlier. Your patch got lost on my inbox. As Nicolas pointed it to me, I've took a look on it. It seems sane. Yet, a few style corrections were needed. Also, the patch doesn't apply anymore, since board 57 is already defined. Generally, I would ask you to check it, using checkpatch.pl and fix the issues. But, as this patch is old, I decided to fix it and resubmit for you to check and test it. Please let me know if everything is ok for me to commit it and send upstream. Also, please send your Signed-off-by: Nicolas, It would be nice if you can review the patch and send us a reviewed-by: line. Cheers, Mauro --- From: Zbynek Hrabovsky <hrabosh@t-email.cz> I bought Leadtek WinFast DTV2000H, but it didn't work. I found, that there are two types of this card. Type I (older), and type J (latest) ... and only type I is supported by the module. Type J is not autodetected, and if you force card type (card = 51), DVB-T works, but there is no sound in analogue television. I know why (multiplexer, which is switching between the radio, TV, and external sound is driven by GPIO pins ... and setting of this pins is wrong), and I wrote a patch, which makes this card (DTV2000H type J) works. With this patch, card is autodetected, I'm having sound in analogue television, I can switch between antenna, and cable signal input, and I can see video from external S-video and composite video input. So ... I'm sending this patch to you. I think it will be good to add support for this card to the cx88xx module. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 2008 -0300 @@ -1284,7 +1284,7 @@ }, [CX88_BOARD_WINFAST_DTV2000H] = { /* video inputs and radio still in testing */ - .name = "WinFast DTV2000 H", + .name = "WinFast DTV2000 H ver. I (old)", .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, @@ -1298,6 +1298,45 @@ .gpio2 = 0x00017304, .gpio3 = 0x02000000, }}, + .mpeg = CX88_MPEG_DVB, + }, + [CX88_BOARD_WINFAST_DTV2000H_2] = { + /* this is just a try */ + .name = "WinFast DTV2000 H ver. J (new)", + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tda9887_conf = TDA9887_PRESENT, + .input = { { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00017300, + .gpio1 = 0x00008207, + .gpio2 = 0x00000000, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00018300, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + } }, .mpeg = CX88_MPEG_DVB, }, [CX88_BOARD_GENIATECH_DVBS] = { @@ -1963,6 +2002,10 @@ .subdevice = 0x665e, .card = CX88_BOARD_WINFAST_DTV2000H, },{ + .subvendor = 0x107d, + .subdevice = 0x6f2b, + .card = CX88_BOARD_WINFAST_DTV2000H_2, + }, { .subvendor = 0x18ac, .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */ .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 -0300 @@ -561,6 +561,7 @@ } break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100LP: case CX88_BOARD_HAUPPAUGE_HVR1300: diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 2008 -0300 @@ -242,6 +242,7 @@ ir->sampling = 1; break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: ir_codes = ir_codes_winfast; ir->gpio_addr = MO_GP0_IO; ir->mask_keycode = 0x8f8; diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-mpeg.c --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 2008 -0300 @@ -148,6 +148,12 @@ cx_write(TS_SOP_STAT, 0); cx_write(TS_VALERR_CNTRL, 0); udelay(100); + break; + case CX88_BOARD_WINFAST_DTV2000H_2: + /* switch signal input to antena */ + cx_write(MO_GP0_IO, 0x00017300); + + cx_write(TS_SOP_STAT, 0x00); break; default: cx_write(TS_SOP_STAT, 0x00); diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 -0300 @@ -224,6 +224,7 @@ #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 #define CX88_BOARD_PROLINK_PV_8000GT 66 #define CX88_BOARD_KWORLD_ATSC_120 67 +#define CX88_BOARD_WINFAST_DTV2000H_2 68 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-06-13 18:18 ` Mauro Carvalho Chehab @ 2008-06-13 21:09 ` André AUZI 2008-06-20 21:57 ` Zbynek Hrabovsky 2008-06-20 21:52 ` Zbynek Hrabovsky 1 sibling, 1 reply; 8+ messages in thread From: André AUZI @ 2008-06-13 21:09 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Zbynek Hrabovsky, video4linux-list, Michel Lespinasse, Nicolas Marot, linux-kernel, nicolas Hi all, forgive me if I jump in the conversation without invitation but I've got the same board and basically started the same task as you, Zbynek. I'm still stuck with the radio support and your patch seems more advanced on the mpeg side. Therefore, would you mind if I ask a question about what's proposed in the cx88-mpeg.c file? > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-mpeg.c > --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 2008 -0300 > +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 2008 -0300 > @@ -148,6 +148,12 @@ > cx_write(TS_SOP_STAT, 0); > cx_write(TS_VALERR_CNTRL, 0); > udelay(100); > + break; > + case CX88_BOARD_WINFAST_DTV2000H_2: > + /* switch signal input to antena */ > + cx_write(MO_GP0_IO, 0x00017300); > + > + cx_write(TS_SOP_STAT, 0x00); > break; > default: > cx_write(TS_SOP_STAT, 0x00); > Correct me if I'm wrong but this change doesn't it prevent from processing data coming from the cable input? Cheers, André ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-06-13 21:09 ` André AUZI @ 2008-06-20 21:57 ` Zbynek Hrabovsky 0 siblings, 0 replies; 8+ messages in thread From: Zbynek Hrabovsky @ 2008-06-20 21:57 UTC (permalink / raw) To: André AUZI Cc: Mauro Carvalho Chehab, video4linux-list, Michel Lespinasse, Nicolas Marot, linux-kernel, nicolas Hi André, Yes, you are right .. most likely. But it used to work when I wrote it. Zbynek On Fri, 13 Jun 2008 23:09:05 +0200 André AUZI <aauzi@users.sourceforge.net> wrote: > Hi all, > > forgive me if I jump in the conversation without invitation but I've got > the same board and basically started the same task as you, Zbynek. > > I'm still stuck with the radio support and your patch seems more > advanced on the mpeg side. > > Therefore, would you mind if I ask a question about what's proposed in > the cx88-mpeg.c file? > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-mpeg.c > > --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 2008 -0300 > > +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 2008 -0300 > > @@ -148,6 +148,12 @@ > > cx_write(TS_SOP_STAT, 0); > > cx_write(TS_VALERR_CNTRL, 0); > > udelay(100); > > + break; > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > + /* switch signal input to antena */ > > + cx_write(MO_GP0_IO, 0x00017300); > > + > > + cx_write(TS_SOP_STAT, 0x00); > > break; > > default: > > cx_write(TS_SOP_STAT, 0x00); > > > > Correct me if I'm wrong but this change doesn't it prevent from > processing data coming from the cable input? > > Cheers, > André > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-06-13 18:18 ` Mauro Carvalho Chehab 2008-06-13 21:09 ` André AUZI @ 2008-06-20 21:52 ` Zbynek Hrabovsky [not found] ` <f4d5b6dd0806201352h4538072fy20f6187f54f81bae@mail.gmail.com> 1 sibling, 1 reply; 8+ messages in thread From: Zbynek Hrabovsky @ 2008-06-20 21:52 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-kernel, video4linux-list, Nicolas Marot, nicolas, Michel Lespinasse Hi Mauro, thanks for your answer. I've tried to apply the updated patch you've sent me and it is working, but .... ... there is a little problem with this: --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 2008 -0300 @@ -148,6 +148,12 @@ cx_write(TS_SOP_STAT, 0); cx_write(TS_VALERR_CNTRL, 0); udelay(100); + break; + case CX88_BOARD_WINFAST_DTV2000H_2: + /* switch signal input to antena */ + cx_write(MO_GP0_IO, 0x00017300); + + cx_write(TS_SOP_STAT, 0x00); break; default: cx_write(TS_SOP_STAT, 0x00); This piece of code used to switch the input of RF signal to "Air Antenna" mode. When I was writing the patch, this code was executed every time I was tunning DVB-T station. (using Kaffeine, or sth.) But now ( I don't know why ... ) this code is ran only if the station is succesfully tuned ... which is late for switching RF input. So ... all the things about sound in analog TV and video inputs, etc. are working well, but switching between Cable and Air Antenna RF inputs must be done using programs for analog TV ... such as TvTime for example. It would be nice, if this patch (and driver) would be able to switch RF inputs in DVB-T mode somehow. My idea is, to have two DVB-T devices ... one would use Air Antenna input as a source of signal, second the Cable input as source of signal. This will provide us to receive DVB-T from both inputs (BTW ... original Windows driver is not able to do this). The problem is, that I'm not sure if I'm able to do it ... I have very poor idea how all the things around this driver works ...for example which c. file I should focus on. If you would give me a small piece of advise, where to start, I would be pleased. OK, I'm not sure if I understood what you meant by adding sign-off-by and reviewed-by line ... I hope I did what you want me to: So .. thanks for your time, Zbynek Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz> Reviewed-by: Zbynek Hrbaovsky <hrabosh@t-email.cz> diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 2008 -0300 @@ -1284,7 +1284,7 @@ }, [CX88_BOARD_WINFAST_DTV2000H] = { /* video inputs and radio still in testing */ - .name = "WinFast DTV2000 H", + .name = "WinFast DTV2000 H ver. I (old)", .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, @@ -1298,6 +1298,45 @@ .gpio2 = 0x00017304, .gpio3 = 0x02000000, }}, + .mpeg = CX88_MPEG_DVB, + }, + [CX88_BOARD_WINFAST_DTV2000H_2] = { + /* this is just a try */ + .name = "WinFast DTV2000 H ver. J (new)", + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tda9887_conf = TDA9887_PRESENT, + .input = { { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00017300, + .gpio1 = 0x00008207, + .gpio2 = 0x00000000, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00018300, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + } }, .mpeg = CX88_MPEG_DVB, }, [CX88_BOARD_GENIATECH_DVBS] = { @@ -1963,6 +2002,10 @@ .subdevice = 0x665e, .card = CX88_BOARD_WINFAST_DTV2000H, },{ + .subvendor = 0x107d, + .subdevice = 0x6f2b, + .card = CX88_BOARD_WINFAST_DTV2000H_2, + }, { .subvendor = 0x18ac, .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */ .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 -0300 @@ -561,6 +561,7 @@ } break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100LP: case CX88_BOARD_HAUPPAUGE_HVR1300: diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 2008 -0300 @@ -242,6 +242,7 @@ ir->sampling = 1; break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: ir_codes = ir_codes_winfast; ir->gpio_addr = MO_GP0_IO; ir->mask_keycode = 0x8f8; diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 -0300 @@ -224,6 +224,7 @@ #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 #define CX88_BOARD_PROLINK_PV_8000GT 66 #define CX88_BOARD_KWORLD_ATSC_120 67 +#define CX88_BOARD_WINFAST_DTV2000H_2 68 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, ^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <f4d5b6dd0806201352h4538072fy20f6187f54f81bae@mail.gmail.com>]
* Re: [PATCH][RESEND] New type of DTV2000H TV Card [not found] ` <f4d5b6dd0806201352h4538072fy20f6187f54f81bae@mail.gmail.com> @ 2008-06-28 17:56 ` Zbynek Hrabovsky 2008-06-29 12:13 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 8+ messages in thread From: Zbynek Hrabovsky @ 2008-06-28 17:56 UTC (permalink / raw) To: Nicolas Marot Cc: Mauro Carvalho Chehab, linux-kernel, video4linux-list, nicolas, Michel Lespinasse [-- Attachment #1: Type: text/plain, Size: 8083 bytes --] Hi Nicolas, so I should install git and run these commands, or .. ? I'm really confuzzled. But I had installed GPG and signed my patch, maybe this is what I should have done earlier. My key ID is: 7803B3E1 If you guys want me somethink more to do, write me ... I'll do my best. Thanx for your time Zbynek On Fri, 20 Jun 2008 22:52:02 +0200 "Nicolas Marot" <nicolas.marot@gmail.com> wrote: > Hi Zbynek, > > I think lines Mauro asks us are some git commands on driver source code > > nicolas > > > On Fri, Jun 20, 2008 at 11:52 PM, Zbynek Hrabovsky <hrabosh@t-email.cz> > wrote: > > > Hi Mauro, > > > > thanks for your answer. > > > > I've tried to apply the updated patch you've sent me and it is working, but > > .... > > > > ... there is a little problem with this: > > > > --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 > > 2008 -0300 > > +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 > > 2008 -0300 > > @@ -148,6 +148,12 @@ > > cx_write(TS_SOP_STAT, 0); > > cx_write(TS_VALERR_CNTRL, 0); > > udelay(100); > > + break; > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > + /* switch signal input to antena */ > > + cx_write(MO_GP0_IO, 0x00017300); > > + > > + cx_write(TS_SOP_STAT, 0x00); > > break; > > default: > > cx_write(TS_SOP_STAT, 0x00); > > > > > > This piece of code used to switch the input of RF signal to "Air Antenna" > > mode. When I was writing the patch, this code was executed every time I was > > tunning DVB-T station. (using Kaffeine, or sth.) But now ( I don't know why > > ... ) this code is ran only if the station is succesfully tuned ... which is > > late for switching RF input. > > > > So ... all the things about sound in analog TV and video inputs, etc. are > > working well, but switching between Cable and Air Antenna RF inputs must be > > done using programs for analog TV ... such as TvTime for example. > > > > It would be nice, if this patch (and driver) would be able to switch RF > > inputs in DVB-T mode somehow. My idea is, to have two DVB-T devices ... one > > would use Air Antenna input as a source of signal, second the Cable input as > > source of signal. This will provide us to receive DVB-T from both inputs > > (BTW ... original Windows driver is not able to do this). The problem is, > > that I'm not sure if I'm able to do it ... I have very poor idea how all the > > things around this driver works ...for example which c. file I should focus > > on. If you would give me a small piece of advise, where to start, I would be > > pleased. > > > > OK, I'm not sure if I understood what you meant by adding sign-off-by and > > reviewed-by line ... I hope I did what you want me to: > > > > > > So .. thanks for your time, > > Zbynek > > > > Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz> > > > > Reviewed-by: Zbynek Hrbaovsky <hrabosh@t-email.cz> > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c > > --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 > > 2008 -0300 > > +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 > > 2008 -0300 > > @@ -1284,7 +1284,7 @@ > > }, > > [CX88_BOARD_WINFAST_DTV2000H] = { > > /* video inputs and radio still in testing */ > > - .name = "WinFast DTV2000 H", > > + .name = "WinFast DTV2000 H ver. I (old)", > > .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > .radio_type = UNSET, > > .tuner_addr = ADDR_UNSET, > > @@ -1298,6 +1298,45 @@ > > .gpio2 = 0x00017304, > > .gpio3 = 0x02000000, > > }}, > > + .mpeg = CX88_MPEG_DVB, > > + }, > > + [CX88_BOARD_WINFAST_DTV2000H_2] = { > > + /* this is just a try */ > > + .name = "WinFast DTV2000 H ver. J (new)", > > + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > + .radio_type = UNSET, > > + .tuner_addr = ADDR_UNSET, > > + .radio_addr = ADDR_UNSET, > > + .tda9887_conf = TDA9887_PRESENT, > > + .input = { { > > + .type = CX88_VMUX_TELEVISION, > > + .vmux = 0, > > + .gpio0 = 0x00017300, > > + .gpio1 = 0x00008207, > > + .gpio2 = 0x00000000, > > + .gpio3 = 0x02000000, > > + }, { > > + .type = CX88_VMUX_TELEVISION, > > + .vmux = 0, > > + .gpio0 = 0x00018300, > > + .gpio1 = 0x0000f207, > > + .gpio2 = 0x00017304, > > + .gpio3 = 0x02000000, > > + }, { > > + .type = CX88_VMUX_COMPOSITE1, > > + .vmux = 1, > > + .gpio0 = 0x00018301, > > + .gpio1 = 0x0000f207, > > + .gpio2 = 0x00017304, > > + .gpio3 = 0x02000000, > > + }, { > > + .type = CX88_VMUX_SVIDEO, > > + .vmux = 2, > > + .gpio0 = 0x00018301, > > + .gpio1 = 0x0000f207, > > + .gpio2 = 0x00017304, > > + .gpio3 = 0x02000000, > > + } }, > > .mpeg = CX88_MPEG_DVB, > > }, > > [CX88_BOARD_GENIATECH_DVBS] = { > > @@ -1963,6 +2002,10 @@ > > .subdevice = 0x665e, > > .card = CX88_BOARD_WINFAST_DTV2000H, > > },{ > > + .subvendor = 0x107d, > > + .subdevice = 0x6f2b, > > + .card = CX88_BOARD_WINFAST_DTV2000H_2, > > + }, { > > .subvendor = 0x18ac, > > .subdevice = 0xd800, /* FusionHDTV 3 Gold (original > > revision) */ > > .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c > > --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 > > -0300 > > +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 > > -0300 > > @@ -561,6 +561,7 @@ > > } > > break; > > case CX88_BOARD_WINFAST_DTV2000H: > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > case CX88_BOARD_HAUPPAUGE_HVR1100: > > case CX88_BOARD_HAUPPAUGE_HVR1100LP: > > case CX88_BOARD_HAUPPAUGE_HVR1300: > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c > > --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 > > 2008 -0300 > > +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 > > 2008 -0300 > > @@ -242,6 +242,7 @@ > > ir->sampling = 1; > > break; > > case CX88_BOARD_WINFAST_DTV2000H: > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > ir_codes = ir_codes_winfast; > > ir->gpio_addr = MO_GP0_IO; > > ir->mask_keycode = 0x8f8; > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h > > --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 > > -0300 > > +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 > > -0300 > > @@ -224,6 +224,7 @@ > > #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 > > #define CX88_BOARD_PROLINK_PV_8000GT 66 > > #define CX88_BOARD_KWORLD_ATSC_120 67 > > +#define CX88_BOARD_WINFAST_DTV2000H_2 68 > > > > enum cx88_itype { > > CX88_VMUX_COMPOSITE1 = 1, > > > > > > > > > [-- Attachment #2: DTV2000H.diff.asc --] [-- Type: text/plain, Size: 3474 bytes --] -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz> Reviewed-by: Zbynek Hrabovsky <hrabosh@t-email.cz> diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c - --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 2008 -0300 @@ -1284,7 +1284,7 @@ }, [CX88_BOARD_WINFAST_DTV2000H] = { /* video inputs and radio still in testing */ - - .name = "WinFast DTV2000 H", + .name = "WinFast DTV2000 H ver. I (old)", .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, .radio_type = UNSET, .tuner_addr = ADDR_UNSET, @@ -1298,6 +1298,45 @@ .gpio2 = 0x00017304, .gpio3 = 0x02000000, }}, + .mpeg = CX88_MPEG_DVB, + }, + [CX88_BOARD_WINFAST_DTV2000H_2] = { + /* this is just a try */ + .name = "WinFast DTV2000 H ver. J (new)", + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, + .radio_type = UNSET, + .tuner_addr = ADDR_UNSET, + .radio_addr = ADDR_UNSET, + .tda9887_conf = TDA9887_PRESENT, + .input = { { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00017300, + .gpio1 = 0x00008207, + .gpio2 = 0x00000000, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_TELEVISION, + .vmux = 0, + .gpio0 = 0x00018300, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_COMPOSITE1, + .vmux = 1, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + }, { + .type = CX88_VMUX_SVIDEO, + .vmux = 2, + .gpio0 = 0x00018301, + .gpio1 = 0x0000f207, + .gpio2 = 0x00017304, + .gpio3 = 0x02000000, + } }, .mpeg = CX88_MPEG_DVB, }, [CX88_BOARD_GENIATECH_DVBS] = { @@ -1963,6 +2002,10 @@ .subdevice = 0x665e, .card = CX88_BOARD_WINFAST_DTV2000H, },{ + .subvendor = 0x107d, + .subdevice = 0x6f2b, + .card = CX88_BOARD_WINFAST_DTV2000H_2, + }, { .subvendor = 0x18ac, .subdevice = 0xd800, /* FusionHDTV 3 Gold (original revision) */ .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c - --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 -0300 @@ -561,6 +561,7 @@ } break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100LP: case CX88_BOARD_HAUPPAUGE_HVR1300: diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c - --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 2008 -0300 @@ -242,6 +242,7 @@ ir->sampling = 1; break; case CX88_BOARD_WINFAST_DTV2000H: + case CX88_BOARD_WINFAST_DTV2000H_2: ir_codes = ir_codes_winfast; ir->gpio_addr = MO_GP0_IO; ir->mask_keycode = 0x8f8; diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h - --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 -0300 +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 -0300 @@ -224,6 +224,7 @@ #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 #define CX88_BOARD_PROLINK_PV_8000GT 66 #define CX88_BOARD_KWORLD_ATSC_120 67 +#define CX88_BOARD_WINFAST_DTV2000H_2 68 enum cx88_itype { CX88_VMUX_COMPOSITE1 = 1, -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAkhmXRgACgkQPedPCXgDs+FAwgCghc3wFwpAmeGkMzGKoJi8HnHz W5EAn2iybN7vkU3nR7gqJ0k7NBOVSGXD =O/Qr -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-06-28 17:56 ` Zbynek Hrabovsky @ 2008-06-29 12:13 ` Mauro Carvalho Chehab 2008-08-30 22:35 ` Nicolas Marot 0 siblings, 1 reply; 8+ messages in thread From: Mauro Carvalho Chehab @ 2008-06-29 12:13 UTC (permalink / raw) To: Zbynek Hrabovsky Cc: Nicolas Marot, linux-kernel, video4linux-list, nicolas, Michel Lespinasse On Sat, 28 Jun 2008 19:56:37 +0200 Zbynek Hrabovsky <hrabosh@t-email.cz> wrote: > > Hi Nicolas, > > so I should install git and run these commands, or .. ? I'm really confuzzled. > > But I had installed GPG and signed my patch, maybe this is what I should have done earlier. My key ID is: 7803B3E1 We don't need a GPG signature. All we need is a "Signed-off-by". Please take a look at: http://linuxtv.org/hg/v4l-dvb/raw-file/tip/README.patches There are a quick explanation there on how we generally receive V4L/DVB patches. It also points to some docs at kernel Documentation, with the current rules for SubmittingPatches. Cheers, Mauro. > > If you guys want me somethink more to do, write me ... I'll do my best. > > Thanx for your time > > Zbynek > > On Fri, 20 Jun 2008 22:52:02 +0200 > "Nicolas Marot" <nicolas.marot@gmail.com> wrote: > > > Hi Zbynek, > > > > I think lines Mauro asks us are some git commands on driver source code > > > > nicolas > > > > > > On Fri, Jun 20, 2008 at 11:52 PM, Zbynek Hrabovsky <hrabosh@t-email.cz> > > wrote: > > > > > Hi Mauro, > > > > > > thanks for your answer. > > > > > > I've tried to apply the updated patch you've sent me and it is working, but > > > .... > > > > > > ... there is a little problem with this: > > > > > > --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 > > > 2008 -0300 > > > +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 > > > 2008 -0300 > > > @@ -148,6 +148,12 @@ > > > cx_write(TS_SOP_STAT, 0); > > > cx_write(TS_VALERR_CNTRL, 0); > > > udelay(100); > > > + break; > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > + /* switch signal input to antena */ > > > + cx_write(MO_GP0_IO, 0x00017300); > > > + > > > + cx_write(TS_SOP_STAT, 0x00); > > > break; > > > default: > > > cx_write(TS_SOP_STAT, 0x00); > > > > > > > > > This piece of code used to switch the input of RF signal to "Air Antenna" > > > mode. When I was writing the patch, this code was executed every time I was > > > tunning DVB-T station. (using Kaffeine, or sth.) But now ( I don't know why > > > ... ) this code is ran only if the station is succesfully tuned ... which is > > > late for switching RF input. > > > > > > So ... all the things about sound in analog TV and video inputs, etc. are > > > working well, but switching between Cable and Air Antenna RF inputs must be > > > done using programs for analog TV ... such as TvTime for example. > > > > > > It would be nice, if this patch (and driver) would be able to switch RF > > > inputs in DVB-T mode somehow. My idea is, to have two DVB-T devices ... one > > > would use Air Antenna input as a source of signal, second the Cable input as > > > source of signal. This will provide us to receive DVB-T from both inputs > > > (BTW ... original Windows driver is not able to do this). The problem is, > > > that I'm not sure if I'm able to do it ... I have very poor idea how all the > > > things around this driver works ...for example which c. file I should focus > > > on. If you would give me a small piece of advise, where to start, I would be > > > pleased. > > > > > > OK, I'm not sure if I understood what you meant by adding sign-off-by and > > > reviewed-by line ... I hope I did what you want me to: > > > > > > > > > So .. thanks for your time, > > > Zbynek > > > > > > Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz> > > > > > > Reviewed-by: Zbynek Hrbaovsky <hrabosh@t-email.cz> > > > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c > > > --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 > > > 2008 -0300 > > > +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 > > > 2008 -0300 > > > @@ -1284,7 +1284,7 @@ > > > }, > > > [CX88_BOARD_WINFAST_DTV2000H] = { > > > /* video inputs and radio still in testing */ > > > - .name = "WinFast DTV2000 H", > > > + .name = "WinFast DTV2000 H ver. I (old)", > > > .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > > .radio_type = UNSET, > > > .tuner_addr = ADDR_UNSET, > > > @@ -1298,6 +1298,45 @@ > > > .gpio2 = 0x00017304, > > > .gpio3 = 0x02000000, > > > }}, > > > + .mpeg = CX88_MPEG_DVB, > > > + }, > > > + [CX88_BOARD_WINFAST_DTV2000H_2] = { > > > + /* this is just a try */ > > > + .name = "WinFast DTV2000 H ver. J (new)", > > > + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > > + .radio_type = UNSET, > > > + .tuner_addr = ADDR_UNSET, > > > + .radio_addr = ADDR_UNSET, > > > + .tda9887_conf = TDA9887_PRESENT, > > > + .input = { { > > > + .type = CX88_VMUX_TELEVISION, > > > + .vmux = 0, > > > + .gpio0 = 0x00017300, > > > + .gpio1 = 0x00008207, > > > + .gpio2 = 0x00000000, > > > + .gpio3 = 0x02000000, > > > + }, { > > > + .type = CX88_VMUX_TELEVISION, > > > + .vmux = 0, > > > + .gpio0 = 0x00018300, > > > + .gpio1 = 0x0000f207, > > > + .gpio2 = 0x00017304, > > > + .gpio3 = 0x02000000, > > > + }, { > > > + .type = CX88_VMUX_COMPOSITE1, > > > + .vmux = 1, > > > + .gpio0 = 0x00018301, > > > + .gpio1 = 0x0000f207, > > > + .gpio2 = 0x00017304, > > > + .gpio3 = 0x02000000, > > > + }, { > > > + .type = CX88_VMUX_SVIDEO, > > > + .vmux = 2, > > > + .gpio0 = 0x00018301, > > > + .gpio1 = 0x0000f207, > > > + .gpio2 = 0x00017304, > > > + .gpio3 = 0x02000000, > > > + } }, > > > .mpeg = CX88_MPEG_DVB, > > > }, > > > [CX88_BOARD_GENIATECH_DVBS] = { > > > @@ -1963,6 +2002,10 @@ > > > .subdevice = 0x665e, > > > .card = CX88_BOARD_WINFAST_DTV2000H, > > > },{ > > > + .subvendor = 0x107d, > > > + .subdevice = 0x6f2b, > > > + .card = CX88_BOARD_WINFAST_DTV2000H_2, > > > + }, { > > > .subvendor = 0x18ac, > > > .subdevice = 0xd800, /* FusionHDTV 3 Gold (original > > > revision) */ > > > .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c > > > --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 > > > -0300 > > > +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 > > > -0300 > > > @@ -561,6 +561,7 @@ > > > } > > > break; > > > case CX88_BOARD_WINFAST_DTV2000H: > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > case CX88_BOARD_HAUPPAUGE_HVR1100: > > > case CX88_BOARD_HAUPPAUGE_HVR1100LP: > > > case CX88_BOARD_HAUPPAUGE_HVR1300: > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c > > > --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 > > > 2008 -0300 > > > +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 > > > 2008 -0300 > > > @@ -242,6 +242,7 @@ > > > ir->sampling = 1; > > > break; > > > case CX88_BOARD_WINFAST_DTV2000H: > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > ir_codes = ir_codes_winfast; > > > ir->gpio_addr = MO_GP0_IO; > > > ir->mask_keycode = 0x8f8; > > > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h > > > --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 > > > -0300 > > > +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 > > > -0300 > > > @@ -224,6 +224,7 @@ > > > #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 > > > #define CX88_BOARD_PROLINK_PV_8000GT 66 > > > #define CX88_BOARD_KWORLD_ATSC_120 67 > > > +#define CX88_BOARD_WINFAST_DTV2000H_2 68 > > > > > > enum cx88_itype { > > > CX88_VMUX_COMPOSITE1 = 1, > > > > > > > > > > > > > > Cheers, Mauro ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH][RESEND] New type of DTV2000H TV Card 2008-06-29 12:13 ` Mauro Carvalho Chehab @ 2008-08-30 22:35 ` Nicolas Marot 0 siblings, 0 replies; 8+ messages in thread From: Nicolas Marot @ 2008-08-30 22:35 UTC (permalink / raw) To: linux-kernel Hi Mauro, The patch looks good for me. Tested under 2.6.25 and 2.6.26 Reviewed-by: Nicolas Marot <nicolas.marot@gmail.com> On Sun, Jun 29, 2008 at 2:13 PM, Mauro Carvalho Chehab <mchehab@infradead.org> wrote: > > On Sat, 28 Jun 2008 19:56:37 +0200 > Zbynek Hrabovsky <hrabosh@t-email.cz> wrote: > > > > > Hi Nicolas, > > > > so I should install git and run these commands, or .. ? I'm really confuzzled. > > > > But I had installed GPG and signed my patch, maybe this is what I should have done earlier. My key ID is: 7803B3E1 > > We don't need a GPG signature. All we need is a "Signed-off-by". > > Please take a look at: > http://linuxtv.org/hg/v4l-dvb/raw-file/tip/README.patches > > There are a quick explanation there on how we generally receive V4L/DVB > patches. It also points to some docs at kernel Documentation, with the current > rules for SubmittingPatches. > > Cheers, > Mauro. > > > > > If you guys want me somethink more to do, write me ... I'll do my best. > > > > Thanx for your time > > > > Zbynek > > > > On Fri, 20 Jun 2008 22:52:02 +0200 > > "Nicolas Marot" <nicolas.marot@gmail.com> wrote: > > > > > Hi Zbynek, > > > > > > I think lines Mauro asks us are some git commands on driver source code > > > > > > nicolas > > > > > > > > > On Fri, Jun 20, 2008 at 11:52 PM, Zbynek Hrabovsky <hrabosh@t-email.cz> > > > wrote: > > > > > > > Hi Mauro, > > > > > > > > thanks for your answer. > > > > > > > > I've tried to apply the updated patch you've sent me and it is working, but > > > > .... > > > > > > > > ... there is a little problem with this: > > > > > > > > --- a/linux/drivers/media/video/cx88/cx88-mpeg.c Tue Jun 10 15:27:29 > > > > 2008 -0300 > > > > +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c Fri Jun 13 15:07:34 > > > > 2008 -0300 > > > > @@ -148,6 +148,12 @@ > > > > cx_write(TS_SOP_STAT, 0); > > > > cx_write(TS_VALERR_CNTRL, 0); > > > > udelay(100); > > > > + break; > > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > > + /* switch signal input to antena */ > > > > + cx_write(MO_GP0_IO, 0x00017300); > > > > + > > > > + cx_write(TS_SOP_STAT, 0x00); > > > > break; > > > > default: > > > > cx_write(TS_SOP_STAT, 0x00); > > > > > > > > > > > > This piece of code used to switch the input of RF signal to "Air Antenna" > > > > mode. When I was writing the patch, this code was executed every time I was > > > > tunning DVB-T station. (using Kaffeine, or sth.) But now ( I don't know why > > > > ... ) this code is ran only if the station is succesfully tuned ... which is > > > > late for switching RF input. > > > > > > > > So ... all the things about sound in analog TV and video inputs, etc. are > > > > working well, but switching between Cable and Air Antenna RF inputs must be > > > > done using programs for analog TV ... such as TvTime for example. > > > > > > > > It would be nice, if this patch (and driver) would be able to switch RF > > > > inputs in DVB-T mode somehow. My idea is, to have two DVB-T devices ... one > > > > would use Air Antenna input as a source of signal, second the Cable input as > > > > source of signal. This will provide us to receive DVB-T from both inputs > > > > (BTW ... original Windows driver is not able to do this). The problem is, > > > > that I'm not sure if I'm able to do it ... I have very poor idea how all the > > > > things around this driver works ...for example which c. file I should focus > > > > on. If you would give me a small piece of advise, where to start, I would be > > > > pleased. > > > > > > > > OK, I'm not sure if I understood what you meant by adding sign-off-by and > > > > reviewed-by line ... I hope I did what you want me to: > > > > > > > > > > > > So .. thanks for your time, > > > > Zbynek > > > > > > > > Signed-off-by: Zbynek Hrabovsky <hrabosh@t-email.cz> > > > > > > > > Reviewed-by: Zbynek Hrbaovsky <hrabosh@t-email.cz> > > > > > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-cards.c > > > > --- a/linux/drivers/media/video/cx88/cx88-cards.c Tue Jun 10 15:27:29 > > > > 2008 -0300 > > > > +++ b/linux/drivers/media/video/cx88/cx88-cards.c Fri Jun 13 15:07:33 > > > > 2008 -0300 > > > > @@ -1284,7 +1284,7 @@ > > > > }, > > > > [CX88_BOARD_WINFAST_DTV2000H] = { > > > > /* video inputs and radio still in testing */ > > > > - .name = "WinFast DTV2000 H", > > > > + .name = "WinFast DTV2000 H ver. I (old)", > > > > .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > > > .radio_type = UNSET, > > > > .tuner_addr = ADDR_UNSET, > > > > @@ -1298,6 +1298,45 @@ > > > > .gpio2 = 0x00017304, > > > > .gpio3 = 0x02000000, > > > > }}, > > > > + .mpeg = CX88_MPEG_DVB, > > > > + }, > > > > + [CX88_BOARD_WINFAST_DTV2000H_2] = { > > > > + /* this is just a try */ > > > > + .name = "WinFast DTV2000 H ver. J (new)", > > > > + .tuner_type = TUNER_PHILIPS_FMD1216ME_MK3, > > > > + .radio_type = UNSET, > > > > + .tuner_addr = ADDR_UNSET, > > > > + .radio_addr = ADDR_UNSET, > > > > + .tda9887_conf = TDA9887_PRESENT, > > > > + .input = { { > > > > + .type = CX88_VMUX_TELEVISION, > > > > + .vmux = 0, > > > > + .gpio0 = 0x00017300, > > > > + .gpio1 = 0x00008207, > > > > + .gpio2 = 0x00000000, > > > > + .gpio3 = 0x02000000, > > > > + }, { > > > > + .type = CX88_VMUX_TELEVISION, > > > > + .vmux = 0, > > > > + .gpio0 = 0x00018300, > > > > + .gpio1 = 0x0000f207, > > > > + .gpio2 = 0x00017304, > > > > + .gpio3 = 0x02000000, > > > > + }, { > > > > + .type = CX88_VMUX_COMPOSITE1, > > > > + .vmux = 1, > > > > + .gpio0 = 0x00018301, > > > > + .gpio1 = 0x0000f207, > > > > + .gpio2 = 0x00017304, > > > > + .gpio3 = 0x02000000, > > > > + }, { > > > > + .type = CX88_VMUX_SVIDEO, > > > > + .vmux = 2, > > > > + .gpio0 = 0x00018301, > > > > + .gpio1 = 0x0000f207, > > > > + .gpio2 = 0x00017304, > > > > + .gpio3 = 0x02000000, > > > > + } }, > > > > .mpeg = CX88_MPEG_DVB, > > > > }, > > > > [CX88_BOARD_GENIATECH_DVBS] = { > > > > @@ -1963,6 +2002,10 @@ > > > > .subdevice = 0x665e, > > > > .card = CX88_BOARD_WINFAST_DTV2000H, > > > > },{ > > > > + .subvendor = 0x107d, > > > > + .subdevice = 0x6f2b, > > > > + .card = CX88_BOARD_WINFAST_DTV2000H_2, > > > > + }, { > > > > .subvendor = 0x18ac, > > > > .subdevice = 0xd800, /* FusionHDTV 3 Gold (original > > > > revision) */ > > > > .card = CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q, > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-dvb.c > > > > --- a/linux/drivers/media/video/cx88/cx88-dvb.c Tue Jun 10 15:27:29 2008 > > > > -0300 > > > > +++ b/linux/drivers/media/video/cx88/cx88-dvb.c Fri Jun 13 15:07:34 2008 > > > > -0300 > > > > @@ -561,6 +561,7 @@ > > > > } > > > > break; > > > > case CX88_BOARD_WINFAST_DTV2000H: > > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > > case CX88_BOARD_HAUPPAUGE_HVR1100: > > > > case CX88_BOARD_HAUPPAUGE_HVR1100LP: > > > > case CX88_BOARD_HAUPPAUGE_HVR1300: > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88-input.c > > > > --- a/linux/drivers/media/video/cx88/cx88-input.c Tue Jun 10 15:27:29 > > > > 2008 -0300 > > > > +++ b/linux/drivers/media/video/cx88/cx88-input.c Fri Jun 13 15:07:34 > > > > 2008 -0300 > > > > @@ -242,6 +242,7 @@ > > > > ir->sampling = 1; > > > > break; > > > > case CX88_BOARD_WINFAST_DTV2000H: > > > > + case CX88_BOARD_WINFAST_DTV2000H_2: > > > > ir_codes = ir_codes_winfast; > > > > ir->gpio_addr = MO_GP0_IO; > > > > ir->mask_keycode = 0x8f8; > > > > > > > > diff -r 04ddbe145932 linux/drivers/media/video/cx88/cx88.h > > > > --- a/linux/drivers/media/video/cx88/cx88.h Tue Jun 10 15:27:29 2008 > > > > -0300 > > > > +++ b/linux/drivers/media/video/cx88/cx88.h Fri Jun 13 15:07:34 2008 > > > > -0300 > > > > @@ -224,6 +224,7 @@ > > > > #define CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD 65 > > > > #define CX88_BOARD_PROLINK_PV_8000GT 66 > > > > #define CX88_BOARD_KWORLD_ATSC_120 67 > > > > +#define CX88_BOARD_WINFAST_DTV2000H_2 68 > > > > > > > > enum cx88_itype { > > > > CX88_VMUX_COMPOSITE1 = 1, > > > > > > > > > > > > > > > > > > > > > > > > Cheers, > Mauro ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2008-08-30 22:36 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-06 23:22 [PATCH][RESEND] New type of DTV2000H TV Card Zbynek Hrabovsky
2008-06-13 18:18 ` Mauro Carvalho Chehab
2008-06-13 21:09 ` André AUZI
2008-06-20 21:57 ` Zbynek Hrabovsky
2008-06-20 21:52 ` Zbynek Hrabovsky
[not found] ` <f4d5b6dd0806201352h4538072fy20f6187f54f81bae@mail.gmail.com>
2008-06-28 17:56 ` Zbynek Hrabovsky
2008-06-29 12:13 ` Mauro Carvalho Chehab
2008-08-30 22:35 ` Nicolas Marot
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox