d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more updates.

Browse Source 
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
This commit is contained in:
Satoshi Asami 1996-11-14 08:46:21 +00:00
parent bcd92649c9
commit 7c219eac8f
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/i386/isa/wdreg.h
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wdreg.h 7.1 (Berkeley) 5/9/91
* $Id: wdreg.h,v 1.12 1996/06/08 10:03:38 bde Exp $
* $Id: wdreg.h,v 1.13 1996/11/02 10:37:08 asami Exp $
*/
/*
@ -63,7 +63,6 @@
#define wd_altsts_epson 0x3 /*alternate fixed disk status(via 1015) (R)*/
#define wd_ctlr_epson 0x3 /*fixed disk controller control(via 1015) (W)*/
#define wd_altsts wd_alsts_nec
#define wd_ctlr wd_ctlr_nec
#define WDCTL_4BIT 0x8 /* use four head bits (wd1003) */
#define WDCTL_RST 0x4 /* reset the controller */

3
sys/pc98/conf/GENERIC
View File

@ -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

3
sys/pc98/conf/GENERIC98
View File

@ -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

4
sys/pc98/pc98/if_fe.c
View File

@ -21,7 +21,7 @@
*/
/*
* $Id: if_fe.c,v 1.9 1996/10/09 21:46:25 asami Exp $
* $Id: if_fe.c,v 1.10 1996/10/30 22:39:56 asami Exp $
*
* Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
* To be used with FreeBSD 2.x
@ -749,7 +749,6 @@ fe_probe_re1000 ( DEVICE * isa_dev, struct fe_softc * sc )
outb(sc->ioaddr[FE_RE1000_IRQCONF], c);
sc->typestr = "RE1000";
sc->sc_description = "Ethernet adapter: RE1000";
/*
* Program the 86965 as follows:
@ -893,7 +892,6 @@ fe_probe_re1000p ( DEVICE * isa_dev, struct fe_softc * sc )
bcopy( eeprom + FE_ATI_EEP_ADDR, sc->sc_enaddr, ETHER_ADDR_LEN );
sc->typestr = "RE1000Plus/ME1500";
sc->sc_description = "Ethernet adapter: RE1000Plus/ME1500";
/*
* Read IRQ configuration.

5
sys/pc98/pc98/pc98.c
View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
* $Id: pc98.c,v 1.9 1996/10/23 07:25:20 asami Exp $
* $Id: pc98.c,v 1.10 1996/10/29 08:36:23 asami Exp $
*/
/*
@ -573,7 +573,8 @@ static u_int8_t dma_inuse = 0; /* User for acquire/release */
/* high byte of address is stored in this port for i-th dma channel */
#ifdef PC98
static int dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 };
/* SCSI driver use the variable */
int dmapageport[4] = { 0x27, 0x21, 0x23, 0x25 };
#else /* IBM-PC */
static int dmapageport[8] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
#endif

6
sys/pci/wd82371.c
View File

@ -26,7 +26,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: wd82371.c,v 1.4 1996/05/02 14:20:50 phk Exp $
* $Id: wd82371.c,v 1.5 1996/06/14 11:02:09 asami Exp $
*/
#include "pci.h"
@ -44,11 +44,7 @@
#include <machine/pmap.h> /* for vtophys */
#ifdef PC98
#include <pc98/pc98/wdreg.h>
#else
#include <i386/isa/wdreg.h>
#endif
#include <pci/pcivar.h>
#include <pci/pcireg.h>