Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci/bktr Restore non-NetBSD parts -- we're still sha...



details:   https://anonhg.NetBSD.org/src/rev/5f083ca04bf3
branches:  trunk
changeset: 507198:5f083ca04bf3
user:      wiz <wiz%NetBSD.org@localhost>
date:      Fri Mar 16 15:06:24 2001 +0000

description:
Restore non-NetBSD parts -- we're still sharing this code.

diffstat:

 sys/dev/pci/bktr/bktr_os.h |  13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diffs (27 lines):

diff -r 50b44f2e6c45 -r 5f083ca04bf3 sys/dev/pci/bktr/bktr_os.h
--- a/sys/dev/pci/bktr/bktr_os.h        Fri Mar 16 14:12:43 2001 +0000
+++ b/sys/dev/pci/bktr/bktr_os.h        Fri Mar 16 15:06:24 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bktr_os.h,v 1.3 2001/03/15 22:49:27 ross Exp $ */
+/*     $NetBSD: bktr_os.h,v 1.4 2001/03/16 15:06:24 wiz Exp $  */
 
 /* FreeBSD: src/sys/dev/bktr/bktr_os.h,v 1.4 2000/04/16 07:56:58 roger Exp */
 
@@ -66,6 +66,17 @@
 /************************************/
 /* *** Interrupt Enable/Disable *** */
 /************************************/
+#if defined(__FreeBSD__)
+#define DECLARE_INTR_MASK(s)   intrmask_t s
+#define DISABLE_INTR(s)                s = spltty()
+#define ENABLE_INTR(s)         splx(s)
+#elif defined(__NetBSD__)
 #define DECLARE_INTR_MASK(s)   int s
 #define DISABLE_INTR(s)                s = spltty()
 #define ENABLE_INTR(s)         splx(s)
+#else
+#define DECLARE_INTR_MASK(s)   /* no need to declare 's' */
+#define DISABLE_INTR(s)                disable_intr()
+#define ENABLE_INTR(s)         enable_intr()
+#endif
+



Home | Main Index | Thread Index | Old Index