diff options
author | peter <peter@FreeBSD.org> | 1999-04-16 23:39:15 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-04-16 23:39:15 +0000 |
commit | 3ecea8861d683edff8b0c13aad47e44218d8285d (patch) | |
tree | 46b1818201ff3d4654a6df00a0a0a1bd76f4ed8b | |
parent | 245187b52e39f3a1ae09419cc38aeec38b683465 (diff) | |
download | FreeBSD-src-3ecea8861d683edff8b0c13aad47e44218d8285d.zip FreeBSD-src-3ecea8861d683edff8b0c13aad47e44218d8285d.tar.gz |
As a temporary anti-foot-shooting measure, don't let the user attach
the atkbd device to isa, as was in the old (and 3.x) GENERIC config.
-rw-r--r-- | sys/amd64/isa/isa.c | 6 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbdc_isa.c | 18 | ||||
-rw-r--r-- | sys/dev/atkbdc/atkbdc_subr.c | 18 | ||||
-rw-r--r-- | sys/i386/isa/isa.c | 6 | ||||
-rw-r--r-- | sys/isa/atkbdc_isa.c | 18 |
5 files changed, 61 insertions, 5 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 4b48e36..5ec5f03 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.4 1998/09/16 08:23:51 dfr Exp $ + * $Id: isa.c,v 1.119 1999/04/16 21:22:23 peter Exp $ */ /* @@ -183,6 +183,8 @@ isa_probe(device_t dev) for (i = resource_query_string(-1, "at", buf); i != -1; i = resource_query_string(i, "at", buf)) { + if (strcmp(resource_query_name(i), "atkbd") == 0) + continue; /* old GENERIC kludge */ isa_add_device(dev, resource_query_name(i), resource_query_unit(i)); } @@ -193,6 +195,8 @@ isa_probe(device_t dev) for (i = resource_query_string(-1, "at", "isa"); i != -1; i = resource_query_string(i, "at", "isa")) { + if (strcmp(resource_query_name(i), "atkbd") == 0) + continue; /* old GENERIC kludge */ isa_add_device(dev, resource_query_name(i), resource_query_unit(i)); } diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 4435e1e..04dcac0 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/atkbdc_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: $ + * $Id: atkbdc_isa.c,v 1.1 1999/01/23 16:53:27 dfr Exp $ */ #include "atkbdc.h" @@ -175,6 +175,22 @@ atkbdc_attach(device_t dev) resource_query_unit(i)); } +#ifdef __i386__ + /* + * Foot protection... + */ + for (i = resource_locate(-1, "atkbd"); + i != -1; + i = resource_locate(i, "atkbd")) { + if (device_find_child(dev, resource_query_name(i), + resource_query_unit(i)) == NULL) { + printf("WARNING: Update your atkbdc config!\n"); + atkbdc_add_device(dev, resource_query_name(i), + resource_query_unit(i)); + } + } +#endif + bus_generic_attach(dev); return 0; diff --git a/sys/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 4435e1e..04dcac0 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: $ + * $Id: atkbdc_isa.c,v 1.1 1999/01/23 16:53:27 dfr Exp $ */ #include "atkbdc.h" @@ -175,6 +175,22 @@ atkbdc_attach(device_t dev) resource_query_unit(i)); } +#ifdef __i386__ + /* + * Foot protection... + */ + for (i = resource_locate(-1, "atkbd"); + i != -1; + i = resource_locate(i, "atkbd")) { + if (device_find_child(dev, resource_query_name(i), + resource_query_unit(i)) == NULL) { + printf("WARNING: Update your atkbdc config!\n"); + atkbdc_add_device(dev, resource_query_name(i), + resource_query_unit(i)); + } + } +#endif + bus_generic_attach(dev); return 0; diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 4b48e36..5ec5f03 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: isa.c,v 1.4 1998/09/16 08:23:51 dfr Exp $ + * $Id: isa.c,v 1.119 1999/04/16 21:22:23 peter Exp $ */ /* @@ -183,6 +183,8 @@ isa_probe(device_t dev) for (i = resource_query_string(-1, "at", buf); i != -1; i = resource_query_string(i, "at", buf)) { + if (strcmp(resource_query_name(i), "atkbd") == 0) + continue; /* old GENERIC kludge */ isa_add_device(dev, resource_query_name(i), resource_query_unit(i)); } @@ -193,6 +195,8 @@ isa_probe(device_t dev) for (i = resource_query_string(-1, "at", "isa"); i != -1; i = resource_query_string(i, "at", "isa")) { + if (strcmp(resource_query_name(i), "atkbd") == 0) + continue; /* old GENERIC kludge */ isa_add_device(dev, resource_query_name(i), resource_query_unit(i)); } diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c index 4435e1e..04dcac0 100644 --- a/sys/isa/atkbdc_isa.c +++ b/sys/isa/atkbdc_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: $ + * $Id: atkbdc_isa.c,v 1.1 1999/01/23 16:53:27 dfr Exp $ */ #include "atkbdc.h" @@ -175,6 +175,22 @@ atkbdc_attach(device_t dev) resource_query_unit(i)); } +#ifdef __i386__ + /* + * Foot protection... + */ + for (i = resource_locate(-1, "atkbd"); + i != -1; + i = resource_locate(i, "atkbd")) { + if (device_find_child(dev, resource_query_name(i), + resource_query_unit(i)) == NULL) { + printf("WARNING: Update your atkbdc config!\n"); + atkbdc_add_device(dev, resource_query_name(i), + resource_query_unit(i)); + } + } +#endif + bus_generic_attach(dev); return 0; |