From 57d26a14e90f3cf2acea4e815876962a917e822b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= <sos@FreeBSD.org>
Date: Thu, 21 Apr 1994 14:20:54 +0000
Subject: [PATCH] Added IO_PPI define, pulled timer related stuff

---
 sys/amd64/isa/isa.h | 9 +++------
 sys/i386/isa/isa.h  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/sys/amd64/isa/isa.h b/sys/amd64/isa/isa.h
index 788b754c793..e2a26e719f0 100644
--- a/sys/amd64/isa/isa.h
+++ b/sys/amd64/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.3 1993/11/07 17:44:30 wollman Exp $
+ *	$Id: isa.h,v 1.4 1994/01/05 15:03:28 rgrimes Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
@@ -47,12 +47,8 @@
 #ifndef LOCORE
 #include <sys/cdefs.h>
 
-unsigned char rtcin __P((int));
 extern unsigned int atdevbase;	/* offset in virtual memory of ISA io mem */
-void sysbeep __P((int, int));
-unsigned kbd_8042cmd __P((int));
-struct isa_device;
-int isa_irq_pending __P((struct isa_device *dvp));
+unsigned char rtcin __P((int));
 #endif
 
 
@@ -69,6 +65,7 @@ int isa_irq_pending __P((struct isa_device *dvp));
 #define IO_TIMER1	0x040		/* 8253 Timer #1 */
 #define IO_TIMER2	0x048		/* 8253 Timer #2 */
 #define IO_KBD		0x060		/* 8042 Keyboard */
+#define IO_PPI		0x061		/* Programmabel Peripheral Interface */
 #define IO_RTC		0x070		/* RTC */
 #define IO_NMI		IO_RTC		/* NMI Control */
 #define IO_DMAPG	0x080		/* DMA Page Registers */
diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 788b754c793..e2a26e719f0 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.3 1993/11/07 17:44:30 wollman Exp $
+ *	$Id: isa.h,v 1.4 1994/01/05 15:03:28 rgrimes Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
@@ -47,12 +47,8 @@
 #ifndef LOCORE
 #include <sys/cdefs.h>
 
-unsigned char rtcin __P((int));
 extern unsigned int atdevbase;	/* offset in virtual memory of ISA io mem */
-void sysbeep __P((int, int));
-unsigned kbd_8042cmd __P((int));
-struct isa_device;
-int isa_irq_pending __P((struct isa_device *dvp));
+unsigned char rtcin __P((int));
 #endif
 
 
@@ -69,6 +65,7 @@ int isa_irq_pending __P((struct isa_device *dvp));
 #define IO_TIMER1	0x040		/* 8253 Timer #1 */
 #define IO_TIMER2	0x048		/* 8253 Timer #2 */
 #define IO_KBD		0x060		/* 8042 Keyboard */
+#define IO_PPI		0x061		/* Programmabel Peripheral Interface */
 #define IO_RTC		0x070		/* RTC */
 #define IO_NMI		IO_RTC		/* NMI Control */
 #define IO_DMAPG	0x080		/* DMA Page Registers */