diff mbox

[MAVERICK,SAUCE] UBUNTU: SAUCE: Add support for Intellimouse Mode in ALPS touchpad on Dell E2 series Laptops

Message ID alpine.DEB.2.00.1009091002400.21508@hungry
State Accepted
Delegated to: Leann Ogasawara
Headers show

Commit Message

Manoj Iyer Sept. 9, 2010, 3:08 p.m. UTC 
I ran checkpatch.pl and it generated 3 warning, I am ignoring the "line 
over 80 characters warning"...

WARNING: line over 80 characters
#106: FILE: drivers/input/mouse/alps.c:179:
+                               rc = 
alps_model_init_quirk_tbl[i].callback(psmouse);

WARNING: suspect code indent for conditional statements (24, 8)
#155: FILE: drivers/input/mouse/psmouse-base.c:661:
                         if (!set_properties || alps_init(psmouse) == 0)
+       /* If ALPS model quirk was applied, don't change the settings */

WARNING: line over 80 characters
#158: FILE: drivers/input/mouse/psmouse-base.c:663:
+                               return psmouse->type ? psmouse->type : 
PSMOUSE_ALPS;

total: 0 errors, 3 warnings, 119 lines checked

./0001-UBUNTU-SAUCE-Add-support-for-Intellimouse-Mode-in-AL.patch has 
style problems, please review.  If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.

I fixed warning #158, and pushed to remote repo. Modified patch attached.

The following changes since commit 
4e90adae43f52db35c99bcaccb2e2a912b8299d5:
   stanley.miao (1):
         DSS2: Don't power off a panel twice

are available in the git repository at:


git://kernel.ubuntu.com/git/manjo/ubuntu-maverick.git lp632884

Manoj Iyer (1):
       UBUNTU: SAUCE: Add support for Intellimouse Mode in ALPS touchpad on 
Dell E2 series Laptops

  drivers/input/mouse/alps.c         |   81 
++++++++++++++++++++++++++++++++++++
  drivers/input/mouse/alps.h         |    5 ++
  drivers/input/mouse/psmouse-base.c |    3 +-
  3 files changed, 88 insertions(+), 1 deletions(-)



Cheers
--- manjo

On Thu, 9 Sep 2010, Tim Gardner wrote:

> On 09/08/2010 07:09 PM, Manoj Iyer wrote:
>> git://kernel.ubuntu.com/git/manjo/ubuntu-maverick.git lp632884
>> 
>
> Other then some minor formatting the patch looks self contained. Can you run 
> it through checkpatch.pl first? Then perhaps send it back to Rez with the 
> formatting corrections? Otherwise,
>
> Acked-by: Tim Gardner <tim.gardner@canonical.com>
>
> -- 
> Tim Gardner tim.gardner@canonical.com
>

Comments

Leann Ogasawara Sept. 10, 2010, 3:40 a.m. UTC | #1 
Applied to Maverick linux master.

Thanks,
Leann

On Thu, 2010-09-09 at 10:08 -0500, manoj.iyer@canonical.com wrote:
> I ran checkpatch.pl and it generated 3 warning, I am ignoring the "line 
> over 80 characters warning"...
> 
> WARNING: line over 80 characters
> #106: FILE: drivers/input/mouse/alps.c:179:
> +                               rc = 
> alps_model_init_quirk_tbl[i].callback(psmouse);
> 
> WARNING: suspect code indent for conditional statements (24, 8)
> #155: FILE: drivers/input/mouse/psmouse-base.c:661:
>                          if (!set_properties || alps_init(psmouse) == 0)
> +       /* If ALPS model quirk was applied, don't change the settings */
> 
> WARNING: line over 80 characters
> #158: FILE: drivers/input/mouse/psmouse-base.c:663:
> +                               return psmouse->type ? psmouse->type : 
> PSMOUSE_ALPS;
> 
> total: 0 errors, 3 warnings, 119 lines checked
> 
> ./0001-UBUNTU-SAUCE-Add-support-for-Intellimouse-Mode-in-AL.patch has 
> style problems, please review.  If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> 
> I fixed warning #158, and pushed to remote repo. Modified patch attached.
> 
> The following changes since commit 
> 4e90adae43f52db35c99bcaccb2e2a912b8299d5:
>    stanley.miao (1):
>          DSS2: Don't power off a panel twice
> 
> are available in the git repository at:
> 
> 
> git://kernel.ubuntu.com/git/manjo/ubuntu-maverick.git lp632884
> 
> Manoj Iyer (1):
>        UBUNTU: SAUCE: Add support for Intellimouse Mode in ALPS touchpad on 
> Dell E2 series Laptops
> 
>   drivers/input/mouse/alps.c         |   81 
> ++++++++++++++++++++++++++++++++++++
>   drivers/input/mouse/alps.h         |    5 ++
>   drivers/input/mouse/psmouse-base.c |    3 +-
>   3 files changed, 88 insertions(+), 1 deletions(-)
> 
> 
> 
> Cheers
> --- manjo
> 
> On Thu, 9 Sep 2010, Tim Gardner wrote:
> 
> > On 09/08/2010 07:09 PM, Manoj Iyer wrote:
> >> git://kernel.ubuntu.com/git/manjo/ubuntu-maverick.git lp632884
> >> 
> >
> > Other then some minor formatting the patch looks self contained. Can you run 
> > it through checkpatch.pl first? Then perhaps send it back to Rez with the 
> > formatting corrections? Otherwise,
> >
> > Acked-by: Tim Gardner <tim.gardner@canonical.com>
> >
> > -- 
> > Tim Gardner tim.gardner@canonical.com
> >
diff mbox

Patch

From 02160e697f2a4402a77521a74f30ed88a468a645 Mon Sep 17 00:00:00 2001
From: Manoj Iyer <manoj.iyer@canonical.com>
Date: Wed, 8 Sep 2010 19:40:57 +0100
Subject: [PATCH] UBUNTU: SAUCE: Add support for Intellimouse Mode in ALPS touchpad on Dell E2 series Laptops

Patch was submitted upstream and has not yet been accepted. Currently many
Dell Latitude systems have a ALPS touchpad and are missing scroll support.
Dell will still be shipping this touchpad with upcoming Latitudes.

Though the issue now is upstream does not want to take the patch, as they
want access to the mulitouch capabilities of the ALPS touchpad. ALPS has
stated they will not give out specs for these capabilities and everyone
should use the patch below, developed by Dell.

OriginalAuthor: Rezwanul Kabir <Rezwanul_Kabir@dell.com>
OriginalLocation: https://patchwork.kernel.org/patch/118834/
BugLink: http://bugs.launchpad.net/bugs/632884

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
---
 drivers/input/mouse/alps.c         |   81 ++++++++++++++++++++++++++++++++++++
 drivers/input/mouse/alps.h         |    5 ++
 drivers/input/mouse/psmouse-base.c |    3 +-
 3 files changed, 88 insertions(+), 1 deletions(-)

diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
index 99d5876..0963a0d 100644
--- a/drivers/input/mouse/alps.c
+++ b/drivers/input/mouse/alps.c
@@ -63,6 +63,8 @@  static const struct alps_model_info alps_model_data[] = {
 	/* Dell Latitude E5500, E6400, E6500, Precision M4400 */
 	{ { 0x62, 0x02, 0x14 }, 0xcf, 0xcf,
 		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },
+	/* Dell Precision 4500 */
+	{ { 0x73, 0x02, 0x64 }, 0x80, 0x80, 0 },
 	{ { 0x73, 0x02, 0x50 }, 0xcf, 0xcf, ALPS_FOUR_BUTTONS },	  /* Dell Vostro 1400 */
 	{ { 0x52, 0x01, 0x14 }, 0xff, 0xff,
 		ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED },	  /* Toshiba Tecra A11-11L */
@@ -111,6 +113,77 @@  static const struct alps_model_info alps_model_data[] = {
  * on a dualpoint, etc.
  */
 
+
+/* Magic Sequence to enable Intellimouse Mode on Dell E2 Touchpads*/
+
+static int dell_e2_setup_intellimouse_mode(void *data)
+{
+	struct psmouse *psmouse = (struct psmouse *)(data);
+	struct ps2dev *ps2dev = &psmouse->ps2dev;
+	struct input_dev *dev = psmouse->dev;
+	unsigned char param[] = {0, 0, 0};
+
+	if (ps2_command(ps2dev, param, 0x00f5) ||
+		ps2_command(ps2dev, param, 0x00ea) ||
+		ps2_command(ps2dev, param, 0x00ec) ||
+		ps2_command(ps2dev, param, 0x00ec) ||
+		ps2_command(ps2dev, param, 0x00ec) ||
+		ps2_command(ps2dev, param, 0x03e9))
+			return -1;
+
+	dbg("alps:dell_e2_setup: param[0]: %x,"
+		"param[1]: %x, param[2]: %x\n", param[0],
+					param[1], param[2]);
+/* Check for supported model to continue */
+
+	if (!((param[0] == 0x88) && (param[1] == 0x07)
+		&& ((param[2] == 0x9D) || (param[2] == 0x9B))))
+		return -1;
+
+	if (ps2_command(ps2dev, NULL, 0x00ec) ||
+		ps2_command(ps2dev, NULL, 0x00f0) ||
+		ps2_command(ps2dev, NULL, 0x00f0) ||
+		ps2_command(ps2dev, NULL, 0x00f0) ||
+		ps2_command(ps2dev, NULL, 0x00f3) ||
+		ps2_command(ps2dev, NULL, 0x0028) ||
+		ps2_command(ps2dev, NULL, 0x00f0) ||
+		ps2_command(ps2dev, NULL, 0x00f6) ||
+		ps2_command(ps2dev, NULL, 0x00ea) ||
+		ps2_command(ps2dev, NULL, 0x00f4))
+			return -1;
+
+	__set_bit(BTN_MIDDLE, dev->keybit);
+	__set_bit(REL_WHEEL, dev->relbit);
+
+	psmouse->pktsize = 4;
+	psmouse->type = PSMOUSE_IMPS;
+
+	return 0;
+}
+
+static const struct alps_model_quirk alps_model_init_quirk_tbl[] = {
+
+	{ {0x73, 0x02, 0x64}, dell_e2_setup_intellimouse_mode }
+};
+
+static int alps_model_init_quirk(struct psmouse *psmouse,
+					const struct alps_model_info *model)
+{
+	int rc = 1;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(alps_model_init_quirk_tbl); i++) {
+		if (!memcmp(model->signature,
+			alps_model_init_quirk_tbl[i].signature,
+			    sizeof(alps_model_init_quirk_tbl[i].signature))) {
+				rc = alps_model_init_quirk_tbl[i].callback(psmouse);
+				break;
+		}
+	}
+
+	return rc;
+}
+
 static bool alps_is_valid_first_byte(const struct alps_model_info *model,
 				     unsigned char data)
 {
@@ -677,6 +750,14 @@  int alps_init(struct psmouse *psmouse)
 	if (alps_hw_init(psmouse))
 		goto init_fail;
 
+	if (!alps_model_init_quirk(psmouse, model)) {
+		printk(KERN_WARNING "alps.c: Enabled hardware quirk, falling back to psmouse-core\n");
+		input_free_device(dev2);
+		kfree(priv);
+		psmouse->private = NULL;
+		return 0;
+	}
+
 	/*
 	 * Undo part of setup done for us by psmouse core since touchpad
 	 * is not a relative device.
diff --git a/drivers/input/mouse/alps.h b/drivers/input/mouse/alps.h
index 904ed8b..c54c5ea 100644
--- a/drivers/input/mouse/alps.h
+++ b/drivers/input/mouse/alps.h
@@ -26,6 +26,11 @@  struct alps_data {
 	struct timer_list timer;
 };
 
+struct alps_model_quirk {
+unsigned char signature[3];
+int (*callback)(void *data);
+};
+
 #ifdef CONFIG_MOUSE_PS2_ALPS
 int alps_detect(struct psmouse *psmouse, bool set_properties);
 int alps_init(struct psmouse *psmouse);
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 979c502..3657de8 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -659,7 +659,8 @@  static int psmouse_extensions(struct psmouse *psmouse,
 		ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_RESET_DIS);
 		if (alps_detect(psmouse, set_properties) == 0) {
 			if (!set_properties || alps_init(psmouse) == 0)
-				return PSMOUSE_ALPS;
+/* If ALPS model quirk was applied, don't change the settings */
+				return psmouse->type ? psmouse->type : PSMOUSE_ALPS;
 /*
  * Init failed, try basic relative protocols
  */
-- 
1.7.0.4