summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--distrib/sets/lists/base/md.mvme88k1
-rw-r--r--distrib/sets/lists/comp/md.mvme88k1
-rw-r--r--sys/arch/mvme88k/include/mvme187.h4
-rw-r--r--sys/arch/mvme88k/include/mvme197.h4
-rw-r--r--sys/arch/mvme88k/include/mvme1x7.h73
-rw-r--r--sys/arch/mvme88k/mvme88k/clockvar.h4
-rw-r--r--sys/arch/mvme88k/mvme88k/m187_machdep.c3
-rw-r--r--sys/arch/mvme88k/mvme88k/m197_machdep.c3
-rw-r--r--sys/arch/mvme88k/mvme88k/m1x7_machdep.c3
9 files changed, 10 insertions, 86 deletions
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index f86f6b6fe2e..96204ff4199 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1585,7 +1585,6 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/mvme187.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/mvme188.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/mvme197.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/mvme1x7.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/param.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/pcb.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/pmap.ph
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index a52f95c6815..336da3dd40e 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -185,7 +185,6 @@
./usr/include/mvme88k/mvme187.h
./usr/include/mvme88k/mvme188.h
./usr/include/mvme88k/mvme197.h
-./usr/include/mvme88k/mvme1x7.h
./usr/include/mvme88k/param.h
./usr/include/mvme88k/pcb.h
./usr/include/mvme88k/pmap.h
diff --git a/sys/arch/mvme88k/include/mvme187.h b/sys/arch/mvme88k/include/mvme187.h
index 451454197d9..3e3c6f7f12a 100644
--- a/sys/arch/mvme88k/include/mvme187.h
+++ b/sys/arch/mvme88k/include/mvme187.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mvme187.h,v 1.7 2006/04/27 20:19:31 miod Exp $ */
+/* $OpenBSD: mvme187.h,v 1.8 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -63,6 +63,4 @@
#define MEM_CTLR 0xfff43000 /* MEMC040 mem controller */
-#include <machine/mvme1x7.h>
-
#endif /* __MACHINE_MVME187_H__ */
diff --git a/sys/arch/mvme88k/include/mvme197.h b/sys/arch/mvme88k/include/mvme197.h
index e4b4ed5c0b4..9f137ad3451 100644
--- a/sys/arch/mvme88k/include/mvme197.h
+++ b/sys/arch/mvme88k/include/mvme197.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: mvme197.h,v 1.6 2006/04/27 20:19:31 miod Exp $ */
+/* $OpenBSD: mvme197.h,v 1.7 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1996 Nivas Madhur
* Copyright (c) 1999 Steve Murphree, Jr.
@@ -58,6 +58,4 @@
#define M197_ISRC 0xfff0006f /* interrupt SRC */
#define M197_IACK 0xfff00100 /* interrupt ACK base */
-#include <machine/mvme1x7.h>
-
#endif /* __MACHINE_MVME197_H__ */
diff --git a/sys/arch/mvme88k/include/mvme1x7.h b/sys/arch/mvme88k/include/mvme1x7.h
deleted file mode 100644
index ea8a044103c..00000000000
--- a/sys/arch/mvme88k/include/mvme1x7.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* $OpenBSD: mvme1x7.h,v 1.13 2006/04/27 20:19:31 miod Exp $ */
-/*
- * Copyright (c) 1996 Nivas Madhur
- * Copyright (c) 1999 Steve Murphree, Jr.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Nivas Madhur.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-/*
- * Mach Operating System
- * Copyright (c) 1991 Carnegie Mellon University
- * Copyright (c) 1991 OMRON Corporation
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- */
-#ifndef __MACHINE_MVME1X7_H__
-#define __MACHINE_MVME1X7_H__
-
-#define INT_PRI_LEVEL 0xFFF4203E /* interrupt priority level */
-#define INT_MASK_LEVEL 0xFFF4203F /* interrupt mask level */
-
-#define LOCAL_IO_DEVS 0xFFF00000 /* local IO devices */
-
-#define SCC_ADDR 0xFFF45000 /* Cirrus Chip */
-#define LANCE_ADDR 0xFFF46000 /* 82596CA */
-#define SCSI_ADDR 0xFFF47000 /* NCR 710 address */
-#define NCR710_SIZE 0x00000040 /* NCR 710 size */
-#define MK48T08_ADDR 0xFFFC0000 /* BBRAM, TOD */
-
-#define TOD_CAL_CTL 0xFFFC1FF8 /* calendar control register */
-#define TOD_CAL_SEC 0xFFFC1FF9 /* seconds */
-#define TOD_CAL_MIN 0xFFFC1FFA /* minutes */
-#define TOD_CAL_HOUR 0xFFFC1FFB /* hours */
-#define TOD_CAL_DOW 0xFFFC1FFC /* Day Of the Week */
-#define TOD_CAL_DAY 0xFFFC1FFD /* days */
-#define TOD_CAL_MON 0xFFFC1FFE /* months */
-#define TOD_CAL_YEAR 0xFFFC1FFF /* years */
-
-#if defined(_KERNEL) && !defined(_LOCORE)
-void m1x7_init_clocks(void);
-#endif
-
-#endif /* __MACHINE_MVME1X7_H__ */
diff --git a/sys/arch/mvme88k/mvme88k/clockvar.h b/sys/arch/mvme88k/mvme88k/clockvar.h
index 161a26fa790..5d491874aa4 100644
--- a/sys/arch/mvme88k/mvme88k/clockvar.h
+++ b/sys/arch/mvme88k/mvme88k/clockvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: clockvar.h,v 1.1 2006/04/19 22:09:40 miod Exp $ */
+/* $OpenBSD: clockvar.h,v 1.2 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1995 Theo de Raadt
@@ -71,3 +71,5 @@ extern struct intrhand statclock_ih;
extern int statvar;
extern int statmin;
+
+void m1x7_init_clocks(void);
diff --git a/sys/arch/mvme88k/mvme88k/m187_machdep.c b/sys/arch/mvme88k/mvme88k/m187_machdep.c
index 012f4a94fba..bb0fb0d4e96 100644
--- a/sys/arch/mvme88k/mvme88k/m187_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m187_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m187_machdep.c,v 1.10 2006/04/27 20:19:31 miod Exp $ */
+/* $OpenBSD: m187_machdep.c,v 1.11 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -61,6 +61,7 @@
#include <machine/mvme187.h>
#include <mvme88k/dev/memcreg.h>
+#include <mvme88k/mvme88k/clockvar.h>
void m187_bootstrap(void);
void m187_ext_int(u_int, struct trapframe *);
diff --git a/sys/arch/mvme88k/mvme88k/m197_machdep.c b/sys/arch/mvme88k/mvme88k/m197_machdep.c
index 2c9a7ee7f53..327653264d7 100644
--- a/sys/arch/mvme88k/mvme88k/m197_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m197_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m197_machdep.c,v 1.10 2006/04/27 20:19:31 miod Exp $ */
+/* $OpenBSD: m197_machdep.c,v 1.11 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr.
* Copyright (c) 1996 Nivas Madhur
@@ -60,6 +60,7 @@
#include <machine/mvme197.h>
#include <mvme88k/dev/busswreg.h>
+#include <mvme88k/mvme88k/clockvar.h>
void m197_bootstrap(void);
void m197_ext_int(u_int, struct trapframe *);
diff --git a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
index e74b5ddad50..67f73f24da9 100644
--- a/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
+++ b/sys/arch/mvme88k/mvme88k/m1x7_machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: m1x7_machdep.c,v 1.2 2006/04/27 20:19:31 miod Exp $ */
+/* $OpenBSD: m1x7_machdep.c,v 1.3 2006/04/27 20:21:19 miod Exp $ */
/*
* Copyright (c) 1999 Steve Murphree, Jr.
* Copyright (c) 1995 Theo de Raadt
@@ -77,7 +77,6 @@
#include <machine/bus.h>
-#include <machine/mvme1x7.h>
#include <mvme88k/dev/pcctwovar.h>
#include <mvme88k/dev/pcctworeg.h>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-03 19:54:11 +0000