summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Kconfig.staging44
-rw-r--r--v4l/Makefile8
-rwxr-xr-xv4l/scripts/cardlist3
-rwxr-xr-xv4l/scripts/fix_dvb_customise.pl3
-rwxr-xr-xv4l/scripts/make_kconfig.pl3
-rwxr-xr-xv4l/scripts/make_makefile.pl18
-rw-r--r--v4l/scripts/saa7164.pl57
-rw-r--r--v4l/versions.txt16
8 files changed, 147 insertions, 5 deletions
diff --git a/v4l/Kconfig.staging b/v4l/Kconfig.staging
new file mode 100644
index 000000000..0ca923421
--- /dev/null
+++ b/v4l/Kconfig.staging
@@ -0,0 +1,44 @@
+menuconfig STAGING
+ bool "Staging drivers"
+ default n
+ ---help---
+ This option allows you to select a number of drivers that are
+ not of the "normal" Linux kernel quality level. These drivers
+ are placed here in order to get a wider audience for use of
+ them. Please note that these drivers are under heavy
+ development, may or may not work, and may contain userspace
+ interfaces that most likely will be changed in the near
+ future.
+
+ Using any of these drivers will taint your kernel which might
+ affect support options from both the community, and various
+ commercial support orginizations.
+
+ If you wish to work on these drivers, to help improve them, or
+ to report problems you have with them, please see the
+ driver_name.README file in the drivers/staging/ directory to
+ see what needs to be worked on, and who to contact.
+
+ If in doubt, say N here.
+
+if STAGING
+menu "Media devices in staging"
+
+config STAGING_BROKEN
+ bool "Enable drivers that are known to not compile"
+ default n
+ --- help ---
+ Say N here, except if you will be fixing the drivers
+ compilation.
+
+source "../linux/drivers/staging/go7007/Kconfig"
+source "../linux/drivers/staging/cx25821/Kconfig"
+source "../linux/drivers/staging/tm6000/Kconfig"
+
+# Currently, there are no broken staging drivers with Kernel 2.6.31
+# if STAGING_BROKEN
+# endif
+
+endmenu
+
+endif # STAGING
diff --git a/v4l/Makefile b/v4l/Makefile
index 29b9675ae..6fe949f27 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -58,12 +58,15 @@ v4l2-spec::
$(MAKE) -C ../v4l2-spec
man::
- $(MAKE) -C ../v4l2-spec man
+ $(MAKE) -C ../media-specs man
dvb-spec::
$(MAKE) -C ../dvb-spec/dvbapi
-spec:: v4l2-spec dvb-spec
+media-spec::
+ $(MAKE) -C ../media-specs
+
+spec:: media-spec
apps::
$(MAKE) -C ../v4l2-apps
@@ -278,6 +281,7 @@ links::
@echo creating symbolic links...
@find ../linux/drivers/media -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
@find ../linux/sound -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
+ @find ../linux/drivers/staging -name '*.[ch]' -type f -print0 | xargs -0n 255 ln -sf --target-directory=.
# This link is so code with #include "oss/*.h" will find its header files
oss:
diff --git a/v4l/scripts/cardlist b/v4l/scripts/cardlist
index 7c903539c..ebf372610 100755
--- a/v4l/scripts/cardlist
+++ b/v4l/scripts/cardlist
@@ -23,3 +23,6 @@ scripts/cx23885.pl ../linux/drivers/media/video/cx23885/cx23885.h ../linux/drive
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
+
+scripts/saa7164.pl ../linux/drivers/media/video/saa7164/saa7164.h ../linux/drivers/media/video/saa7164/saa7164-cards.c \
+ | perl -ne 's/[ \t]+$//; print' > ../linux/Documentation/video4linux/CARDLIST.saa7164
diff --git a/v4l/scripts/fix_dvb_customise.pl b/v4l/scripts/fix_dvb_customise.pl
index 86a6bcf8c..04aa1350c 100755
--- a/v4l/scripts/fix_dvb_customise.pl
+++ b/v4l/scripts/fix_dvb_customise.pl
@@ -182,7 +182,8 @@ sub found_ref($$)
my $ref = $driver_config{$n};
printf "$ref needs %s\n", $header if ($debug);
- if ($ref =~ m/(PVRUSB2|CX23885|CX88|EM28XX|SAA3134)/) {
+ if ($ref =~ m/(PVRUSB2|CX23885|CX88|EM28XX|SAA3134
+ |SAA7164)/) {
$ref .="_DVB";
}
diff --git a/v4l/scripts/make_kconfig.pl b/v4l/scripts/make_kconfig.pl
index 4690f6ab4..8e0504b61 100755
--- a/v4l/scripts/make_kconfig.pl
+++ b/v4l/scripts/make_kconfig.pl
@@ -585,6 +585,7 @@ EOF
open_kconfig('../linux', '../linux/drivers/media/Kconfig');
open_kconfig('.', './Kconfig.sound');
+open_kconfig('.', './Kconfig.staging');
close OUT;
# These options should default to off
@@ -592,6 +593,8 @@ disable_config('DVB_AV7110_FIRMWARE');
disable_config('DVB_CINERGYT2_TUNING');
disable_config('VIDEO_HELPER_CHIPS_AUTO');
disable_config('VIDEO_FIXED_MINOR_RANGES');
+disable_config('STAGING');
+disable_config('STAGING_BROKEN');
$intopt { "DVB_MAX_ADAPTERS" } = 8;
# Check dependencies
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 35ab7dddf..b49f960d1 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -1,5 +1,6 @@
#!/usr/bin/perl
use FileHandle;
+use File::Find;
my %instdir = ();
@@ -185,11 +186,23 @@ sub removeubuntu()
print OUT " fi\n";
}
+sub parse_dir()
+{
+ my $file = $File::Find::name;
+
+ return if (!($file =~ /Makefile$/));
+ open_makefile($file);
+}
+
+##############################################################################
+
getobsolete();
open OUT, '>Makefile.media' or die 'Unable to write Makefile.media';
open_makefile('../linux/drivers/media/Makefile');
+find({wanted => \&parse_dir, no_chdir => 1}, '../linux/drivers/staging');
+
# Creating Install rule
print OUT "media-install::\n";
@@ -234,9 +247,12 @@ while ( my ($dir, $files) = each(%instdir) ) {
print OUT " rm \$(DESTDIR)\$(KDIR26)/$dir/\$\$i.gz; fi; done; echo;\n\n";
}
+my $mediadeps = join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir));
+$mediadeps =~ s,\.\./linux/drivers/media/\.\.,..,g;
+
# Print dependencies of Makefile.media
print OUT "Makefile.media: ../linux/drivers/media/Makefile \\\n";
print OUT "\tobsolete.txt \\\n";
-print OUT join(" \\\n", map("\t../linux/drivers/media/$_/Makefile", keys %instdir));
+print OUT $mediadeps;
print OUT "\n";
close OUT;
diff --git a/v4l/scripts/saa7164.pl b/v4l/scripts/saa7164.pl
new file mode 100644
index 000000000..95c5eb579
--- /dev/null
+++ b/v4l/scripts/saa7164.pl
@@ -0,0 +1,57 @@
+#!/usr/bin/perl -w
+use strict;
+
+my %map = (
+ "PCI_ANY_ID" => "0",
+);
+
+sub fix_id($) {
+ my $id = shift;
+ $id = $map{$id} if defined($map{$id});
+ $id =~ s/^0x//;
+ return $id;
+}
+
+my $new_entry = -1;
+my $nr = 0;
+my ($id,$subvendor,$subdevice);
+my %data;
+
+while (<>) {
+ # defines in header file
+ if (/#define\s+(SAA7164_BOARD_\w+)\s+(\d+)/) {
+ $data{$1}->{nr} = $2;
+ next;
+ }
+ # saa7164_boards
+ if (/\[(SAA7164_BOARD_\w+)\]/) {
+ $id = $1;
+ $data{$id}->{id} = $id;
+# $data{$id}->{nr} = $nr++;
+ };
+ next unless defined($id);
+
+ if (!defined($data{$id}) || !defined($data{$id}->{name})) {
+ $data{$id}->{name} = $1 if (/\.name\s*=\s*\"([^\"]+)\"/);
+ }
+
+ # saa7164_pci_tbl
+ $subvendor = fix_id($1) if (/\.subvendor\s*=\s*(\w+),/);
+ $subdevice = fix_id($1) if (/\.subdevice\s*=\s*(\w+),/);
+ if (/.card\s*=\s*(\w+),/) {
+ if (defined($data{$1}) &&
+ defined($subvendor) && $subvendor ne "0" &&
+ defined($subdevice) && $subdevice ne "0") {
+ push @{$data{$1}->{subid}}, "$subvendor:$subdevice";
+ undef $subvendor;
+ undef $subdevice;
+ }
+ }
+}
+
+foreach my $item (sort { $data{$a}->{nr} <=> $data{$b}->{nr} } keys %data) {
+ printf("%3d -> %-51s", $data{$item}->{nr}, $data{$item}->{name});
+ printf(" [%s]",join(",",@{$data{$item}->{subid}}))
+ if defined($data{$item}->{subid});
+ print "\n";
+}
diff --git a/v4l/versions.txt b/v4l/versions.txt
index 1995c9006..54108741d 100644
--- a/v4l/versions.txt
+++ b/v4l/versions.txt
@@ -7,6 +7,18 @@ VIDEO_VPSS_SYSTEM
VIDEO_VPFE_CAPTURE
VIDEO_DM6446_CCDC
VIDEO_DM355_CCDC
+# Start version for those drivers - probably compile with older versions
+VIDEO_CX25821
+VIDEO_CX25821_ALSA
+
+# follow_pfn needed by VIDEOBUF_DMA_CONTIG and drivers that use it
+VIDEOBUF_DMA_CONTIG
+VIDEOBUF_VMALLOC
+DISPLAY_DAVINCI_DM646X_EVM
+VIDEO_VPFE_CAPTURE
+VIDEO_MX1
+VIDEO_MX3
+VIDEO_SH_MOBILE_CEU
[2.6.29]
# Needs defines that are only available from 2.6.29
@@ -28,6 +40,7 @@ SOC_CAMERA_PLATFORM
VIDEO_TVP514X
# requires id_table and new i2c stuff
RADIO_TEA5764
+VIDEO_SAA7164
VIDEO_THS7303
VIDEO_ADV7343
RADIO_SI4713
@@ -72,8 +85,9 @@ USB_GSPCA_SQ905C
VIDEO_HDPVR
[2.6.19]
-#This driver were developed at kernel 2.6.19, requiring vmalloc_user/remap_vmalloc_range
+# requires vmalloc_user/remap_vmalloc_range
VIDEO_CAFE_CCIC
+VIDEO_TM6000
#struct device vs struct class_device issues
USB_ET61X251
USB_SN9C102
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-28 07:14:14 +0000