checkpoint: pull in spl() changes from NetBSD, and more siginfo.

2 files changed, 6 insertions, 24 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
 
diff --git a/sys/arch/hp300/dev/ite.c b/sys/arch/hp300/dev/ite.c
index 66e5263410e..22c49075407 100644
--- a/sys/arch/hp300/dev/ite.c
+++ b/sys/arch/hp300/dev/ite.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: ite.c,v 1.7 1997/02/03 04:47:38 downsj Exp $	*/
-/*	$NetBSD: ite.c,v 1.35 1997/01/30 09:18:56 thorpej Exp $	*/
+/*	$OpenBSD: ite.c,v 1.8 1997/02/04 06:21:26 downsj Exp $	*/
+/*	$NetBSD: ite.c,v 1.37 1997/02/02 09:40:31 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1996 Jason R. Thorpe.  All rights reserved.
@@ -72,13 +72,6 @@
 #define clr_attr(ip, attr)	((ip)->attribute &= ~(attr))
 
 /*
- * No need to raise SPL above the HIL (the only thing that can
- * affect our state.
- */
-#include <hp300/dev/hilreg.h>
-#define splite()		splhil()
-
-/*
  * # of chars are output in a single itestart() call.
  * If this is too big, user processes will be blocked out for
  * long periods of time while we are emptying the queue in itestart().
@@ -174,6 +167,7 @@ iteattach(parent, self, aux)
 			return;
 		}
 		bzero(ite->sc_data, sizeof(struct ite_data));
+		ite->sc_data->flags = ITE_ALIVE;
 	}
 
 	/*
@@ -427,12 +421,7 @@ itestart(tp)
 	sc = ite_cd.cd_devs[ITEUNIT(tp->t_dev)];
 	ip = sc->sc_data;
 
-	/*
-	 * (Potentially) lower priority.  We only need to protect ourselves
-	 * from keyboard interrupts since that is all that can affect the
-	 * state of our tty (kernel printf doesn't go through this routine).
-	 */
-	s = splite();
+	s = splkbd();
 	if (tp->t_state & (TS_TIMEOUT|TS_BUSY|TS_TTSTOP)) {
 		splx(s);
 		return;