Output what the sub-item really is

The table was labeled as 'Sub-items' every time. Now it is
context-based, names them as vendors, devices, etc...

diff --git a/PciIds/Address/Pci.pm b/PciIds/Address/Pci.pm
index 5c1c7f394b9f8daf3c8fa1b228c93aacba41dbc5..40c37f518e4c1fd38136d1ac39f1f5f4b5448348 100644 (file)
--- a/PciIds/Address/Pci.pm
+++ b/PciIds/Address/Pci.pm
@@ -70,4 +70,11 @@ sub addressDeps( $ ) {
        return [ [ PciIds::Address::new( "PC/$addr" ), "Subsystem vendor $addr does not exist" ] ];
 }
 
+sub subName( $ ) {
+       my( $self ) = @_;
+       return 'Subsystems' if $self->get() =~ /^PC\/....\/..../;
+       return 'Devices' if $self->get() =~ /^PC\/..../;
+       die "Can not happend\n";
+}
+
 1;

diff --git a/PciIds/Address/PciClass.pm b/PciIds/Address/PciClass.pm
index f0ac79328218e42212e88fd3103e1285ce5e40f6..d0c792d4fc766a5a50f92a56e0d48b7a38e2c67d 100644 (file)
--- a/PciIds/Address/PciClass.pm
+++ b/PciIds/Address/PciClass.pm
@@ -23,7 +23,6 @@ sub pretty( $ ) {
        } else {
                $prefix = 'Device class';
        }
-       #TODO Other levels? Are the names OK?
        return $prefix.' '.$_;
 }
 
@@ -48,4 +47,11 @@ sub helpName( $ ) {
        return 'pci_class';
 }
 
+sub subName( $ ) {
+       my( $self ) = @_;
+       return 'Program interfaces' if $self->get() =~ /PD\/..\/../;
+       return 'Device subclasses' if $self->get() =~ /PD\/../;
+       die "Can not happen\n";
+}
+
 1;

diff --git a/PciIds/Address/Toplevel.pm b/PciIds/Address/Toplevel.pm
index 614db4735b1609975c78288cf2bb8b4dd0bcb8a4..bc77a64850e43b3034cac956051b32cdfa185bea 100644 (file)
--- a/PciIds/Address/Toplevel.pm
+++ b/PciIds/Address/Toplevel.pm
@@ -45,7 +45,7 @@ sub canDiscuss( $ ) { return 0; }
 
 sub defaultRestrict( $ ) {
        my( $self ) = @_;
-       if( $self->get() =~ /PC/ ) {
+       if( $self->get() =~ /^PC/ ) {
                return "0";
        } else {
                return "";
@@ -54,7 +54,7 @@ sub defaultRestrict( $ ) {
 
 sub defaultRestrictList( $ ) {
        my( $self ) = @_;
-       if( $self->get() =~ /PC/ ) {
+       if( $self->get() =~ /^PC/ ) {
                my @result;
                for(my $i = '0'; $i < '10'; ++ $i ) {
                        push @result, $i;
@@ -82,4 +82,13 @@ sub helpName( $ ) {
        }
 }
 
+sub subName( $ ) {
+       my( $self ) = @_;
+       if( $self->get() =~ /^PC/ ) {
+               return 'Vendors';
+       } else {
+               return 'Device classes';
+       }
+}
+
 1;

diff --git a/PciIds/Html/List.pm b/PciIds/Html/List.pm
index abaabb50ac5f9dda6b3fa822647fd6aa4c6495bb..44ce9773a0cdff1380966684f0402027ce4c79fb 100644 (file)
--- a/PciIds/Html/List.pm
+++ b/PciIds/Html/List.pm
@@ -64,7 +64,7 @@ sub list( $$$$ ) {
                print "</div>\n" if( $diss );
        }
        unless( $address->leaf() ) {
-               print "<h2>Sub-items</h2>\n";
+               print "<h2>".encode( $address->subName() )."</h2>\n";
                my $restricts = $address->defaultRestrictList();
                if( scalar @{$restricts} ) {
                        print "<p>";