diff options
| -rwxr-xr-x | convert/merge2pcitable.pl | 16 | ||||
| -rwxr-xr-x | convert/merge_MonitorsDB.pl | 2 | ||||
| -rwxr-xr-x | convert/verify_Cards.pl | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/convert/merge2pcitable.pl b/convert/merge2pcitable.pl index 8ccf4b85..eb37edeb 100755 --- a/convert/merge2pcitable.pl +++ b/convert/merge2pcitable.pl @@ -10,10 +10,10 @@ qw(alsa ignore), my ($force, @force_modules, $all, $keep_subids, $wildcards, $use_description); # UPDATE ME WHEN UPDATING ../lst/Cards+: -my $ati_driver = 'Card:ATI Radeon HD 2000 to HD 6300 (radeon/fglrx)'; -my $ati_driver_fw = 'Card:ATI Radeon HD 6400 and later (radeon/fglrx)'; -my $ati_driver_vesa= 'Card:ATI Radeon HD 2000 and later without free driver (vesa/fglrx)'; -my $ati_free_only = 'Card:ATI Radeon X1950 and earlier'; +my $ati_driver = 'Card:ATI Radeon HD 2000 to HD 6300 (radeon/fglrx)'; +my $ati_driver_fw = 'Card:ATI Radeon HD 6400 and later (radeon/fglrx)'; +my $ati_driver_vesa = 'Card:ATI Radeon HD 2000 and later without free driver (vesa/fglrx)'; +my $ati_free_only = 'Card:ATI Radeon X1950 and earlier'; # also, be careful when merging as Cards+ and pcitable may contain card-specific # cases due to bugs in the various drivers @@ -103,7 +103,7 @@ sub read_rhpcitable { # works for RedHat's pcitable old and new format, + mdk format (alike RedHat's old one) # (the new format has ending .o's and double quotes are removed) sub read_pcitable { - my ($f, $strict, $newer_rh_format) = @_; + my ($f, $strict, $o_newer_rh_format) = @_; my %drivers; my %class; my $line = 0; @@ -125,7 +125,7 @@ sub read_pcitable { } if (my ($id1, $id2, @l) = split /\t+/) { - push @l, '""' if $newer_rh_format; + push @l, '""' if $o_newer_rh_format; my ($subid1, $subid2) = ('ffff', 'ffff'); ($subid1, $subid2, @l) = @l if @l > 2; @l == 1 || @l == 2 or die "$f:$line: bad number of fields " . (int @l) . " (in $_)\n"; @@ -380,7 +380,7 @@ sub read_nvidia_readme { my ($f) = @_; my %drivers; my $section; - my $card = $ENV{NVIDIA_CARD} ? $ENV{NVIDIA_CARD} : "NVIDIA_UNKNOWN"; + my $card = $ENV{NVIDIA_CARD} || "NVIDIA_UNKNOWN"; foreach (cat_($f)) { chomp; last if $section > 3; @@ -418,7 +418,7 @@ sub read_rhd_id_c { my %drivers; foreach (cat_($f)) { chomp; - my ($id, $description) = /^\s+RHD_DEVICE_MATCH\(\s*0x(....).*\/\* (.*)\*\// or next; + my ($id, $description) = m!^\s+RHD_DEVICE_MATCH\(\s*0x(....).*/\* (.*)\*/! or next; $drivers{"1002" . lc($id) . "ffffffff"} = [ "Card:RADEONHD_FIXME", $description ]; } \%drivers; diff --git a/convert/merge_MonitorsDB.pl b/convert/merge_MonitorsDB.pl index 7a24cfe3..b961ca4e 100755 --- a/convert/merge_MonitorsDB.pl +++ b/convert/merge_MonitorsDB.pl @@ -46,7 +46,7 @@ if ($verif) { } } - print $_->{text} foreach (@$monitors_db, @to_add); + print $_->{text} foreach @$monitors_db, @to_add; } sub verif { diff --git a/convert/verify_Cards.pl b/convert/verify_Cards.pl index a504c332..883b4c82 100755 --- a/convert/verify_Cards.pl +++ b/convert/verify_Cards.pl @@ -4,8 +4,9 @@ use lib qw(/usr/lib/libDrakX); use Xconfig::card; require './merge2pcitable.pl'; -$cards = Xconfig::card::readCardsDB("../lst/Cards+"); +my $cards = Xconfig::card::readCardsDB("../lst/Cards+"); +my $bad; foreach my $file (qw(pcitable usbtable)) { my $drivers = read_pcitable("../lst/$file"); foreach (values %$drivers) { |