diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-03-15 20:02:55 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-03-15 20:02:55 +0000 |
| commit | 9109db5aefeef2488e47329f083c7229fc10bf52 (patch) | |
| tree | da6c49a0b31c3b7fd8c852853cfa91de6c4c1613 /sys/dev | |
| parent | 47f456a03fef6a04355f67255f8003352b73cdb2 (diff) | |
rbus is always #defined as 1, so unifdef -D rbus=1.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/pccbb.c | 32 | ||||
| -rw-r--r-- | sys/dev/pci/pccbbvar.h | 4 |
2 files changed, 3 insertions, 33 deletions
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 43665edd3c0..54f8a564474 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.196 2010/02/25 00:47:40 dyoung Exp $ */ +/* $NetBSD: pccbb.c,v 1.197 2010/03/15 20:02:55 dyoung Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.196 2010/02/25 00:47:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.197 2010/03/15 20:02:55 dyoung Exp $"); /* #define CBB_DEBUG @@ -119,12 +119,6 @@ STATIC int pccbb_ctrl(cardbus_chipset_tag_t, int); STATIC int pccbb_power(struct pccbb_softc *sc, int); STATIC int pccbb_power_ct(cardbus_chipset_tag_t, int); STATIC int pccbb_cardenable(struct pccbb_softc * sc, int function); -#if !rbus -static int pccbb_io_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); -static int pccbb_io_close(cardbus_chipset_tag_t, int); -static int pccbb_mem_open(cardbus_chipset_tag_t, int, u_int32_t, u_int32_t); -static int pccbb_mem_close(cardbus_chipset_tag_t, int); -#endif /* !rbus */ static void *pccbb_intr_establish(struct pccbb_softc *, cardbus_intr_line_t irq, int level, int (*ih) (void *), void *sc); static void pccbb_intr_disestablish(struct pccbb_softc *, void *ih); @@ -169,7 +163,6 @@ static void pccbb_pcmcia_do_io_map(struct pccbb_softc *, int); static void pccbb_pcmcia_do_mem_map(struct pccbb_softc *, int); /* bus-space allocation and deallocation functions */ -#if rbus static int pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t, bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align, @@ -177,9 +170,7 @@ static int pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t, rbus_tag_t, static int pccbb_rbus_cb_space_free(cardbus_chipset_tag_t, rbus_tag_t, bus_space_handle_t, bus_size_t); -#endif /* rbus */ -#if rbus static int pccbb_open_win(struct pccbb_softc *, bus_space_tag_t, bus_addr_t, bus_size_t, bus_space_handle_t, int flags); @@ -193,7 +184,6 @@ static void pccbb_winset(bus_addr_t align, struct pccbb_softc *, bus_space_tag_t); void pccbb_winlist_show(struct pccbb_win_chain *); -#endif /* rbus */ /* for config_defer */ static void pccbb_pci_callback(device_t); @@ -227,7 +217,6 @@ static const struct pcmcia_chip_functions pccbb_pcmcia_funcs = { pccbb_pcmcia_card_detect }; -#if rbus static const struct cardbus_functions pccbb_funcs = { pccbb_rbus_cb_space_alloc, pccbb_rbus_cb_space_free, @@ -239,21 +228,6 @@ static const struct cardbus_functions pccbb_funcs = { pccbb_conf_read, pccbb_conf_write, }; -#else -static const struct cardbus_functions pccbb_funcs = { - pccbb_ctrl, - pccbb_power_ct, - pccbb_mem_open, - pccbb_mem_close, - pccbb_io_open, - pccbb_io_close, - pccbb_cb_intr_establish, - pccbb_cb_intr_disestablish, - pccbb_make_tag, - pccbb_conf_read, - pccbb_conf_write, -}; -#endif int pcicbbmatch(device_t parent, cfdata_t match, void *aux) @@ -434,7 +408,6 @@ pccbbattach(device_t parent, device_t self, void *aux) TAILQ_INIT(&sc->sc_memwindow); TAILQ_INIT(&sc->sc_iowindow); -#if rbus sc->sc_rbus_iot = rbus_pccbb_parent_io(pa); sc->sc_rbus_memt = rbus_pccbb_parent_mem(pa); @@ -442,7 +415,6 @@ pccbbattach(device_t parent, device_t self, void *aux) printf("pa->pa_memt: %08x vs rbus_mem->rb_bt: %08x\n", pa->pa_memt, sc->sc_rbus_memt->rb_bt); #endif -#endif /* rbus */ sc->sc_flags &= ~CBB_MEMHMAPPED; diff --git a/sys/dev/pci/pccbbvar.h b/sys/dev/pci/pccbbvar.h index d9d6f17774e..02e1c876d04 100644 --- a/sys/dev/pci/pccbbvar.h +++ b/sys/dev/pci/pccbbvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: pccbbvar.h,v 1.39 2009/12/15 22:17:12 snj Exp $ */ +/* $NetBSD: pccbbvar.h,v 1.40 2010/03/15 20:02:56 dyoung Exp $ */ /* * Copyright (c) 1999 HAYAKAWA Koichi. All rights reserved. @@ -89,10 +89,8 @@ struct pccbb_softc { bus_space_tag_t sc_memt; bus_dma_tag_t sc_dmat; -#if rbus rbus_tag_t sc_rbus_iot; /* rbus for i/o donated from parent */ rbus_tag_t sc_rbus_memt; /* rbus for mem donated from parent */ -#endif bus_space_tag_t sc_base_memt; bus_space_handle_t sc_base_memh; |
