summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-02-27 19:27:31 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-02-27 19:27:31 +0000
commit5da3d6fa7d096deda15a3527f7fc26cb9f52af89 (patch)
tree25ec45cf7530f9422063ff876a19524cb0de50d5
parentb4108a7ae2b31571b4f2f1c9d40c4610d2994824 (diff)
downloaddrakx-5da3d6fa7d096deda15a3527f7fc26cb9f52af89.tar
drakx-5da3d6fa7d096deda15a3527f7fc26cb9f52af89.tar.gz
drakx-5da3d6fa7d096deda15a3527f7fc26cb9f52af89.tar.bz2
drakx-5da3d6fa7d096deda15a3527f7fc26cb9f52af89.tar.xz
drakx-5da3d6fa7d096deda15a3527f7fc26cb9f52af89.zip
misc
-rwxr-xr-xmdk-stage1/pcmcia_/merge_from_pcitable11
1 files changed, 8 insertions, 3 deletions
diff --git a/mdk-stage1/pcmcia_/merge_from_pcitable b/mdk-stage1/pcmcia_/merge_from_pcitable
index 7d980312d..74fc56f31 100755
--- a/mdk-stage1/pcmcia_/merge_from_pcitable
+++ b/mdk-stage1/pcmcia_/merge_from_pcitable
@@ -26,12 +26,15 @@ foreach my $k (sort keys %$drivers) {
push @pcitable, { vendor => $1, device => $2, driver => $v->[0], name => $v->[1], vd => "$1$2" };
}
+my @res;
print "Missing in `probe.c':\n";
foreach my $p (@pcitable) {
next if $p->{driver} ne 'yenta_socket';
member($p->{vd}, map { $_->{vd} } @probes) or
- print " { 0x$p->{vendor}, 0x$p->{device}, \"..\", \"$p->{name}\" },\n";
+ push @res, " { 0x$p->{vendor}, 0x$p->{device}, \"..\", \"$p->{name}\" },\n";
}
+print sort @res;
+@res = ();
print "\n";
print "Missing in pcitable:\n";
@@ -39,8 +42,10 @@ foreach my $p (@probes) {
my @r = grep { $_->{vd} eq $p->{vd} } @pcitable;
@r > 1 and die "duplicate entry in pcitable <$p->{vd}>\n";
if (@r && $r[0]->{driver} ne 'yenta_socket') {
- print "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"$r[0]->{name}\"\n";
- $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver was <$r[0]->{driver}>\n";
+ push @res, "0x$p->{vendor}\t0x$p->{device}\t\"yenta_socket\"\t\"$r[0]->{name}\"\n";
+ $r[0]->{driver} ne 'unknown' and print STDERR "WARNING, driver for <$p->{vd}> was <$r[0]->{driver}>\n";
}
}
+print sort @res;
+@res = ();
print "\n";