diff options
| author | dyoung <dyoung@NetBSD.org> | 2010-02-24 23:38:40 +0000 |
|---|---|---|
| committer | dyoung <dyoung@NetBSD.org> | 2010-02-24 23:38:40 +0000 |
| commit | 7c4be3328d6a88bf77bf0f7573ff151b64bb2526 (patch) | |
| tree | 65e7d9056266e3f976c55d07fd66c63d90f3490a /sys/dev | |
| parent | c138fa58da52fae97596f9e8223df9a70169982e (diff) | |
Start to tuck Cardbus under the PCI abstraction. Step #1, textual
substitution: for all practical purposes, pcitag_t and cardbustag_t are
interchangeable, so just use pcitag_t. Ditto pcireg_t and cardbusreg_t.
Poison new uses of cardbusreg_t and cardbustag_t by deleting the type
definitions.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/cardbus.c | 67 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbusreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/cardbus/cardbusvar.h | 58 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_atw_cardbus.c | 12 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_fxp_cardbus.c | 6 | ||||
| -rw-r--r-- | sys/dev/cardbus/if_rtw_cardbus.c | 10 | ||||
| -rw-r--r-- | sys/dev/pci/pccbb.c | 33 |
7 files changed, 93 insertions, 97 deletions
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c index 9ce10332180..008c0fefa0d 100644 --- a/sys/dev/cardbus/cardbus.c +++ b/sys/dev/cardbus/cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: cardbus.c,v 1.101 2010/02/24 22:37:57 dyoung Exp $ */ +/* $NetBSD: cardbus.c,v 1.102 2010/02/24 23:38:40 dyoung Exp $ */ /* * Copyright (c) 1997, 1998, 1999 and 2000 @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.101 2010/02/24 22:37:57 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cardbus.c,v 1.102 2010/02/24 23:38:40 dyoung Exp $"); #include "opt_cardbus.h" @@ -78,7 +78,7 @@ static void print_tuple(u_int8_t*, int, void*); #endif static int cardbus_read_tuples(struct cardbus_attach_args *, - cardbusreg_t, u_int8_t *, size_t); + pcireg_t, u_int8_t *, size_t); static void enable_function(struct cardbus_softc *, int, int); static void disable_function(struct cardbus_softc *, int); @@ -151,19 +151,19 @@ cardbusdetach(device_t self, int flags) } static int -cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr, +cardbus_read_tuples(struct cardbus_attach_args *ca, pcireg_t cis_ptr, u_int8_t *tuples, size_t len) { struct cardbus_softc *sc = ca->ca_ct->ct_sc; cardbus_chipset_tag_t cc = ca->ca_ct->ct_cc; cardbus_function_tag_t cf = ca->ca_ct->ct_cf; - cardbustag_t tag = ca->ca_tag; - cardbusreg_t command; + pcitag_t tag = ca->ca_tag; + pcireg_t command; bus_space_tag_t bar_tag; bus_space_handle_t bar_memh; bus_size_t bar_size; bus_addr_t bar_addr; - cardbusreg_t reg; + pcireg_t reg; int found = 0; int cardbus_space = cis_ptr & CARDBUS_CIS_ASIMASK; int i, j; @@ -222,7 +222,7 @@ cardbus_read_tuples(struct cardbus_attach_args *ca, cardbusreg_t cis_ptr, (uintmax_t)bar_size, (uintmax_t)bar_addr); if (cardbus_space == CARDBUS_CIS_ASI_ROM) { - cardbusreg_t exrom; + pcireg_t exrom; int save; struct cardbus_rom_image_head rom_image; struct cardbus_rom_image *p; @@ -423,9 +423,9 @@ cardbus_rescan(device_t self, const char *ifattr, struct cardbus_softc *sc = device_private(self); cardbus_chipset_tag_t cc; cardbus_function_tag_t cf; - cardbustag_t tag; - cardbusreg_t id, class, cis_ptr; - cardbusreg_t bhlc, icr, lattimer; + pcitag_t tag; + pcireg_t id, class, cis_ptr; + pcireg_t bhlc, icr, lattimer; int cdstatus; int function, nfunction; device_t csc; @@ -803,8 +803,8 @@ cardbus_function_enable(struct cardbus_softc *sc, int func) cardbus_chipset_tag_t cc = sc->sc_cc; cardbus_function_tag_t cf = sc->sc_cf; cardbus_devfunc_t ct; - cardbusreg_t command; - cardbustag_t tag; + pcireg_t command; + pcitag_t tag; DPRINTF(("entering cardbus_function_enable... ")); @@ -852,16 +852,16 @@ cardbus_function_disable(struct cardbus_softc *sc, int func) /* * int cardbus_get_capability(cardbus_chipset_tag_t cc, - * cardbus_function_tag_t cf, cardbustag_t tag, int capid, int *offset, - * cardbusreg_t *value) + * cardbus_function_tag_t cf, pcitag_t tag, int capid, int *offset, + * pcireg_t *value) * * Find the specified PCI capability. */ int cardbus_get_capability(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, - cardbustag_t tag, int capid, int *offset, cardbusreg_t *value) + pcitag_t tag, int capid, int *offset, pcireg_t *value) { - cardbusreg_t reg; + pcireg_t reg; unsigned int ofs; reg = cardbus_conf_read(cc, cf, tag, PCI_COMMAND_STATUS_REG); @@ -948,10 +948,10 @@ decode_tuple(u_int8_t *tuple, u_int8_t *end, * XXX: this is another reason why this code should be shared with PCI. */ static int -cardbus_get_powerstate_int(cardbus_devfunc_t ct, cardbustag_t tag, - cardbusreg_t *state, int offset) +cardbus_get_powerstate_int(cardbus_devfunc_t ct, pcitag_t tag, + pcireg_t *state, int offset) { - cardbusreg_t value, now; + pcireg_t value, now; cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; @@ -970,13 +970,12 @@ cardbus_get_powerstate_int(cardbus_devfunc_t ct, cardbustag_t tag, } int -cardbus_get_powerstate(cardbus_devfunc_t ct, cardbustag_t tag, - cardbusreg_t *state) +cardbus_get_powerstate(cardbus_devfunc_t ct, pcitag_t tag, pcireg_t *state) { cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; int offset; - cardbusreg_t value; + pcireg_t value; if (!cardbus_get_capability(cc, cf, tag, PCI_CAP_PWRMGMT, &offset, &value)) return EOPNOTSUPP; @@ -985,13 +984,13 @@ cardbus_get_powerstate(cardbus_devfunc_t ct, cardbustag_t tag, } static int -cardbus_set_powerstate_int(cardbus_devfunc_t ct, cardbustag_t tag, - cardbusreg_t state, int offset, cardbusreg_t cap_reg) +cardbus_set_powerstate_int(cardbus_devfunc_t ct, pcitag_t tag, + pcireg_t state, int offset, pcireg_t cap_reg) { cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; - cardbusreg_t value, cap, now; + pcireg_t value, cap, now; KASSERT((offset & 0x3) == 0); @@ -1041,12 +1040,12 @@ cardbus_set_powerstate_int(cardbus_devfunc_t ct, cardbustag_t tag, } int -cardbus_set_powerstate(cardbus_devfunc_t ct, cardbustag_t tag, cardbusreg_t state) +cardbus_set_powerstate(cardbus_devfunc_t ct, pcitag_t tag, pcireg_t state) { cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; int offset; - cardbusreg_t value; + pcireg_t value; if (!cardbus_get_capability(cc, cf, tag, PCI_CAP_PWRMGMT, &offset, &value)) @@ -1116,7 +1115,7 @@ print_tuple(u_int8_t *tuple, int len, void *data) void cardbus_conf_capture(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, - cardbustag_t tag, struct cardbus_conf_state *pcs) + pcitag_t tag, struct cardbus_conf_state *pcs) { int off; @@ -1126,10 +1125,10 @@ cardbus_conf_capture(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, void cardbus_conf_restore(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, - cardbustag_t tag, struct cardbus_conf_state *pcs) + pcitag_t tag, struct cardbus_conf_state *pcs) { int off; - cardbusreg_t val; + pcireg_t val; for (off = 15; off >= 0; off--) { val = cardbus_conf_read(cc, cf, tag, (off * 4)); @@ -1141,10 +1140,10 @@ cardbus_conf_restore(cardbus_chipset_tag_t cc, cardbus_function_tag_t cf, struct cardbus_child_power { struct cardbus_conf_state p_cardbusconf; cardbus_devfunc_t p_ct; - cardbustag_t p_tag; + pcitag_t p_tag; cardbus_chipset_tag_t p_cc; cardbus_function_tag_t p_cf; - cardbusreg_t p_pm_cap; + pcireg_t p_pm_cap; bool p_has_pm; int p_pm_offset; }; @@ -1205,7 +1204,7 @@ cardbus_child_register(device_t child) struct cardbus_devfunc *ct; struct cardbus_child_power *priv; int off; - cardbusreg_t reg; + pcireg_t reg; ct = sc->sc_funcs[device_locator(child, CARDBUSCF_FUNCTION)]; diff --git a/sys/dev/cardbus/cardbusreg.h b/sys/dev/cardbus/cardbusreg.h index 377f8a13755..54bdd26488d 100644 --- a/sys/dev/cardbus/cardbusreg.h +++ b/sys/dev/cardbus/cardbusreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: cardbusreg.h,v 1.3 2009/12/15 22:17:12 snj Exp $ */ +/* $NetBSD: cardbusreg.h,v 1.4 2010/02/24 23:38:40 dyoung Exp $ */ /* * Copyright (c) 2001 @@ -31,8 +31,6 @@ #include <dev/pci/pcivar.h> /* for pcitag_t */ -typedef u_int32_t cardbusreg_t; -typedef pcitag_t cardbustag_t; typedef int cardbus_intr_line_t; #define CARDBUS_ID_REG 0x00 diff --git a/sys/dev/cardbus/cardbusvar.h b/sys/dev/cardbus/cardbusvar.h index 31a63d5fb65..956220ecc2b 100644 --- a/sys/dev/cardbus/cardbusvar.h +++ b/sys/dev/cardbus/cardbusvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: cardbusvar.h,v 1.45 2010/02/23 19:28:00 dyoung Exp $ */ +/* $NetBSD: cardbusvar.h,v 1.46 2010/02/24 23:38:40 dyoung Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -69,13 +69,13 @@ typedef struct cardbus_chipset_tag *cardbus_chipset_tag_t; * int (*cardbus_ctrl)(cardbus_chipset_tag_t ct, int command); * int (*cardbus_power)(cardbus_chipset_tag_t ct, int voltage); * - * cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t ct, + * pcitag_t (*cardbus_make_tag)(cardbus_chipset_tag_t ct, * int busno, int functionno); - * void (*cardbus_free_tag)(cardbus_chipset_tag_t ct, cardbustag_t tag); - * cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t ct, - * cardbustag_t tag, int offs); + * void (*cardbus_free_tag)(cardbus_chipset_tag_t ct, pcitag_t tag); + * pcireg_t (*cardbus_conf_read)(cardbus_chipset_tag_t ct, + * pcitag_t tag, int offs); * void (*cardbus_conf_write)(cardbus_chipset_tag_t ct, - * cardbustag_t tag, int offs, cardbusreg_t val); + * pcitag_t tag, int offs, pcireg_t val); */ typedef const struct cardbus_functions { int (*cardbus_space_alloc)(cardbus_chipset_tag_t, rbus_tag_t, @@ -89,12 +89,12 @@ typedef const struct cardbus_functions { int (*cardbus_ctrl)(cardbus_chipset_tag_t, int); int (*cardbus_power)(cardbus_chipset_tag_t, int); - cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int); - void (*cardbus_free_tag)(cardbus_chipset_tag_t, cardbustag_t); - cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, - cardbustag_t, int); - void (*cardbus_conf_write)(cardbus_chipset_tag_t, cardbustag_t, - int, cardbusreg_t); + pcitag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int); + void (*cardbus_free_tag)(cardbus_chipset_tag_t, pcitag_t); + pcireg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, + pcitag_t, int); + void (*cardbus_conf_write)(cardbus_chipset_tag_t, pcitag_t, + int, pcireg_t); } cardbus_function_t, *cardbus_function_tag_t; #else @@ -112,11 +112,11 @@ typedef const struct cardbus_functions { int (*)(void *), void *); void (*cardbus_intr_disestablish)(cardbus_chipset_tag_t, void *); - cardbustag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int); - cardbusreg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, - cardbustag_t, int); - void (*cardbus_conf_write)(cardbus_chipset_tag_t, cardbustag_t, - int, cardbusreg_t); + pcitag_t (*cardbus_make_tag)(cardbus_chipset_tag_t, int, int); + pcireg_t (*cardbus_conf_read)(cardbus_chipset_tag_t, + pcitag_t, int); + void (*cardbus_conf_write)(cardbus_chipset_tag_t, pcitag_t, + int, pcireg_t); } cardbus_function_t, *cardbus_function_tag_t; #endif /* rbus */ @@ -193,7 +193,7 @@ struct cardbus_softc { }; struct cardbus_conf_state { - cardbusreg_t reg[16]; + pcireg_t reg[16]; }; /* @@ -215,8 +215,8 @@ typedef struct cardbus_devfunc { rbus_tag_t ct_rbus_memt; /* CardBus mem rbus tag */ #endif - cardbusreg_t ct_bar[6]; /* Base Address Regs 0 to 6 */ - cardbusreg_t ct_bhlc; /* Latency timer and cache line size */ + pcireg_t ct_bar[6]; /* Base Address Regs 0 to 6 */ + pcireg_t ct_bhlc; /* Latency timer and cache line size */ /* u_int32_t ct_cisreg; */ /* CIS reg: is it needed??? */ device_t ct_device; /* pointer to the device */ @@ -258,9 +258,9 @@ struct cardbus_attach_args { u_int ca_bus; u_int ca_function; - cardbustag_t ca_tag; - cardbusreg_t ca_id; - cardbusreg_t ca_class; + pcitag_t ca_tag; + pcireg_t ca_id; + pcireg_t ca_class; /* interrupt information */ cardbus_intr_line_t ca_intrline; @@ -311,7 +311,7 @@ void *cardbus_intr_establish(cardbus_chipset_tag_t, cardbus_function_tag_t, void cardbus_intr_disestablish(cardbus_chipset_tag_t, cardbus_function_tag_t, void *); -int cardbus_mapreg_map(struct cardbus_softc *, int, int, cardbusreg_t, +int cardbus_mapreg_map(struct cardbus_softc *, int, int, pcireg_t, int, bus_space_tag_t *, bus_space_handle_t *, bus_addr_t *, bus_size_t *); int cardbus_mapreg_unmap(struct cardbus_softc *, int, int, bus_space_tag_t, bus_space_handle_t, bus_size_t); @@ -323,14 +323,14 @@ int cardbus_function_enable(struct cardbus_softc *, int); int cardbus_function_disable(struct cardbus_softc *, int); int cardbus_get_capability(cardbus_chipset_tag_t, cardbus_function_tag_t, - cardbustag_t, int, int *, cardbusreg_t *); -int cardbus_get_powerstate(cardbus_devfunc_t, cardbustag_t, cardbusreg_t *); -int cardbus_set_powerstate(cardbus_devfunc_t, cardbustag_t, cardbusreg_t); + pcitag_t, int, int *, pcireg_t *); +int cardbus_get_powerstate(cardbus_devfunc_t, pcitag_t, pcireg_t *); +int cardbus_set_powerstate(cardbus_devfunc_t, pcitag_t, pcireg_t); void cardbus_conf_capture(cardbus_chipset_tag_t, cardbus_function_tag_t, - cardbustag_t, struct cardbus_conf_state *); + pcitag_t, struct cardbus_conf_state *); void cardbus_conf_restore(cardbus_chipset_tag_t, cardbus_function_tag_t, - cardbustag_t, struct cardbus_conf_state *); + pcitag_t, struct cardbus_conf_state *); #define Cardbus_function_enable(ct) cardbus_function_enable((ct)->ct_sc, (ct)->ct_func) #define Cardbus_function_disable(ct) cardbus_function_disable((ct)->ct_sc, (ct)->ct_func) diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c index b2d7fa2c1c7..837a01c5bb1 100644 --- a/sys/dev/cardbus/if_atw_cardbus.c +++ b/sys/dev/cardbus/if_atw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_atw_cardbus.c,v 1.30 2010/02/24 22:37:57 dyoung Exp $ */ +/* $NetBSD: if_atw_cardbus.c,v 1.31 2010/02/24 23:38:40 dyoung Exp $ */ /*- * Copyright (c) 1999, 2000, 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.30 2010/02/24 22:37:57 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_atw_cardbus.c,v 1.31 2010/02/24 23:38:40 dyoung Exp $"); #include "opt_inet.h" @@ -94,15 +94,15 @@ struct atw_cardbus_softc { /* CardBus-specific goo. */ void *sc_ih; /* interrupt handle */ cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */ - cardbustag_t sc_tag; /* our CardBus tag */ - cardbusreg_t sc_csr; /* CSR bits */ + pcitag_t sc_tag; /* our CardBus tag */ + pcireg_t sc_csr; /* CSR bits */ bus_size_t sc_mapsize; /* the size of mapped bus space * region */ int sc_cben; /* CardBus enables */ int sc_bar_reg; /* which BAR to use */ - cardbusreg_t sc_bar_val; /* value of the BAR */ + pcireg_t sc_bar_val; /* value of the BAR */ cardbus_intr_line_t sc_intrline; /* interrupt line */ }; @@ -364,7 +364,7 @@ atw_cardbus_setup(struct atw_cardbus_softc *csc) cardbus_devfunc_t ct = csc->sc_ct; cardbus_chipset_tag_t cc = ct->ct_cc; cardbus_function_tag_t cf = ct->ct_cf; - cardbusreg_t csr; + pcireg_t csr; int rc; if ((rc = cardbus_set_powerstate(ct, csc->sc_tag, PCI_PWR_D0)) != 0) diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c index 49456a0067a..9f41a23c6c8 100644 --- a/sys/dev/cardbus/if_fxp_cardbus.c +++ b/sys/dev/cardbus/if_fxp_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_fxp_cardbus.c,v 1.41 2010/01/18 18:52:35 pooka Exp $ */ +/* $NetBSD: if_fxp_cardbus.c,v 1.42 2010/02/24 23:38:40 dyoung Exp $ */ /* * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.41 2010/01/18 18:52:35 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_fxp_cardbus.c,v 1.42 2010/02/24 23:38:40 dyoung Exp $"); #include "opt_inet.h" #include "rnd.h" @@ -193,7 +193,7 @@ fxp_cardbus_setup(struct fxp_softc * sc) cardbus_function_tag_t cf = psc->sc_cf; pcireg_t command; - cardbustag_t tag = cardbus_make_tag(cc, cf, csc->ct->ct_bus, + pcitag_t tag = cardbus_make_tag(cc, cf, csc->ct->ct_bus, csc->ct->ct_func); command = Cardbus_conf_read(csc->ct, tag, CARDBUS_COMMAND_STATUS_REG); diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c index ee4c43abfb0..0d48b75a8a4 100644 --- a/sys/dev/cardbus/if_rtw_cardbus.c +++ b/sys/dev/cardbus/if_rtw_cardbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_rtw_cardbus.c,v 1.35 2010/02/24 22:37:57 dyoung Exp $ */ +/* $NetBSD: if_rtw_cardbus.c,v 1.36 2010/02/24 23:38:40 dyoung Exp $ */ /*- * Copyright (c) 2004, 2005 David Young. All rights reserved. @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.35 2010/02/24 22:37:57 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_rtw_cardbus.c,v 1.36 2010/02/24 23:38:40 dyoung Exp $"); #include "opt_inet.h" @@ -120,7 +120,7 @@ struct rtw_cardbus_softc { /* CardBus-specific goo. */ void *sc_ih; /* interrupt handle */ cardbus_devfunc_t sc_ct; /* our CardBus devfuncs */ - cardbustag_t sc_tag; /* our CardBus tag */ + pcitag_t sc_tag; /* our CardBus tag */ int sc_csr; /* CSR bits */ bus_size_t sc_mapsize; /* size of the mapped bus space * region @@ -386,10 +386,10 @@ rtw_cardbus_suspend(device_t self, const pmf_qual_t *qual) void rtw_cardbus_setup(struct rtw_cardbus_softc *csc) { - cardbustag_t tag = csc->sc_tag; + pcitag_t tag = csc->sc_tag; cardbus_devfunc_t ct = csc->sc_ct; cardbus_chipset_tag_t cc = ct->ct_cc; - cardbusreg_t bhlc, csr, lattimer; + pcireg_t bhlc, csr, lattimer; cardbus_function_tag_t cf = ct->ct_cf; (void)cardbus_set_powerstate(ct, tag, PCI_PWR_D0); diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c index 7da625d4aa4..f015bc7455b 100644 --- a/sys/dev/pci/pccbb.c +++ b/sys/dev/pci/pccbb.c @@ -1,4 +1,4 @@ -/* $NetBSD: pccbb.c,v 1.194 2010/02/24 22:38:01 dyoung Exp $ */ +/* $NetBSD: pccbb.c,v 1.195 2010/02/24 23:38:40 dyoung Exp $ */ /* * Copyright (c) 1998, 1999 and 2000 @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.194 2010/02/24 22:38:01 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.195 2010/02/24 23:38:40 dyoung Exp $"); /* #define CBB_DEBUG @@ -133,11 +133,11 @@ static void *pccbb_cb_intr_establish(cardbus_chipset_tag_t, cardbus_intr_line_t irq, int level, int (*ih) (void *), void *sc); static void pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih); -static cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int); -static void pccbb_free_tag(cardbus_chipset_tag_t, cardbustag_t); -static cardbusreg_t pccbb_conf_read(cardbus_chipset_tag_t, cardbustag_t, int); -static void pccbb_conf_write(cardbus_chipset_tag_t, cardbustag_t, int, - cardbusreg_t); +static pcitag_t pccbb_make_tag(cardbus_chipset_tag_t, int, int); +static void pccbb_free_tag(cardbus_chipset_tag_t, pcitag_t); +static pcireg_t pccbb_conf_read(cardbus_chipset_tag_t, pcitag_t, int); +static void pccbb_conf_write(cardbus_chipset_tag_t, pcitag_t, int, + pcireg_t); static void pccbb_chipinit(struct pccbb_softc *); static void pccbb_intrinit(struct pccbb_softc *); @@ -1897,12 +1897,12 @@ cb_show_regs(pci_chipset_tag_t pc, pcitag_t tag, bus_space_tag_t memt, #endif /* - * static cardbustag_t pccbb_make_tag(cardbus_chipset_tag_t cc, + * static pcitag_t pccbb_make_tag(cardbus_chipset_tag_t cc, * int busno, int function) * This is the function to make a tag to access config space of * a CardBus Card. It works same as pci_conf_read. */ -static cardbustag_t +static pcitag_t pccbb_make_tag(cardbus_chipset_tag_t cc, int busno, int function) { struct pccbb_softc *sc = (struct pccbb_softc *)cc; @@ -1911,7 +1911,7 @@ pccbb_make_tag(cardbus_chipset_tag_t cc, int busno, int function) } static void -pccbb_free_tag(cardbus_chipset_tag_t cc, cardbustag_t tag) +pccbb_free_tag(cardbus_chipset_tag_t cc, pcitag_t tag) { } @@ -1921,12 +1921,12 @@ pccbb_free_tag(cardbus_chipset_tag_t cc, cardbustag_t tag) * This is the function to read the config space of a CardBus card. * It works the same as pci_conf_read(9). */ -static cardbusreg_t -pccbb_conf_read(cardbus_chipset_tag_t cc, cardbustag_t tag, int offset) +static pcireg_t +pccbb_conf_read(cardbus_chipset_tag_t cc, pcitag_t tag, int offset) { struct pccbb_softc *sc = (struct pccbb_softc *)cc; pcitag_t brtag = sc->sc_tag; - cardbusreg_t reg; + pcireg_t reg; /* * clear cardbus master abort status; it is OK to write without @@ -1949,8 +1949,7 @@ pccbb_conf_read(cardbus_chipset_tag_t cc, cardbustag_t tag, int offset) * card. It works the same as pci_conf_write(9). */ static void -pccbb_conf_write(cardbus_chipset_tag_t cc, cardbustag_t tag, int reg, - cardbusreg_t val) +pccbb_conf_write(cardbus_chipset_tag_t cc, pcitag_t tag, int reg, pcireg_t val) { struct pccbb_softc *sc = (struct pccbb_softc *)cc; @@ -3062,8 +3061,8 @@ pccbb_winset(bus_addr_t align, struct pccbb_softc *sc, bus_space_tag_t bst) pcitag_t tag; bus_addr_t mask = ~(align - 1); struct { - cardbusreg_t win_start; - cardbusreg_t win_limit; + pcireg_t win_start; + pcireg_t win_limit; int win_flags; } win[2]; struct pccbb_win_chain *chainp; |
