diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-07-25 11:27:27 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2009-07-25 11:27:27 +0000 |
| commit | e7d864b23704eb225a4baef0139290e9cfba8573 (patch) | |
| tree | a44fe3a9cc7bb123d7282e5060ca2e8bff5f5c22 /sys/dev/pci/pccbbvar.h | |
| parent | fa095e14de08b033704439a082fd87f2c3996b94 (diff) | |
Stop using rbus to set up the socket BAR if it has been left unitialized
by the firmware; our PCI code takes care of this now. Also eliminate
support for I/O socket BARs. There is no evidence they actually exist.
Clean up some unused structure members while there.
ok miod@
Diffstat (limited to 'sys/dev/pci/pccbbvar.h')
| -rw-r--r-- | sys/dev/pci/pccbbvar.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h index 5b973be8dfc..9d5db19c8c8 100644 --- a/sys/dev/pci/pccbbvar.h +++ b/sys/dev/pci/pccbbvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pccbbvar.h,v 1.13 2007/11/30 08:12:00 miod Exp $ */ +/* $OpenBSD: pccbbvar.h,v 1.14 2009/07/25 11:27:26 kettenis Exp $ */ /* $NetBSD: pccbbvar.h,v 1.13 2000/06/08 10:28:29 haya Exp $ */ /* * Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved. @@ -137,7 +137,6 @@ struct pccbb_softc { #define CBB_INSERTING 0x01000000 #define CBB_16BITCARD 0x04 #define CBB_32BITCARD 0x08 -#define CBB_MEMHMAPPED 0x02000000 pci_chipset_tag_t sc_pc; pcitag_t sc_tag; @@ -145,11 +144,6 @@ struct pccbb_softc { int sc_chipset; /* chipset id */ int sc_ints_on; - bus_addr_t sc_mem_start; /* CardBus/PCMCIA memory start */ - bus_addr_t sc_mem_end; /* CardBus/PCMCIA memory end */ - bus_addr_t sc_io_start; /* CardBus/PCMCIA io start */ - bus_addr_t sc_io_end; /* CardBus/PCMCIA io end */ - pcireg_t sc_sockbase; /* Socket base register */ pcireg_t sc_busnum; /* bus number */ |