Ratibibugle struct frame and <machine/frame.h>

7 files changed, 5 insertions, 67 deletions

diff --git a/sys/arch/aviion/dev/syscon.c b/sys/arch/aviion/dev/syscon.c
index 57c87822930..b52b4631ec1 100644
--- a/sys/arch/aviion/dev/syscon.c
+++ b/sys/arch/aviion/dev/syscon.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: syscon.c,v 1.2 2006/05/21 12:22:02 miod Exp $ */
+/*	$OpenBSD: syscon.c,v 1.3 2006/11/16 23:21:56 miod Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -32,7 +32,6 @@
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 
 #include <machine/avcommon.h>
 #include <aviion/dev/sysconreg.h>
diff --git a/sys/arch/aviion/include/frame.h b/sys/arch/aviion/include/frame.h
deleted file mode 100644
index b2e872e703d..00000000000
--- a/sys/arch/aviion/include/frame.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: frame.h,v 1.1 2006/04/18 10:56:58 miod Exp $ */
-/* public domain */
-#include <m88k/frame.h>
diff --git a/sys/arch/luna88k/include/frame.h b/sys/arch/luna88k/include/frame.h
deleted file mode 100644
index 2ad6f41586d..00000000000
--- a/sys/arch/luna88k/include/frame.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: frame.h,v 1.3 2004/04/26 14:31:08 miod Exp $ */
-/* public domain */
-#include <m88k/frame.h>
diff --git a/sys/arch/m88k/include/frame.h b/sys/arch/m88k/include/frame.h
deleted file mode 100644
index d05f8a4e51a..00000000000
--- a/sys/arch/m88k/include/frame.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*	$OpenBSD: frame.h,v 1.1 2004/04/26 12:34:05 miod Exp $	*/
-/*	$NetBSD: frame.h,v 1.15 1997/05/03 12:49:05 mycroft Exp $	*/
-
-/*
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1982, 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department.
- *
- * 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. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
- *
- * from: Utah $Hdr: frame.h 1.8 92/12/20$
- *
- *	@(#)frame.h	8.1 (Berkeley) 6/10/93
- */
-
-#ifndef	_M88K_FRAME_H_
-#define	_M88K_FRAME_H_
-
-struct frame {
-	struct trapframe  __packed F_t;
-};
-
-#endif	/* _M88K_FRAME_H_ */
diff --git a/sys/arch/mvme88k/dev/memc.c b/sys/arch/mvme88k/dev/memc.c
index 0a7ba2a87ea..5cdbf3fb3a3 100644
--- a/sys/arch/mvme88k/dev/memc.c
+++ b/sys/arch/mvme88k/dev/memc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: memc.c,v 1.12 2006/05/08 14:36:10 miod Exp $ */
+/*	$OpenBSD: memc.c,v 1.13 2006/11/16 23:21:56 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -68,7 +68,7 @@ struct cfdriver memc_cd = {
 };
 
 #if 0
-int memcintr(struct frame *frame);
+int memcintr(void *);
 #endif
 
 int
diff --git a/sys/arch/mvme88k/dev/vme.c b/sys/arch/mvme88k/dev/vme.c
index b383fa82ea0..ded1048ada3 100644
--- a/sys/arch/mvme88k/dev/vme.c
+++ b/sys/arch/mvme88k/dev/vme.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vme.c,v 1.44 2006/05/08 14:36:10 miod Exp $ */
+/*	$OpenBSD: vme.c,v 1.45 2006/11/16 23:21:56 miod Exp $ */
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -37,7 +37,6 @@
 
 #include <machine/autoconf.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 
 #include "pcctwo.h"
 #include "syscon.h"
@@ -616,8 +615,6 @@ int
 vme2abort(eframe)
 	void *eframe;
 {
-	struct frame *frame = eframe;
-
 	struct vmesoftc *sc = (struct vmesoftc *)vme_cd.cd_devs[0];
 
 	if ((bus_space_read_4(sc->sc_iot, sc->sc_ioh, VME2_IRQSTAT) &
@@ -627,7 +624,7 @@ vme2abort(eframe)
 	}
 
 	bus_space_write_4(sc->sc_iot, sc->sc_ioh, VME2_IRQCLR, VME2_IRQ_AB);
-	nmihand(frame);
+	nmihand(eframe);
 	return (1);
 }
 #endif
diff --git a/sys/arch/mvme88k/include/frame.h b/sys/arch/mvme88k/include/frame.h
deleted file mode 100644
index f237553829b..00000000000
--- a/sys/arch/mvme88k/include/frame.h
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $OpenBSD: frame.h,v 1.9 2004/04/26 14:31:11 miod Exp $ */
-/* public domain */
-#include <m88k/frame.h>