summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-09-23 18:15:26 +0000
committerThierry Vignaud <tv@mandriva.org>2009-09-23 18:15:26 +0000
commit58da80b53a7db58a522a14400fabaab9bb22bedf (patch)
treec1127bc9b1c95f84a3e84dfda589be7008596b37
parent145e444257d8f894f1d4a862a4ea69106df5042c (diff)
downloaddrakx-58da80b53a7db58a522a14400fabaab9bb22bedf.tar
drakx-58da80b53a7db58a522a14400fabaab9bb22bedf.tar.gz
drakx-58da80b53a7db58a522a14400fabaab9bb22bedf.tar.bz2
drakx-58da80b53a7db58a522a14400fabaab9bb22bedf.tar.xz
drakx-58da80b53a7db58a522a14400fabaab9bb22bedf.zip
display PCI revision (#42576)
-rw-r--r--perl-install/NEWS3
-rwxr-xr-xperl-install/standalone/harddrake29
2 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 3848a88bd..57ed35a21 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- harddrake:
+ o display PCI revision (#42576)
+
Version 12.54 - 23 September 2009
- drakboot:
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index adc96cbd9..6df4b4aab 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -56,6 +56,7 @@ my %fields =
"primary_partitions" => [ N("Primary partitions"), N("the number of the primary partitions") ],
"Vendor" => [ N("Vendor"), N("the vendor name of the device") ],
"pci_domain" => [ N("PCI domain"), N("the PCI domain of the device") ],
+ "pci_revision" => [ N("PCI revision"), N("the PCI domain of the device") ],
"pci_bus" => [ N("Bus PCI #"), N("the PCI bus on which the device is plugged") ],
"pci_device" => [ N("PCI device #"), N("PCI device number") ],
"pci_function" => [ N("PCI function #"), N("PCI function number") ],
@@ -130,7 +131,7 @@ my %groups = (
generic =>
{
N("Identification") => [ qw(Vendor model description info media_type) ],
- N("Connection") => [ qw(bus pci_domain pci_bus pci_device pci_function vendor id subvendor subid) ],
+ N("Connection") => [ qw(bus pci_domain pci_bus pci_device pci_function pci_revision vendor id subvendor subid) ],
},
AUDIO =>
{
@@ -478,6 +479,12 @@ foreach (@classes) {
$_->{$field} = sprintf("0x%04x", $_->{$field});
delete $_->{$field} if $_->{$field} eq "0xffff"; # 0xffff equals to '*'
}
+ if ($_->{pci_revision}) {
+ $_->{pci_revision} = sprintf("0x%02x", $_->{pci_revision});
+ } else {
+ delete $_->{pci_revision};# if $_->{pci_revision} eq "0x0000";
+ }
+
$tree_model->append_set($parent_iter, [ 1 => $custom_id, 2 => $index++ ]);
push @data, [ $_, $Ident ];
push @configurators, $configurator;