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

Back out last change. (Partially my fault, for not reviewing it close

Browse Source 
enough.)
This commit is contained in:
thorpej 1997-10-06 21:01:23 +00:00
parent ca201eb4fc
commit 8eb7170ff8
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/pci/pci_map.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci_map.c,v 1.3 1997/10/03 18:45:39 lonhyn Exp $ */ /* $NetBSD: pci_map.c,v 1.4 1997/10/06 21:01:24 thorpej Exp $ */
/* /*
* Copyright (c) 1994, 1997 Charles M. Hannum. All rights reserved. * Copyright (c) 1994, 1997 Charles M. Hannum. All rights reserved.
@ -171,21 +171,22 @@ pci_mem_find(pc, tag, reg, type, basep, sizep, flagsp)
} }
int int
pci_mapreg_info(pa, reg, type, basep, sizep) pci_mapreg_info(pc, tag, reg, type, basep, sizep, flagsp)
struct pci_attach_args *pa; pci_chipset_tag_t pc;
pcitag_t tag;
int reg; int reg;
pcireg_t type; pcireg_t type;
bus_addr_t *basep; bus_addr_t *basep;
bus_size_t *sizep; bus_size_t *sizep;
int *flagsp;
{ {
int flags;
if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO) if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO)
return (pci_io_find(pa->pa_pc, pa->pa_tag, reg, type, return (pci_io_find(pc, tag, reg, type, basep, sizep,
basep, sizep, &flags)); flagsp));
else else
return (pci_mem_find(pa->pa_pc, pa->pa_tag, reg, type, return (pci_mem_find(pc, tag, reg, type, basep, sizep,
basep, sizep, &flags)); flagsp));
} }
int int

6
sys/dev/pci/pcivar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcivar.h,v 1.26 1997/10/03 18:45:41 lonhyn Exp $ */ /* $NetBSD: pcivar.h,v 1.27 1997/10/06 21:01:23 thorpej Exp $ */
/* /*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved. * 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, * Configuration space access and utility functions. (Note that most,
* e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.) * e.g. make_tag, conf_read, conf_write are declared by pci_machdep.h.)
*/ */
int pci_mapreg_info __P((struct pci_attach_args *, int, pcireg_t, int pci_mapreg_info __P((pci_chipset_tag_t, pcitag_t, int, pcireg_t,
bus_addr_t *, bus_size_t *)); bus_addr_t *, bus_size_t *, int *));
int pci_mapreg_map __P((struct pci_attach_args *, int, pcireg_t, int, 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_space_tag_t *, bus_space_handle_t *, bus_addr_t *,
bus_size_t *)); bus_size_t *));