summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog13
-rw-r--r--i386/i386/hardclock.c2
-rw-r--r--i386/i386/locore.S10
-rw-r--r--i386/i386/pic.c17
-rw-r--r--i386/i386/pic.h16
-rw-r--r--i386/i386/pit.h5
-rw-r--r--kern/machine.c7
-rw-r--r--vm/vm_map.h4
8 files changed, 16 insertions, 58 deletions
diff --git a/ChangeLog b/ChangeLog
index e93046b..de0c7dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2006-11-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
+ Drop iPSC architecture support.
+ * i386/i386/hardclock.c: Remove iPSC386 from #if.
+ * i386/i386/locore.S: Remove iPSC386 delays.
+ * i386/i386/pic.c: Remove iPSC386 support.
+ (SLAVEMASK): Rmove iPSC386 case.
+ * i386/i386/pic.h (ADDR_PIC_BASE, OFF_ICW, OFF_OCW, SIZE_PIC)
+ (PICM_VECTBASE, PICS_VECTBASE): Remove iPSC386 cases.
+ [iPSC386] (I_AM_A_SLAVE, I_AM_A_MASTR): Remove macros.
+ * i386/i386/pit.h: Remove iPSC386 from #if.
+ [iPSC386] (CLKNUM): Remove macro.
+ * kern/machine.c (host_get_boot_info): Remove iPSC386 support.
+ * vm/vm_map.h (VM_MAP_COPY_PAGE_LIST_MAX): Remove iPSC case.
+
Drop i860 architecture support.
* i386/i386/pmap.h: Remove i860 comment.
* i386/intel/pmap.c: Remove i860 comments.
diff --git a/i386/i386/hardclock.c b/i386/i386/hardclock.c
index 23eb4c1..c34105b 100644
--- a/i386/i386/hardclock.c
+++ b/i386/i386/hardclock.c
@@ -38,7 +38,7 @@
#ifdef SYMMETRY
#include <sqt/intctl.h>
#endif
-#if defined(AT386) || defined(iPSC386)
+#if defined(AT386)
#include <i386/ipl.h>
#endif
diff --git a/i386/i386/locore.S b/i386/i386/locore.S
index 3db614f..4f04670 100644
--- a/i386/i386/locore.S
+++ b/i386/i386/locore.S
@@ -1473,9 +1473,6 @@ ENTRY(outb)
movl S_ARG0,%edx /* IO port address */
movl S_ARG1,%eax /* data to output */
outb %al,%dx /* send it out */
-#ifdef iPSC386
- mull %ecx /* Delay a little to make H/W happy */
-#endif /* iPSC386 */
ret
/*
@@ -1487,13 +1484,6 @@ ENTRY(inb)
movl S_ARG0,%edx /* IO port address */
xor %eax,%eax /* clear high bits of register */
inb %dx,%al /* get the byte */
-#ifdef iPSC386
-/ Do a long multiply to delay a little to make H/W happy. Must
-/ save and restore EAX which is used to hold result of multiply
- pushl %eax
- mull %ecx
- popl %eax
-#endif /* iPSC386 */
ret
/*
diff --git a/i386/i386/pic.c b/i386/i386/pic.c
index ea16111..b681070 100644
--- a/i386/i386/pic.c
+++ b/i386/i386/pic.c
@@ -151,23 +151,11 @@ picinit()
PICM_ICW3 = ( SLAVE_ON_IR2 );
PICS_ICW3 = ( I_AM_SLAVE_2 );
#endif /* AT386 */
-#ifdef iPSC386
- PICM_ICW3 = ( SLAVE_ON_IR7 );
- PICS_ICW3 = ( I_AM_SLAVE_7 );
-#endif /* iPSC386 */
-
-#ifdef iPSC386
- /* Use Buffered mode for iPSC386 */
- PICM_ICW4 = (SNF_MODE_DIS | BUFFERD_MODE | I_AM_A_MASTR |
- NRML_EOI_MOD | I8086_EMM_MOD);
- PICS_ICW4 = (SNF_MODE_DIS | BUFFERD_MODE | I_AM_A_SLAVE |
- NRML_EOI_MOD | I8086_EMM_MOD);
-#else /* iPSC386 */
+
PICM_ICW4 =
(SNF_MODE_DIS | NONBUFD_MODE | NRML_EOI_MOD | I8086_EMM_MOD);
PICS_ICW4 =
(SNF_MODE_DIS | NONBUFD_MODE | NRML_EOI_MOD | I8086_EMM_MOD);
-#endif /* iPSC386 */
PICM_OCW1 = (curr_pic_mask & 0x00FF);
PICS_OCW1 = ((curr_pic_mask & 0xFF00)>>8);
@@ -230,9 +218,6 @@ picinit()
#if defined(AT386)
#define SLAVEMASK (0xFFFF ^ SLAVE_ON_IR2)
#endif /* defined(AT386) */
-#ifdef iPSC386
-#define SLAVEMASK (0xFFFF ^ SLAVE_ON_IR7)
-#endif /* iPSC386 */
#define SLAVEACTV 0xFF00
diff --git a/i386/i386/pic.h b/i386/i386/pic.h
index d455f7c..c6f8a4b 100644
--- a/i386/i386/pic.h
+++ b/i386/i386/pic.h
@@ -66,13 +66,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define SIZE_PIC 0x80
#endif /* defined(AT386) */
-#ifdef iPSC386
-#define ADDR_PIC_BASE 0xC0
-#define OFF_ICW 0x00
-#define OFF_OCW 0x02
-#define SIZE_PIC 0x04
-#endif /* iPSC386 */
-
#define PIC_MASTER_ICW (ADDR_PIC_BASE + OFF_ICW)
#define PIC_MASTER_OCW (ADDR_PIC_BASE + OFF_OCW)
#define PIC_SLAVE_ICW (PIC_MASTER_ICW + SIZE_PIC)
@@ -107,11 +100,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define PICS_VECTBASE PICM_VECTBASE + 0x08
#endif /* defined(AT386) */
-#ifdef iPSC386
-#define PICM_VECTBASE 0x40
-#define PICS_VECTBASE PICM_VECTBASE + 0x08
-#endif /* iPSC386 */
-
/*
** ICW3
*/
@@ -142,10 +130,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define SNF_MODE_DIS 0x00
#define BUFFERD_MODE 0x08
#define NONBUFD_MODE 0x00
-#if iPSC386
-#define I_AM_A_SLAVE 0x00
-#define I_AM_A_MASTR 0x04
-#endif /* iPSC386 */
#define AUTO_EOI_MOD 0x02
#define NRML_EOI_MOD 0x00
#define I8086_EMM_MOD 0x01
diff --git a/i386/i386/pit.h b/i386/i386/pit.h
index a34628e..4cee44b 100644
--- a/i386/i386/pit.h
+++ b/i386/i386/pit.h
@@ -45,7 +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 || iPSC386
+#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 */
@@ -89,9 +89,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#if defined(MB2) || EXL > 0
#define CLKNUM 12500
#endif
-#if iPSC386
-#define CLKNUM 1000000
-#endif /* iPSC386 */
#if EXL
/* added micro-timer support. --- csy */
diff --git a/kern/machine.c b/kern/machine.c
index e242da8..3a5d21f 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -743,13 +743,6 @@ host_get_boot_info(priv_host, boot_info)
return KERN_INVALID_HOST;
}
-#if defined(iPSC386) || defined(iPSC860)
-{
- extern char *ipsc_boot_environ();
- src = ipsc_boot_environ();
-}
-#endif /* defined(iPSC386) || defined(iPSC860) */
-
(void) strncpy(boot_info, src, KERNEL_BOOT_INFO_MAX);
return KERN_SUCCESS;
}
diff --git a/vm/vm_map.h b/vm/vm_map.h
index 3e0246b..af85ef9 100644
--- a/vm/vm_map.h
+++ b/vm/vm_map.h
@@ -228,11 +228,7 @@ typedef struct vm_map_version {
* (returned) and an abort flag (abort if TRUE).
*/
-#if iPSC386 || iPSC860
-#define VM_MAP_COPY_PAGE_LIST_MAX 64
-#else /* iPSC386 || iPSC860 */
#define VM_MAP_COPY_PAGE_LIST_MAX 8
-#endif /* iPSC386 || iPSC860 */
typedef struct vm_map_copy {
int type;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-04 16:27:55 +0000