From 62ed04dfc877eef2cfe3335dd7f1d964b83d22b8 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 31 Oct 1995 21:03:57 +0000
Subject: [PATCH] We no longer need the spltty() == splimp() hack if PPP is
 configured into the kernel.  ppp_tty.c goes to some lengths to minimise the
 inter-layer calling (including a soft ISR).  ppp_tty.c takes care of the soft
 masking that was needed still.

(I've discovered that bugs in this area show up within an hour if the
masking was not correct.. :-}  This combination has proven stable on
specialix serial ports, although there was some concern about the softtty
parts of sio/cy and netisr colliding - but Bruce has fixed that now)
---
 sys/amd64/isa/isa.c | 16 ++++++++++------
 sys/i386/isa/isa.c  | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index ade77a43cdba..7eeda5d694a4 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.52 1995/09/15 03:10:06 davidg Exp $
+ *	$Id: isa.c,v 1.53 1995/10/22 15:07:43 bde Exp $
  */
 
 /*
@@ -61,6 +61,7 @@
 #include <machine/segments.h>
 #include <vm/vm.h>
 #include <machine/spl.h>
+#include <machine/cpu.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
@@ -342,15 +343,17 @@ isa_configure() {
 #include "sl.h"
 #include "ppp.h"
 
-#if (NSL > 0) || (NPPP > 0)
+#if (NSL > 0)
 	net_imask |= tty_imask;
 	tty_imask = net_imask;
 #endif
+
 	/* bio_imask |= tty_imask ;  can some tty devices use buffers? */
-#ifdef DIAGNOSTIC
-	printf("bio_imask %x tty_imask %x net_imask %x\n",
-	       bio_imask, tty_imask, net_imask);
-#endif
+
+	if (bootverbose)
+		printf("imasks: bio %x, tty %x, net %x\n",
+			bio_imask, tty_imask, net_imask);
+
 	/*
 	 * Finish initializing intr_mask[].  Note that the partly
 	 * constructed masks aren't actually used since we're at splhigh.
@@ -933,6 +936,7 @@ update_intr_masks(void)
 {
 	int intr, n=0;
 	u_int mask,*maskptr;
+
 	for (intr=0; intr < ICU_LEN; intr ++) {
 		if (intr==2) continue;
 		maskptr = intr_mptr[intr];
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index ade77a43cdba..7eeda5d694a4 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.52 1995/09/15 03:10:06 davidg Exp $
+ *	$Id: isa.c,v 1.53 1995/10/22 15:07:43 bde Exp $
  */
 
 /*
@@ -61,6 +61,7 @@
 #include <machine/segments.h>
 #include <vm/vm.h>
 #include <machine/spl.h>
+#include <machine/cpu.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isa.h>
 #include <i386/isa/icu.h>
@@ -342,15 +343,17 @@ isa_configure() {
 #include "sl.h"
 #include "ppp.h"
 
-#if (NSL > 0) || (NPPP > 0)
+#if (NSL > 0)
 	net_imask |= tty_imask;
 	tty_imask = net_imask;
 #endif
+
 	/* bio_imask |= tty_imask ;  can some tty devices use buffers? */
-#ifdef DIAGNOSTIC
-	printf("bio_imask %x tty_imask %x net_imask %x\n",
-	       bio_imask, tty_imask, net_imask);
-#endif
+
+	if (bootverbose)
+		printf("imasks: bio %x, tty %x, net %x\n",
+			bio_imask, tty_imask, net_imask);
+
 	/*
 	 * Finish initializing intr_mask[].  Note that the partly
 	 * constructed masks aren't actually used since we're at splhigh.
@@ -933,6 +936,7 @@ update_intr_masks(void)
 {
 	int intr, n=0;
 	u_int mask,*maskptr;
+
 	for (intr=0; intr < ICU_LEN; intr ++) {
 		if (intr==2) continue;
 		maskptr = intr_mptr[intr];