Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax Merge forward from matt-nb5-mips64.
details: https://anonhg.NetBSD.org/src/rev/1398d739ee5f
branches: trunk
changeset: 762365:1398d739ee5f
user: matt <matt%NetBSD.org@localhost>
date: Sun Feb 20 07:50:24 2011 +0000
description:
Merge forward from matt-nb5-mips64.
New interrupt code.
mips64 support for DS5000/260.
diffstat:
sys/arch/pmax/conf/GENERIC | 5 +-
sys/arch/pmax/conf/GENERIC64 | 16 ++-
sys/arch/pmax/conf/RAMDISK64 | 5 +-
sys/arch/pmax/conf/files.pmax | 4 +-
sys/arch/pmax/ibus/dz_ibus.c | 10 +-
sys/arch/pmax/ibus/ibus.c | 15 +-
sys/arch/pmax/ibus/ibus_3max.c | 20 +-
sys/arch/pmax/ibus/ibus_pmax.c | 22 +-
sys/arch/pmax/ibus/ibusvar.h | 16 +-
sys/arch/pmax/ibus/mcclock_ibus.c | 20 +-
sys/arch/pmax/ibus/sii_ds.c | 16 +-
sys/arch/pmax/include/bus.h | 113 ++++++++--------
sys/arch/pmax/include/dec_prom.h | 7 +-
sys/arch/pmax/include/intr.h | 66 +---------
sys/arch/pmax/include/param.h | 4 +-
sys/arch/pmax/include/sysconf.h | 12 +-
sys/arch/pmax/include/vmparam.h | 7 +-
sys/arch/pmax/pmax/autoconf.c | 10 +-
sys/arch/pmax/pmax/bus_dma.c | 13 +-
sys/arch/pmax/pmax/cpu.c | 12 +-
sys/arch/pmax/pmax/dec_3100.c | 47 +++---
sys/arch/pmax/pmax/dec_3max.c | 64 +++++----
sys/arch/pmax/pmax/dec_3maxplus.c | 183 ++++++++++++++-------------
sys/arch/pmax/pmax/dec_3min.c | 228 +++++++++++++++++-----------------
sys/arch/pmax/pmax/dec_5100.c | 42 +++---
sys/arch/pmax/pmax/dec_maxine.c | 135 ++++++++++----------
sys/arch/pmax/pmax/disksubr.c | 6 +-
sys/arch/pmax/pmax/interrupt.c | 75 ++++-------
sys/arch/pmax/pmax/locore_machdep.S | 94 ++++++++++++-
sys/arch/pmax/pmax/machdep.c | 80 ++++--------
sys/arch/pmax/pmax/mainbus.c | 4 +-
sys/arch/pmax/pmax/promcall.c | 23 ++-
sys/arch/pmax/pmax/sysconf.c | 8 +-
sys/arch/pmax/stand/Makefile.booters | 9 +-
sys/arch/pmax/tc/tcbus.c | 11 +-
35 files changed, 696 insertions(+), 706 deletions(-)
diffs (truncated from 2888 to 300 lines):
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/conf/GENERIC Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.166 2010/07/07 01:24:52 chs Exp $
+# $NetBSD: GENERIC,v 1.167 2011/02/20 07:50:24 matt Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.166 $"
+#ident "GENERIC-$Revision: 1.167 $"
maxusers 64
@@ -42,6 +42,7 @@
#options DEC_5500 # DECsystem 5500 (kn220)
#options DEC_5800 # DECsystem 58x0 (kn5800)
+makeoptions DEBUG="-g"
# Standard system options
options DDB # in-kernel debugger
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/conf/GENERIC64
--- a/sys/arch/pmax/conf/GENERIC64 Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/conf/GENERIC64 Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.4 2010/04/29 22:40:53 chs Exp $
+# $NetBSD: GENERIC64,v 1.5 2011/02/20 07:50:24 matt Exp $
#
# GENERIC machine description file
#
@@ -22,13 +22,14 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.4 $"
+#ident "GENERIC-$Revision: 1.5 $"
maxusers 64
options MIPS3 # R4000/R4400 CPUs
# Support for specific models of DECstation
+options DEC_3MAX # DECstation 5000/200 (kn02)
options DEC_3MIN # DECstation 5000/1xx (kn02ba), 5000/150 (kn04)
options DEC_MAXINE # Personal DECstation 5000/xx (kn02ca)
options DEC_3MAXPLUS # DECstation 5000/240 (kn03), 5000/260 (kn05)
@@ -176,6 +177,16 @@
# TURBOchannel bus support
tc* at mainbus0
+# 3MAX has TURBOchannel but no IOASIC
+ibus0 at tc? slot ? offset ? # 3MAX system slot
+
+# PMAX, 3MAX and MIPSMATE common devices
+mcclock* at ibus0 addr ? # DS1287 RTC
+dz* at ibus0 addr ? # DC7085 quad line serial device
+lkkbd* at dz? line 0 # Keyboard
+vsms* at dz? line 1 # Mouse
+sii* at ibus0 addr ? # DC7061 onboard SCSI`
+
# 3MIN, 3MAX+ and MAXINE have IOASIC in system slot
ioasic0 at tc?
mcclock* at ioasic? offset ? # DS1287 RTC
@@ -232,6 +243,7 @@
# SCSI configuration #
#########################################################################
+scsibus* at sii?
scsibus* at asc?
sd* at scsibus? target ? lun ? # SCSI disks
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/conf/RAMDISK64
--- a/sys/arch/pmax/conf/RAMDISK64 Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/conf/RAMDISK64 Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: RAMDISK64,v 1.3 2010/11/23 11:14:04 hannken Exp $
+# $NetBSD: RAMDISK64,v 1.4 2011/02/20 07:50:24 matt Exp $
#
# Install kernel with ramdisk added.
# The ramdisk is be too big to netboot directly via ECOFF on some machines,
@@ -13,8 +13,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=6600 # size of memory disk, in blocks (3300kB)
-#options MEMORY_DISK_ROOT_SIZE=2880 # 1.44M, same as a floppy
+options MEMORY_DISK_ROOT_SIZE=7168 # size of memory disk, in blocks (3500kB)
# File systems: need MFS
file-system MFS # memory file system
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/conf/files.pmax
--- a/sys/arch/pmax/conf/files.pmax Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/conf/files.pmax Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.pmax,v 1.112 2009/08/21 04:05:20 thorpej Exp $
+# $NetBSD: files.pmax,v 1.113 2011/02/20 07:50:24 matt Exp $
# DECstation-specific configuration info
# maxpartitions must be first item in files.${ARCH}.
@@ -124,8 +124,6 @@
file common/bus_dma/bus_dmamem_common.c
-file arch/mips/mips/softintr.c
-
#
# Workstation console devices
#
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/ibus/dz_ibus.c
--- a/sys/arch/pmax/ibus/dz_ibus.c Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/ibus/dz_ibus.c Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_ibus.c,v 1.9 2008/04/28 20:23:31 martin Exp $ */
+/* $NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.9 2008/04/28 20:23:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ibus.c,v 1.10 2011/02/20 07:50:24 matt Exp $");
#include "dzkbd.h"
#include "dzms.h"
@@ -136,9 +136,7 @@
int
dz_ibus_match(device_t parent, cfdata_t cf, void *aux)
{
- struct ibus_attach_args *iba;
-
- iba = aux;
+ struct ibus_attach_args *iba = aux;
if (strcmp(iba->ia_name, "dc") != 0 &&
strcmp(iba->ia_name, "mdc") != 0 &&
@@ -157,7 +155,9 @@
struct ibus_attach_args *iba = aux;
struct dz_softc *sc = device_private(self);
volatile struct dzregs *dz;
+#if NDZMS > 0 || NDZKBD > 0
struct dzkm_attach_args daa;
+#endif
int i;
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/ibus/ibus.c
--- a/sys/arch/pmax/ibus/ibus.c Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus.c Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus.c,v 1.18 2009/03/16 23:11:13 dsl Exp $ */
+/* $NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt 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: ibus.c,v 1.18 2009/03/16 23:11:13 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus.c,v 1.19 2011/02/20 07:50:24 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,14 +43,14 @@
#include "locators.h"
void
-ibusattach(struct device *parent, struct device *self, void *aux)
+ibusattach(device_t parent, device_t self, void *aux)
{
struct ibus_dev_attach_args *ida = aux;
struct ibus_attach_args *ia;
int i;
int locs[IBUSCF_NLOCS];
- printf("\n");
+ aprint_normal("\n");
/*
* Loop through the devices and attach them. If a probe-size
@@ -63,7 +63,7 @@
badaddr((void *)ia->ia_addr, ia->ia_basz) != 0)
continue;
- locs[IBUSCF_ADDR] = MIPS_KSEG1_TO_PHYS(ia->ia_addr);
+ locs[IBUSCF_ADDR] = (int32_t)MIPS_KSEG1_TO_PHYS(ia->ia_addr);
config_found_sm_loc(self, "ibus", locs, ia,
ibusprint, config_stdsubmatch);
@@ -78,13 +78,14 @@
if (pnp)
aprint_normal("%s at %s", ia->ia_name, pnp);
- aprint_normal(" addr 0x%x", MIPS_KSEG1_TO_PHYS(ia->ia_addr));
+ aprint_normal(" addr %#"PRIxPADDR, MIPS_KSEG1_TO_PHYS(ia->ia_addr));
return (UNCONF);
}
void
-ibus_intr_establish(struct device *dev, void *cookie, int level, int (*handler)(void *), void *arg)
+ibus_intr_establish(device_t dev, void *cookie, int level,
+ int (*handler)(void *), void *arg)
{
(*platform.intr_establish)(dev, cookie, level, handler, arg);
}
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/ibus/ibus_3max.c
--- a/sys/arch/pmax/ibus/ibus_3max.c Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus_3max.c Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_3max.c,v 1.13 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: ibus_3max.c,v 1.14 2011/02/20 07:50:24 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.13 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_3max.c,v 1.14 2011/02/20 07:50:24 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -45,18 +45,14 @@
{ "dc", SYS_DEV_SCC0, KV(KN02_SYS_DZ), 0 },
};
-static int kn02sys_match(struct device *, struct cfdata *, void *);
-static void kn02sys_attach(struct device *, struct device *, void *);
+static int kn02sys_match(device_t, cfdata_t, void *);
+static void kn02sys_attach(device_t, device_t, void *);
-CFATTACH_DECL(kn02sys, sizeof(struct ibus_softc),
+CFATTACH_DECL_NEW(kn02sys, 0,
kn02sys_match, kn02sys_attach, NULL, NULL);
static int
-kn02sys_match(parent, cfdata, aux)
- struct device *parent;
- struct cfdata *cfdata;
- void *aux;
-
+kn02sys_match(device_t parent, cfdata_t cf, void *aux)
{
struct tc_attach_args *ta = aux;
@@ -64,13 +60,13 @@
}
static void
-kn02sys_attach(struct device *parent, struct device *self, void *aux)
+kn02sys_attach(device_t parent, device_t self, void *aux)
{
struct ibus_dev_attach_args ida;
ida.ida_busname = "ibus";
ida.ida_devs = kn02sys_devs;
- ida.ida_ndevs = sizeof(kn02sys_devs)/sizeof(kn02sys_devs[0]);
+ ida.ida_ndevs = __arraycount(kn02sys_devs);
ibusattach(parent, self, &ida);
}
diff -r e8dfef33a993 -r 1398d739ee5f sys/arch/pmax/ibus/ibus_pmax.c
--- a/sys/arch/pmax/ibus/ibus_pmax.c Sun Feb 20 07:48:33 2011 +0000
+++ b/sys/arch/pmax/ibus/ibus_pmax.c Sun Feb 20 07:50:24 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ibus_pmax.c,v 1.21 2009/03/14 21:04:14 dsl Exp $ */
+/* $NetBSD: ibus_pmax.c,v 1.22 2011/02/20 07:50:24 matt 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: ibus_pmax.c,v 1.21 2009/03/14 21:04:14 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibus_pmax.c,v 1.22 2011/02/20 07:50:24 matt Exp $");
#include "opt_dec_3100.h"
#include "opt_dec_5100.h"
@@ -49,10 +49,10 @@
#include <pmax/pmax/kn230.h>
#include <pmax/pmax/pmaxtype.h>
-static int ibus_pmax_match(struct device *, struct cfdata *, void *);
-static void ibus_pmax_attach(struct device *, struct device *, void *);
+static int ibus_pmax_match(device_t, cfdata_t, void *);
+static void ibus_pmax_attach(device_t, device_t, void *);
-CFATTACH_DECL(ibus_pmax, sizeof(struct ibus_softc),
+CFATTACH_DECL_NEW(ibus_pmax, 0,
ibus_pmax_match, ibus_pmax_attach, NULL, NULL);
Home |
Main Index |
Thread Index |
Old Index