diff --git a/src/mouse_bus.c b/src/mouse_bus.c index cbe4ba40a..5a5e7f802 100644 --- a/src/mouse_bus.c +++ b/src/mouse_bus.c @@ -49,11 +49,7 @@ * * Based on an early driver for MINIX 1.5. * - * TODO: Re-integrate the InPort part. Currently, - * only the Logitech part is considered to - * be OK. - * - * Version: @(#)mouse_bus.c 1.0.28 2017/12/14 + * Version: @(#)mouse_bus.c 1.0.29 2017/12/14 * * Authors: Fred N. van Kempen, * @@ -249,7 +245,7 @@ ms_read(mouse_t *dev, uint16_t port) if (dev->but & 0x02) /* RIGHT */ ret |= 0x01; if (dev->flags & FLAG_3BTN) - if (dev->but & 0x04) /*MIDDLE*/ + if (dev->but & 0x04) /* MIDDLE */ ret |= 0x02; break; @@ -415,12 +411,12 @@ lt_read(mouse_t *dev, uint16_t port) switch (port) { case LTMOUSE_DATA: /* [00] data register */ ret = 0x07; - if (dev->but & 0x01) /*LEFT*/ + if (dev->but & 0x01) /* LEFT */ ret &= ~0x04; - if (dev->but & 0x02) /*RIGHT*/ + if (dev->but & 0x02) /* RIGHT */ ret &= ~0x01; if (dev->flags & FLAG_3BTN) - if (dev->but & 0x04) /*MIDDLE*/ + if (dev->but & 0x04) /* MIDDLE */ ret &= ~0x02; ret <<= 5; @@ -584,7 +580,6 @@ bm_close(void *priv) bm_read, NULL, NULL, bm_write, NULL, NULL, dev); free(dev); - dev = NULL; } diff --git a/src/mouse_ps2.c b/src/mouse_ps2.c index c5e9af72d..e3743438d 100644 --- a/src/mouse_ps2.c +++ b/src/mouse_ps2.c @@ -8,7 +8,7 @@ * * Implementation of PS/2 series Mouse devices. * - * Version: @(#)mouse_ps2.c 1.0.4 2017/12/13 + * Version: @(#)mouse_ps2.c 1.0.5 2017/12/14 * * Authors: Fred N. van Kempen, */ @@ -261,7 +261,6 @@ ps2_close(void *priv) keyboard_at_set_mouse(NULL, NULL); free(dev); - dev = NULL; } diff --git a/src/mouse_serial.c b/src/mouse_serial.c index 5907898ed..ebc819ba7 100644 --- a/src/mouse_serial.c +++ b/src/mouse_serial.c @@ -10,7 +10,7 @@ * * TODO: Add the Genius Serial Mouse. * - * Version: @(#)mouse_serial.c 1.0.17 2017/12/13 + * Version: @(#)mouse_serial.c 1.0.18 2017/12/14 * * Author: Fred N. van Kempen, */ @@ -205,7 +205,6 @@ sermouse_close(void *priv) } free(dev); - dev = NULL; }