diff options
Diffstat (limited to 'sys/arch')
-rw-r--r-- | sys/arch/macppc/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/arch/macppc/dev/tpms.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 81f27ea57b5..303a1d0f68b 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.116 2005/12/21 18:50:51 miod Exp $g +# $OpenBSD: GENERIC,v 1.117 2005/12/22 13:47:31 xsa Exp $g # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -222,7 +222,7 @@ scsibus* at umass? atapiscsi* at umass? uhidev* at uhub? # Human Interface Devices tpms* at uhidev? # Apple trackpad mouse -wsmouse* at ums? mux 0 +wsmouse* at tpms? mux 0 ums* at uhidev? # USB mouse wsmouse* at ums? mux 0 ukbd* at uhidev? # USB keyboard diff --git a/sys/arch/macppc/dev/tpms.c b/sys/arch/macppc/dev/tpms.c index 09852a3a8ef..36d226a966c 100644 --- a/sys/arch/macppc/dev/tpms.c +++ b/sys/arch/macppc/dev/tpms.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tpms.c,v 1.2 2005/12/21 22:19:41 miod Exp $ */ +/* $OpenBSD: tpms.c,v 1.3 2005/12/22 13:47:31 xsa Exp $ */ /* * Copyright (c) 2005, Johan Wallén @@ -351,8 +351,8 @@ USB_ATTACH(tpms) } } } - if (sc->sc_x_sensors <= 0 || sc->sc_x_sensors >= TPMS_X_SENSORS || - sc->sc_y_sensors <= 0 || sc->sc_y_sensors >= TPMS_Y_SENSORS) { + if (sc->sc_x_sensors <= 0 || sc->sc_x_sensors > TPMS_X_SENSORS || + sc->sc_y_sensors <= 0 || sc->sc_y_sensors > TPMS_Y_SENSORS) { printf(": unexpected sensors configuration (%d:%d)\n", sc->sc_x_sensors, sc->sc_y_sensors); USB_ATTACH_ERROR_RETURN; @@ -364,8 +364,6 @@ USB_ATTACH(tpms) sc->sc_status = 0; - printf("\n"); - a.accessops = &tpms_accessops; a.accesscookie = sc; sc->sc_wsmousedev = config_found(self, &a, wsmousedevprint); |