diff options
author | Jason Downs <downsj@cvs.openbsd.org> | 1997-02-04 06:21:34 +0000 |
---|---|---|
committer | Jason Downs <downsj@cvs.openbsd.org> | 1997-02-04 06:21:34 +0000 |
commit | ffccb3a8f483a4b0442123bab1d15ff22827899b (patch) | |
tree | 0a9f27b69c7bc10fea4669ee74ef15042387fa8b /sys/arch/hp300/dev/hilreg.h | |
parent | 4033520eec6ef0571bc70ae9c27fbdc83b02a9f9 (diff) |
checkpoint: pull in spl() changes from NetBSD, and more siginfo.
Diffstat (limited to 'sys/arch/hp300/dev/hilreg.h')
-rw-r--r-- | sys/arch/hp300/dev/hilreg.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sys/arch/hp300/dev/hilreg.h b/sys/arch/hp300/dev/hilreg.h index 0b09598d0b9..453689a2800 100644 --- a/sys/arch/hp300/dev/hilreg.h +++ b/sys/arch/hp300/dev/hilreg.h @@ -1,5 +1,5 @@ -/* $OpenBSD: hilreg.h,v 1.2 1997/01/12 15:12:44 downsj Exp $ */ -/* $NetBSD: hilreg.h,v 1.5 1994/10/26 07:24:15 cgd Exp $ */ +/* $OpenBSD: hilreg.h,v 1.3 1997/02/04 06:21:24 downsj Exp $ */ +/* $NetBSD: hilreg.h,v 1.6 1997/02/02 09:39:21 thorpej Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -94,13 +94,6 @@ struct hil_dev { #define WRITEHILCMD(x, y) ((x)->hil_cmd = ((y) << 24)) #endif -#ifdef hp300 -#define splhil() spl1() -#else -extern int hilspl; -#define splhil() splx(hilspl) -#endif - #define HIL_BUSY 0x02 #define HIL_DATA_RDY 0x01 |