diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/compat.h | 28 | ||||
| -rw-r--r-- | v4l/obsolete.txt | 18 | ||||
| -rwxr-xr-x | v4l/scripts/au0828.pl | 48 | ||||
| -rwxr-xr-x | v4l/scripts/cardlist | 7 | ||||
| -rwxr-xr-x | v4l/scripts/hghead.pl | 2 | ||||
| -rw-r--r-- | v4l/versions.txt | 5 |
6 files changed, 105 insertions, 3 deletions
diff --git a/v4l/compat.h b/v4l/compat.h index ea7d49acf..04950ea74 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -533,6 +533,8 @@ do { \ le16_to_cpu(get_unaligned((unsigned short *)(a))) #define put_unaligned_le16(r, a) \ put_unaligned(cpu_to_le16(r), ((unsigned short *)(a))) +#endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) #ifdef CONFIG_PROC_FS static inline struct proc_dir_entry *proc_create(const char *a, mode_t b, struct proc_dir_entry *c, const struct file_operations *d) @@ -547,7 +549,33 @@ static inline struct proc_dir_entry *proc_create(const char *a, } return e; } + +static inline struct proc_dir_entry *proc_create_data(const char *a, + mode_t b, struct proc_dir_entry *c, const struct file_operations *d, + void *f) +{ + struct proc_dir_entry *e; + + e = create_proc_entry(a, b, c); + if (e) { + e->owner = THIS_MODULE; + e->proc_fops = d; + e->data = f; + } + return e; +} +#endif #endif + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) +#define div64_u64(a,b) div64_64(a,b) + +#define clamp( x, l, h ) max_t( __typeof__( x ), \ + ( l ), \ + min_t( __typeof__( x ), \ + ( h ), \ + ( x ) ) ) + #endif #endif diff --git a/v4l/obsolete.txt b/v4l/obsolete.txt index 384224df8..e720a48b8 100644 --- a/v4l/obsolete.txt +++ b/v4l/obsolete.txt @@ -3,3 +3,21 @@ video/video-buf # This file were replaced by videobuf-dvb video/video-buf-dvb + +# Those drivers were moved to common/tuners +dvb/frontends/mt2060 +dvb/frontends/mt2131 +dvb/frontends/mt2266 +dvb/frontends/qt1010 +dvb/frontends/tda18271 +dvb/frontends/tda827x +dvb/frontends/xc5000 +video/mt20xx +video/tda8290 +video/tda9887 +video/tea5761 +video/tea5767 +video/tuner-simple +video/tuner-types +video/tuner-xc2028 + diff --git a/v4l/scripts/au0828.pl b/v4l/scripts/au0828.pl new file mode 100755 index 000000000..822a54afb --- /dev/null +++ b/v4l/scripts/au0828.pl @@ -0,0 +1,48 @@ +#!/usr/bin/perl -w +use strict; + +my $new_entry = -1; +my $nr = 0; +my ($id,$subvendor,$subdevice); +my %data; + +while (<>) { + # defines in header file + if (/#define\s+(AU08[\d]._BOARD_\w+)\s+(\d+)/) { + $data{$1}->{nr} = $2; + next; + } + # au0828_boards + if (/\[(AU0828_BOARD_\w+)\]/) { + $id = $1; + $data{$id}->{id} = $id; + $data{$id}->{type} = "(au0828)"; +# $data{$id}->{nr} = $nr++; + }; + + next unless defined($id); + + if (/USB_DEVICE.*0x([0-9a-fA-F]*).*0x([0-9a-fA-F]*)/ ) { + $subvendor=$1; + $subdevice=$2; + } + + if (/.*driver_info.*(AU08[\d]._BOARD_\w+)/ ) { + push @{$data{$1}->{subid}}, "$subvendor:$subdevice"; + } + + if (!defined($data{$id}) || !defined($data{$id}->{name})) { + $data{$id}->{name} = $1 if (/\.name\s*=\s*\"([^\"]+)\"/); + } + + # au0828_USB_tbl + + +} + +foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) { + printf("%3d -> %-40s %-15s", $data{$item}->{nr}, $data{$item}->{name},$data{$item}->{type}); + printf(" [%s]",join(",",@{$data{$item}->{subid}})) + if defined($data{$item}->{subid}); + print "\n"; +} diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist index 3e5213975..7c903539c 100755 --- a/v4l/scripts/cardlist +++ b/v4l/scripts/cardlist @@ -6,10 +6,10 @@ scripts/bttv.pl ../linux/drivers/media/video/bt8xx/bttv.h ../linux/drivers/medi scripts/cx88.pl ../linux/drivers/media/video/cx88/cx88.h ../linux/drivers/media/video/cx88/cx88-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx88 -scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx-cards.c \ +scripts/em28xx.pl ../linux/drivers/media/video/em28xx/em28xx-cards.c ../linux/drivers/media/video/em28xx/em28xx.h \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.em28xx -scripts/tuner.pl ../linux/include/media/tuner.h ../linux/drivers/media/video/tuner-types.c \ +scripts/tuner.pl ../linux/include/media/tuner.h ../linux/drivers/media/common/tuners/tuner-types.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.tuner scripts/saa7134.pl ../linux/drivers/media/video/saa7134/saa7134.h ../linux/drivers/media/video/saa7134/saa7134-cards.c \ @@ -20,3 +20,6 @@ scripts/usbvision.pl ../linux/drivers/media/video/usbvision/usbvision-cards.h .. scripts/cx23885.pl ../linux/drivers/media/video/cx23885/cx23885.h ../linux/drivers/media/video/cx23885/cx23885-cards.c \ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.cx23885 + +scripts/au0828.pl ../linux/drivers/media/video/au0828/au0828-cards.h ../linux/drivers/media/video/au0828/au0828-cards.c \ + | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.au0828 diff --git a/v4l/scripts/hghead.pl b/v4l/scripts/hghead.pl index 9a6389311..1eb7355c4 100755 --- a/v4l/scripts/hghead.pl +++ b/v4l/scripts/hghead.pl @@ -25,7 +25,7 @@ my $fromname=""; open IN, "<$in"; while ($line = <IN>) { - if ($line =~ m/Index.*/) { + if ($line =~ m/^\s*Index.*/) { last; } if ($line =~ m/^diff .*/) { diff --git a/v4l/versions.txt b/v4l/versions.txt index 221f4f547..54be82237 100644 --- a/v4l/versions.txt +++ b/v4l/versions.txt @@ -126,7 +126,9 @@ VIDEO_SAA7127 VIDEO_UPD64031A VIDEO_UPD64083 VIDEO_IVTV +VIDEO_CX18 VIDEO_EM28XX +VIDEO_AU0828 DVB DVB_CORE DVB_AV7110 @@ -201,6 +203,9 @@ DVB_TUNER_MT2060 DVB_TUNER_MT2131 DVB_TDA827X DVB_TDA18271 +DVB_AU8522 +DVB_TDA10048 +DVB_S5H1411 VIDEO_SAA7146 VIDEO_SAA7146_VV VIDEO_TUNER |