From 7e8b31e61e4bd9207bde37662e757a5988c556df Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Sun, 5 Nov 2006 16:36:31 +0000 Subject: 2006-11-05 Samuel Thibault * DEVELOPMENT: Document the removals. Drop MB1/MB2/EXL architecture support. * i386/i386/pit.h (PITCTR0_PORT, PITCTR1_PORT, PITCTR2_PORT) (PITCTL_PORT, CLKNUM): Remove MB1/MB2/EXL cases. [EXL] (time_latch): Remove structure and type. [EXL] (intr_disable, intr_restore): Remove functions. --- ChangeLog | 8 ++++++++ DEVELOPMENT | 4 ++++ i386/i386/pit.h | 39 +-------------------------------------- 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index de0c7dc3..941b9723 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2006-11-05 Samuel Thibault + * DEVELOPMENT: Document the following removals. + + Drop MB1/MB2/EXL architecture support. + * i386/i386/pit.h (PITCTR0_PORT, PITCTR1_PORT, PITCTR2_PORT) + (PITCTL_PORT, CLKNUM): Remove MB1/MB2/EXL cases. + [EXL] (time_latch): Remove structure and type. + [EXL] (intr_disable, intr_restore): Remove functions. + Drop iPSC architecture support. * i386/i386/hardclock.c: Remove iPSC386 from #if. * i386/i386/locore.S: Remove iPSC386 delays. diff --git a/DEVELOPMENT b/DEVELOPMENT index e01dead9..dbd7ac4c 100644 --- a/DEVELOPMENT +++ b/DEVELOPMENT @@ -37,5 +37,9 @@ within the native Mach NE2000 NIC device driver, see Support for NORMA was removed on 2006-03-20. . +Support for PS2, i860, iPSC 386/860 and MB1/MB2/EXL was removed on +2006-11-05. +. + Be sure to check the ChangeLog and have a look at the repository at that tag's state if you want to work on those parts of GNU Mach. diff --git a/i386/i386/pit.h b/i386/i386/pit.h index 4cee44b4..b59d8c5c 100644 --- a/i386/i386/pit.h +++ b/i386/i386/pit.h @@ -45,13 +45,7 @@ NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(MB1) || defined(MB2) || EXL > 0 -/* Definitions for 8254 Programmable Interrupt Timer ports on 386/20 */ -#define PITCTR0_PORT 0xD0 /* counter 0 port */ -#define PITCTR1_PORT 0xD2 /* counter 1 port */ -#define PITCTR2_PORT 0xD4 /* counter 2 port */ -#define PITCTL_PORT 0xD6 /* PIT control port */ -#else /* defined(AT386) */ +#if defined(AT386) /* Definitions for 8254 Programmable Interrupt Timer ports on AT 386 */ #define PITCTR0_PORT 0x40 /* counter 0 port */ #define PITCTR1_PORT 0x41 /* counter 1 port */ @@ -83,34 +77,3 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #if AT386 #define CLKNUM 1193167 #endif /* AT386 */ -#if defined(MB1) -#define CLKNUM 12300 -#endif -#if defined(MB2) || EXL > 0 -#define CLKNUM 12500 -#endif - -#if EXL -/* added micro-timer support. --- csy */ -typedef struct time_latch { - time_t ticks; /* time in HZ since boot */ - time_t uticks; /* time in 1.25 MHZ */ -/* don't need these two for now. --- csy */ -#if 0 - time_t secs; /* seconds since boot */ - time_t epochsecs; /* seconds since epoch */ -#endif - } time_latch; -/* a couple in-line assembly codes for efficiency. */ -asm int intr_disable() -{ - pushfl - cli -} - -asm int intr_restore() -{ - popfl -} - -#endif /* EXL */ -- cgit v1.2.3