From 27adad708fc2a95010bb0148d8c63a144a842963 Mon Sep 17 00:00:00 2001
From: scottr <scottr@NetBSD.org>
Date: Sun, 7 Nov 1999 00:12:55 +0000
Subject: [PATCH] ite_polling -> adb_polling

---
 sys/arch/mac68k/dev/aed.c       |  9 ++-------
 sys/arch/mac68k/dev/ite.c       | 10 +++++-----
 sys/arch/mac68k/dev/pm_direct.c | 12 +++++-------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/sys/arch/mac68k/dev/aed.c b/sys/arch/mac68k/dev/aed.c
index 44ecdc03ea6b..6c71016f0965 100644
--- a/sys/arch/mac68k/dev/aed.c
+++ b/sys/arch/mac68k/dev/aed.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: aed.c,v 1.7 1999/02/16 01:08:16 ender Exp $	*/
+/*	$NetBSD: aed.c,v 1.8 1999/11/07 00:12:55 scottr Exp $	*/
 
 /*
  * Copyright (C) 1994	Bradley A. Grantham
@@ -62,11 +62,6 @@ static void	aed_dokeyupdown __P((adb_event_t *event));
 static void	aed_handoff __P((adb_event_t *event));
 static void	aed_enqevent __P((adb_event_t *event));
 
-/*
- * Global variables.
- */
-extern int ite_polling;			/* Are we polling?  (Debugger mode) */
-
 /*
  * Local variables.
  */
@@ -365,7 +360,7 @@ static void
 aed_handoff(event)
 	adb_event_t *event;
 {
-	if (aed_sc->sc_open && !ite_polling)
+	if (aed_sc->sc_open && !adb_polling)
 		aed_enqevent(event);
 	else {
 		if (event->def_addr == 2)
diff --git a/sys/arch/mac68k/dev/ite.c b/sys/arch/mac68k/dev/ite.c
index 184082792c14..1e8a4db5ba6c 100644
--- a/sys/arch/mac68k/dev/ite.c
+++ b/sys/arch/mac68k/dev/ite.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite.c,v 1.51 1999/07/08 18:05:29 thorpej Exp $	*/
+/*	$NetBSD: ite.c,v 1.52 1999/11/07 00:12:55 scottr Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -83,6 +83,7 @@
 
 #include <mac68k/mac68k/macrom.h>
 #include <mac68k/nubus/nubus.h>
+#include <mac68k/dev/adbvar.h>
 #include <mac68k/dev/itevar.h>
 #include <mac68k/dev/grfvar.h>
 
@@ -167,7 +168,6 @@ static int	bell_length = 10;	/* duration */
 static int	bell_volume = 100;	/* volume */
 
 /* For polled kbd mode */
-int		ite_polling = 0;
 static int	polledkey;
 
 extern u_int32_t mac68k_vidphys;
@@ -895,7 +895,7 @@ ite_pollforchar()
 	s = splhigh();
 
 	polledkey = -1;
-	ite_polling = 1;
+	adb_polling = 1;
 
 	/* pretend we're VIA interrupt dispatcher */
 	while (polledkey == -1) {
@@ -911,7 +911,7 @@ ite_pollforchar()
 		}
 	}
 
-	ite_polling = 0;
+	adb_polling = 0;
 
 	splx(s);
 
@@ -1216,7 +1216,7 @@ ite_intr(adb_event_t * event)
 			str[1] = '\0';
 			break;
 		}
-		if (ite_polling)
+		if (adb_polling)
 			polledkey = str[0];
 		else
 			for (s = str; *s; s++)
diff --git a/sys/arch/mac68k/dev/pm_direct.c b/sys/arch/mac68k/dev/pm_direct.c
index 7b348a3abed1..ac9f3831de1d 100644
--- a/sys/arch/mac68k/dev/pm_direct.c
+++ b/sys/arch/mac68k/dev/pm_direct.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pm_direct.c,v 1.9 1999/06/28 01:56:56 briggs Exp $	*/
+/*	$NetBSD: pm_direct.c,v 1.10 1999/11/07 00:12:56 scottr Exp $	*/
 
 /*
  * Copyright (C) 1997 Takashi Hamada
@@ -221,8 +221,6 @@ struct adbCommand {
 };
 extern	void	adb_pass_up __P((struct adbCommand *));
 
-extern int ite_polling;		/* Are we polling?  (Debugger mode) */
-
 #if 0
 /*
  * Define the external functions
@@ -1051,9 +1049,9 @@ pm_adb_op(buffer, compRout, data, command)
 		packet.cmd = command;
 		packet.unsol = 0;
 		packet.ack_only = 1;
-		ite_polling = 1;
+		adb_polling = 1;
 		adb_pass_up(&packet);
-		ite_polling = 0;
+		adb_polling = 0;
 	}
 
 	rval = pmgrop(&pmdata);
@@ -1125,9 +1123,9 @@ pm_adb_get_TALK_result(pmdata)
 	packet.compData = adbCompData;
 	packet.unsol = 0;
 	packet.ack_only = 0;
-	ite_polling = 1;
+	adb_polling = 1;
 	adb_pass_up(&packet);
-	ite_polling = 0;
+	adb_polling = 0;
 
 	adbWaiting = 0;
 	adbBuffer = (long)0;