Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/vax device_t, cfdata_t, etc.



details:   https://anonhg.NetBSD.org/src/rev/73cb5552b5ff
branches:  trunk
changeset: 765775:73cb5552b5ff
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Jun 05 16:59:21 2011 +0000

description:
device_t, cfdata_t, etc.
CFATTACH_DECL -> CFATTACH_DECL_NEW for sizeof(struct device).

diffstat:

 sys/arch/vax/include/cpu.h   |   4 ++--
 sys/arch/vax/include/nexus.h |   4 ++--
 sys/arch/vax/include/types.h |   4 +++-
 sys/arch/vax/uba/uba_ubi.c   |   8 ++++----
 sys/arch/vax/vax/ka6400.c    |   6 +++---
 sys/arch/vax/vax/ka730.c     |  16 ++++++++--------
 sys/arch/vax/vax/ka820.c     |   6 +++---
 sys/arch/vax/vax/ka88.c      |   6 +++---
 sys/arch/vax/vax/multicpu.c  |   6 +++---
 sys/arch/vax/vax/ubi.c       |  14 +++++++-------
 10 files changed, 38 insertions(+), 36 deletions(-)

diffs (288 lines):

diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/include/cpu.h
--- a/sys/arch/vax/include/cpu.h        Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/include/cpu.h        Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*      $NetBSD: cpu.h,v 1.92 2011/04/14 08:17:27 matt Exp $      */
+/*      $NetBSD: cpu.h,v 1.93 2011/06/05 16:59:21 matt Exp $      */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -123,7 +123,7 @@
         * Public members.
         */
        struct cpu_data ci_data;        /* MI per-cpu data */
-       struct device *ci_dev;          /* device struct for this cpu */
+       device_t ci_dev;                /* device struct for this cpu */
        int ci_mtx_oldspl;              /* saved spl */
        int ci_mtx_count;               /* negative count of mutexes */
        int ci_cpuid;                   /* h/w specific cpu id */
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/include/nexus.h
--- a/sys/arch/vax/include/nexus.h      Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/include/nexus.h      Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nexus.h,v 1.26 2010/07/01 19:50:12 ragge Exp $ */
+/*     $NetBSD: nexus.h,v 1.27 2011/06/05 16:59:21 matt Exp $  */
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -114,7 +114,7 @@
 
 /* Memory device struct. This should be somewhere else */
 struct mem_softc {
-       struct  device *sc_dev;
+       device_t sc_dev;
        void *  sc_memaddr;
        int     sc_memtype;
        int     sc_memnr;
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/include/types.h
--- a/sys/arch/vax/include/types.h      Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/include/types.h      Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.41 2010/12/22 01:03:18 matt Exp $  */
+/*     $NetBSD: types.h,v 1.42 2011/06/05 16:59:21 matt Exp $  */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -77,4 +77,6 @@
 #define        __HAVE_FAST_SOFTINTS
 #define        __HAVE_CPU_DATA_FIRST
 
+#define        __HAVE___LWP_GETPRIVATE_FAST
+
 #endif /* _MACHTYPES_H_ */
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/uba/uba_ubi.c
--- a/sys/arch/vax/uba/uba_ubi.c        Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/uba/uba_ubi.c        Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $    */
+/*     $NetBSD: uba_ubi.c,v 1.3 2011/06/05 16:59:21 matt Exp $    */
 /*
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * All rights reserved.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.2 2010/12/14 23:38:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uba_ubi.c,v 1.3 2011/06/05 16:59:21 matt Exp $");
 
 #define _VAX_BUS_DMA_PRIVATE
 
@@ -98,8 +98,8 @@
  * and bus status/command registers, the latter are (partly) IPR's
  * on 750.
  */
-static int     dw730_match(struct device *, struct cfdata *, void *);
-static void    dw730_attach(struct device *, struct device *, void *);
+static int     dw730_match(device_t, cfdata_t, void *);
+static void    dw730_attach(device_t, device_t, void *);
 static void    dw730_init(struct uba_softc*);
 #ifdef notyet
 static void    dw730_purge(struct uba_softc *, int);
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/ka6400.c
--- a/sys/arch/vax/vax/ka6400.c Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/ka6400.c Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $ */
+/*     $NetBSD: ka6400.c,v 1.16 2011/06/05 16:59:21 matt Exp $ */
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka6400.c,v 1.16 2011/06/05 16:59:21 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -194,7 +194,7 @@
 static void ms6400_attach(device_t , device_t , void*);
 
 struct mem_xmi_softc {
-       struct device *sc_dev;
+       device_t sc_dev;
        bus_space_tag_t sc_iot;
        bus_space_handle_t sc_ioh;
 };
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/ka730.c
--- a/sys/arch/vax/vax/ka730.c  Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/ka730.c  Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $ */
+/*     $NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $ */
 /*
  * Copyright (c) 1982, 1986, 1988 The Regents of the University of California.
  * All rights reserved.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.2 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka730.c,v 1.3 2011/06/05 16:59:21 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,16 +120,16 @@
        aprint_normal("KA730, ucode rev %d\n", V730UCODE(vax_cpudata));
 }
 
-static void ka730_memenable(struct device *, struct device *, void *);
-static int ka730_memmatch(struct device  *, struct cfdata *, void *);
+static void ka730_memenable(device_t, device_t, void *);
+static int ka730_memmatch(device_t, cfdata_t, void *);
 
-CFATTACH_DECL(mem_ubi, sizeof(struct device),
+CFATTACH_DECL_NEW(mem_ubi, 0,
     ka730_memmatch, ka730_memenable, NULL, NULL);
 
 int
-ka730_memmatch(struct device *parent, struct cfdata *cf, void *aux)
+ka730_memmatch(device_t parent, cfdata_t cf, void *aux)
 {
-       struct  sbi_attach_args *sa = (struct sbi_attach_args *)aux;
+       struct  sbi_attach_args *sa = aux;
 
        if (cf->cf_loc[UBICF_TR] != sa->sa_nexnum &&
            cf->cf_loc[UBICF_TR] > UBICF_TR_DEFAULT)
@@ -148,7 +148,7 @@
 
 /* enable crd interrupts */
 void
-ka730_memenable(struct device *parent, struct device *self, void *aux)
+ka730_memenable(device_t parent, device_t self, void *aux)
 {
 }
 
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/ka820.c
--- a/sys/arch/vax/vax/ka820.c  Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/ka820.c  Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $  */
+/*     $NetBSD: ka820.c,v 1.54 2011/06/05 16:59:21 matt Exp $  */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.53 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka820.c,v 1.54 2011/06/05 16:59:21 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -279,7 +279,7 @@
 static void ms820_attach(device_t, device_t, void*);
 
 struct mem_bi_softc {
-       struct device *sc_dev;
+       device_t sc_dev;
        bus_space_tag_t sc_iot;
        bus_space_handle_t sc_ioh;
 };
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/ka88.c
--- a/sys/arch/vax/vax/ka88.c   Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/ka88.c   Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $   */
+/*     $NetBSD: ka88.c,v 1.16 2011/06/05 16:59:21 matt Exp $   */
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.15 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ka88.c,v 1.16 2011/06/05 16:59:21 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -165,7 +165,7 @@
     ka88_cpu_match, ka88_cpu_attach, NULL, NULL);
 
 struct mem_nmi_softc {
-       struct device *sc_dev;
+       device_t sc_dev;
        bus_space_tag_t sc_iot;
        bus_space_handle_t sc_ioh;
 };
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/multicpu.c
--- a/sys/arch/vax/vax/multicpu.c       Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/multicpu.c       Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $       */
+/*     $NetBSD: multicpu.c,v 1.32 2011/06/05 16:59:21 matt Exp $       */
 
 /*
  * Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.31 2010/12/14 23:44:49 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multicpu.c,v 1.32 2011/06/05 16:59:21 matt Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -57,7 +57,7 @@
 struct cpuq {
        SIMPLEQ_ENTRY(cpuq) cq_q;
        struct cpu_info *cq_ci;
-       struct device *cq_dev;
+       device_t cq_dev;
 };
 
 SIMPLEQ_HEAD(, cpuq) cpuq = SIMPLEQ_HEAD_INITIALIZER(cpuq);
diff -r d15667410964 -r 73cb5552b5ff sys/arch/vax/vax/ubi.c
--- a/sys/arch/vax/vax/ubi.c    Sun Jun 05 16:58:00 2011 +0000
+++ b/sys/arch/vax/vax/ubi.c    Sun Jun 05 16:59:21 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $ */
+/*     $NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $ */
 /*
  * Copyright (c) 1999 Ludd, University of Lule}, Sweden.
  * All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.3 2010/12/14 23:44:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubi.c,v 1.4 2011/06/05 16:59:21 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -44,10 +44,10 @@
 #include <machine/ka730.h>
 
 static int ubi_print(void *, const char *);
-static int ubi_match(struct device *, struct cfdata *, void *);
-static void ubi_attach(struct device *, struct device *, void*);
+static int ubi_match(device_t, cfdata_t, void *);
+static void ubi_attach(device_t, device_t, void*);
 
-CFATTACH_DECL_NEW(ubi, sizeof(struct device),
+CFATTACH_DECL_NEW(ubi, 0,
     ubi_match, ubi_attach, NULL, NULL);
 
 int
@@ -64,7 +64,7 @@
 
 
 int
-ubi_match(struct device *parent, struct cfdata *cf, void *aux)
+ubi_match(device_t parent, cfdata_t cf, void *aux)
 {
        if (vax_bustype == VAX_UNIBUS)
                return 1;
@@ -72,7 +72,7 @@
 }
 
 void
-ubi_attach(struct device *parent, struct device *self, void *aux)
+ubi_attach(device_t parent, device_t self, void *aux)
 {
        struct  sbi_attach_args sa;
 



Home | Main Index | Thread Index | Old Index