View | Details | Raw Unified | Return to bug 222667 | Differences between
and this patch

Collapse All | Expand All

(-)b/sys/dev/atkbdc/psm.c (-2 / +10 lines)
Lines 644-649 static struct { Link Here
644
	 * WARNING: the order of probe is very important.  Don't mess it
651
	 * WARNING: the order of probe is very important.  Don't mess it
645
	 * unless you know what you are doing.
652
	 * unless you know what you are doing.
646
	 */
653
	 */
654
	{ MOUSE_MODEL_SYNAPTICS,	/* Synaptics Touchpad */
655
	  0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
647
	{ MOUSE_MODEL_NET,		/* Genius NetMouse */
656
	{ MOUSE_MODEL_NET,		/* Genius NetMouse */
648
	  0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_gmouse },
657
	  0x08, MOUSE_PS2INTELLI_PACKETSIZE, enable_gmouse },
649
	{ MOUSE_MODEL_NETSCROLL,	/* Genius NetScroll */
658
	{ MOUSE_MODEL_NETSCROLL,	/* Genius NetScroll */
Lines 656-663 static struct { Link Here
656
	  0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse },
665
	  0x08, MOUSE_4D_PACKETSIZE, enable_4dmouse },
657
	{ MOUSE_MODEL_4DPLUS,		/* A4 Tech 4D+ Mouse */
666
	{ MOUSE_MODEL_4DPLUS,		/* A4 Tech 4D+ Mouse */
658
	  0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus },
667
	  0xc8, MOUSE_4DPLUS_PACKETSIZE, enable_4dplus },
659
	{ MOUSE_MODEL_SYNAPTICS,	/* Synaptics Touchpad */
660
	  0xc0, MOUSE_SYNAPTICS_PACKETSIZE, enable_synaptics },
661
	{ MOUSE_MODEL_ELANTECH,		/* Elantech Touchpad */
668
	{ MOUSE_MODEL_ELANTECH,		/* Elantech Touchpad */
662
	  0x04, MOUSE_ELANTECH_PACKETSIZE, enable_elantech },
669
	  0x04, MOUSE_ELANTECH_PACKETSIZE, enable_elantech },
663
	{ MOUSE_MODEL_INTELLI,		/* Microsoft IntelliMouse */
670
	{ MOUSE_MODEL_INTELLI,		/* Microsoft IntelliMouse */
Lines 6001-6006 enable_synaptics(struct psm_softc *sc, enum probearg arg) Link Here
6001
6034
6002
	VLOG(3, (LOG_DEBUG, "synaptics: BEGIN init\n"));
6035
	VLOG(3, (LOG_DEBUG, "synaptics: BEGIN init\n"));
6003
6036
6037
/*
6038
	int i = send_aux_command(kbdc, PSMC_SET_DEFAULTS);
6039
	printf("psm%d: SET_DEFAULTS return code:%04x\n", sc->unit, i);
6040
/*
6041
/*
6042
	if (!reset_aux_dev(kbdc))
6043
		printf("Reset failed\n");
6044
*/
6004
	/*
6045
	/*
6005
	 * Just to be on the safe side: this avoids troubles with
6046
	 * Just to be on the safe side: this avoids troubles with
6006
	 * following mouse_ext_command() when the previous command
6047
	 * following mouse_ext_command() when the previous command

Return to bug 222667