diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-06-12 15:40:34 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2001-06-12 15:40:34 +0000 |
| commit | 863b60f4757a6099cb3d4cd2929f329b25d32e68 (patch) | |
| tree | 2a7712531ca485cdb471f9dbf7b496e0c7bc40ea /sys/dev/pci/pccbb.c | |
| parent | d468f5520cb27434701c19a9a1c745b39679516b (diff) | |
Make pci_mapreg_map take an extra argument where we can
put a size limitation of the PCI region to map. That makes the PERC 3/Di
raid controller usable, as it publishes too much PCI memory for us to map
in the kernel virtual memory. As we only access the first 256 byte it is
of no use to map 128MB of kvm.
Diffstat (limited to 'sys/dev/pci/pccbb.c')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index b661b6094cf..956f07f29ca 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbb.c,v 1.19 2001/05/16 12:51:49 ho Exp $ */ +/* $OpenBSD: pccbb.c,v 1.20 2001/06/12 15:40:32 niklas Exp $ */ /* $NetBSD: pccbb.c,v 1.42 2000/06/16 23:41:35 cgd Exp $ */ /* @@ -417,16 +417,17 @@ pccbbattach(parent, self, aux) PCI_MAPREG_MEM_ADDR(sock_base) != 0xfffffff0) { /* The address must be valid. */ if (pci_mapreg_map(pa, PCI_SOCKBASE, PCI_MAPREG_TYPE_MEM, 0, - &sc->sc_base_memt, &sc->sc_base_memh, &sockbase, NULL)) { + &sc->sc_base_memt, &sc->sc_base_memh, &sockbase, NULL, 0)) + { printf("%s: can't map socket base address 0x%x\n", sc->sc_dev.dv_xname, sock_base); /* * I think it's funny: socket base registers must be * mapped on memory space, but ... */ - if (pci_mapreg_map(pa, PCI_SOCKBASE, PCI_MAPREG_TYPE_IO, - 0, &sc->sc_base_memt, &sc->sc_base_memh, &sockbase, - NULL)) { + if (pci_mapreg_map(pa, PCI_SOCKBASE, + PCI_MAPREG_TYPE_IO, 0, &sc->sc_base_memt, + &sc->sc_base_memh, &sockbase, NULL, 0)) { printf("%s: can't map socket base address" " 0x%lx: io mode\n", sc->sc_dev.dv_xname, sockbase); @@ -1282,7 +1283,7 @@ struct cb_poll_str { static struct cb_poll_str cb_poll[10]; static int cb_poll_n = 0; -static void cb_pcmcia_poll __P((void *arg)); +STATIC void cb_pcmcia_poll __P((void *arg)); void cb_pcmcia_poll(arg) @@ -2679,7 +2680,7 @@ struct pccbb_poll_str { static struct pccbb_poll_str pccbb_poll[10]; static int pccbb_poll_n = 0; -static void pccbb_pcmcia_poll __P((void *arg)); +STATIC void pccbb_pcmcia_poll __P((void *arg)); void pccbb_pcmcia_poll(arg) |