| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | /* $NetBSD: synaptics.c,v 1.40 2018/06/03 14:41:05 christos Exp $ */ | | 1 | /* $NetBSD: synaptics.c,v 1.41 2018/06/03 15:10:12 christos Exp $ */ |
| 2 | | | 2 | |
| 3 | /* | | 3 | /* |
| 4 | * Copyright (c) 2005, Steve C. Woodford | | 4 | * Copyright (c) 2005, Steve C. Woodford |
| 5 | * Copyright (c) 2004, Ales Krenek | | 5 | * Copyright (c) 2004, Ales Krenek |
| 6 | * Copyright (c) 2004, Kentaro A. Kurahone | | 6 | * Copyright (c) 2004, Kentaro A. Kurahone |
| 7 | * All rights reserved. | | 7 | * All rights reserved. |
| 8 | * | | 8 | * |
| 9 | * Redistribution and use in source and binary forms, with or without | | 9 | * Redistribution and use in source and binary forms, with or without |
| 10 | * modification, are permitted provided that the following conditions | | 10 | * modification, are permitted provided that the following conditions |
| 11 | * are met: | | 11 | * are met: |
| 12 | * | | 12 | * |
| 13 | * * Redistributions of source code must retain the above copyright | | 13 | * * Redistributions of source code must retain the above copyright |
| 14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -38,27 +38,27 @@ | | | @@ -38,27 +38,27 @@ |
| 38 | /* | | 38 | /* |
| 39 | * TODO: | | 39 | * TODO: |
| 40 | * - Make the sysctl values per-instance instead of global. | | 40 | * - Make the sysctl values per-instance instead of global. |
| 41 | * - Consider setting initial scaling factors at runtime according | | 41 | * - Consider setting initial scaling factors at runtime according |
| 42 | * to the values returned by the 'Read Resolutions' command. | | 42 | * to the values returned by the 'Read Resolutions' command. |
| 43 | * - Support the serial protocol (we only support PS/2 for now) | | 43 | * - Support the serial protocol (we only support PS/2 for now) |
| 44 | * - Support auto-repeat for up/down button Z-axis emulation. | | 44 | * - Support auto-repeat for up/down button Z-axis emulation. |
| 45 | * - Maybe add some more gestures (can we use Palm support somehow?) | | 45 | * - Maybe add some more gestures (can we use Palm support somehow?) |
| 46 | */ | | 46 | */ |
| 47 | | | 47 | |
| 48 | #include "opt_pms.h" | | 48 | #include "opt_pms.h" |
| 49 | | | 49 | |
| 50 | #include <sys/cdefs.h> | | 50 | #include <sys/cdefs.h> |
| 51 | __KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.40 2018/06/03 14:41:05 christos Exp $"); | | 51 | __KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.41 2018/06/03 15:10:12 christos Exp $"); |
| 52 | | | 52 | |
| 53 | #include <sys/param.h> | | 53 | #include <sys/param.h> |
| 54 | #include <sys/systm.h> | | 54 | #include <sys/systm.h> |
| 55 | #include <sys/device.h> | | 55 | #include <sys/device.h> |
| 56 | #include <sys/ioctl.h> | | 56 | #include <sys/ioctl.h> |
| 57 | #include <sys/sysctl.h> | | 57 | #include <sys/sysctl.h> |
| 58 | #include <sys/kernel.h> | | 58 | #include <sys/kernel.h> |
| 59 | #include <sys/proc.h> | | 59 | #include <sys/proc.h> |
| 60 | | | 60 | |
| 61 | #include <sys/bus.h> | | 61 | #include <sys/bus.h> |
| 62 | | | 62 | |
| 63 | #include <dev/pckbport/pckbportvar.h> | | 63 | #include <dev/pckbport/pckbportvar.h> |
| 64 | | | 64 | |
| @@ -382,26 +382,27 @@ pms_synaptics_probe_init(void *vsc) | | | @@ -382,26 +382,27 @@ pms_synaptics_probe_init(void *vsc) |
| 382 | pms_synaptics_probe_extended(psc); | | 382 | pms_synaptics_probe_extended(psc); |
| 383 | } | | 383 | } |
| 384 | | | 384 | |
| 385 | if (sc->flags) { | | 385 | if (sc->flags) { |
| 386 | const char comma[] = ", "; | | 386 | const char comma[] = ", "; |
| 387 | const char *sep = ""; | | 387 | const char *sep = ""; |
| 388 | aprint_normal_dev(psc->sc_dev, ""); | | 388 | aprint_normal_dev(psc->sc_dev, ""); |
| 389 | for (size_t f = 0; f < __arraycount(syn_flags); f++) { | | 389 | for (size_t f = 0; f < __arraycount(syn_flags); f++) { |
| 390 | if (sc->flags & syn_flags[f].bit) { | | 390 | if (sc->flags & syn_flags[f].bit) { |
| 391 | aprint_normal("%s%s", sep, syn_flags[f].desc); | | 391 | aprint_normal("%s%s", sep, syn_flags[f].desc); |
| 392 | sep = comma; | | 392 | sep = comma; |
| 393 | } | | 393 | } |
| 394 | } | | 394 | } |
| | | 395 | aprint_normal("\n"); |
| 395 | } | | 396 | } |
| 396 | | | 397 | |
| 397 | done: | | 398 | done: |
| 398 | pms_sysctl_synaptics(&clog); | | 399 | pms_sysctl_synaptics(&clog); |
| 399 | pckbport_set_inputhandler(psc->sc_kbctag, psc->sc_kbcslot, | | 400 | pckbport_set_inputhandler(psc->sc_kbctag, psc->sc_kbcslot, |
| 400 | pms_synaptics_input, psc, device_xname(psc->sc_dev)); | | 401 | pms_synaptics_input, psc, device_xname(psc->sc_dev)); |
| 401 | | | 402 | |
| 402 | return (0); | | 403 | return (0); |
| 403 | } | | 404 | } |
| 404 | | | 405 | |
| 405 | void | | 406 | void |
| 406 | pms_synaptics_enable(void *vsc) | | 407 | pms_synaptics_enable(void *vsc) |
| 407 | { | | 408 | { |