ansi function decls, no binary change.

1 files changed, 76 insertions, 198 deletions

diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index 267fb19ac28..a51a97a5e87 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccbb.c,v 1.63 2008/10/15 19:12:18 blambert Exp $	*/
+/*	$OpenBSD: pccbb.c,v 1.64 2009/06/03 04:32:10 jsg Exp $	*/
 /*	$NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $	*/
 
 /*
@@ -381,10 +381,7 @@ pccbb_shutdown(void *arg)
 }
 
 void
-pccbbattach(parent, self, aux)
-	struct device *parent;
-	struct device *self;
-	void *aux;
+pccbbattach(struct device *parent, struct device *self, void *aux)
 {
 	struct pccbb_softc *sc = (void *)self;
 	struct pci_attach_args *pa = aux;
@@ -557,8 +554,7 @@ pccbbattach(parent, self, aux)
  *   function kills pcic compatible port used by ISA pcic.
  */
 void
-pccbb_pci_callback(self)
-	struct device *self;
+pccbb_pci_callback(struct device *self)
 {
 	struct pccbb_softc *sc = (void *)self;
 	pci_chipset_tag_t pc = sc->sc_pc;
@@ -675,8 +671,7 @@ pccbb_pci_callback(self)
  *     4) close all memory and io windows.
  */
 void
-pccbb_chipinit(sc)
-	struct pccbb_softc *sc;
+pccbb_chipinit(struct pccbb_softc *sc)
 {
 	pci_chipset_tag_t pc = sc->sc_pc;
 	pcitag_t tag = sc->sc_tag;
@@ -863,9 +858,8 @@ pccbb_chipinit(sc)
  *   This function attaches 16-bit PCcard bus.
  */
 void
-pccbb_pcmcia_attach_setup(sc, paa)
-	struct pccbb_softc *sc;
-	struct pcmciabus_attach_args *paa;
+pccbb_pcmcia_attach_setup(struct pccbb_softc *sc,
+    struct pcmciabus_attach_args *paa)
 {
 	struct pcic_handle *ph = &sc->sc_pcmcia_h;
 	rbus_tag_t rb;
@@ -916,8 +910,7 @@ pccbb_pcmcia_attach_setup(sc, paa)
 
 #if 0
 void
-pccbb_pcmcia_attach_card(ph)
-	struct pcic_handle *ph;
+pccbb_pcmcia_attach_card(struct pcic_handle *ph)
 {
 	if (ph->flags & PCIC_FLAG_CARDP) {
 		panic("pccbb_pcmcia_attach_card: already attached");
@@ -930,9 +923,7 @@ pccbb_pcmcia_attach_card(ph)
 }
 
 void
-pccbb_pcmcia_detach_card(ph, flags)
-	struct pcic_handle *ph;
-	int flags;
+pccbb_pcmcia_detach_card(struct pcic_handle *ph, int flags)
 {
 	if (!(ph->flags & PCIC_FLAG_CARDP)) {
 		panic("pccbb_pcmcia_detach_card: already detached");
@@ -952,8 +943,7 @@ pccbb_pcmcia_detach_card(ph, flags)
  *   itself.
  */
 int
-pccbbintr(arg)
-	void *arg;
+pccbbintr(void *arg)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)arg;
 	u_int32_t sockevent, sockstate;
@@ -1029,8 +1019,7 @@ pccbbintr(arg)
  *    bridge.  The interrupt handlers are called in registered order.
  */
 int
-pccbbintr_function(sc)
-	struct pccbb_softc *sc;
+pccbbintr_function(struct pccbb_softc *sc)
 {
 	int retval = 0, val;
 	struct pccbb_intrhand_list *pil;
@@ -1087,8 +1076,7 @@ pccbbintr_function(sc)
 }
 
 void
-pci113x_insert(arg)
-	void *arg;
+pci113x_insert(void *arg)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)arg;
 	u_int32_t sockevent, sockstate;
@@ -1123,9 +1111,7 @@ pci113x_insert(arg)
 
 #define PCCBB_PCMCIA_OFFSET 0x800
 u_int8_t
-pccbb_pcmcia_read(ph, reg)
-	struct pcic_handle *ph;
-	int reg;
+pccbb_pcmcia_read(struct pcic_handle *ph, int reg)
 {
 	bus_space_barrier(ph->ph_bus_t, ph->ph_bus_h,
 	    PCCBB_PCMCIA_OFFSET + reg, 1, BUS_SPACE_BARRIER_READ);
@@ -1135,10 +1121,7 @@ pccbb_pcmcia_read(ph, reg)
 }
 
 void
-pccbb_pcmcia_write(ph, reg, val)
-	struct pcic_handle *ph;
-	int reg;
-	u_int8_t val;
+pccbb_pcmcia_write(struct pcic_handle *ph, int reg, int val)
 {
 	bus_space_barrier(ph->ph_bus_t, ph->ph_bus_h,
 	    PCCBB_PCMCIA_OFFSET + reg, 1, BUS_SPACE_BARRIER_WRITE);
@@ -1151,9 +1134,7 @@ pccbb_pcmcia_write(ph, reg, val)
  * int pccbb_ctrl(cardbus_chipset_tag_t, int)
  */
 int
-pccbb_ctrl(ct, command)
-	cardbus_chipset_tag_t ct;
-	int command;
+pccbb_ctrl(cardbus_chipset_tag_t ct, int command)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1201,9 +1182,7 @@ pccbb_ctrl(ct, command)
  *   it fails.
  */
 int
-pccbb_power(ct, command)
-	cardbus_chipset_tag_t ct;
-	int command;
+pccbb_power(cardbus_chipset_tag_t ct, int command)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1344,8 +1323,7 @@ static struct timeout cb_poll_timeout;
 void cb_pcmcia_poll(void *arg);
 
 void
-cb_pcmcia_poll(arg)
-	void *arg;
+cb_pcmcia_poll(void *arg)
 {
 	struct cb_poll_str *poll = arg;
 	struct cbb_pcmcia_softc *psc = (void *)poll->ct->v;
@@ -1397,8 +1375,7 @@ cb_pcmcia_poll(arg)
  *                  2 if cardbus card exists.
  */
 int
-pccbb_detect_card(sc)
-	struct pccbb_softc *sc;
+pccbb_detect_card(struct pccbb_softc *sc)
 {
 	bus_space_handle_t base_memh = sc->sc_base_memh;
 	bus_space_tag_t base_memt = sc->sc_base_memt;
@@ -1437,8 +1414,7 @@ pccbb_detect_card(sc)
  *   This function resets CardBus card.
  */
 int
-cb_reset(sc)
-	struct pccbb_softc *sc;
+cb_reset(struct pccbb_softc *sc)
 {
 	/*
 	 * Reset Assert at least 20 ms
@@ -1467,8 +1443,7 @@ cb_reset(sc)
  *  This function detect card Voltage.
  */
 int
-cb_detect_voltage(sc)
-	struct pccbb_softc *sc;
+cb_detect_voltage(struct pccbb_softc *sc)
 {
 	u_int32_t psr;		       /* socket present-state reg */
 	bus_space_tag_t iot = sc->sc_base_memt;
@@ -1488,9 +1463,7 @@ cb_detect_voltage(sc)
 }
 
 int
-cbbprint(aux, pcic)
-	void *aux;
-	const char *pcic;
+cbbprint(void *aux, const char *pcic)
 {
 /*
   struct cbslot_attach_args *cba = aux;
@@ -1507,9 +1480,7 @@ cbbprint(aux, pcic)
  *   This function enables and disables the card
  */
 int
-pccbb_cardenable(sc, function)
-	struct pccbb_softc *sc;
-	int function;
+pccbb_cardenable(struct pccbb_softc *sc, int function)
 {
 	u_int32_t command =
 	    pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_COMMAND_STATUS_REG);
@@ -1558,12 +1529,8 @@ pccbb_cardenable(sc, function)
  *   The arguments irq is not used because pccbb selects intr vector.
  */
 void *
-pccbb_cb_intr_establish(ct, irq, level, func, arg, name)
-	cardbus_chipset_tag_t ct;
-	int irq, level;
-	int (*func)(void *);
-	void *arg;
-	const char *name;
+pccbb_cb_intr_establish(cardbus_chipset_tag_t ct, int irq, int level,
+    int (*func)(void *), void *arg, const char *name)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1578,9 +1545,7 @@ pccbb_cb_intr_establish(ct, irq, level, func, arg, name)
  *   This function removes an interrupt handler pointed by ih.
  */
 void
-pccbb_cb_intr_disestablish(ct, ih)
-	cardbus_chipset_tag_t ct;
-	void *ih;
+pccbb_cb_intr_disestablish(cardbus_chipset_tag_t ct, void *ih)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -1603,12 +1568,8 @@ pccbb_cb_intr_disestablish(ct, ih)
  *   The arguments irq and level are not used.
  */
 void *
-pccbb_intr_establish(sc, irq, level, func, arg, name)
-	struct pccbb_softc *sc;
-	int irq, level;
-	int (*func)(void *);
-	void *arg;
-	const char *name;
+pccbb_intr_establish(struct pccbb_softc *sc, int irq, int level,
+    int (*func)(void *), void *arg, const char *name)
 {
 	struct pccbb_intrhand_list *pil, *newpil;
 	pcireg_t reg;
@@ -1666,9 +1627,7 @@ pccbb_intr_establish(sc, irq, level, func, arg, name)
  *   This function removes an interrupt handler pointed by ih.
  */
 void
-pccbb_intr_disestablish(sc, ih)
-	struct pccbb_softc *sc;
-	void *ih;
+pccbb_intr_disestablish(struct pccbb_softc *sc, void *ih)
 {
 	struct pccbb_intrhand_list *pil, **pil_prev;
 	pcireg_t reg;
@@ -1713,11 +1672,8 @@ pccbb_intr_disestablish(sc, ih)
 
 #if defined SHOW_REGS
 void
-cb_show_regs(pc, tag, memt, memh)
-	pci_chipset_tag_t pc;
-	pcitag_t tag;
-	bus_space_tag_t memt;
-	bus_space_handle_t memh;
+cb_show_regs(pci_chipset_tag_t pc, pcitag_t tag, bus_space_tag_t memt,
+    bus_space_handle_t memh)
 {
 	int i;
 	printf("PCI config regs:");
@@ -1759,9 +1715,7 @@ cb_show_regs(pc, tag, memt, memh)
  *  a CardBus Card.  It works same as pci_conf_read.
  */
 cardbustag_t
-pccbb_make_tag(cc, busno, devno, function)
-	cardbus_chipset_tag_t cc;
-	int busno, devno, function;
+pccbb_make_tag(cardbus_chipset_tag_t cc, int busno, int devno, int function)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
 
@@ -1769,9 +1723,7 @@ pccbb_make_tag(cc, busno, devno, function)
 }
 
 void
-pccbb_free_tag(cc, tag)
-	cardbus_chipset_tag_t cc;
-	cardbustag_t tag;
+pccbb_free_tag(cardbus_chipset_tag_t cc, cardbustag_t tag)
 {
 }
 
@@ -1782,10 +1734,7 @@ pccbb_free_tag(cc, tag)
  *  It works same as pci_conf_read.
  */
 cardbusreg_t
-pccbb_conf_read(cc, tag, offset)
-	cardbus_chipset_tag_t cc;
-	cardbustag_t tag;
-	int offset;		       /* register offset */
+pccbb_conf_read(cardbus_chipset_tag_t cc, cardbustag_t tag, int offset)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
 
@@ -1799,11 +1748,8 @@ pccbb_conf_read(cc, tag, offset)
  *  It works same as pci_conf_write.
  */
 void
-pccbb_conf_write(cc, tag, reg, val)
-	cardbus_chipset_tag_t cc;
-	cardbustag_t tag;
-	int reg;		       /* register offset */
-	cardbusreg_t val;
+pccbb_conf_write(cardbus_chipset_tag_t cc, cardbustag_t tag, int reg,
+    cardbusreg_t val)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)cc;
 
@@ -1829,12 +1775,8 @@ pccbb_new_pcmcia_io_alloc(pcmcia_chipset_handle_t pch,
  * XXX: The interface of this function is not very good, I believe.
  */
 int
-pccbb_pcmcia_io_alloc(pch, start, size, align, pcihp)
-	pcmcia_chipset_handle_t pch;
-	bus_addr_t start;	       /* start address */
-	bus_size_t size;
-	bus_size_t align;
-	struct pcmcia_io_handle *pcihp;
+pccbb_pcmcia_io_alloc(pcmcia_chipset_handle_t pch, bus_addr_t start,
+    bus_size_t size, bus_size_t align, struct pcmcia_io_handle *pcihp)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	bus_addr_t ioaddr;
@@ -1904,9 +1846,8 @@ pccbb_pcmcia_io_alloc(pch, start, size, align, pcihp)
  * XXX: The interface of this function is not very good, I believe.
  */
 void
-pccbb_pcmcia_io_free(pch, pcihp)
-	pcmcia_chipset_handle_t pch;
-	struct pcmcia_io_handle *pcihp;
+pccbb_pcmcia_io_free(pcmcia_chipset_handle_t pch,
+    struct pcmcia_io_handle *pcihp)
 {
 	bus_space_handle_t ioh = pcihp->ioh;
 	bus_size_t size = pcihp->size;
@@ -1932,13 +1873,8 @@ pccbb_pcmcia_io_free(pch, pcihp)
  * XXX: no wait timing control?
  */
 int
-pccbb_pcmcia_io_map(pch, width, offset, size, pcihp, windowp)
-	pcmcia_chipset_handle_t pch;
-	int width;
-	bus_addr_t offset;
-	bus_size_t size;
-	struct pcmcia_io_handle *pcihp;
-	int *windowp;
+pccbb_pcmcia_io_map(pcmcia_chipset_handle_t pch, int width, bus_addr_t offset,
+    bus_size_t size, struct pcmcia_io_handle *pcihp, int *windowp)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	bus_addr_t ioaddr = pcihp->addr + offset;
@@ -2000,9 +1936,7 @@ pccbb_pcmcia_io_map(pch, width, offset, size, pcihp, windowp)
  * This function changes register-value to map I/O region for pccard.
  */
 void
-pccbb_pcmcia_do_io_map(ph, win)
-	struct pcic_handle *ph;
-	int win;
+pccbb_pcmcia_do_io_map(struct pcic_handle *ph, int win)
 {
 	static u_int8_t pcic_iowidth[3] = {
 		PCIC_IOCTL_IO0_IOCS16SRC_CARD,
@@ -2078,9 +2012,7 @@ pccbb_pcmcia_do_io_map(ph, win)
  * This function unmaps I/O region.  No return value.
  */
 void
-pccbb_pcmcia_io_unmap(pch, win)
-	pcmcia_chipset_handle_t pch;
-	int win;
+pccbb_pcmcia_io_unmap(pcmcia_chipset_handle_t pch, int win)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	int reg;
@@ -2110,8 +2042,7 @@ pccbb_pcmcia_io_unmap(pch, win)
  * the first argument, pcmcia_chipset_handle_t.
  */
 void
-pccbb_pcmcia_wait_ready(ph)
-	struct pcic_handle *ph;
+pccbb_pcmcia_wait_ready(struct pcic_handle *ph)
 {
 	int i;
 
@@ -2142,8 +2073,7 @@ pccbb_pcmcia_wait_ready(ph)
  * the first argument, pcmcia_chipset_handle_t.
  */
 void
-pccbb_pcmcia_socket_enable(pch)
-	pcmcia_chipset_handle_t pch;
+pccbb_pcmcia_socket_enable(pcmcia_chipset_handle_t pch)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2259,8 +2189,7 @@ pccbb_pcmcia_socket_enable(pch)
  * the first argument, pcmcia_chipset_handle_t.
  */
 void
-pccbb_pcmcia_socket_disable(pch)
-	pcmcia_chipset_handle_t pch;
+pccbb_pcmcia_socket_disable(pcmcia_chipset_handle_t pch)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2293,8 +2222,7 @@ pccbb_pcmcia_socket_disable(pch)
  * If a card is inserted, return 1.  Otherwise, return 0.
  */
 int
-pccbb_pcmcia_card_detect(pch)
-	pcmcia_chipset_handle_t pch;
+pccbb_pcmcia_card_detect(pcmcia_chipset_handle_t pch)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2320,10 +2248,8 @@ pccbb_new_pcmcia_mem_alloc(pcmcia_chipset_handle_t pch,
  * XXX: Why the argument of start address is not in?
  */
 int
-pccbb_pcmcia_mem_alloc(pch, size, pcmhp)
-	pcmcia_chipset_handle_t pch;
-	bus_size_t size;
-	struct pcmcia_mem_handle *pcmhp;
+pccbb_pcmcia_mem_alloc(pcmcia_chipset_handle_t pch, bus_size_t size,
+    struct pcmcia_mem_handle *pcmhp)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	bus_space_handle_t memh;
@@ -2383,9 +2309,8 @@ pccbb_pcmcia_mem_alloc(pch, size, pcmhp)
  * pccbb_pcmcia_mem_alloc().
  */
 void
-pccbb_pcmcia_mem_free(pch, pcmhp)
-	pcmcia_chipset_handle_t pch;
-	struct pcmcia_mem_handle *pcmhp;
+pccbb_pcmcia_mem_free(pcmcia_chipset_handle_t pch,
+    struct pcmcia_mem_handle *pcmhp)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2400,9 +2325,7 @@ pccbb_pcmcia_mem_free(pch, pcmhp)
  * pccbb_pcmcia_mem_alloc().
  */
 void
-pccbb_pcmcia_do_mem_map(ph, win)
-	struct pcic_handle *ph;
-	int win;
+pccbb_pcmcia_do_mem_map(struct pcic_handle *ph, int win)
 {
 	int regbase_win;
 	bus_addr_t phys_addr;
@@ -2506,14 +2429,9 @@ pccbb_pcmcia_do_mem_map(ph, win)
  * pccbb_pcmcia_mem_alloc().
  */
 int
-pccbb_pcmcia_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
-	pcmcia_chipset_handle_t pch;
-	int kind;
-	bus_addr_t card_addr;
-	bus_size_t size;
-	struct pcmcia_mem_handle *pcmhp;
-	bus_size_t *offsetp;
-	int *windowp;
+pccbb_pcmcia_mem_map(pcmcia_chipset_handle_t pch, int kind,
+    bus_addr_t card_addr, bus_size_t size, struct pcmcia_mem_handle *pcmhp,
+    bus_size_t *offsetp, int *windowp)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	bus_addr_t busaddr;
@@ -2581,9 +2499,7 @@ pccbb_pcmcia_mem_map(pch, kind, card_addr, size, pcmhp, offsetp, windowp)
  * pccbb_pcmcia_mem_map().
  */
 void
-pccbb_pcmcia_mem_unmap(pch, window)
-	pcmcia_chipset_handle_t pch;
-	int window;
+pccbb_pcmcia_mem_unmap(pcmcia_chipset_handle_t pch, int window)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	int reg;
@@ -2616,8 +2532,7 @@ static struct timeout pccbb_poll_timeout;
 void pccbb_pcmcia_poll(void *arg);
 
 void
-pccbb_pcmcia_poll(arg)
-	void *arg;
+pccbb_pcmcia_poll(void *arg)
 {
 	struct pccbb_poll_str *poll = arg;
 	struct pcic_handle *ph = poll->ph;
@@ -2673,13 +2588,9 @@ pccbb_pcmcia_poll(arg)
  * This function enables PC-Card interrupt.  PCCBB uses PCI interrupt line.
  */
 void *
-pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg, xname)
-	pcmcia_chipset_handle_t pch;
-	struct pcmcia_function *pf;
-	int ipl;
-	int (*func)(void *);
-	void *arg;
-	char *xname;
+pccbb_pcmcia_intr_establish(pcmcia_chipset_handle_t pch,
+    struct pcmcia_function *pf, int ipl, int (*func)(void *), void *arg,
+    char *xname)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2708,9 +2619,7 @@ pccbb_pcmcia_intr_establish(pch, pf, ipl, func, arg, xname)
  * This function disables PC-Card interrupt.
  */
 void
-pccbb_pcmcia_intr_disestablish(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+pccbb_pcmcia_intr_disestablish(pcmcia_chipset_handle_t pch, void *ih)
 {
 	struct pcic_handle *ph = (struct pcic_handle *)pch;
 	struct pccbb_softc *sc = (struct pccbb_softc *)ph->ph_parent;
@@ -2719,9 +2628,7 @@ pccbb_pcmcia_intr_disestablish(pch, ih)
 }
 
 const char *
-pccbb_pcmcia_intr_string(pch, ih)
-	pcmcia_chipset_handle_t pch;
-	void *ih;
+pccbb_pcmcia_intr_string(pcmcia_chipset_handle_t pch, void *ih)
 {
 	if (ih == NULL)
 		return "couldn't establish interrupt";
@@ -2741,16 +2648,9 @@ pccbb_pcmcia_intr_string(pch, ih)
  *   clients.  This function is called from CardBus card drivers.
  */
 int
-pccbb_rbus_cb_space_alloc(ct, rb, addr, size, mask, align, flags, addrp, bshp)
-	cardbus_chipset_tag_t ct;
-	rbus_tag_t rb;
-	bus_addr_t addr;
-	bus_size_t size;
-	bus_addr_t mask;
-	bus_size_t align;
-	int flags;
-	bus_addr_t *addrp;
-	bus_space_handle_t *bshp;
+pccbb_rbus_cb_space_alloc(cardbus_chipset_tag_t ct, rbus_tag_t rb,
+    bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_size_t align,
+    int flags, bus_addr_t *addrp, bus_space_handle_t *bshp)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 
@@ -2802,11 +2702,8 @@ pccbb_rbus_cb_space_alloc(ct, rb, addr, size, mask, align, flags, addrp, bshp)
  *   This function is called from CardBus card drivers.
  */
 int
-pccbb_rbus_cb_space_free(ct, rb, bsh, size)
-	cardbus_chipset_tag_t ct;
-	rbus_tag_t rb;
-	bus_space_handle_t bsh;
-	bus_size_t size;
+pccbb_rbus_cb_space_free(cardbus_chipset_tag_t ct, rbus_tag_t rb,
+    bus_space_handle_t bsh, bus_size_t size)
 {
 	struct pccbb_softc *sc = (struct pccbb_softc *)ct;
 	bus_space_tag_t bt = rb->rb_bt;
@@ -2824,13 +2721,8 @@ pccbb_rbus_cb_space_free(ct, rb, bsh, size)
 }
 
 int
-pccbb_open_win(sc, bst, addr, size, bsh, flags)
-	struct pccbb_softc *sc;
-	bus_space_tag_t bst;
-	bus_addr_t addr;
-	bus_size_t size;
-	bus_space_handle_t bsh;
-	int flags;
+pccbb_open_win(struct pccbb_softc *sc, bus_space_tag_t bst, bus_addr_t addr,
+    bus_size_t size, bus_space_handle_t bsh, int flags)
 {
 	struct pccbb_win_chain_head *head;
 	bus_addr_t align;
@@ -2855,11 +2747,8 @@ pccbb_open_win(sc, bst, addr, size, bsh, flags)
 }
 
 int
-pccbb_close_win(sc, bst, bsh, size)
-	struct pccbb_softc *sc;
-	bus_space_tag_t bst;
-	bus_space_handle_t bsh;
-	bus_size_t size;
+pccbb_close_win(struct pccbb_softc *sc, bus_space_tag_t bst,
+    bus_space_handle_t bsh, bus_size_t size)
 {
 	struct pccbb_win_chain_head *head;
 	bus_addr_t align;
@@ -2882,12 +2771,8 @@ pccbb_close_win(sc, bst, bsh, size)
 }
 
 int
-pccbb_winlist_insert(head, start, size, bsh, flags)
-	struct pccbb_win_chain_head *head;
-	bus_addr_t start;
-	bus_size_t size;
-	bus_space_handle_t bsh;
-	int flags;
+pccbb_winlist_insert(struct pccbb_win_chain_head *head, bus_addr_t start,
+    bus_size_t size, bus_space_handle_t bsh, int flags)
 {
 	struct pccbb_win_chain *chainp, *elem;
 
@@ -2913,10 +2798,8 @@ pccbb_winlist_insert(head, start, size, bsh, flags)
 }
 
 int
-pccbb_winlist_delete(head, bsh, size)
-	struct pccbb_win_chain_head *head;
-	bus_space_handle_t bsh;
-	bus_size_t size;
+pccbb_winlist_delete(struct pccbb_win_chain_head *head, bus_space_handle_t bsh,
+    bus_size_t size)
 {
 	struct pccbb_win_chain *chainp;
 
@@ -2943,10 +2826,7 @@ pccbb_winlist_delete(head, bsh, size)
 }
 
 void
-pccbb_winset(align, sc, bst)
-	bus_addr_t align;
-	struct pccbb_softc *sc;
-	bus_space_tag_t bst;
+pccbb_winset(bus_addr_t align, struct pccbb_softc *sc, bus_space_tag_t bst)
 {
 	pci_chipset_tag_t pc;
 	pcitag_t tag;
@@ -3067,9 +2947,7 @@ pccbb_winset(align, sc, bst)
 }
 
 void
-pccbb_powerhook(why, arg)
-	int why;
-	void *arg;
+pccbb_powerhook(int why, void *arg)
 {
 	struct pccbb_softc *sc = arg;
 	u_int32_t reg;