 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -24,27 +24,27 @@
  * 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>
 @@ -75,27 +75,27 @@ STATIC int (*sbus_pcmcia_intr)(void *) =
 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);

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -20,27 +20,27 @@
  * ``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
 @@ -53,27 +53,27 @@ STATIC int spd_match(device_t, cfdata_t,
 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));
+}

 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -17,41 +17,41 @@
  * ``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)
+{