From 95ac832055c11e8031e18bcc9759b2d12b654e9b Mon Sep 17 00:00:00 2001
From: asami <asami@FreeBSD.org>
Date: Wed, 30 Oct 1996 22:41:46 +0000
Subject: More merge and update.

(1) deleted #if 0

    pc98/pc98/mse.c

(2) hold per-unit I/O ports in ed_softc

    pc98/pc98/if_ed.c
    pc98/pc98/if_ed98.h

(3) merge more files by segregating changes into headers.

  new file (moved from pc98/pc98):

    i386/isa/aic_98.h

  deleted:

    well, it's already in the commit message so I won't repeat the
    long list here ;)

Submitted by:	The FreeBSD(98) Development Team
---
 sys/amd64/pci/pci_bus.c    | 6 +++++-
 sys/amd64/pci/pci_cfgreg.c | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'sys/amd64/pci')

diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 4232069..903214c 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
+**  $Id: pcibus.c,v 1.26 1996/06/18 01:22:28 bde Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -151,7 +151,11 @@ DATA_SET (pcibus_set, i386pci);
 #define CONF1_ENABLE_RES1  0x80000000ul
 
 #define CONF2_ENABLE_PORT  0x0cf8
+#ifdef PC98
+#define CONF2_FORWARD_PORT 0x0cf9
+#else
 #define CONF2_FORWARD_PORT 0x0cfa
+#endif
 
 #define CONF2_ENABLE_CHK   0x0e
 #define CONF2_ENABLE_RES   0x0e
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 4232069..903214c 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.25 1996/06/13 21:50:41 se Exp $
+**  $Id: pcibus.c,v 1.26 1996/06/18 01:22:28 bde Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -151,7 +151,11 @@ DATA_SET (pcibus_set, i386pci);
 #define CONF1_ENABLE_RES1  0x80000000ul
 
 #define CONF2_ENABLE_PORT  0x0cf8
+#ifdef PC98
+#define CONF2_FORWARD_PORT 0x0cf9
+#else
 #define CONF2_FORWARD_PORT 0x0cfa
+#endif
 
 #define CONF2_ENABLE_CHK   0x0e
 #define CONF2_ENABLE_RES   0x0e
-- 
cgit v1.1