Convert mvmeppc to use common powerpc parts.

1 files changed, 2 insertions, 194 deletions

diff --git a/sys/arch/mvmeppc/include/pio.h b/sys/arch/mvmeppc/include/pio.h
index 5373eebcc84..71110b885c1 100644
--- a/sys/arch/mvmeppc/include/pio.h
+++ b/sys/arch/mvmeppc/include/pio.h
@@ -1,195 +1,3 @@
-/*	$OpenBSD: pio.h,v 1.1 2001/06/26 21:57:47 smurph Exp $ */
+/*	$OpenBSD: pio.h,v 1.2 2001/09/02 19:40:24 miod Exp $	*/
 
-/*
- * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
- * 
- * 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 under OpenBSD by
- *	Per Fogelstrom Opsycon AB for RTMX Inc, North Carolina, USA.
- * 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.
- *
- */
-
-#ifndef _MACHINE_PIO_H_
-#define _MACHINE_PIO_H_
-/*
- * I/O macros.
- */
-void *mapiodev(paddr_t pa, psize_t len);
-
-static __inline void
-__outb(a,v)
-	volatile u_int8_t *a;
-	int v;
-{
-	*a = v;
-	__asm__ volatile("eieio");
-}
-
-static __inline void
-__outw(a,v)
-	volatile u_int16_t *a;
-	u_int16_t v;
-{
-	*a = v;
-	__asm__ volatile("eieio");
-}
-
-static __inline void
-__outl(a,v)
-	volatile u_int32_t *a;
-	int v;
-{
-	*a = v;
-	__asm__ volatile("eieio");
-}
-
-static __inline void
-__outwrb(a,v)
-	volatile u_int16_t *a;
-	u_int16_t v;
-{
-	u_int32_t _p_ = (u_int32_t)a;
-
-	__asm__ volatile("sthbrx %0, 0, %1" :: "r"(v), "r"(_p_));
-	__asm__ volatile("eieio");
-}
-
-static __inline void
-__outlrb(a,v)
-	volatile u_int32_t *a;
-	u_int32_t v;
-{
-	u_int32_t _p_ = (u_int32_t)a;
-
-	__asm__ volatile("stwbrx %0, 0, %1" :: "r"(v), "r"(_p_));
-	__asm__ volatile("eieio");
-}
-
-static __inline u_int8_t
-__inb(a)
-	volatile u_int8_t *a;
-{
-	u_int8_t _v_;
-
-	__asm__ volatile("eieio");
-	_v_ = *a;
-	return _v_;
-}
-
-static __inline u_int16_t
-__inw(a)
-	volatile u_int16_t *a;
-{
-	u_int16_t _v_;
-
-	__asm__ volatile("eieio");
-	_v_ = *a;
-	return _v_;
-}
-
-static __inline u_int32_t
-__inl(a)
-	volatile u_int32_t *a;
-{
-	u_int32_t _v_;
-
-	__asm__ volatile("eieio");
-	_v_ = *a;
-	return _v_;
-}
-
-static __inline u_int16_t
-__inwrb(a)
-	volatile u_int16_t *a;
-{
-	u_int16_t _v_;
-	u_int32_t _p_ = (u_int32_t)a;
-
-	__asm__ volatile("eieio");
-	__asm__ volatile("lhbrx %0, 0, %1" : "=r"(_v_) : "r"(_p_));
-	return _v_;
-}
-
-static __inline u_int32_t
-__inlrb(a)
-	volatile u_int32_t *a;
-{
-	u_int32_t _v_;
-	u_int32_t _p_ = (u_int32_t)a;
-
-	__asm__ volatile("eieio");
-	__asm__ volatile("lwbrx %0, 0, %1" : "=r"(_v_) : "r"(_p_));
-	return _v_;
-}
-
-
-#define	outb(a,v)	(__outb((volatile u_int8_t *)(a), v))
-#define	out8(a,v)	outb(a,v)
-#define	outw(a,v)	(__outw((volatile u_int16_t *)(a), v))
-#define	out16(a,v)	outw(a,v)
-#define	outl(a,v)	(__outl((volatile u_int32_t *)(a), v))
-#define	out32(a,v)	outl(a,v)
-#define	inb(a)		(__inb((volatile u_int8_t *)(a)))
-#define	in8(a)		inb(a)
-#define	inw(a)		(__inw((volatile u_int16_t *)(a)))
-#define	in16(a)		inw(a)
-#define	inl(a)		(__inl((volatile u_int32_t *)(a)))
-#define	in32(a)		inl(a)
-
-#define	out8rb(a,v)	outb(a,v)
-#define	outwrb(a,v)	(__outwrb((volatile u_int16_t *)(a), v))
-#define	out16rb(a,v)	outwrb(a,v)
-#define	outlrb(a,v)	(__outlrb((volatile u_int32_t *)(a), v))
-#define	out32rb(a,v)	outlrb(a,v)
-#define	in8rb(a)	inb(a)
-#define	inwrb(a)	(__inwrb((volatile u_int16_t *)(a)))
-#define	in16rb(a)	inwrb(a)
-#define	inlrb(a)	(__inlrb((volatile u_int32_t *)(a)))
-#define	in32rb(a)	inlrb(a)
-
-#ifdef DEBUG_SPEC
-static __inline void
-__flash_led(bits, count)
-	int bits;
-{
-	int i, v = 0;
-
-	if(bits == 0) {
-		v = 1; bits = 3;
-	}
-	bits &= 3;
-	count += count;
-	v |= (*(volatile u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4)) & ~3;
-	while(count--) {
-		v ^= bits;
-		for(i = 100000; i > 0; i--)
-			*(volatile u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4) = v;
-	}
-	*(u_int8_t *)(MPC106_V_ISA_IO_SPACE + 0x01f4) &= ~3;
-}
-#endif /* DEBUG */
-
-#endif /*_MACHINE_PIO_H_*/
+#include <powerpc/pio.h>