Module Name: src
Committed By: tsutsui
Date: Sat Oct 13 06:51:23 UTC 2012
Modified Files:
src/sys/arch/pmax/pmax: autoconf.c dec_3100.c dec_3max.c dec_3maxplus.c
dec_3min.c dec_5100.c dec_maxine.c
src/sys/arch/pmax/tc: tcbus.c
Log Message:
struct device * -> device_t, use device_xname() (from chs@)
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/pmax/pmax/autoconf.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/pmax/pmax/dec_3100.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/pmax/pmax/dec_3max.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/pmax/pmax/dec_3maxplus.c
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/pmax/pmax/dec_3min.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/pmax/pmax/dec_5100.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/pmax/pmax/dec_maxine.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/pmax/tc/tcbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/pmax/autoconf.c
diff -u src/sys/arch/pmax/pmax/autoconf.c:1.79 src/sys/arch/pmax/pmax/autoconf.c:1.80
--- src/sys/arch/pmax/pmax/autoconf.c:1.79 Sun Jul 29 18:05:45 2012
+++ src/sys/arch/pmax/pmax/autoconf.c Sat Oct 13 06:51:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.79 2012/07/29 18:05:45 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.80 2012/10/13 06:51:22 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.79 2012/07/29 18:05:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.80 2012/10/13 06:51:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -62,9 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include "opt_dec_3100.h"
#include "opt_dec_5100.h"
-struct intrhand intrtab[MAX_DEV_NCOOKIES];
-static struct device *booted_controller;
-static int booted_slot, booted_unit;
+struct intrhand intrtab[MAX_DEV_NCOOKIES];
+static device_t booted_controller;
+static int booted_slot, booted_unit;
static const char *booted_protocol;
/*
@@ -149,7 +149,7 @@ cpu_rootconf(void)
{
printf("boot device: %s\n",
- booted_device ? booted_device->dv_xname : "<unknown>");
+ booted_device ? device_xname(booted_device) : "<unknown>");
rootconf();
}
@@ -158,11 +158,11 @@ cpu_rootconf(void)
* Try to determine the boot device.
*/
void
-device_register(struct device *dev, void *aux)
+device_register(device_t dev, void *aux)
{
static int found, initted, scsiboot, netboot;
- static struct device *ioasicdev;
- struct device *parent = device_parent(dev);
+ static device_t ioasicdev;
+ device_t parent = device_parent(dev);
if (found)
return;
Index: src/sys/arch/pmax/pmax/dec_3100.c
diff -u src/sys/arch/pmax/pmax/dec_3100.c:1.52 src/sys/arch/pmax/pmax/dec_3100.c:1.53
--- src/sys/arch/pmax/pmax/dec_3100.c:1.52 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_3100.c Sat Oct 13 06:51:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3100.c,v 1.52 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_3100.c,v 1.53 2012/10/13 06:51:22 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -69,7 +69,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.52 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3100.c,v 1.53 2012/10/13 06:51:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -102,7 +102,7 @@ static void dec_3100_bus_reset(void);
static void dec_3100_cons_init(void);
static void dec_3100_errintr(void);
static void dec_3100_intr(uint32_t, vaddr_t, uint32_t);
-static void dec_3100_intr_establish(struct device *, void *,
+static void dec_3100_intr_establish(device_t, void *,
int, int (*)(void *), void *);
#define kn01_wbflush() wbflush() /* XXX to be corrected XXX */
@@ -221,7 +221,7 @@ dec_3100_intr(uint32_t status, vaddr_t p
}
static void
-dec_3100_intr_establish(struct device *dev, void *cookie, int level,
+dec_3100_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
Index: src/sys/arch/pmax/pmax/dec_3max.c
diff -u src/sys/arch/pmax/pmax/dec_3max.c:1.54 src/sys/arch/pmax/pmax/dec_3max.c:1.55
--- src/sys/arch/pmax/pmax/dec_3max.c:1.54 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_3max.c Sat Oct 13 06:51:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3max.c,v 1.54 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_3max.c,v 1.55 2012/10/13 06:51:22 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.54 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.55 2012/10/13 06:51:22 tsutsui Exp $");
#include "dzkbd.h"
@@ -220,7 +220,7 @@ static const struct {
};
static void
-dec_3max_intr_establish(struct device *dev, void *cookie, int level,
+dec_3max_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
int i;
Index: src/sys/arch/pmax/pmax/dec_3maxplus.c
diff -u src/sys/arch/pmax/pmax/dec_3maxplus.c:1.68 src/sys/arch/pmax/pmax/dec_3maxplus.c:1.69
--- src/sys/arch/pmax/pmax/dec_3maxplus.c:1.68 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_3maxplus.c Sat Oct 13 06:51:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.68 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.69 2012/10/13 06:51:22 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.68 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.69 2012/10/13 06:51:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -104,7 +104,7 @@ static void dec_3maxplus_bus_reset(void)
static void dec_3maxplus_cons_init(void);
static void dec_3maxplus_errintr(void);
static void dec_3maxplus_intr(uint32_t, vaddr_t, uint32_t);
-static void dec_3maxplus_intr_establish(struct device *, void *,
+static void dec_3maxplus_intr_establish(device_t, void *,
int, int (*)(void *), void *);
static void kn03_wbflush(void);
@@ -234,7 +234,7 @@ dec_3maxplus_cons_init(void)
}
static void
-dec_3maxplus_intr_establish(struct device *dev, void *cookie, int level,
+dec_3maxplus_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
uint32_t mask;
Index: src/sys/arch/pmax/pmax/dec_3min.c
diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.71 src/sys/arch/pmax/pmax/dec_3min.c:1.72
--- src/sys/arch/pmax/pmax/dec_3min.c:1.71 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_3min.c Sat Oct 13 06:51:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.71 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_3min.c,v 1.72 2012/10/13 06:51:23 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.71 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.72 2012/10/13 06:51:23 tsutsui Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -102,7 +102,7 @@ void dec_3min_init(void); /* XXX */
static void dec_3min_bus_reset(void);
static void dec_3min_cons_init(void);
static void dec_3min_intr(uint32_t, vaddr_t, uint32_t);
-static void dec_3min_intr_establish(struct device *, void *,
+static void dec_3min_intr_establish(device_t, void *,
int, int (*)(void *), void *);
static void kn02ba_wbflush(void);
@@ -233,7 +233,7 @@ dec_3min_cons_init(void)
}
static void
-dec_3min_intr_establish(struct device *dev, void *cookie, int level,
+dec_3min_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
uint32_t mask;
Index: src/sys/arch/pmax/pmax/dec_5100.c
diff -u src/sys/arch/pmax/pmax/dec_5100.c:1.46 src/sys/arch/pmax/pmax/dec_5100.c:1.47
--- src/sys/arch/pmax/pmax/dec_5100.c:1.46 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_5100.c Sat Oct 13 06:51:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.46 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_5100.c,v 1.47 2012/10/13 06:51:23 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.46 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_5100.c,v 1.47 2012/10/13 06:51:23 tsutsui Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -63,7 +63,7 @@ void dec_5100_init(void); /* XXX */
static void dec_5100_bus_reset(void);
static void dec_5100_cons_init(void);
static void dec_5100_intr(uint32_t, vaddr_t, uint32_t);
-static void dec_5100_intr_establish(struct device *, void *,
+static void dec_5100_intr_establish(device_t, void *,
int, int (*)(void *), void *);
static void dec_5100_memintr(void);
@@ -135,7 +135,7 @@ dec_5100_cons_init(void)
}
static void
-dec_5100_intr_establish(struct device *dev, void *cookie, int level,
+dec_5100_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
Index: src/sys/arch/pmax/pmax/dec_maxine.c
diff -u src/sys/arch/pmax/pmax/dec_maxine.c:1.63 src/sys/arch/pmax/pmax/dec_maxine.c:1.64
--- src/sys/arch/pmax/pmax/dec_maxine.c:1.63 Sat Jul 9 17:32:30 2011
+++ src/sys/arch/pmax/pmax/dec_maxine.c Sat Oct 13 06:51:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.63 2011/07/09 17:32:30 matt Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.64 2012/10/13 06:51:23 tsutsui Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.63 2011/07/09 17:32:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.64 2012/10/13 06:51:23 tsutsui Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -101,7 +101,7 @@ void dec_maxine_init(void); /* XXX */
static void dec_maxine_bus_reset(void);
static void dec_maxine_cons_init(void);
static void dec_maxine_intr(uint32_t, vaddr_t, uint32_t);
-static void dec_maxine_intr_establish(struct device *, void *,
+static void dec_maxine_intr_establish(device_t, void *,
int, int (*)(void *), void *);
static void dec_maxine_tc_init(void);
@@ -227,7 +227,7 @@ dec_maxine_cons_init(void)
}
static void
-dec_maxine_intr_establish(struct device *dev, void *cookie, int level,
+dec_maxine_intr_establish(device_t dev, void *cookie, int level,
int (*handler)(void *), void *arg)
{
uint32_t mask;
Index: src/sys/arch/pmax/tc/tcbus.c
diff -u src/sys/arch/pmax/tc/tcbus.c:1.28 src/sys/arch/pmax/tc/tcbus.c:1.29
--- src/sys/arch/pmax/tc/tcbus.c:1.28 Sat Jul 9 17:32:31 2011
+++ src/sys/arch/pmax/tc/tcbus.c Sat Oct 13 06:51:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: tcbus.c,v 1.28 2011/07/09 17:32:31 matt Exp $ */
+/* $NetBSD: tcbus.c,v 1.29 2012/10/13 06:51:23 tsutsui Exp $ */
/*-
* Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.28 2011/07/09 17:32:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.29 2012/10/13 06:51:23 tsutsui Exp $");
#define _PMAX_BUS_DMA_PRIVATE
/*
@@ -52,10 +52,10 @@ __KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.
#include <dev/tc/tcvar.h>
#include <pmax/pmax/pmaxtype.h>
-static const struct evcnt *tc_ds_intr_evcnt(struct device *, void *);
-static void tc_ds_intr_establish(struct device *, void *,
+static const struct evcnt *tc_ds_intr_evcnt(device_t, void *);
+static void tc_ds_intr_establish(device_t, void *,
int, int (*)(void *), void *);
-static void tc_ds_intr_disestablish(struct device *, void *);
+static void tc_ds_intr_disestablish(device_t, void *);
static bus_dma_tag_t tc_ds_get_dma_tag(int);
extern struct tcbus_attach_args kn02_tc_desc[]; /* XXX */
