33_saa7134-2.6.5.diff.gz
PATCH 1/1 33_saa7134-2.6.5.diff.gz
Hi,
This is a update for the saa7134 driver. Changes:
* add cropping support.
* fix Makefile to build the saa6752hs module.
* fix locking bug in oss dsp driver.
* infrared remote keytable update.
* some card-specific fixes.
please apply,
Gerd
drivers/media/video/saa7134/Makefile +1 -1
@@ -3,6 +3,6 @@ saa7134-objs := saa7134-cards.o saa7134- saa7134-oss.o saa7134-ts.o saa7134-tvaudio.o \ saa7134-vbi.o saa7134-video.o saa7134-input.o -obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o +obj-$(CONFIG_VIDEO_SAA7134) += saa7134.o saa6752hs.o EXTRA_CFLAGS = -I$(src)/..
drivers/media/video/saa7134/saa7134-cards.c +4 -2
@@ -2,7 +2,7 @@* device driver for philips saa7134 based TV cards * card-specific stuff. * -* (c) 2001-03 Gerd Knorr <[email protected]> [SuSE Labs] +* (c) 2001-04 Gerd Knorr <[email protected]> [SuSE Labs] * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -732,7 +732,9 @@ struct saa7134_board saa7134_boards[] = [SAA7134_BOARD_ASUSTEK_TVFM7133] = { .name = "ASUS TV-FM 7133", .audio_clock = 0x00187de7, - .tuner_type = TUNER_PHILIPS_FM1236_MK3, +// probably wrong, the 7133 one is the NTSC version ... +// .tuner_type = TUNER_PHILIPS_FM1236_MK3 + .tuner_type = TUNER_LG_NTSC_NEW_TAPC, .need_tda9887 = 1, .inputs = {{ .name = name_tv,
drivers/media/video/saa7134/saa7134-core.c +2 -2
@@ -101,7 +101,7 @@ unsigned int saa7134_devcount;/* debug help functions */ static const char *v4l1_ioctls[] = { -"0" ,"CGAP" ,"GCHAN" ,"SCHAN" ,"GTUNER" ,"STUNER" ,"GPICT" ,"SPICT" , +"0" ,"GCAP" ,"GCHAN" ,"SCHAN" ,"GTUNER" ,"STUNER" ,"GPICT" ,"SPICT" ,"CCAPTURE" ,"GWIN" ,"SWIN" ,"GFBUF" ,"SFBUF" ,"KEY" ,"GFREQ" ,"SFREQ" ,"GAUDIO" ,"SAUDIO" ,"SYNC" ,"MCAPTURE" ,"GMBUF" ,"GUNIT" ,"GCAPTURE" ,"SCAPTURE" ,"SPLAYMODE" ,"SWRITEMODE" ,"GPLAYINFO" ,
@@ -466,7 +466,7 @@ int saa7134_set_dmabits(struct saa7134_d }/* audio capture -- dma 3 */ -if (dev->oss.recording) { +if (dev->oss.dma_running) { ctrl |=SAA7134_MAIN_CTRL_TE6 ; irq |=SAA7134_IRQ1_INTE_RA3_1 |SAA7134_IRQ1_INTE_RA3_0 ;
drivers/media/video/saa7134/saa7134-input.c +13 -13
@@ -100,42 +100,42 @@ static IR_KEYTAB_TYPE cinergy_codes[IR_K [ 0x23 ] = KEY_STOP, }; -/* Alfons Geser <[email protected]> */ +/* Alfons Geser <[email protected]> +* updates from Job D. R. Borges <[email protected]> */ static IR_KEYTAB_TYPE eztv_codes[IR_KEYTAB_SIZE ] = { [18 ] =KEY_POWER , [1 ] =KEY_TV ,// DVR - [21 ] =KEY_VIDEO ,// DVD + [21 ] =KEY_DVD ,// DVD [23 ] =KEY_AUDIO ,// music -// DVR mode / DVD mode / music mode [27 ] =KEY_MUTE ,// mute - [2 ] =KEY_RESERVED ,// MTS/SAP / audio /autoseek - [30 ] =KEY_RESERVED ,// closed captioning / subtitle / seek + [2 ] =KEY_LANGUAGE ,// MTS/SAP / audio / autoseek + [30 ] =KEY_SUBTITLE ,// closed captioning / subtitle / seek [22 ] =KEY_ZOOM ,// full screen - [28 ] =KEY_RESERVED ,// video source / eject /delall - [29 ] =KEY_RESERVED ,// playback / angle /del + [28 ] =KEY_VIDEO ,// video source / eject / delall + [29 ] =KEY_RESTART ,// playback / angle / del [47 ] =KEY_SEARCH ,// scan / menu / playlist - [48 ] =KEY_RESERVED ,// CH surfing / bookmark / memo + [48 ] =KEY_CHANNEL ,// CH surfing / bookmark / memo [49 ] =KEY_HELP ,// help - [50 ] =KEY_RESERVED ,// num/memo + [50 ] =KEY_MODE ,// num/memo [51 ] =KEY_ESC ,// cancel [12 ] =KEY_UP ,// up [16 ] =KEY_DOWN ,// down [8 ] =KEY_LEFT ,// left [4 ] =KEY_RIGHT ,// right - [3 ] =KEY_ENTER ,// select + [3 ] =KEY_SELECT ,// select [31 ] =KEY_REWIND ,// rewind [32 ] =KEY_PLAYPAUSE ,// play/pause [41 ] =KEY_FORWARD ,// forward - [20 ] =KEY_RESERVED ,// repeat + [20 ] =KEY_AGAIN ,// repeat [43 ] =KEY_RECORD ,// recording [44 ] =KEY_STOP ,// stop [45 ] =KEY_PLAY ,// play - [46 ] =KEY_RESERVED ,// snapshot + [46 ] =KEY_SHUFFLE ,// snapshot / shuffle [0 ] =KEY_KP0 , [5 ] =KEY_KP1 ,
@@ -147,7 +147,7 @@ static IR_KEYTAB_TYPE eztv_codes[IR_KEYT [ 13 ] = KEY_KP7, [ 14 ] = KEY_KP8, [ 15 ] = KEY_KP9, - + [ 42 ] = KEY_VOLUMEUP, [ 17 ] = KEY_VOLUMEDOWN, [ 24 ] = KEY_CHANNELUP, // CH.tracking up
drivers/media/video/saa7134/saa7134-oss.c +37 -16
151 lines not on this page · raw message
drivers/media/video/saa7134/saa7134-tvaudio.c +5 -4
@@ -60,8 +60,9 @@ MODULE_PARM_DESC(audio_clock_tweak, "Aud#define print_regb (reg) printk("%s: reg 0x%03x [%-16s]: 0x%02x\n", \ dev->name,(SAA7134_##reg),(#reg),saa_readb((SAA7134_##reg))) -#define SCAN_INITIAL_DELAY (HZ) -#define SCAN_SAMPLE_DELAY (HZ/5) +#define SCAN_INITIAL_DELAY (HZ) +#define SCAN_SAMPLE_DELAY (HZ/5) +#define SCAN_SUBCARRIER_DELAY (HZ*2)/* ------------------------------------------------------------------ */ /* saa7134 code */
@@ -145,7 +146,7 @@ static void tvaudio_init(struct saa7134_if (UNSET != audio_clock_override) clock = audio_clock_override; - +/* init all audio registers */ saa_writeb (SAA7134_AUDIO_PLL_CTRL ,0x00 );if (need_resched ())
@@ -557,7 +558,7 @@ static int tvaudio_thread(void *data)if (UNSET == audio) audio = i;tvaudio_setmode (dev,&tvaudio[i],"trying" ); -if (tvaudio_sleep (dev,HZ *2 )) +if (tvaudio_sleep (dev,SCAN_SUBCARRIER_DELAY )) goto restart;if (-1 !=tvaudio_getstereo (dev,&tvaudio[i])) { audio = i;
drivers/media/video/saa7134/saa7134-video.c +118 -35
256 lines not on this page · raw message
drivers/media/video/saa7134/saa7134.h +9 -5
@@ -19,7 +19,7 @@*/ #include <linux/version.h> -#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,9) +#define SAA7134_VERSION_CODE KERNEL_VERSION(0,2,11)#include <linux/pci.h> #include <linux/i2c.h>
@@ -73,8 +73,6 @@ enum saa7134_video_out {struct saa7134_tvnorm {char *name;v4l2_std_id id; -unsigned int width; -unsigned int height;/* video decoder */ unsigned int sync_control;
@@ -301,7 +299,8 @@ struct saa7134_oss {unsigned int afmt;unsigned int rate;unsigned int channels; -unsigned int recording; +unsigned int recording_on; +unsigned int dma_running;unsigned int blocks;unsigned int blksize;unsigned int bufsize;
@@ -394,7 +393,12 @@ struct saa7134_dev {int ctl_mirror;int ctl_y_odd;int ctl_y_even; - + +/* crop */ +struct v4l2_rect crop_bounds; +struct v4l2_rect crop_defrect; +struct v4l2_rect crop_current; +/* other global state info */ unsigned int automute;struct saa7134_thread thread;
Signature · 1 line
http://bigendian.bytesex.org