| Message ID | 1346966932.22677.256.camel@fourier |
|---|---|
| State | New |
| Headers | show |
On 09/06/2012 02:28 PM, Kamal Mostafa wrote: > Bug reference: > https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1041594 > Edge scrolling on ALPS touchpad broken since the upgrade to 3.5.0-11 > > [IMPACT] > > This patch fixes edge-scrolling on ALPS, which broke with the > introduction of the Cypress Trackpad driver in 3.2.0-31.49. > > [TESTCASE] > > To test: > 1. Try edge scrolling on an ALPS touchpad in 3.2.0-31-49. > 2. Verify that this patch restores edge scrolling to working order. > > [Regression Potential] > > None known. > > > Thanks, > > -Kamal > > ---------- > > commit a7317fe696c3b33c07bc2c98ed9ef98b66a3d5b9 > Author: Kamal Mostafa <kamal@canonical.com> > Date: Thu Sep 6 12:53:40 2012 -0700 > > UBUNTU: SAUCE: input: Cypress PS/2 Trackpad move PSMOUSE_CYPRESS enum > > Move PSMOUSE_CYPRESS to the end of the enum, since awful > src/eventcomm.c in x-x-i-s actually depends on hardcoded values > of the model numbers (including MODEL_ALPS). *sigh* > > BugLink: http://launchpad.net/bugs/1041594 > > Signed-off-by: Kamal Mostafa <kamal@canonical.com> > > diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h > index 6e5b143..bfcc72d 100644 > --- a/drivers/input/mouse/psmouse.h > +++ b/drivers/input/mouse/psmouse.h > @@ -79,6 +79,9 @@ struct psmouse { > }; > > enum psmouse_type { > + /* IMPORTANT! src/eventcomm.c in x-x-i-s uses the hard-coded values > + * of some of these (awful!), so never insert new entries to the > + * middle of the list! */ > PSMOUSE_NONE, > PSMOUSE_PS2, > PSMOUSE_PS2PP, > @@ -87,7 +90,6 @@ enum psmouse_type { > PSMOUSE_IMPS, > PSMOUSE_IMEX, > PSMOUSE_SYNAPTICS, > - PSMOUSE_CYPRESS, > PSMOUSE_ALPS, > PSMOUSE_LIFEBOOK, > PSMOUSE_TRACKPOINT, > @@ -96,6 +98,7 @@ enum psmouse_type { > PSMOUSE_HGPK, > PSMOUSE_ELANTECH, > PSMOUSE_FSP, > + PSMOUSE_CYPRESS, > PSMOUSE_AUTO /* This one should always be last */ > }; > > > >
diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h index 6e5b143..bfcc72d 100644 --- a/drivers/input/mouse/psmouse.h +++ b/drivers/input/mouse/psmouse.h @@ -79,6 +79,9 @@ struct psmouse { }; enum psmouse_type { + /* IMPORTANT! src/eventcomm.c in x-x-i-s uses the hard-coded values + * of some of these (awful!), so never insert new entries to the + * middle of the list! */ PSMOUSE_NONE, PSMOUSE_PS2, PSMOUSE_PS2PP, @@ -87,7 +90,6 @@ enum psmouse_type { PSMOUSE_IMPS, PSMOUSE_IMEX, PSMOUSE_SYNAPTICS, - PSMOUSE_CYPRESS, PSMOUSE_ALPS, PSMOUSE_LIFEBOOK, PSMOUSE_TRACKPOINT, @@ -96,6 +98,7 @@ enum psmouse_type { PSMOUSE_HGPK, PSMOUSE_ELANTECH, PSMOUSE_FSP, + PSMOUSE_CYPRESS, PSMOUSE_AUTO /* This one should always be last */ };
Bug reference: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1041594 Edge scrolling on ALPS touchpad broken since the upgrade to 3.5.0-11 [IMPACT] This patch fixes edge-scrolling on ALPS, which broke with the introduction of the Cypress Trackpad driver in 3.2.0-31.49. [TESTCASE] To test: 1. Try edge scrolling on an ALPS touchpad in 3.2.0-31-49. 2. Verify that this patch restores edge scrolling to working order. [Regression Potential] None known. Thanks, -Kamal ---------- commit a7317fe696c3b33c07bc2c98ed9ef98b66a3d5b9 Author: Kamal Mostafa <kamal@canonical.com> Date: Thu Sep 6 12:53:40 2012 -0700 UBUNTU: SAUCE: input: Cypress PS/2 Trackpad move PSMOUSE_CYPRESS enum Move PSMOUSE_CYPRESS to the end of the enum, since awful src/eventcomm.c in x-x-i-s actually depends on hardcoded values of the model numbers (including MODEL_ALPS). *sigh* BugLink: http://launchpad.net/bugs/1041594 Signed-off-by: Kamal Mostafa <kamal@canonical.com>