summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1999-05-09 20:45:53 +0000
committerpeter <peter@FreeBSD.org>1999-05-09 20:45:53 +0000
commit77f650ef5f3f98911da699e5d7dfcaf29c1841ab (patch)
treeb34a506d9dc04b6be7dd9e54876393243b041020
parent2bc4e0eea26926c7f3be019049b30d552d8846d8 (diff)
downloadFreeBSD-src-77f650ef5f3f98911da699e5d7dfcaf29c1841ab.zip
FreeBSD-src-77f650ef5f3f98911da699e5d7dfcaf29c1841ab.tar.gz
Remove hackish foot protection.. If you ask for an atkbd on an isa bus
rather than on the keyboard controller, you will get it.. (and shoot your feet)
-rw-r--r--sys/dev/atkbdc/atkbdc_isa.c18
-rw-r--r--sys/dev/atkbdc/atkbdc_subr.c18
-rw-r--r--sys/isa/atkbdc_isa.c18
3 files changed, 3 insertions, 51 deletions
diff --git a/sys/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c
index 5342c52..88a2d11 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: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $
+ * $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
*/
#include "atkbdc.h"
@@ -174,22 +174,6 @@ 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 5342c52..88a2d11 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: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $
+ * $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
*/
#include "atkbdc.h"
@@ -174,22 +174,6 @@ 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/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c
index 5342c52..88a2d11 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: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $
+ * $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
*/
#include "atkbdc.h"
@@ -174,22 +174,6 @@ 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;
OpenPOWER on IntegriCloud