From 99f1b222339d6eee1c65e04ad1def3c866f155b0 Mon Sep 17 00:00:00 2001 From: nyan Date: Sat, 14 May 2005 09:10:02 +0000 Subject: - Move timerreg.h to /include and split i8253 specific defines into i8253reg.h, and add some defines to control a speaker. - Move PPI related defines from i386/isa/spkr.c into ppireg.h and use them. - Move IO_{PPI,TIMER} defines into ppireg.h and timerreg.h respectively. - Use isa/isareg.h rather than /isa/isa.h. Tested on: i386, pc98 --- sys/isa/isareg.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'sys/isa/isareg.h') diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h index 05f21bfb..8be7443 100644 --- a/sys/isa/isareg.h +++ b/sys/isa/isareg.h @@ -56,10 +56,7 @@ #define IO_DMA1 0x000 /* 8237A DMA Controller #1 */ #define IO_ICU1 0x020 /* 8259A Interrupt Controller #1 */ #define IO_PMP1 0x026 /* 82347 Power Management Peripheral */ -#define IO_TIMER1 0x040 /* 8253 Timer #1 */ -#define IO_TIMER2 0x048 /* 8253 Timer #2 */ #define IO_KBD 0x060 /* 8042 Keyboard */ -#define IO_PPI 0x061 /* Programmable Peripheral Interface */ #define IO_RTC 0x070 /* RTC */ #define IO_NMI IO_RTC /* NMI Control */ #define IO_DMAPG 0x080 /* DMA Page Registers */ -- cgit v1.1