diff options
| author | ragge <ragge@NetBSD.org> | 1999-05-27 03:45:21 +0000 |
|---|---|---|
| committer | ragge <ragge@NetBSD.org> | 1999-05-27 03:45:21 +0000 |
| commit | f558ec11e26e6f3278f7933fc6a4eab0a4639e54 (patch) | |
| tree | a2ada78a014a7b2fc3acf869b115f019ab2d8c6c /sys/dev/dec | |
| parent | c346b0ace0fc7879f05c5c7c34e0f04439738b0b (diff) | |
Directory called qbus instead of uba, per request from Matt/Jason/...
(More describing name actually)
Diffstat (limited to 'sys/dev/dec')
| -rw-r--r-- | sys/dev/dec/qbus/dl.c | 8 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/dz.c | 10 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/dz_uba.c | 10 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/files.uba | 11 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/uba.c | 6 | ||||
| -rw-r--r-- | sys/dev/dec/qbus/ubareg.h | 4 |
6 files changed, 28 insertions, 21 deletions
diff --git a/sys/dev/dec/qbus/dl.c b/sys/dev/dec/qbus/dl.c index 79532f91a1b..fda3993be4f 100644 --- a/sys/dev/dec/qbus/dl.c +++ b/sys/dev/dec/qbus/dl.c @@ -1,4 +1,4 @@ -/* $NetBSD: dl.c,v 1.7 1999/05/26 02:01:49 ragge Exp $ */ +/* $NetBSD: dl.c,v 1.8 1999/05/27 03:45:21 ragge Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -97,10 +97,10 @@ #include <machine/bus.h> #include <machine/scb.h> -#include <dev/dec/uba/ubareg.h> -#include <dev/dec/uba/ubavar.h> +#include <dev/dec/qbus/ubareg.h> +#include <dev/dec/qbus/ubavar.h> -#include <dev/dec/uba/dlreg.h> +#include <dev/dec/qbus/dlreg.h> #include "ioconf.h" diff --git a/sys/dev/dec/qbus/dz.c b/sys/dev/dec/qbus/dz.c index af9fc03ec43..7d4ae47069a 100644 --- a/sys/dev/dec/qbus/dz.c +++ b/sys/dev/dec/qbus/dz.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz.c,v 1.15 1999/05/26 01:26:17 ragge Exp $ */ +/* $NetBSD: dz.c,v 1.16 1999/05/27 03:45:21 ragge Exp $ */ /* * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. * Copyright (c) 1992, 1993 @@ -61,11 +61,11 @@ #include <machine/trap.h> #include <machine/cpu.h> -#include <dev/dec/uba/ubareg.h> -#include <dev/dec/uba/ubavar.h> +#include <dev/dec/qbus/ubareg.h> +#include <dev/dec/qbus/ubavar.h> -#include <dev/dec/uba/dzreg.h> -#include <dev/dec/uba/dzvar.h> +#include <dev/dec/qbus/dzreg.h> +#include <dev/dec/qbus/dzvar.h> #define DZ_READ_BYTE(adr) \ bus_space_read_1(sc->sc_iot, sc->sc_ioh, sc->sc_dr.adr) diff --git a/sys/dev/dec/qbus/dz_uba.c b/sys/dev/dec/qbus/dz_uba.c index 42aa3bfefef..2d44ffbe086 100644 --- a/sys/dev/dec/qbus/dz_uba.c +++ b/sys/dev/dec/qbus/dz_uba.c @@ -1,4 +1,4 @@ -/* $NetBSD: dz_uba.c,v 1.4 1999/05/26 01:26:17 ragge Exp $ */ +/* $NetBSD: dz_uba.c,v 1.5 1999/05/27 03:45:21 ragge Exp $ */ /* * Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved. * Copyright (c) 1996 Ken C. Wellsch. All rights reserved. @@ -49,11 +49,11 @@ #include <machine/trap.h> #include <machine/scb.h> -#include <dev/dec/uba/ubareg.h> -#include <dev/dec/uba/ubavar.h> +#include <dev/dec/qbus/ubareg.h> +#include <dev/dec/qbus/ubavar.h> -#include <dev/dec/uba/dzreg.h> -#include <dev/dec/uba/dzvar.h> +#include <dev/dec/qbus/dzreg.h> +#include <dev/dec/qbus/dzvar.h> #include "ioconf.h" diff --git a/sys/dev/dec/qbus/files.uba b/sys/dev/dec/qbus/files.uba index 320c054cc52..7a9844169c6 100644 --- a/sys/dev/dec/qbus/files.uba +++ b/sys/dev/dec/qbus/files.uba @@ -1,4 +1,4 @@ -# $NetBSD: files.uba,v 1.2 1999/05/26 01:26:18 ragge Exp $ +# $NetBSD: files.uba,v 1.3 1999/05/27 03:45:21 ragge Exp $ # # Config file and device description for machine-independent # code for devices Digital Equipment Corp. Unibus and Q22 bus. @@ -10,5 +10,10 @@ file dev/dec/uba/uba.c uba & new_uba # DZ-11 (-compatible) tty device driver. device dz { }: tty attach dz at uba with dz_uba -file dev/dec/uba/dz.c dz needs-flag -file dev/dec/uba/dz_uba.c dz_uba & new_uba +file dev/dec/qbus/dz.c dz needs-flag +file dev/dec/qbus/dz_uba.c dz_uba & new_uba + +# DL-11 at UBA +device dl: tty +attach dl at uba +file dev/dec/qbus/dl.c dl needs-flag diff --git a/sys/dev/dec/qbus/uba.c b/sys/dev/dec/qbus/uba.c index aa9b268a6ea..115485c42b7 100644 --- a/sys/dev/dec/qbus/uba.c +++ b/sys/dev/dec/qbus/uba.c @@ -1,4 +1,4 @@ -/* $NetBSD: uba.c,v 1.44 1999/05/26 01:26:18 ragge Exp $ */ +/* $NetBSD: uba.c,v 1.45 1999/05/27 03:45:21 ragge Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. @@ -62,8 +62,8 @@ #include <machine/pte.h> #endif -#include <dev/dec/uba/ubareg.h> -#include <dev/dec/uba/ubavar.h> +#include <dev/dec/qbus/ubareg.h> +#include <dev/dec/qbus/ubavar.h> static int ubasearch __P((struct device *, struct cfdata *, void *)); static int ubaprint __P((void *, const char *)); diff --git a/sys/dev/dec/qbus/ubareg.h b/sys/dev/dec/qbus/ubareg.h index d29d4cc31e1..6877b7bf68d 100644 --- a/sys/dev/dec/qbus/ubareg.h +++ b/sys/dev/dec/qbus/ubareg.h @@ -1,4 +1,4 @@ -/* $NetBSD: ubareg.h,v 1.11 1999/05/24 20:12:58 ragge Exp $ */ +/* $NetBSD: ubareg.h,v 1.12 1999/05/27 03:45:21 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -89,6 +89,7 @@ #define UBAIOSIZE 8192 /* 8K I/O space */ #ifndef _LOCORE +#if 0 /* * DW780/DW750 hardware registers */ @@ -108,6 +109,7 @@ struct uba_regs { int pad3[UBAIOPAGES]; /* no maps for device address space */ }; #endif +#endif #ifdef DW780 /* uba_cnfgr */ |
