Attachment 187790 Details for Bug 222667 – move-synaptics-init-to-front.patch

[patch] move-synaptics-init-to-front.patch

psm.c.diff (text/plain), 1.44 KB, created by Vladimir Kondratyev on 2017-11-06 10:52:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Kondratyev

Created: 2017-11-06 10:52:06 UTC

Size: 1.44 KB

patch

obsolete

>diff --git a/sys/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c
>index c077a68190e..eee4baa4598 100644
>--- a/sys/dev/atkbdc/psm.c
>+++ b/sys/dev/atkbdc/psm.c
>@@ -644,6 +651,8 @@ static struct {
> 	 * WARNING: the order of probe is very important.  Don't mess it
> 	 * unless you know what you are doing.
> 	 */
>+	{ MOUSE_MODEL_SYNAPTICS,	/* Synaptics Touchpad */
>+	  0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
> 	{ MOUSE_MODEL_NET,		/* Genius NetMouse */
> 	  0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_gmouse },
> 	{ MOUSE_MODEL_NETSCROLL,	/* Genius NetScroll */
>@@ -656,8 +665,6 @@ static struct {
> 	  0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse },
> 	{ MOUSE_MODEL_4DPLUS,		/* A4 Tech 4D+ Mouse */
> 	  0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus },
>-	{ MOUSE_MODEL_SYNAPTICS,	/* Synaptics Touchpad */
>-	  0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
> 	{ MOUSE_MODEL_ELANTECH,		/* Elantech Touchpad */
> 	  0x04, MOUSE_ELANTECH_PACKETSIZE, enable_elantech },
> 	{ MOUSE_MODEL_INTELLI,		/* Microsoft IntelliMouse */
>@@ -6001,6 +6034,14 @@ enable_synaptics(struct psm_softc *sc, enum probearg arg)
> 
> 	VLOG(3, (LOG_DEBUG, "synaptics: BEGIN init\n"));
> 
>+/*
>+	int i = send_aux_command(kbdc, PSMC_SET_DEFAULTS);
>+	printf("psm%d: SET_DEFAULTS return code:%04x\n", sc->unit, i);
>+/*
>+/*
>+	if (!reset_aux_dev(kbdc))
>+		printf("Reset failed\n");
>+*/
> 	/*
> 	 * Just to be on the safe side: this avoids troubles with
> 	 * following mouse_ext_command() when the previous command

Actions: View | Diff

Attachments on bug 222667: 186785 | 187151 | 187245 | 187246 | 187251 | 187252 | 187253 | 187255 | 187284 | 187503 | 187547 | 187790 | 188126