 @@ -1,309 +1,309 @@
-/*	$NetBSD: sbus.c,v 1.19 2021/08/07 16:19:02 thorpej Exp $	*/
+/*	$NetBSD: sbus.c,v 1.20 2022/02/11 17:30:48 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PlayStation 2 internal PCMCIA/USB interface unit.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.19 2021/08/07 16:19:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.20 2022/02/11 17:30:48 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/bootinfo.h>
 #include <machine/autoconf.h>
 #include <playstation2/playstation2/interrupt.h>
 #include <playstation2/ee/eevar.h>
 #include <playstation2/ee/intcvar.h>
 #include <playstation2/dev/sbusvar.h>
 #include <playstation2/dev/sbusreg.h>
 #ifdef DEBUG
 #define STATIC
 #else
 #define STATIC static
 #endif
 STATIC void sbus_type2_pcmcia_intr_clear(void);
 STATIC void sbus_type2_pcmcia_intr_enable(void);
 STATIC void sbus_type2_pcmcia_intr_disable(void);
 STATIC void sbus_type2_pcmcia_intr_reinstall(void);
 STATIC void sbus_type3_pcmcia_intr_clear(void);
 STATIC void sbus_type3_pcmcia_intr_enable(void);
 STATIC void sbus_type3_pcmcia_intr_disable(void);
 STATIC void sbus_type3_pcmcia_intr_reinstall(void);
 STATIC int sbus_spurious_intr(void *);
 STATIC void (*sbus_pcmcia_intr_clear)(void);
 STATIC void (*sbus_pcmcia_intr_enable)(void);
 STATIC void (*sbus_pcmcia_intr_disable)(void);
 STATIC void (*sbus_pcmcia_intr_reinstall)(void);
 STATIC int (*sbus_pcmcia_intr)(void *) = sbus_spurious_intr;
 STATIC void *sbus_pcmcia_context;
 STATIC int (*sbus_usb_intr)(void *) = sbus_spurious_intr;
 STATIC void *sbus_usb_context;
 STATIC void sbus_init(int);
 STATIC int sbus_intr(void *);
 STATIC int sbus_match(device_t, cfdata_t, void *);
 STATIC void sbus_attach(device_t, device_t, void *);
 STATIC int sbus_search(device_t, cfdata_t,
 		       const int *, void *);
 STATIC int sbus_print(void *, const char *);
-CFATTACH_DECL_NEW(sbus, sizeof (struct device),
+CFATTACH_DECL_NEW(sbus, 0,
     sbus_match, sbus_attach, NULL, NULL);
 extern struct cfdriver sbus_cd;
 STATIC int __sbus_attached;
 int
 sbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct mainbus_attach_args *ma = aux;
 	if (strcmp(ma->ma_name, sbus_cd.cd_name) != 0)
 		return (0);
 	return (!__sbus_attached);
+}
 void
 sbus_attach(device_t parent, device_t self, void *aux)
+{
 	int type = BOOTINFO_REF(BOOTINFO_PCMCIA_TYPE);
 	printf(": controller type %d\n", type);
 	/* Initialize SBUS controller */
 	sbus_init(type);
 	config_search(self, NULL,
 	    CFARGS(.search = sbus_search));
+}
 int
 sbus_search(device_t parent, cfdata_t cf,
 	    const int *ldesc, void *aux)
+{
 	struct sbus_attach_args sa;
 	if (config_probe(parent, cf, &sa))
 		config_attach(parent, cf, &sa, sbus_print, CFARGS_NONE);
 	return (0);
+}
 int
 sbus_print(void *aux, const char *pnp)
+{
 	return (pnp ? QUIET : UNCONF);
+}
 void
 sbus_init(int type)
+{
 	/* install model dependent hook */
 #define SET_PCMCIA_INTR_OPS(x)	 					\
 	sbus_pcmcia_intr_clear = sbus_type##x##_pcmcia_intr_clear;	\
 	sbus_pcmcia_intr_enable = sbus_type##x##_pcmcia_intr_enable;	\
 	sbus_pcmcia_intr_disable = sbus_type##x##_pcmcia_intr_disable;	\
 	sbus_pcmcia_intr_reinstall = sbus_type##x##_pcmcia_intr_reinstall
 	switch (type) {
 	default:
 		panic("unknown pcmcia controller type = %d", type);
 		break;
 	case 0:
 		/* FALLTHROUGH */
 	case 1:
 		/* FALLTHROUGH */
 	case 2:
 		SET_PCMCIA_INTR_OPS(2);
 		break;
 	case 3:
 		SET_PCMCIA_INTR_OPS(3);
 		break;
+	}
 #undef SET_PCMCIA_INTR_OPS
 	/* disable interrupt */
 	(*sbus_pcmcia_intr_disable)();
 	/* clear interrupt */
 	(*sbus_pcmcia_intr_clear)();
 	_reg_write_4(SBUS_SMFLG_REG, SMFLG_PCMCIA_INT);
 	_reg_write_4(SBUS_SMFLG_REG, SMFLG_USB_INT);
 	/* connect to INTC */
 	intc_intr_establish(I_CH1_SBUS, IPL_BIO, sbus_intr, 0);
+}
 void *
 sbus_intr_establish(enum sbus_irq irq, int (*ih_func)(void *), void *ih_arg)
+{
 	switch (irq) {
 	default:
 		panic("unknown IRQ");
 		break;
 	case SBUS_IRQ_PCMCIA:
 		sbus_pcmcia_intr = ih_func;
 		sbus_pcmcia_context = ih_arg;
 		(*sbus_pcmcia_intr_enable)();
 		break;
 	case SBUS_IRQ_USB:
 		sbus_usb_intr = ih_func;
 		sbus_usb_context = ih_arg;
 		break;
+	}
 	return (void *)irq;
+}
 void
 sbus_intr_disestablish(void *handle)
+{
 	int irq = (int)handle;
 	switch (irq) {
 	default:
 		panic("unknown IRQ");
 		break;
 	case SBUS_IRQ_PCMCIA:
 		sbus_pcmcia_intr = sbus_spurious_intr;
 		(*sbus_pcmcia_intr_disable)();
 		break;
 	case SBUS_IRQ_USB:
 		sbus_usb_intr = sbus_spurious_intr;
 		break;
+	}
+}
 int
 sbus_intr(void *arg)
+{
 	u_int32_t stat;
 	_playstation2_evcnt.sbus.ev_count++;
 	stat = _reg_read_4(SBUS_SMFLG_REG);
 	if (stat & SMFLG_PCMCIA_INT) {
 		(*sbus_pcmcia_intr_clear)();
 		_reg_write_4(SBUS_SMFLG_REG, SMFLG_PCMCIA_INT);
 		(*sbus_pcmcia_intr)(sbus_pcmcia_context);
+	}
 	if (stat & SMFLG_USB_INT) {
 		_reg_write_4(SBUS_SMFLG_REG, SMFLG_USB_INT);
 		(*sbus_usb_intr)(sbus_usb_context);
+	}
 	(*sbus_pcmcia_intr_reinstall)();
 	return (1);
+}
 int
 sbus_spurious_intr(void *arg)
+{
 	printf("spurious interrupt.\n");
 	return (1);
+}
 /* SCPH-18000 */
 void
 sbus_type2_pcmcia_intr_clear(void)
+{
 	if (_reg_read_2(SBUS_PCMCIA_CSC1_REG16) & 0x080)
 		_reg_write_2(SBUS_PCMCIA_CSC1_REG16, 0xffff);
+}
 void
 sbus_type2_pcmcia_intr_enable(void)
+{
 	_reg_write_2(SBUS_PCMCIA_TIMR_REG16, 0);
+}
 void
 sbus_type2_pcmcia_intr_disable(void)
+{
 	_reg_write_2(SBUS_PCMCIA_TIMR_REG16, 1);
+}
 void
 sbus_type2_pcmcia_intr_reinstall(void)
+{
 	u_int16_t r = _reg_read_2(SBUS_PCMCIA_TIMR_REG16);
 	_reg_write_2(SBUS_PCMCIA_TIMR_REG16, 1);
 	_reg_write_2(SBUS_PCMCIA_TIMR_REG16, r);
+}
 /* SCPH-30000/35000 */
 void
 sbus_type3_pcmcia_intr_clear(void)
+{
 	/* nothing */
+}
 void
 sbus_type3_pcmcia_intr_enable(void)
+{
 	_reg_write_2(SBUS_PCMCIA3_TIMR_REG16, 0);
+}
 void
 sbus_type3_pcmcia_intr_disable(void)
+{
 	_reg_write_2(SBUS_PCMCIA3_TIMR_REG16, 1);
+}
 void
 sbus_type3_pcmcia_intr_reinstall(void)
+{
 	u_int16_t r = _reg_read_2(SBUS_PCMCIA3_TIMR_REG16);
 	_reg_write_2(SBUS_PCMCIA3_TIMR_REG16, 1);
 	_reg_write_2(SBUS_PCMCIA3_TIMR_REG16, r);
+}

 @@ -1,276 +1,276 @@
-/*	$NetBSD: spd.c,v 1.15 2021/08/07 16:19:02 thorpej Exp $	*/
+/*	$NetBSD: spd.c,v 1.16 2022/02/11 17:30:48 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by UCHIYAMA Yasushi.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.15 2021/08/07 16:19:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.16 2022/02/11 17:30:48 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/bootinfo.h>
 #include <playstation2/ee/eevar.h>
 #include <playstation2/dev/sbusvar.h>
 #include <playstation2/dev/spdvar.h>
 #include <playstation2/dev/spdreg.h>
 #ifdef DEBUG
 #define STATIC
 #else
 #define STATIC static
 #endif
 STATIC int spd_match(device_t, cfdata_t, void *);
 STATIC void spd_attach(device_t, device_t, void *);
 STATIC int spd_print(void *, const char *);
 STATIC int spd_intr(void *);
 STATIC void __spd_eeprom_out(u_int8_t *, int);
 STATIC int __spd_eeprom_in(u_int8_t *);
 /* SPD device can't attach twice. because PS2 PC-Card slot is only one. */
 STATIC struct {
 	int (*func)(void *);
 	void *arg;
 	const char *name;
 } __spd_table[2];
-CFATTACH_DECL_NEW(spd, sizeof(struct device),
+CFATTACH_DECL_NEW(spd, 0,
     spd_match, spd_attach, NULL, NULL);
 #ifdef DEBUG
 #define LEGAL_SLOT(slot)	((slot) >= 0 && (slot) < 2)
 #endif
 int
 spd_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return ((BOOTINFO_REF(BOOTINFO_DEVCONF) ==
 	    BOOTINFO_DEVCONF_SPD_PRESENT));
+}
 void
 spd_attach(device_t parent, device_t self, void *aux)
+{
 	struct spd_attach_args spa;
 	printf(": PlayStation 2 HDD Unit\n");
 	switch (BOOTINFO_REF(BOOTINFO_PCMCIA_TYPE)) {
 	default:
 		__spd_table[0].name = "<unknown product>";
 		break;
 	case 0:
 		/* FALLTHROUGH */
 	case 1:
 		/* FALLTHROUGH */
 	case 2:
 		__spd_table[SPD_HDD].name = "SCPH-20400";
 		__spd_table[SPD_NIC].name = "SCPH-10190";
 		break;
 	case 3:
 		__spd_table[SPD_HDD].name = "SCPH-10260";
 		__spd_table[SPD_NIC].name = "SCPH-10260";
 		break;
+	}
 	/* disable all */
 	_reg_write_2(SPD_INTR_ENABLE_REG16, 0);
 	_reg_write_2(SPD_INTR_CLEAR_REG16, _reg_read_2(SPD_INTR_STATUS_REG16));
 	spa.spa_slot = SPD_HDD;
 	spa.spa_product_name = __spd_table[SPD_HDD].name;
 	config_found(self, &spa, spd_print, CFARGS_NONE);
 	spa.spa_slot = SPD_NIC;
 	spa.spa_product_name = __spd_table[SPD_NIC].name;
 	config_found(self, &spa, spd_print, CFARGS_NONE);
 	sbus_intr_establish(SBUS_IRQ_PCMCIA, spd_intr, 0);
+}
 int
 spd_print(void *aux, const char *pnp)
+{
 	struct spd_attach_args *spa = aux;
 	if (pnp)
 		aprint_normal("%s at %s", __spd_table[spa->spa_slot].name, pnp);
 	return (UNCONF);
+}
 int
 spd_intr(void *arg)
+{
 	u_int16_t r;
 	r = _reg_read_2(SPD_INTR_STATUS_REG16);
  	/* HDD (SCPH-20400) */
 	if ((r & SPD_INTR_HDD) != 0)
 		if (__spd_table[SPD_HDD].func != NULL)
 			(*__spd_table[SPD_HDD].func)(__spd_table[SPD_HDD].arg);
 	/* Network (SCPH-10190) */
 	if ((r & (SPD_INTR_EMAC3 | SPD_INTR_RXEND | SPD_INTR_TXEND |
 	    SPD_INTR_RXDNV | SPD_INTR_TXDNV)) != 0)
 		if (__spd_table[SPD_NIC].func)
 			(*__spd_table[SPD_NIC].func)(__spd_table[SPD_NIC].arg);
 	/* reinstall */
 	r = _reg_read_2(SPD_INTR_ENABLE_REG16);
 	_reg_write_2(SPD_INTR_ENABLE_REG16, 0);
 	_reg_write_2(SPD_INTR_ENABLE_REG16, r);
 	return (1);
+}
 void *
 spd_intr_establish(enum spd_slot slot, int (*func)(void *), void *arg)
+{
 	KDASSERT(LEGAL_SLOT(slot));
 	KDASSERT(__spd_table[slot].func == 0);
 	__spd_table[slot].func = func;
 	__spd_table[slot].arg = arg;
 	return ((void *)slot);
+}
 void
 spd_intr_disestablish(void *handle)
+{
 	int slot = (int)handle;
 	KDASSERT(LEGAL_SLOT(slot));
 	__spd_table[slot].func = 0;
+}
 /*
  * EEPROM access
  */
 void
 spd_eeprom_read(int addr, u_int16_t *data, int n)
+{
 	int i, j, s;
 	u_int8_t r;
 	s = _intr_suspend();
 	/* set direction */
 	_reg_write_1(SPD_IO_DIR_REG8, SPD_IO_CLK | SPD_IO_CS | SPD_IO_IN);
 	/* chip select high */
 	r = 0;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	r |= SPD_IO_CS;
 	r &= ~(SPD_IO_IN | SPD_IO_CLK);
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	/* put start bit */
 	__spd_eeprom_out(&r, 1);
 	/* put op code (read) */
 	__spd_eeprom_out(&r, 1);
 	__spd_eeprom_out(&r, 0);
 	/* set address */
 	for (i = 0; i < 6; i++, addr <<= 1)
 		__spd_eeprom_out(&r, addr & 0x20);
 	/* get data */
 	for (i = 0; i < n; i++, data++)
 		for (*data = 0, j = 15; j >= 0; j--)
 			*data |= (__spd_eeprom_in(&r) << j);
 	/* chip select low */
 	r &= ~(SPD_IO_CS | SPD_IO_IN | SPD_IO_CLK);
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(2);
 	_intr_resume(s);
+}
 void
 __spd_eeprom_out(u_int8_t *rp, int onoff)
+{
 	u_int8_t r = *rp;
 	if (onoff)
 		r |= SPD_IO_IN;
 	else
 		r &= ~SPD_IO_IN;
 	r &= ~SPD_IO_CLK;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	r |= SPD_IO_CLK;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	r &= ~SPD_IO_CLK;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	*rp = r;
+}
 int
 __spd_eeprom_in(u_int8_t *rp)
+{
 	int ret;
 	u_int8_t r = *rp;
 	r &= ~(SPD_IO_IN | SPD_IO_CLK);
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	r |= SPD_IO_CLK;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	ret = (_reg_read_1(SPD_IO_DATA_REG8) >> 4) & 0x1;
 	r &= ~SPD_IO_CLK;
 	_reg_write_1(SPD_IO_DATA_REG8, r);
 	delay(1);
 	*rp = r;
 	return (ret);
+}

 @@ -1,86 +1,86 @@
-/*	$NetBSD: mainbus.c,v 1.18 2021/08/07 16:19:02 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.19 2022/02/11 17:30:48 riastradh Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.18 2021/08/07 16:19:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.19 2022/02/11 17:30:48 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <machine/autoconf.h>
 static int mainbus_match(device_t, cfdata_t, void *);
 static void mainbus_attach(device_t, device_t, void *);
 static int mainbus_search(device_t, cfdata_t,
 			  const int *, void *);
 static int mainbus_print(void *, const char *);
-CFATTACH_DECL_NEW(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, 0,
     mainbus_match, mainbus_attach, NULL, NULL);
 static int
 mainbus_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return (1);
+}
 static void
 mainbus_attach(device_t parent, device_t self, void *aux)
+{
 	printf("\n");
 	/* attach CPU first */
 	config_found(self, &(struct mainbus_attach_args){.ma_name = "cpu"},
 	    mainbus_print, CFARGS_NONE);
 	config_search(self, NULL,
 	    CFARGS(.search = mainbus_search));
+}
 static int
 mainbus_search(device_t parent, cfdata_t cf,
 	       const int *ldesc, void *aux)
+{
 	struct mainbus_attach_args ma;
 	ma.ma_name = cf->cf_name;
 	if (config_probe(parent, cf, &ma))
 		config_attach(parent, cf, &ma, mainbus_print, CFARGS_NONE);
 	return (0);
+}
 static int
 mainbus_print(void *aux, const char *pnp)
+{
 	return (pnp ? QUIET : UNCONF);
+}