|
@@ -18,7 +18,7 @@ open DRV, "<$source" or die "Could not open $source: $!\n";
|
18
|
18
|
my $printed_family;
|
19
|
19
|
|
20
|
20
|
sub rom {
|
21
|
|
- ( my $type, my $image, my $desc, my $vendor, my $device ) = @_;
|
|
21
|
+ ( my $type, my $image, my $desc, my $vendor, my $device, my $dup ) = @_;
|
22
|
22
|
my $ids = $vendor ? "$vendor,$device" : "-";
|
23
|
23
|
unless ( $printed_family ) {
|
24
|
24
|
print "\n";
|
|
@@ -34,8 +34,8 @@ sub rom {
|
34
|
34
|
print "ROM_DESCRIPTION_$image = \"$desc\"\n";
|
35
|
35
|
print "PCI_VENDOR_$image = 0x$vendor\n" if $vendor;
|
36
|
36
|
print "PCI_DEVICE_$image = 0x$device\n" if $device;
|
37
|
|
- print "ROMS += $image\n";
|
38
|
|
- print "ROMS_$driver_name += $image\n";
|
|
37
|
+ print "ROMS += $image\n" unless $dup;
|
|
38
|
+ print "ROMS_$driver_name += $image\n" unless $dup;
|
39
|
39
|
}
|
40
|
40
|
|
41
|
41
|
while ( <DRV> ) {
|
|
@@ -49,8 +49,8 @@ while ( <DRV> ) {
|
49
|
49
|
\s*.*\s* # Driver data
|
50
|
50
|
\)/x ) {
|
51
|
51
|
( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
|
52
|
|
- rom ( "pci", $image, $desc, $vendor, $device );
|
53
|
52
|
rom ( "pci", lc "${vendor}${device}", $desc, $vendor, $device );
|
|
53
|
+ rom ( "pci", $image, $desc, $vendor, $device, 1 );
|
54
|
54
|
} elsif ( /^\s*ISA_ROM\s*\(
|
55
|
55
|
\s*\"([^\"]*)\"\s*, # Image
|
56
|
56
|
\s*\"([^\"]*)\"\s* # Description
|