kernel: Remove some Micro Channel and EISA remains.
authorSascha Wildner <saw@online.de>
Fri, 24 Jun 2011 11:16:22 +0000 (13:16 +0200)
committerSascha Wildner <saw@online.de>
Fri, 24 Jun 2011 11:16:22 +0000 (13:16 +0200)
sys/bus/pci/i386/legacy.c
sys/bus/pci/x86_64/legacy.c
sys/platform/pc32/i386/nexus.c
sys/platform/pc64/x86_64/nexus.c

index ef10b52..2f71a53 100644 (file)
 #include <sys/module.h>
 #include <sys/rman.h>
 
-#undef DEV_MCA
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #include "legacyvar.h"
 
 static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
@@ -151,23 +146,9 @@ legacy_attach(device_t dev)
        bus_generic_attach(dev);
 
        /*
-        * If we didn't see EISA or ISA on a pci bridge, create some
-        * connection points now so they show up "on motherboard".
+        * If we didn't see ISA on a pci bridge, create a
+        * connection point now so it shows up "on motherboard".
         */
-       if (!devclass_get_device(devclass_find("eisa"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "eisa", 0);
-               if (child == NULL)
-                       panic("legacy_attach eisa");
-               device_probe_and_attach(child);
-       }
-#ifdef DEV_MCA
-       if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "mca", 0);
-               if (child == 0)
-                       panic("legacy_probe mca");
-               device_probe_and_attach(child);
-       }
-#endif
        if (!devclass_get_device(devclass_find("isa"), 0)) {
                child = BUS_ADD_CHILD(dev, dev, 0, "isa", 0);
                if (child == NULL)
index ef10b52..2f71a53 100644 (file)
 #include <sys/module.h>
 #include <sys/rman.h>
 
-#undef DEV_MCA
-#ifdef DEV_MCA
-#include <i386/bios/mca_machdep.h>
-#endif
-
 #include "legacyvar.h"
 
 static MALLOC_DEFINE(M_LEGACYDEV, "legacydrv", "legacy system device");
@@ -151,23 +146,9 @@ legacy_attach(device_t dev)
        bus_generic_attach(dev);
 
        /*
-        * If we didn't see EISA or ISA on a pci bridge, create some
-        * connection points now so they show up "on motherboard".
+        * If we didn't see ISA on a pci bridge, create a
+        * connection point now so it shows up "on motherboard".
         */
-       if (!devclass_get_device(devclass_find("eisa"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "eisa", 0);
-               if (child == NULL)
-                       panic("legacy_attach eisa");
-               device_probe_and_attach(child);
-       }
-#ifdef DEV_MCA
-       if (MCA_system && !devclass_get_device(devclass_find("mca"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "mca", 0);
-               if (child == 0)
-                       panic("legacy_probe mca");
-               device_probe_and_attach(child);
-       }
-#endif
        if (!devclass_get_device(devclass_find("isa"), 0)) {
                child = BUS_ADD_CHILD(dev, dev, 0, "isa", 0);
                if (child == NULL)
index e9a4c3e..acb8a61 100644 (file)
@@ -233,15 +233,9 @@ nexus_attach(device_t dev)
        bus_generic_attach(dev);
 
        /*
-        * And if we didn't see EISA or ISA on a pci bridge, create some
-        * connection points now so they show up "on motherboard".
+        * And if we didn't see ISA on a pci bridge, create a
+        * connection point now so it shows up "on motherboard".
         */
-       if (!devclass_get_device(devclass_find("eisa"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "eisa", 0);
-               if (child == NULL)
-                       panic("nexus_attach eisa");
-               device_probe_and_attach(child);
-       }
        if (!devclass_get_device(devclass_find("isa"), 0)) {
                child = BUS_ADD_CHILD(dev, dev, 0, "isa", 0);
                if (child == NULL)
index 8550e94..ed71718 100644 (file)
@@ -229,15 +229,9 @@ nexus_attach(device_t dev)
        bus_generic_attach(dev);
 
        /*
-        * And if we didn't see EISA or ISA on a pci bridge, create some
-        * connection points now so they show up "on motherboard".
+        * And if we didn't see ISA on a pci bridge, create a
+        * connection point now so it shows up "on motherboard".
         */
-       if (!devclass_get_device(devclass_find("eisa"), 0)) {
-               child = BUS_ADD_CHILD(dev, dev, 0, "eisa", 0);
-               if (child == NULL)
-                       panic("nexus_attach eisa");
-               device_probe_and_attach(child);
-       }
        if (!devclass_get_device(devclass_find("isa"), 0)) {
                child = BUS_ADD_CHILD(dev, dev, 0, "isa", 0);
                if (child == NULL)