summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-01 12:10:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-01 12:10:52 +0000
commit528412f5c72a6c839c039033594056a727e8a50e (patch)
treeedab2548a7f9f7573fd18fe064cdc6d8325f3701
parent1121561ce55ea65445b52a2cc2c85029df401f2d (diff)
downloadldetect-lst-528412f5c72a6c839c039033594056a727e8a50e.tar
ldetect-lst-528412f5c72a6c839c039033594056a727e8a50e.tar.gz
ldetect-lst-528412f5c72a6c839c039033594056a727e8a50e.tar.bz2
ldetect-lst-528412f5c72a6c839c039033594056a727e8a50e.tar.xz
ldetect-lst-528412f5c72a6c839c039033594056a727e8a50e.zip
add some better checking especially for titi. use "make check"!!
-rw-r--r--Makefile3
-rwxr-xr-xconvert/merge2pcitable.pl6
-rw-r--r--lst/Makefile4
3 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index ea16ed6c..f8c156af 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,9 @@ include Makefile.config
build:
make -C lst build
+check:
+ make -C lst check
+
clean:
rm -f *~
make -C lst clean
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl
index 0a79130b..61fd6ffb 100755
--- a/convert/merge2pcitable.pl
+++ b/convert/merge2pcitable.pl
@@ -70,7 +70,11 @@ sub read_pcitable {
# known errors in redhat's pcitable
# these are pci to pci bridge
$module = "yenta_socket" if $module =~ /i82365/;
- my $id = join '', map { s/^0x//; $_ } $id1, $id2, $subid1, $subid2;
+ my $id = join '', map {
+ s/^0x//;
+ length == 4 or print STDERR "$f $line: bad number $_\n";
+ $_;
+ } $id1, $id2, $subid1, $subid2;
$drivers{$id} and print STDERR "$f $line: multiple entry for $id (skipping $module $text)\n";
$drivers{$id} ||= [ map &$rm_quote, $module, $text ];
}
diff --git a/lst/Makefile b/lst/Makefile
index 3fd241a1..d8a5e9bc 100644
--- a/lst/Makefile
+++ b/lst/Makefile
@@ -16,6 +16,10 @@ build: CardsNames
clean:
rm -f *~ CardsNames *.tmp ScannerDB.gz
+check:
+ @../convert/merge2pcitable.pl pcitable pcitable pcitable > /dev/null
+ @../convert/merge2pcitable.pl pcitable usbtable usbtable > /dev/null
+
CardsNames: Cards+ ../convert/Cards2CardsNames.pl
rm -f $@
../convert/Cards2CardsNames.pl $< > $@