diff options
| -rw-r--r-- | sys/amd64/amd64/legacy.c | 13 | ||||
| -rw-r--r-- | sys/amd64/amd64/nexus.c | 13 | ||||
| -rw-r--r-- | sys/i386/i386/legacy.c | 13 | ||||
| -rw-r--r-- | sys/i386/i386/nexus.c | 13 |
4 files changed, 48 insertions, 4 deletions
diff --git a/sys/amd64/amd64/legacy.c b/sys/amd64/amd64/legacy.c index 7df4387..dab0e65 100644 --- a/sys/amd64/amd64/legacy.c +++ b/sys/amd64/amd64/legacy.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: nexus.c,v 1.1 1999/04/16 21:22:14 peter Exp $ */ /* @@ -63,7 +63,11 @@ #include <machine/mpapic.h> #endif +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#else #include <i386/isa/isa.h> +#endif #include <i386/isa/icu.h> #include <i386/isa/intr_machdep.h> @@ -194,6 +198,12 @@ nexus_probe(device_t dev) panic("nexus_probe eisa"); #endif #if NISA > 0 +#ifdef PC98 + /* Add an ISA bus directly */ + child = device_add_child(dev, "isa", 0, 0); + if (child == 0) + panic("nexus_probe isa"); +#else /* Add an ISA bus directly if pci bus is not present */ if (pci_cfgopen() == 0) { child = device_add_child(dev, "isa", 0, 0); @@ -201,6 +211,7 @@ nexus_probe(device_t dev) panic("nexus_probe isa"); } #endif +#endif return 0; } diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c index 7df4387..dab0e65 100644 --- a/sys/amd64/amd64/nexus.c +++ b/sys/amd64/amd64/nexus.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: nexus.c,v 1.1 1999/04/16 21:22:14 peter Exp $ */ /* @@ -63,7 +63,11 @@ #include <machine/mpapic.h> #endif +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#else #include <i386/isa/isa.h> +#endif #include <i386/isa/icu.h> #include <i386/isa/intr_machdep.h> @@ -194,6 +198,12 @@ nexus_probe(device_t dev) panic("nexus_probe eisa"); #endif #if NISA > 0 +#ifdef PC98 + /* Add an ISA bus directly */ + child = device_add_child(dev, "isa", 0, 0); + if (child == 0) + panic("nexus_probe isa"); +#else /* Add an ISA bus directly if pci bus is not present */ if (pci_cfgopen() == 0) { child = device_add_child(dev, "isa", 0, 0); @@ -201,6 +211,7 @@ nexus_probe(device_t dev) panic("nexus_probe isa"); } #endif +#endif return 0; } diff --git a/sys/i386/i386/legacy.c b/sys/i386/i386/legacy.c index 7df4387..dab0e65 100644 --- a/sys/i386/i386/legacy.c +++ b/sys/i386/i386/legacy.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: nexus.c,v 1.1 1999/04/16 21:22:14 peter Exp $ */ /* @@ -63,7 +63,11 @@ #include <machine/mpapic.h> #endif +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#else #include <i386/isa/isa.h> +#endif #include <i386/isa/icu.h> #include <i386/isa/intr_machdep.h> @@ -194,6 +198,12 @@ nexus_probe(device_t dev) panic("nexus_probe eisa"); #endif #if NISA > 0 +#ifdef PC98 + /* Add an ISA bus directly */ + child = device_add_child(dev, "isa", 0, 0); + if (child == 0) + panic("nexus_probe isa"); +#else /* Add an ISA bus directly if pci bus is not present */ if (pci_cfgopen() == 0) { child = device_add_child(dev, "isa", 0, 0); @@ -201,6 +211,7 @@ nexus_probe(device_t dev) panic("nexus_probe isa"); } #endif +#endif return 0; } diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c index 7df4387..dab0e65 100644 --- a/sys/i386/i386/nexus.c +++ b/sys/i386/i386/nexus.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: nexus.c,v 1.1 1999/04/16 21:22:14 peter Exp $ */ /* @@ -63,7 +63,11 @@ #include <machine/mpapic.h> #endif +#ifdef PC98 +#include <pc98/pc98/pc98.h> +#else #include <i386/isa/isa.h> +#endif #include <i386/isa/icu.h> #include <i386/isa/intr_machdep.h> @@ -194,6 +198,12 @@ nexus_probe(device_t dev) panic("nexus_probe eisa"); #endif #if NISA > 0 +#ifdef PC98 + /* Add an ISA bus directly */ + child = device_add_child(dev, "isa", 0, 0); + if (child == 0) + panic("nexus_probe isa"); +#else /* Add an ISA bus directly if pci bus is not present */ if (pci_cfgopen() == 0) { child = device_add_child(dev, "isa", 0, 0); @@ -201,6 +211,7 @@ nexus_probe(device_t dev) panic("nexus_probe isa"); } #endif +#endif return 0; } |
