psmouse-base.c (243db53bbd8503065b21fd6e8265387048eb569b) psmouse-base.c (55e3d9224b60df0fd2dc36bff9b538ce40fd9586)
1/*
2 * PS/2 mouse driver
3 *
4 * Copyright (c) 1999-2002 Vojtech Pavlik
5 * Copyright (c) 2003-2004 Dmitry Torokhov
6 */
7
8/*

--- 556 unchanged lines hidden (view full) ---

565 * Try Kensington ThinkingMouse (we try first, because synaptics probe
566 * upsets the thinkingmouse).
567 */
568
569 if (max_proto > PSMOUSE_IMEX && thinking_detect(psmouse, set_properties) == 0)
570 return PSMOUSE_THINKPS;
571
572/*
1/*
2 * PS/2 mouse driver
3 *
4 * Copyright (c) 1999-2002 Vojtech Pavlik
5 * Copyright (c) 2003-2004 Dmitry Torokhov
6 */
7
8/*

--- 556 unchanged lines hidden (view full) ---

565 * Try Kensington ThinkingMouse (we try first, because synaptics probe
566 * upsets the thinkingmouse).
567 */
568
569 if (max_proto > PSMOUSE_IMEX && thinking_detect(psmouse, set_properties) == 0)
570 return PSMOUSE_THINKPS;
571
572/*
573 * Try Synaptics TouchPad
573 * Try Synaptics TouchPad. Note that probing is done even if Synaptics protocol
574 * support is disabled in config - we need to know if it is synaptics so we
575 * can reset it properly after probing for intellimouse.
574 */
575 if (max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse, set_properties) == 0) {
576 synaptics_hardware = 1;
577
578 if (max_proto > PSMOUSE_IMEX) {
579 if (!set_properties || synaptics_init(psmouse) == 0)
580 return PSMOUSE_SYNAPTICS;
581/*

--- 74 unchanged lines hidden (view full) ---

656static const struct psmouse_protocol psmouse_protocols[] = {
657 {
658 .type = PSMOUSE_PS2,
659 .name = "PS/2",
660 .alias = "bare",
661 .maxproto = 1,
662 .detect = ps2bare_detect,
663 },
576 */
577 if (max_proto > PSMOUSE_PS2 && synaptics_detect(psmouse, set_properties) == 0) {
578 synaptics_hardware = 1;
579
580 if (max_proto > PSMOUSE_IMEX) {
581 if (!set_properties || synaptics_init(psmouse) == 0)
582 return PSMOUSE_SYNAPTICS;
583/*

--- 74 unchanged lines hidden (view full) ---

658static const struct psmouse_protocol psmouse_protocols[] = {
659 {
660 .type = PSMOUSE_PS2,
661 .name = "PS/2",
662 .alias = "bare",
663 .maxproto = 1,
664 .detect = ps2bare_detect,
665 },
666#ifdef CONFIG_MOUSE_PS2_LOGIPS2PP
664 {
665 .type = PSMOUSE_PS2PP,
666 .name = "PS2++",
667 .alias = "logitech",
668 .detect = ps2pp_init,
669 },
667 {
668 .type = PSMOUSE_PS2PP,
669 .name = "PS2++",
670 .alias = "logitech",
671 .detect = ps2pp_init,
672 },
673#endif
670 {
671 .type = PSMOUSE_THINKPS,
672 .name = "ThinkPS/2",
673 .alias = "thinkps",
674 .detect = thinking_detect,
675 },
676 {
677 .type = PSMOUSE_GENPS,

--- 10 unchanged lines hidden (view full) ---

688 },
689 {
690 .type = PSMOUSE_IMEX,
691 .name = "ImExPS/2",
692 .alias = "exps",
693 .maxproto = 1,
694 .detect = im_explorer_detect,
695 },
674 {
675 .type = PSMOUSE_THINKPS,
676 .name = "ThinkPS/2",
677 .alias = "thinkps",
678 .detect = thinking_detect,
679 },
680 {
681 .type = PSMOUSE_GENPS,

--- 10 unchanged lines hidden (view full) ---

692 },
693 {
694 .type = PSMOUSE_IMEX,
695 .name = "ImExPS/2",
696 .alias = "exps",
697 .maxproto = 1,
698 .detect = im_explorer_detect,
699 },
700#ifdef CONFIG_MOUSE_PS2_SYNAPTICS
696 {
697 .type = PSMOUSE_SYNAPTICS,
698 .name = "SynPS/2",
699 .alias = "synaptics",
700 .detect = synaptics_detect,
701 .init = synaptics_init,
702 },
701 {
702 .type = PSMOUSE_SYNAPTICS,
703 .name = "SynPS/2",
704 .alias = "synaptics",
705 .detect = synaptics_detect,
706 .init = synaptics_init,
707 },
708#endif
709#ifdef CONFIG_MOUSE_PS2_ALPS
703 {
704 .type = PSMOUSE_ALPS,
705 .name = "AlpsPS/2",
706 .alias = "alps",
707 .detect = alps_detect,
708 .init = alps_init,
709 },
710 {
711 .type = PSMOUSE_ALPS,
712 .name = "AlpsPS/2",
713 .alias = "alps",
714 .detect = alps_detect,
715 .init = alps_init,
716 },
717#endif
718#ifdef CONFIG_MOUSE_PS2_LIFEBOOK
710 {
711 .type = PSMOUSE_LIFEBOOK,
712 .name = "LBPS/2",
713 .alias = "lifebook",
714 .init = lifebook_init,
715 },
719 {
720 .type = PSMOUSE_LIFEBOOK,
721 .name = "LBPS/2",
722 .alias = "lifebook",
723 .init = lifebook_init,
724 },
725#endif
726#ifdef CONFIG_MOUSE_PS2_TRACKPOINT
716 {
717 .type = PSMOUSE_TRACKPOINT,
718 .name = "TPPS/2",
719 .alias = "trackpoint",
720 .detect = trackpoint_detect,
721 },
727 {
728 .type = PSMOUSE_TRACKPOINT,
729 .name = "TPPS/2",
730 .alias = "trackpoint",
731 .detect = trackpoint_detect,
732 },
733#endif
734#ifdef CONFIG_MOUSE_PS2_TOUCHKIT
722 {
723 .type = PSMOUSE_TOUCHKIT_PS2,
724 .name = "touchkitPS/2",
725 .alias = "touchkit",
726 .detect = touchkit_ps2_detect,
727 },
735 {
736 .type = PSMOUSE_TOUCHKIT_PS2,
737 .name = "touchkitPS/2",
738 .alias = "touchkit",
739 .detect = touchkit_ps2_detect,
740 },
741#endif
728 {
729 .type = PSMOUSE_AUTO,
730 .name = "auto",
731 .alias = "any",
732 .maxproto = 1,
733 },
734};
735

--- 844 unchanged lines hidden --- 		742 {
743 .type = PSMOUSE_AUTO,
744 .name = "auto",
745 .alias = "any",
746 .maxproto = 1,
747 },
748};
749

--- 844 unchanged lines hidden ---