summaryrefslogtreecommitdiffstats
path: root/sys/pc98/conf
diff options
context:
space:
mode:
authorasami <asami@FreeBSD.org>1996-11-14 08:46:21 +0000
committerasami <asami@FreeBSD.org>1996-11-14 08:46:21 +0000
commit15ab0f62afc28304dad2e833d74adb3733130766 (patch)
tree8f729367d0b6eb8f238437df654fef4b140215dc /sys/pc98/conf
parentfb0769b75343e74a31335638696c104c3eae08e2 (diff)
downloadFreeBSD-src-15ab0f62afc28304dad2e833d74adb3733130766.zip
FreeBSD-src-15ab0f62afc28304dad2e833d74adb3733130766.tar.gz
Some more updates.
wdreg.h: Delete wd_ctlr macro. PC98 version of wd.c treats it as a variable. GENERIC98: Delete ep0 entry. Current ep driver write I/O port 0x100. This clobbers ICW of i8259, because upper 8bits of address line is not masked on mother board. if_fe.c: Merge from revision 1.18 of sys/i386/isa/if_fe.c. pc98.c: Globalize dmapageport, because SCSI driver use this variable. wd82371.c: Yet another merge. These are 2.2 candidates. Submitted by: The FreeBSD(98) Development Team
Diffstat (limited to 'sys/pc98/conf')
-rw-r--r--sys/pc98/conf/GENERIC3
-rw-r--r--sys/pc98/conf/GENERIC983
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 320aaa2..69b5064 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC98,v 1.7 1996/10/23 07:24:45 asami Exp $
+# $Id: GENERIC98,v 1.8 1996/10/30 22:39:29 asami Exp $
# GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks
@@ -180,7 +180,6 @@ device ed9 at isa? port 0x00d0 net irq 6 flags 0xb00000 vector edintr
device fe0 at isa? port 0x00d0 net irq 3 vector feintr
device zp0 at isa? port 0x00d0 net irq 10 iomem 0xe0000 vector zpintr
-device ep0 at isa? port 0x00d0 net irq 6 vector epintr
#controller snd0
#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 vector sbintr
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 320aaa2..69b5064 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
#
-# $Id: GENERIC98,v 1.7 1996/10/23 07:24:45 asami Exp $
+# $Id: GENERIC98,v 1.8 1996/10/30 22:39:29 asami Exp $
# GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks
@@ -180,7 +180,6 @@ device ed9 at isa? port 0x00d0 net irq 6 flags 0xb00000 vector edintr
device fe0 at isa? port 0x00d0 net irq 3 vector feintr
device zp0 at isa? port 0x00d0 net irq 10 iomem 0xe0000 vector zpintr
-device ep0 at isa? port 0x00d0 net irq 6 vector epintr
#controller snd0
#device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 vector sbintr
OpenPOWER on IntegriCloud