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

Collapse All | Expand All

(-)b/sys/dev/atkbdc/psm.c (-4 / +6 lines)
Lines 6014-6020 enable_synaptics(struct psm_softc *sc, enum probearg arg) Link Here
6014
		return (FALSE);
6014
		return (FALSE);
6015
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6015
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6016
		return (FALSE);
6016
		return (FALSE);
6017
	if (status[1] != 0x47)
6017
	if (status[1] != 0x46 && status[1] != 0x47)
6018
		return (FALSE);
6018
		return (FALSE);
6019
6019
6020
	bzero(&synhw, sizeof(synhw));
6020
	bzero(&synhw, sizeof(synhw));
Lines 6025-6031 enable_synaptics(struct psm_softc *sc, enum probearg arg) Link Here
6025
		printf("Synaptics Touchpad v%d.%d\n", synhw.infoMajor,
6025
		printf("Synaptics Touchpad v%d.%d\n", synhw.infoMajor,
6026
		    synhw.infoMinor);
6026
		    synhw.infoMinor);
6027
6027
6028
	if (synhw.infoMajor < 4) {
6028
	if (synhw.infoMajor < 2) {
6029
		printf("  Unsupported (pre-v4) Touchpad detected\n");
6029
		printf("  Unsupported (pre-v4) Touchpad detected\n");
6030
		return (FALSE);
6030
		return (FALSE);
6031
	}
6031
	}
Lines 6066-6072 enable_synaptics(struct psm_softc *sc, enum probearg arg) Link Here
6066
		return (FALSE);
6066
		return (FALSE);
6067
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6067
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6068
		return (FALSE);
6068
		return (FALSE);
6069
	if (!SYNAPTICS_VERSION_GE(synhw, 7, 5) && status[1] != 0x47) {
6069
	if (!SYNAPTICS_VERSION_GE(synhw, 7, 5) &&
6070
	    status[1] != 0x46 && status[1] != 0x47) {
6070
		printf("  Failed to read extended capability bits\n");
6071
		printf("  Failed to read extended capability bits\n");
6071
		return (FALSE);
6072
		return (FALSE);
6072
	}
6073
	}
Lines 6288-6294 enable_synaptics(struct psm_softc *sc, enum probearg arg) Link Here
6288
		return (FALSE);
6291
		return (FALSE);
6289
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6292
	if (get_mouse_status(kbdc, status, 0, 3) != 3)
6290
		return (FALSE);
6293
		return (FALSE);
6291
	if (!SYNAPTICS_VERSION_GE(synhw, 7, 5) && status[1] != 0x47) {
6294
	if (!SYNAPTICS_VERSION_GE(synhw, 7, 5) &&
6295
	    status[1] != 0x46 && status[1] != 0x47) {
6292
		printf("  Failed to read mode byte\n");
6296
		printf("  Failed to read mode byte\n");
6293
		return (FALSE);
6297
		return (FALSE);
6294
	}
6298
	}

Return to bug 222667