[PATCH] correct bus types in probing/probe-input.c

Johannes Berg johannes at sipsolutions.net
Tue Jul 11 07:42:12 PDT 2006


This patch fixes the bus type switch by inserting the actual BUS_HOST
constant instead of using a (wrong!) constant, and switching the others
to symbolic constants too. It "adds" BUS_PARPORT which was previously
there under the label "BUS_HOST".

Signed-off-by: Johannes Berg <johannes at sipsolutions.net>

--- hal-0.5.7.orig/hald/linux2/probing/probe-input.c	2006-07-11 16:37:05.000000000 +0200
+++ hal-0.5.7/hald/linux2/probing/probe-input.c	2006-07-11 16:39:33.000000000 +0200
@@ -186,9 +186,10 @@
 	dbg ("probe-input: id.bustype=%i", id.bustype);
 	if (physical_device == NULL) {
 		switch (id.bustype) {
-		case 17: /* TODO: x86 legacy port; use symbol instead of hardcoded constant */
-		case 21: /* BUS_HOST, not hotpluggable */
-		case 23: /* ADB on Apple computers */
+		case BUS_I8042: /* x86 legacy port */
+		case BUS_HOST: /* not hotpluggable */
+		case BUS_PARPORT: /* XXX: really needed? */
+		case BUS_ADB: /* ADB on Apple computers */
 			break;
 		default:
 			goto out;




More information about the hal mailing list