From a9ad6cae198643cf147259ac92f987932b197431 Mon Sep 17 00:00:00 2001 From: lonhyn Date: Fri, 3 Oct 1997 18:45:39 +0000 Subject: [PATCH] pci_mapreg_info() has been changed to take arguments like pci_mapreg_map() --- sys/dev/pci/pci_map.c | 17 ++++++++--------- sys/dev/pci/pcivar.h | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/sys/dev/pci/pci_map.c b/sys/dev/pci/pci_map.c index aa9b16a459b8..422977740d2e 100644 --- a/sys/dev/pci/pci_map.c +++ b/sys/dev/pci/pci_map.c @@ -1,4 +1,4 @@ -/* $NetBSD: pci_map.c,v 1.2 1997/09/23 23:08:47 mycroft Exp $ */ +/* $NetBSD: pci_map.c,v 1.3 1997/10/03 18:45:39 lonhyn Exp $ */ /* * Copyright (c) 1994, 1997 Charles M. Hannum. All rights reserved. @@ -171,22 +171,21 @@ pci_mem_find(pc, tag, reg, type, basep, sizep, flagsp) } int -pci_mapreg_info(pc, tag, reg, type, basep, sizep, flagsp) - pci_chipset_tag_t pc; - pcitag_t tag; +pci_mapreg_info(pa, reg, type, basep, sizep) + struct pci_attach_args *pa; int reg; pcireg_t type; bus_addr_t *basep; bus_size_t *sizep; - int *flagsp; { + int flags; if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO) - return (pci_io_find(pc, tag, reg, type, basep, sizep, - flagsp)); + return (pci_io_find(pa->pa_pc, pa->pa_tag, reg, type, + basep, sizep, &flags)); else - return (pci_mem_find(pc, tag, reg, type, basep, sizep, - flagsp)); + return (pci_mem_find(pa->pa_pc, pa->pa_tag, reg, type, + basep, sizep, &flags)); } int diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h index 1f89b1b67108..96ea13cbe760 100644 --- a/sys/dev/pci/pcivar.h +++ b/sys/dev/pci/pcivar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pcivar.h,v 1.25 1997/08/30 06:48:24 mycroft Exp $ */ +/* $NetBSD: pcivar.h,v 1.26 1997/10/03 18:45:41 lonhyn Exp $ */ /* * Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. @@ -143,8 +143,8 @@ struct pci_attach_args { * Configuration space access and utility functions. (Note that most, * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.) */ -int pci_mapreg_info __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t, - bus_addr_t *, bus_size_t *, int *)); +int pci_mapreg_info __P((struct pci_attach_args *, int, pcireg_t, + bus_addr_t *, bus_size_t *)); int pci_mapreg_map __P((struct pci_attach_args *, int, pcireg_t, int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, bus_size_t *));