[src/trunk]: src/sys/arch/alpha CFATTACH_DECL(..., sizeof(struct device), -> ...

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

details:   https://anonhg.NetBSD.org/src/rev/11e6ec6dac33
branches:  trunk
changeset: 765808:11e6ec6dac33
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jun 06 17:30:32 2011 +0000

description:
CFATTACH_DECL(..., sizeof(struct device), -> CFATTACH_DECL_NEW(..., 0
struct device * -> device_t
struct cfdata * -> cfdata_t

diffstat:

 sys/arch/alpha/isa/isa_machdep.c |  14 +++++++-------
 sys/arch/alpha/pci/ttwoga.c      |  24 ++++++++++++------------
 sys/arch/alpha/tlsb/tlsb.c       |  14 +++++++-------
 3 files changed, 26 insertions(+), 26 deletions(-)

diffs (177 lines):

diff -r 05add1303507 -r 11e6ec6dac33 sys/arch/alpha/isa/isa_machdep.c
--- a/sys/arch/alpha/isa/isa_machdep.c  Mon Jun 06 17:27:42 2011 +0000
+++ b/sys/arch/alpha/isa/isa_machdep.c  Mon Jun 06 17:30:32 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.20 2011/06/06 17:30:32 matt Exp $ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2010/12/15 01:29:37 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.20 2011/06/06 17:30:32 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -55,10 +55,10 @@
 #if (NPCPPI > 0)
 #include <dev/isa/pcppivar.h>
 
-int isabeepmatch(struct device *, struct cfdata *, void *);
-void isabeepattach(struct device *, struct device *, void *);
+int isabeepmatch(device_t, cfdata_t, void *);
+void isabeepattach(device_t, device_t, void *);
 
-CFATTACH_DECL(isabeep, sizeof(struct device),
+CFATTACH_DECL_NEW(isabeep, 0,
     isabeepmatch, isabeepattach, NULL, NULL);
 
 static int ppi_attached;
@@ -79,13 +79,13 @@
 
 #if (NPCPPI > 0)
 int
-isabeepmatch(struct device *parent, struct cfdata *match, void *aux)
+isabeepmatch(device_t parent, cfdata_t match, void *aux)
 {
        return (!ppi_attached);
 }
 
 void
-isabeepattach(struct device *parent, struct device *self, void *aux)
+isabeepattach(device_t parent, device_t self, void *aux)
 {
        printf("\n");
 
diff -r 05add1303507 -r 11e6ec6dac33 sys/arch/alpha/pci/ttwoga.c
--- a/sys/arch/alpha/pci/ttwoga.c       Mon Jun 06 17:27:42 2011 +0000
+++ b/sys/arch/alpha/pci/ttwoga.c       Mon Jun 06 17:30:32 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ttwoga.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $ */
+/* $NetBSD: ttwoga.c,v 1.13 2011/06/06 17:30:32 matt Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.12 2011/05/17 17:34:47 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttwoga.c,v 1.13 2011/06/06 17:30:32 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -62,18 +62,18 @@
 
 #include "locators.h"
 
-int    ttwogamatch(struct device *, struct cfdata *, void *);
-void   ttwogaattach(struct device *, struct device *, void *);
+int    ttwogamatch(device_t, cfdata_t, void *);
+void   ttwogaattach(device_t, device_t, void *);
 
-CFATTACH_DECL(ttwoga, sizeof(struct device),
+CFATTACH_DECL_NEW(ttwoga, 0,
     ttwogamatch, ttwogaattach, NULL, NULL);
 
 int    ttwogaprint(void *, const char *);
 
-int    ttwopcimatch(struct device *, struct cfdata *, void *);
-void   ttwopciattach(struct device *, struct device *, void *);
+int    ttwopcimatch(device_t, cfdata_t, void *);
+void   ttwopciattach(device_t, device_t, void *);
 
-CFATTACH_DECL(ttwopci, sizeof(struct device),
+CFATTACH_DECL_NEW(ttwopci, 0,
     ttwopcimatch, ttwopciattach, NULL, NULL);
 
 int    ttwosableioprint(void *, const char *);
@@ -108,7 +108,7 @@
 #undef MEGABYTE
 
 int
-ttwogamatch(struct device *parent, struct cfdata *match, void *aux)
+ttwogamatch(device_t parent, cfdata_t match, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
 
@@ -123,7 +123,7 @@
 }
 
 void
-ttwogaattach(struct device *parent, struct device *self, void *aux)
+ttwogaattach(device_t parent, device_t self, void *aux)
 {
        struct pcibus_attach_args pba;
        int hose;
@@ -205,7 +205,7 @@
 }
 
 int
-ttwopcimatch(struct device *parent, struct cfdata *match, void *aux)
+ttwopcimatch(device_t parent, cfdata_t match, void *aux)
 {
        struct pcibus_attach_args *pba = aux;
 
@@ -217,7 +217,7 @@
 }
 
 void
-ttwopciattach(struct device *parent, struct device *self, void *aux)
+ttwopciattach(device_t parent, device_t self, void *aux)
 {
        struct pcibus_attach_args *pba = aux, npba;
        struct ttwoga_config *tcp;
diff -r 05add1303507 -r 11e6ec6dac33 sys/arch/alpha/tlsb/tlsb.c
--- a/sys/arch/alpha/tlsb/tlsb.c        Mon Jun 06 17:27:42 2011 +0000
+++ b/sys/arch/alpha/tlsb/tlsb.c        Mon Jun 06 17:30:32 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: tlsb.c,v 1.34 2009/03/14 15:36:00 dsl Exp $ */
+/* $NetBSD: tlsb.c,v 1.35 2011/06/06 17:30:33 matt Exp $ */
 /*
  * Copyright (c) 1997 by Matthew Jacob
  * NASA AMES Research Center.
@@ -39,7 +39,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.34 2009/03/14 15:36:00 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tlsb.c,v 1.35 2011/06/06 17:30:33 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -62,10 +62,10 @@
 
 #define KV(_addr)      ((void *)ALPHA_PHYS_TO_K0SEG((_addr)))
 
-static int     tlsbmatch(struct device *, struct cfdata *, void *);
-static void    tlsbattach(struct device *, struct device *, void *);
+static int     tlsbmatch(device_t, cfdata_t, void *);
+static void    tlsbattach(device_t, device_t, void *);
 
-CFATTACH_DECL(tlsb, sizeof (struct device),
+CFATTACH_DECL_NEW(tlsb, 0,
     tlsbmatch, tlsbattach, NULL, NULL);
 
 extern struct cfdriver tlsb_cd;
@@ -100,7 +100,7 @@
 }
 
 static int
-tlsbmatch(struct device *parent, struct cfdata *cf, void *aux)
+tlsbmatch(device_t parent, cfdata_t cf, void *aux)
 {
        struct mainbus_attach_args *ma = aux;
 
@@ -120,7 +120,7 @@
 }
 
 static void
-tlsbattach(struct device *parent, struct device *self, void *aux)
+tlsbattach(device_t parent, device_t self, void *aux)
 {
        struct tlsb_dev_attach_args ta;
        u_int32_t tldev;