From 6311ed9ebab694d9befeee478545efb020a2e1bf Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Fri, 24 Jun 2011 13:16:22 +0200 Subject: [PATCH] kernel: Remove some Micro Channel and EISA remains. --- sys/bus/pci/i386/legacy.c | 23 ++--------------------- sys/bus/pci/x86_64/legacy.c | 23 ++--------------------- sys/platform/pc32/i386/nexus.c | 10 ++-------- sys/platform/pc64/x86_64/nexus.c | 10 ++-------- 4 files changed, 8 insertions(+), 58 deletions(-) diff --git a/sys/bus/pci/i386/legacy.c b/sys/bus/pci/i386/legacy.c index ef10b528e0..2f71a53edd 100644 --- a/sys/bus/pci/i386/legacy.c +++ b/sys/bus/pci/i386/legacy.c @@ -42,11 +42,6 @@ #include #include -#undef DEV_MCA -#ifdef DEV_MCA -#include -#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) diff --git a/sys/bus/pci/x86_64/legacy.c b/sys/bus/pci/x86_64/legacy.c index ef10b528e0..2f71a53edd 100644 --- a/sys/bus/pci/x86_64/legacy.c +++ b/sys/bus/pci/x86_64/legacy.c @@ -42,11 +42,6 @@ #include #include -#undef DEV_MCA -#ifdef DEV_MCA -#include -#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) diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c index e9a4c3e3a7..acb8a61270 100644 --- a/sys/platform/pc32/i386/nexus.c +++ b/sys/platform/pc32/i386/nexus.c @@ -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) diff --git a/sys/platform/pc64/x86_64/nexus.c b/sys/platform/pc64/x86_64/nexus.c index 8550e94d9c..ed71718124 100644 --- a/sys/platform/pc64/x86_64/nexus.c +++ b/sys/platform/pc64/x86_64/nexus.c @@ -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) -- 2.41.0