V4L CX88 patch - against 2.6.12-mm2
PATCH 1/1 V4L CX88 patch - against 2.6.12-mm2
- Add support for ADS Tech Instant TV DVB-T PCI.
- Remove obsoleted config options.
- Fix DViCO Board names
- Remove CABLE type setting from DViCO FusionHDTV3 Gold-T.
- Fix compilation with gcc4.0.
- V4L2_TUNER_CAP_LOW implemented according with V4L2 API for Radio.
- radio range is now defined on tuner-core.c. Cleaning up.
- Fix a bug on frequency report for cx88 based cards.
- Added support for changing radio mode stereo/mono.
- Add remove for MSI TV@nywhere.
linux/drivers/media/video/cx88/cx88-cards.c | 50 +++++++--- linux/drivers/media/video/cx88/cx88-core.c | 21 +--- linux/drivers/media/video/cx88/cx88-dvb.c | 5 - linux/drivers/media/video/cx88/cx88-input.c | 100 +++++++++++++++++++- linux/drivers/media/video/cx88/cx88-video.c | 57 +++++------ linux/drivers/media/video/cx88/cx88.h | 9 - 6 files changed, 173 insertions(+), 69 deletions(-)
drivers/media/video/cx88/cx88.h +4 -5
@@ -1,5 +1,5 @@/* -* $Id: cx88.h,v 1.62 2005/06/12 04:19:19 mchehab Exp $ +* $Id: cx88.h,v 1.66 2005/06/22 22:58:04 mchehab Exp $ * * v4l2 device driver for cx2388x based TV cards *
@@ -51,8 +51,6 @@/* ----------------------------------------------------------- */ /* defines and enums */ -#define V4L2_I2C_CLIENTS 1 -#define FORMAT_FLAGS_PACKED 0x01#define FORMAT_FLAGS_PLANAR 0x02
@@ -159,7 +157,7 @@#define CX88_BOARD_KWORLD_DVB_T 14#define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1 15#define CX88_BOARD_KWORLD_LTV883 16 -#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD 17 +#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_Q 17#define CX88_BOARD_HAUPPAUGE_DVB_T1 18#define CX88_BOARD_CONEXANT_DVB_T1 19#define CX88_BOARD_PROVIDEO_PV259 20
@@ -167,10 +165,11 @@#define CX88_BOARD_PCHDTV_HD3000 22#define CX88_BOARD_DNTV_LIVE_DVB_T 23#define CX88_BOARD_HAUPPAUGE_ROSLYN 24 -#define CX88_BOARD_DIGITALLOGIC_MEC 25 +#define CX88_BOARD_DIGITALLOGIC_MEC 25#define CX88_BOARD_IODATA_GVBCTV7E 26#define CX88_BOARD_PIXELVIEW_PLAYTV_ULTRA_PRO 27#define CX88_BOARD_DVICO_FUSIONHDTV_3_GOLD_T 28 +#define CX88_BOARD_ADSTECH_DVB_T_PCI 29enum cx88_itype {CX88_VMUX_COMPOSITE1 =1 ,
drivers/media/video/cx88/cx88-cards.c +36 -14
110 lines not on this page · raw message
drivers/media/video/cx88/cx88-core.c +5 -16
@@ -1,5 +1,5 @@/* -* $Id: cx88-core.c,v 1.28 2005/06/12 04:19:19 mchehab Exp $ +* $Id: cx88-core.c,v 1.31 2005/06/22 22:58:04 mchehab Exp $ * * device driver for Conexant 2388x based TV cards * driver core
@@ -545,12 +545,14 @@ core->name,cx_read(ch->cnt2_reg)); } +/* Used only on cx88-core */ static char *cx88_pci_irqs[32 ] = {"vid" ,"aud" ,"ts" ,"vip" ,"hst" ,"5" ,"6" ,"tm1" ,"src_dma" ,"dst_dma" ,"risc_rd_err" ,"risc_wr_err" ,"brdg_err" ,"src_dma_err" ,"dst_dma_err" ,"ipb_dma_err" ,"i2c" ,"i2c_rack" ,"ir_smp" ,"gpio0" ,"gpio1" }; +/* Used only on cx88-video */ char *cx88_vid_irqs[32 ] = {"y_risci1" ,"u_risci1" ,"v_risci1" ,"vbi_risc1" ,"y_risci2" ,"u_risci2" ,"v_risci2" ,"vbi_risc2" ,
@@ -558,6 +560,7 @@"y_sync" ,"u_sync" ,"v_sync" ,"vbi_sync" , "opc_err", "par_err", "rip_err", "pci_abort", }; +/* Used only on cx88-mpeg */ char *cx88_mpeg_irqs[32 ] = {"ts_risci1" ,NULL ,NULL ,NULL , "ts_risci2", NULL, NULL, NULL,
@@ -1006,21 +1009,7 @@set_tvaudio (core);// tell i2c chips -#ifdef V4L2_I2C_CLIENTS cx88_call_i2c_clients (core,VIDIOC_S_STD ,&norm->id); -#else - { -struct video_channel c; -memset (&c,0 ,sizeof (c)); - c.channel = core->input; - c.norm =VIDEO_MODE_PAL ; -if ((norm->id & (V4L2_STD_NTSC_M |V4L2_STD_NTSC_M_JP ))) - c.norm =VIDEO_MODE_NTSC ; -if (norm->id &V4L2_STD_SECAM ) - c.norm =VIDEO_MODE_SECAM ; -cx88_call_i2c_clients (core,VIDIOCSCHAN ,&c); - } -#endif // done return 0 ;
@@ -1187,7 +1176,7 @@ core->radio_addr = cx88_boards[core->board].radio_addr;printk (KERN_INFO "TV tuner %d at 0x%02x, Radio tuner %d at 0x%02x\n" , - core->tuner_type, core->tuner_addr<<1 , + core->tuner_type, core->tuner_addr<<1 , core->radio_type, core->radio_addr<<1 ); core->tda9887_conf = cx88_boards[core->board].tda9887_conf;
drivers/media/video/cx88/cx88-video.c +28 -29
109 lines not on this page · raw message
drivers/media/video/cx88/cx88-input.c +97 -3
125 lines not on this page · raw message
drivers/media/video/cx88/cx88-dvb.c +3 -2
@@ -1,5 +1,5 @@/* -* $Id: cx88-dvb.c,v 1.33 2005/06/12 04:19:19 mchehab Exp $ +* $Id: cx88-dvb.c,v 1.36 2005/06/21 06:08:12 mkrufky Exp $ * * device driver for Conexant 2388x based TV cards * MPEG Transport Stream (DVB) routines
@@ -183,7 +183,7 @@#endif #if HAVE_OR51132 -static int or51132_set_ts_param (struct dvb_frontend * fe, +static int or51132_set_ts_param (struct dvb_frontend * fe,int is_punctured) {struct cx8802_dev *dev= fe->dvb->priv;
@@ -231,6 +231,7 @@break ;case CX88_BOARD_KWORLD_DVB_T :case CX88_BOARD_DNTV_LIVE_DVB_T : +case CX88_BOARD_ADSTECH_DVB_T_PCI : dev->core->pll_addr =0x61 ; dev->core->pll_desc = &dvb_pll_unknown_1; dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config,
Hi Mauro,
Your patch adds trailing whitespace in various places:
Review
Quoted 11 lines
(quoted diff) +4
-4- core->tuner_type, core->tuner_addr<<1, + core->tuner_type, core->tuner_addr<<1, - ir->mask_keycode = 0x8f8; + ir->mask_keycode = 0x8f8; - ir->mask_keycode = 0x1f; + ir->mask_keycode = 0x1f; -static int or51132_set_ts_param(struct dvb_frontend* fe, +static int or51132_set_ts_param(struct dvb_frontend* fe,
Six people signing this patch and nobody noticed? Amazing.
Please fix, thanks.
Signature · 1 line
Jean Delvare
Quoted 2 lines · Jean Delvare
Your patch adds trailing whitespace in various places:
Everybody adds trailing whitespace, although usually not so obviously. I remove it again.
In this case I expect the hunks which you've noticed came about because of my cleanup of a previous v4l patch, and whatever system the v4l team are using is trying to revert upstream changes which aren't in their tree.
But whatever. `patch -l' works.
Quoted 11 lines · Andrew Morton
Quoted 1 line · Jean Delvare
Your patch adds trailing whitespace in various places:
Everybody adds trailing whitespace, although usually not so obviously. I remove it again.
In this case I expect the hunks which you've noticed came about because of my cleanup of a previous v4l patch, and whatever system the v4l team are using is trying to revert upstream changes which aren't in their tree.
It wont revert. We are taking care to double check the patches against
undesirable regressions.
Quoted 4 lines
But whatever. `patch -l' works.
Quoted 1 line · Jean Delvare
Your patch adds trailing whitespace in various places:
[snip]
Quoted 3 lines
Six people signing this patch and nobody noticed? Amazing.
Please fix, thanks.
Also:
drivers/media/video/cx88/cx88-core.c line 549
Quoted 5 lines
drivers/media/video/cx88/cx88-core.c +1
-0+/* Used only on cx88-core */ static char *cx88_pci_irqs[32 ] = {
"static" already said that.
Quoted 2 lines
+/* Used only on cx88-video */
char *cx88_vid_irqs[32] = {
So move it there.
Quoted 2 lines
+/* Used only on cx88-mpeg */
char *cx88_mpeg_irqs[32] = {
Move this too.
Quoted 5 lines
drivers/media/video/cx88/cx88-input.c +2
-0+static IR_KEYTAB_TYPE ir_codes_msi_tvanywhere[IR_KEYTAB_SIZE ] = { + [0x00 ] =KEY_0 ,/* '0' */
drivers/media/video/cx88/cx88-input.c line 190
Quoted 10 lines
drivers/media/video/cx88/cx88-input.c +10
-0+ [ 0x01 ] = KEY_1, /* '1' */ + [ 0x02 ] = KEY_2, /* '2' */ + [ 0x03 ] = KEY_3, /* '3' */ + [ 0x04 ] = KEY_4, /* '4' */ + [ 0x05 ] = KEY_5, /* '5' */ + [ 0x06 ] = KEY_6, /* '6' */ + [ 0x07 ] = KEY_7, /* '7' */ + [ 0x08 ] = KEY_8, /* '8' */ + [ 0x09 ] = KEY_9, /* '9' */ + [ 0x0c ] = KEY_MUTE, /* 'Mute' */
Duplicating comments.
Quoted 1 line
+ [
0x10] =KEY_F, /* 'Funtion' */
Function.
drivers/media/video/cx88/cx88-input.c line 196
Quoted 3 lines
drivers/media/video/cx88/cx88-input.c +2
-0+ [ 0x12 ] = KEY_POWER, /* 'Power' */ + [ 0x14 ] = KEY_SLOW, /* 'Slow' */
Duplicating comments.
Quoted 1 line · Mauro Carvalho Chehab
- Add remove for MSI TV@nywhere.
You mean of course "Add remote" not "Add remove"...
- D