[src/trunk]: src/sys/arch/playstation2 CFATTACH_DECL -> CFATTACH_DECL_NEW

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/be3742f6ae15
branches:  trunk
changeset: 346571:be3742f6ae15
user:      maya <maya%NetBSD.org@localhost>
date:      Tue Jul 19 17:04:25 2016 +0000

description:
CFATTACH_DECL -> CFATTACH_DECL_NEW
struct device * -> device_t

diffstat:

 sys/arch/playstation2/dev/sbus.c             |  18 +++++++++---------
 sys/arch/playstation2/dev/spd.c              |  14 +++++++-------
 sys/arch/playstation2/playstation2/mainbus.c |  18 +++++++++---------
 3 files changed, 25 insertions(+), 25 deletions(-)

diffs (176 lines):

diff -r b823cb6c702e -r be3742f6ae15 sys/arch/playstation2/dev/sbus.c
--- a/sys/arch/playstation2/dev/sbus.c  Tue Jul 19 17:01:04 2016 +0000
+++ b/sys/arch/playstation2/dev/sbus.c  Tue Jul 19 17:04:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sbus.c,v 1.16 2016/07/19 13:48:51 maya Exp $   */
+/*     $NetBSD: sbus.c,v 1.17 2016/07/19 17:04:25 maya Exp $   */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.16 2016/07/19 13:48:51 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.17 2016/07/19 17:04:25 maya Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -79,20 +79,20 @@
 STATIC void sbus_init(int);
 STATIC int sbus_intr(void *);
 
-STATIC int sbus_match(struct device *, cfdata_t, void *);
-STATIC void sbus_attach(struct device *, struct device *, void *);
-STATIC int sbus_search(struct device *, cfdata_t,
+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(sbus, sizeof (struct device),
+CFATTACH_DECL_NEW(sbus, sizeof (struct device),
     sbus_match, sbus_attach, NULL, NULL);
 
 extern struct cfdriver sbus_cd;
 STATIC int __sbus_attached;
 
 int
-sbus_match(struct device *parent, cfdata_t cf, void *aux)
+sbus_match(device_t parent, cfdata_t cf, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
 
@@ -103,7 +103,7 @@
 }
 
 void
-sbus_attach(struct device *parent, struct device *self, void *aux)
+sbus_attach(device_t parent, device_t self, void *aux)
 {
        int type = BOOTINFO_REF(BOOTINFO_PCMCIA_TYPE); 
 
@@ -116,7 +116,7 @@
 }
 
 int
-sbus_search(struct device *parent, cfdata_t cf,
+sbus_search(device_t parent, cfdata_t cf,
            const int *ldesc, void *aux)
 {
        struct sbus_attach_args sa;
diff -r b823cb6c702e -r be3742f6ae15 sys/arch/playstation2/dev/spd.c
--- a/sys/arch/playstation2/dev/spd.c   Tue Jul 19 17:01:04 2016 +0000
+++ b/sys/arch/playstation2/dev/spd.c   Tue Jul 19 17:04:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spd.c,v 1.12 2016/07/19 13:48:51 maya Exp $    */
+/*     $NetBSD: spd.c,v 1.13 2016/07/19 17:04:25 maya Exp $    */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.12 2016/07/19 13:48:51 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spd.c,v 1.13 2016/07/19 17:04:25 maya Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -49,8 +49,8 @@
 #define STATIC static
 #endif
 
-STATIC int spd_match(struct device *, cfdata_t, void *);
-STATIC void spd_attach(struct device *, struct device *, void *);
+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);
@@ -63,7 +63,7 @@
        const char *name;
 } __spd_table[2];
 
-CFATTACH_DECL(spd, sizeof(struct device),
+CFATTACH_DECL_NEW(spd, sizeof(struct device),
     spd_match, spd_attach, NULL, NULL);
 
 #ifdef DEBUG
@@ -71,7 +71,7 @@
 #endif
 
 int
-spd_match(struct device *parent, cfdata_t cf, void *aux)
+spd_match(device_t parent, cfdata_t cf, void *aux)
 {
        
        return ((BOOTINFO_REF(BOOTINFO_DEVCONF) ==
@@ -79,7 +79,7 @@
 }
 
 void
-spd_attach(struct device *parent, struct device *self, void *aux)
+spd_attach(device_t parent, device_t self, void *aux)
 {
        struct spd_attach_args spa;
 
diff -r b823cb6c702e -r be3742f6ae15 sys/arch/playstation2/playstation2/mainbus.c
--- a/sys/arch/playstation2/playstation2/mainbus.c      Tue Jul 19 17:01:04 2016 +0000
+++ b/sys/arch/playstation2/playstation2/mainbus.c      Tue Jul 19 17:04:25 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.15 2016/07/19 13:48:52 maya Exp $        */
+/*     $NetBSD: mainbus.c,v 1.16 2016/07/19 17:04:25 maya Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.15 2016/07/19 13:48:52 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.16 2016/07/19 17:04:25 maya Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -35,24 +35,24 @@
 
 #include <machine/autoconf.h>
 
-static int mainbus_match(struct device *, cfdata_t, void *);
-static void mainbus_attach(struct device *, struct device *, void *);
-static int mainbus_search(struct device *, cfdata_t,
+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(mainbus, sizeof(struct device),
+CFATTACH_DECL_NEW(mainbus, sizeof(struct device),
     mainbus_match, mainbus_attach, NULL, NULL);
 
 static int
-mainbus_match(struct device *parent, cfdata_t cf, void *aux)
+mainbus_match(device_t parent, cfdata_t cf, void *aux)
 {
 
        return (1);
 }
 
 static void
-mainbus_attach(struct device *parent, struct device *self, void *aux)
+mainbus_attach(device_t parent, device_t self, void *aux)
 {
 
        printf("\n");
@@ -65,7 +65,7 @@
 }
 
 static int
-mainbus_search(struct device *parent, cfdata_t cf,
+mainbus_search(device_t parent, cfdata_t cf,
               const int *ldesc, void *aux)
 {
        struct mainbus_attach_args ma;