From 698b2b11739eedc012d845cc27c008c027562063 Mon Sep 17 00:00:00 2001 From: soda Date: Tue, 18 Jul 2000 11:15:25 +0000 Subject: [PATCH] - define pcibiosverbose here, instead of each C source. - use PIR_DEVFUNC_{DEVICE,FUNCTION}. --- sys/arch/i386/pci/pcibios.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/arch/i386/pci/pcibios.c b/sys/arch/i386/pci/pcibios.c index ea8d37bb335a..1c881c79377b 100644 --- a/sys/arch/i386/pci/pcibios.c +++ b/sys/arch/i386/pci/pcibios.c @@ -1,4 +1,4 @@ -/* $NetBSD: pcibios.c,v 1.3 2000/04/28 17:15:15 uch Exp $ */ +/* $NetBSD: pcibios.c,v 1.4 2000/07/18 11:15:25 soda Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -93,6 +93,10 @@ #include +#ifdef PCIBIOSVERBOSE +int pcibiosverbose = 1; +#endif + int pcibios_present; struct pcibios_pir_header pcibios_pir_header; @@ -273,8 +277,8 @@ pcibios_pir_init() printf("PCI Interrupt Router at %03d:%02d:%01d", pcibios_pir_header.router_bus, - (pcibios_pir_header.router_devfunc >> 3) & 0x1f, - pcibios_pir_header.router_devfunc & 7); + PIR_DEVFUNC_DEVICE(pcibios_pir_header.router_devfunc), + PIR_DEVFUNC_FUNCTION(pcibios_pir_header.router_devfunc)); if (pcibios_pir_header.compat_router != 0) { pci_devinfo(pcibios_pir_header.compat_router, 0, 0, devinfo); @@ -469,7 +473,7 @@ pcibios_print_pir_table() printf("PIR Entry %d:\n", i); printf("\tBus: %d Device: %d\n", pcibios_pir_table[i].bus, - pcibios_pir_table[i].device >> 3); + PIR_DEVFUNC_DEVICE(pcibios_pir_table[i].device)); for (j = 0; j < 4; j++) { printf("\t\tINT%c: link 0x%02x bitmap 0x%04x\n", 'A' + j,