diff options
Diffstat (limited to 'convert')
| -rw-r--r-- | convert/README.pcitable | 2 | ||||
| -rwxr-xr-x | convert/merge2pcitable.pl | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/convert/README.pcitable b/convert/README.pcitable index 27770d7d..747a4f98 100644 --- a/convert/README.pcitable +++ b/convert/README.pcitable @@ -13,6 +13,8 @@ rm -f vendors.txt ; wget http://www.yourvote.com/pci/vendors.txt # Another one rm -f pcids.html ; wget http://www.begent.co.uk/pcids.htm ./merge2pcitable.pl begent_pcids_htm pcids.htm pcitable > pcitable.new +# you can also try the following. BUT be careful when choosing cards needing subids. Ask pixel@mandrakesoft.com first! +./merge2pcitable.pl --keep-subids begent_pcids_htm pcids.htm pcitable > pcitable.new # with redhat's pcitable in /tmp/rh_pcitable (from kudzu or anaconda) diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index ef96b111..06e00afa 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -12,6 +12,7 @@ if ($0 =~ /merge2pcitable/) { $ARGV[0] eq '-f' and $force = shift; $ARGV[0] eq '-a' and $all = shift; + $ARGV[0] eq '--keep-subids' and $keep_subids = shift; my $formats = join '|', grep {$_} map { /^read_(.*)/ ? $1 : '' } keys %main::; @@ -23,7 +24,7 @@ if ($0 =~ /merge2pcitable/) my $d_pci = read_pcitable($pcitable, 'strict'); my $d_in = $read->($in); merge($d_pci, $d_in); - cleanup_subids($d_pci); + cleanup_subids($d_pci) if !$keep_subids; write_pcitable($d_pci); } else { 1 } |