Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-add 2 subclasses new in rev. 3.0 of the spec, and fix a pasto in another 

-get power management rev printing right
This commit is contained in:
drochner 2006-05-31 10:01:18 +00:00
parent 05a790f438
commit 4b02662f6c
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/pci/pci_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_subr.c,v 1.63 2005/12/11 12:22:50 christos Exp $ */
/* $NetBSD: pci_subr.c,v 1.64 2006/05/31 10:01:18 drochner Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.63 2005/12/11 12:22:50 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.64 2006/05/31 10:01:18 drochner Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@ -90,6 +90,7 @@ static const struct pci_class pci_subclass_mass_storage[] = {
{ "RAID", PCI_SUBCLASS_MASS_STORAGE_RAID, },
{ "ATA", PCI_SUBCLASS_MASS_STORAGE_ATA, },
{ "SATA", PCI_SUBCLASS_MASS_STORAGE_SATA, },
{ "SAS", PCI_SUBCLASS_MASS_STORAGE_SAS, },
{ "miscellaneous", PCI_SUBCLASS_MASS_STORAGE_MISC, },
{ 0 },
};
@ -161,7 +162,8 @@ static const struct pci_class pci_subclass_system[] = {
{ "8237 DMA", PCI_SUBCLASS_SYSTEM_DMA, },
{ "8254 timer", PCI_SUBCLASS_SYSTEM_TIMER, },
{ "RTC", PCI_SUBCLASS_SYSTEM_RTC, },
{ "PCI Hot-Plug", PCI_SUBCLASS_SYSTEM_RTC, },
{ "PCI Hot-Plug", PCI_SUBCLASS_SYSTEM_PCIHOTPLUG, },
{ "SD Host Controller", PCI_SUBCLASS_SYSTEM_SDHC, },
{ "miscellaneous", PCI_SUBCLASS_SYSTEM_MISC, },
{ 0 },
};
@ -780,6 +782,10 @@ pci_conf_print_caplist(
#endif
const pcireg_t *regs, int capoff)
{
static const char unk[] = "unknown";
static const char *pmrev[8] = {
unk, "1.0", "1.1", "1.2", unk, unk, unk, unk
};
int off;
pcireg_t rval;
@ -795,8 +801,8 @@ pci_conf_print_caplist(
printf("reserved");
break;
case PCI_CAP_PWRMGMT:
printf("Power Management, rev. %d.0",
(rval >> 0) & 0x07); /* XXX not clear */
printf("Power Management, rev. %s",
pmrev[(rval >> 0) & 0x07]);
break;
case PCI_CAP_AGP:
printf("AGP, rev. %d.%d",

4
sys/dev/pci/pcireg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcireg.h,v 1.49 2006/03/01 18:53:40 gdamore Exp $ */
/* $NetBSD: pcireg.h,v 1.50 2006/05/31 10:01:18 drochner Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@ -169,6 +169,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_SUBCLASS_MASS_STORAGE_RAID 0x04
#define PCI_SUBCLASS_MASS_STORAGE_ATA 0x05
#define PCI_SUBCLASS_MASS_STORAGE_SATA 0x06
#define PCI_SUBCLASS_MASS_STORAGE_SAS 0x07
#define PCI_SUBCLASS_MASS_STORAGE_MISC 0x80
/* 0x02 network subclasses */
@ -227,6 +228,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_SUBCLASS_SYSTEM_TIMER 0x02
#define PCI_SUBCLASS_SYSTEM_RTC 0x03
#define PCI_SUBCLASS_SYSTEM_PCIHOTPLUG 0x04
#define PCI_SUBCLASS_SYSTEM_SDHC 0x05
#define PCI_SUBCLASS_SYSTEM_MISC 0x80
/* 0x09 input subclasses */