From: Michal Vaner <vorner@ucw.cz>
Date: Sun, 31 Aug 2008 18:32:57 +0000 (+0200)
Subject: Output what the sub-item really is
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=0e770c225bdd16713642f77895edf94a356b76f5;p=pciids.git

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 5c1c7f3..40c37f5 100644
--- 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 f0ac793..d0c792d 100644
--- 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 614db47..bc77a64 100644
--- 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 abaabb5..44ce977 100644
--- 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>";