Implement __cpu_simple_lock_t for m88k.

4 files changed, 83 insertions, 1 deletions

diff --git a/sys/arch/luna88k/include/lock.h b/sys/arch/luna88k/include/lock.h
new file mode 100644
index 00000000000..3b46e353ba6
--- /dev/null
+++ b/sys/arch/luna88k/include/lock.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: lock.h,v 1.1 2005/12/03 19:04:03 miod Exp $ */
+/* public domain */
+#include <m88k/lock.h>
diff --git a/sys/arch/m88k/include/intr.h b/sys/arch/m88k/include/intr.h
index 783e2f7efb1..22684ced751 100644
--- a/sys/arch/m88k/include/intr.h
+++ b/sys/arch/m88k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.5 2005/10/12 20:53:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.6 2005/12/03 19:04:06 miod Exp $	*/
 /*
  * Copyright (C) 2000 Steve Murphree, Jr.
  * All rights reserved.
@@ -67,6 +67,8 @@ void splassert_check(int, const char *);
 #define splvm()			raiseipl(IPL_VM)
 #define splhigh()		setipl(IPL_HIGH)
 
+#define	spllock()		splhigh()
+
 #define splx(x)			((x) ? setipl((x)) : spl0())
 
 #endif /* _KERNEL */
diff --git a/sys/arch/m88k/include/lock.h b/sys/arch/m88k/include/lock.h
new file mode 100644
index 00000000000..092b4bd6d0c
--- /dev/null
+++ b/sys/arch/m88k/include/lock.h
@@ -0,0 +1,74 @@
+#ifndef	_M88K_LOCK_H_
+#define	_M88K_LOCK_H_
+/*	$OpenBSD: lock.h,v 1.1 2005/12/03 19:04:06 miod Exp $	*/
+
+/*
+ * Copyright (c) 2005, Miodrag Vallat.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <m88k/asm.h>
+
+typedef volatile u_int	__cpu_simple_lock_t;
+
+/* do not change these - code below assumes r0 == __SIMPLELOCK_UNLOCKED */
+#define	__SIMPLELOCK_LOCKED	1
+#define	__SIMPLELOCK_UNLOCKED	0
+
+static __inline__ void
+__cpu_simple_lock_init(__cpu_simple_lock_t *l)
+{
+	*l = __SIMPLELOCK_UNLOCKED;
+}
+
+static __inline__ void
+__cpu_simple_lock(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old;
+
+	do {
+		old = __SIMPLELOCK_LOCKED;
+		__asm__ __volatile__
+		    ("xmem %0, %2, r0" : "=r" (old) : "0" (old), "r" (l));
+	} while (old != __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ int
+__cpu_simple_lock_try(__cpu_simple_lock_t *l)
+{
+	__cpu_simple_lock_t old = __SIMPLELOCK_LOCKED;
+
+	__asm__ __volatile__
+	    ("xmem %0, %2, r0" : "=r" (old) : "0" (old), "r" (l));
+
+	return (old == __SIMPLELOCK_UNLOCKED);
+}
+
+static __inline__ void
+__cpu_simple_unlock(__cpu_simple_lock_t *l)
+{
+	__asm__ __volatile__
+	    ("xmem r0, %0, r0" : : "r" (l));
+}
+
+#endif	/* _M88K_LOCK_H_ */
diff --git a/sys/arch/mvme88k/include/lock.h b/sys/arch/mvme88k/include/lock.h
new file mode 100644
index 00000000000..a1cceb2c9f8
--- /dev/null
+++ b/sys/arch/mvme88k/include/lock.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: lock.h,v 1.1 2005/12/03 19:04:06 miod Exp $ */
+/* public domain */
+#include <m88k/lock.h>