rpms/kernel/FC-3 kernel-2.6.spec, 1.874, 1.875 linux-2.6-input-alps-typo.patch, 1.1, 1.2
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 2 22:25:48 UTC 2005
Author: davej
Update of /cvs/dist/rpms/kernel/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv26068
Modified Files:
kernel-2.6.spec linux-2.6-input-alps-typo.patch
Log Message:
Update ALPS driver to 2.6.13 level
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/kernel-2.6.spec,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- kernel-2.6.spec 2 Sep 2005 22:25:05 -0000 1.874
+++ kernel-2.6.spec 2 Sep 2005 22:25:45 -0000 1.875
@@ -1004,6 +1004,7 @@
* Mon Aug 29 2005 Dave Jones <davej at redhat.com>
- Fix local builds when '-' is in the hostname.
+- Update ALPS driver to 2.6.13 level
* Fri Aug 26 2005 Dave Jones <davej at redhat.com> [2.6.12-1.1376_FC3]
- Better identify local builds. (#159696)
linux-2.6-input-alps-typo.patch:
alps.c | 81 ++++++++++++++++++++++++++++++++---------------------------------
1 files changed, 40 insertions(+), 41 deletions(-)
Index: linux-2.6-input-alps-typo.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-3/linux-2.6-input-alps-typo.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-input-alps-typo.patch 27 Aug 2005 03:21:09 -0000 1.1
+++ linux-2.6-input-alps-typo.patch 2 Sep 2005 22:25:45 -0000 1.2
@@ -1,11 +1,224 @@
---- linux-2.6.12/drivers/input/mouse/alps.c~ 2005-08-26 05:01:01.000000000 -0400
-+++ linux-2.6.12/drivers/input/mouse/alps.c 2005-08-26 05:01:11.000000000 -0400
-@@ -360,7 +360,7 @@ static int alps_reconnect(struct psmouse
+--- linux-2.6.12/drivers/input/mouse/alps.c 2005-08-30 21:50:16.000000000 -0400
++++ linux-2.6.12/drivers/input/mouse/alps.c 2005-08-30 21:47:45.000000000 -0400
+@@ -2,7 +2,7 @@
+ * ALPS touchpad PS/2 mouse driver
+ *
+ * Copyright (c) 2003 Neil Brown <neilb at cse.unsw.edu.au>
+- * Copyright (c) 2003 Peter Osterlund <petero2 at telia.com>
++ * Copyright (c) 2003-2005 Peter Osterlund <petero2 at telia.com>
+ * Copyright (c) 2004 Dmitry Torokhov <dtor at mail.ru>
+ * Copyright (c) 2005 Vojtech Pavlik <vojtech at suse.cz>
+ *
+@@ -30,10 +30,11 @@
+
+ #define ALPS_DUALPOINT 0x01
+ #define ALPS_WHEEL 0x02
+-#define ALPS_FW_BK 0x04
++#define ALPS_FW_BK_1 0x04
+ #define ALPS_4BTN 0x08
+ #define ALPS_OLDPROTO 0x10
+ #define ALPS_PASS 0x20
++#define ALPS_FW_BK_2 0x40
+
+ static struct alps_model_info alps_model_data[] = {
+ { { 0x33, 0x02, 0x0a }, 0x88, 0xf8, ALPS_OLDPROTO }, /* UMAX-530T */
+@@ -43,11 +44,11 @@ static struct alps_model_info alps_model
+ { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
+ { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, 0 },
+ { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */
+- { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK }, /* NEC Versa L320 */
++ { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */
+ { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 },
+ { { 0x63, 0x03, 0xc8 }, 0xf8, 0xf8, ALPS_PASS }, /* Dell Latitude D800 */
+ { { 0x73, 0x02, 0x0a }, 0xf8, 0xf8, 0 },
+- { { 0x73, 0x02, 0x14 }, 0xf8, 0xf8, 0 },
++ { { 0x73, 0x02, 0x14 }, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Ahtec Laptop */
+ { { 0x20, 0x02, 0x0e }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT }, /* XXX */
+ { { 0x22, 0x02, 0x0a }, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT },
+ { { 0x22, 0x02, 0x14 }, 0xff, 0xff, ALPS_PASS | ALPS_DUALPOINT }, /* Dell Latitude D600 */
+@@ -61,11 +62,11 @@ static struct alps_model_info alps_model
+
+ /*
+ * ALPS abolute Mode - new format
+- *
+- * byte 0: 1 ? ? ? 1 ? ? ?
++ *
++ * byte 0: 1 ? ? ? 1 ? ? ?
+ * byte 1: 0 x6 x5 x4 x3 x2 x1 x0
+ * byte 2: 0 x10 x9 x8 x7 ? fin ges
+- * byte 3: 0 y9 y8 y7 1 M R L
++ * byte 3: 0 y9 y8 y7 1 M R L
+ * byte 4: 0 y6 y5 y4 y3 y2 y1 y0
+ * byte 5: 0 z6 z5 z4 z3 z2 z1 z0
+ *
+@@ -81,11 +82,12 @@ static void alps_process_packet(struct p
+ struct input_dev *dev = &psmouse->dev;
+ struct input_dev *dev2 = &priv->dev2;
+ int x, y, z, ges, fin, left, right, middle;
++ int back = 0, forward = 0;
+
+ input_regs(dev, regs);
+
+ if ((packet[0] & 0xc8) == 0x08) { /* 3-byte PS/2 packet */
+- input_report_key(dev2, BTN_LEFT, packet[0] & 1);
++ input_report_key(dev2, BTN_LEFT, packet[0] & 1);
+ input_report_key(dev2, BTN_RIGHT, packet[0] & 2);
+ input_report_key(dev2, BTN_MIDDLE, packet[0] & 4);
+ input_report_rel(dev2, REL_X,
+@@ -112,6 +114,18 @@ static void alps_process_packet(struct p
+ z = packet[5];
+ }
+
++ if (priv->i->flags & ALPS_FW_BK_1) {
++ back = packet[2] & 4;
++ forward = packet[0] & 0x10;
++ }
++
++ if (priv->i->flags & ALPS_FW_BK_2) {
++ back = packet[3] & 4;
++ forward = packet[2] & 4;
++ if ((middle = forward && back))
++ forward = back = 0;
++ }
++
+ ges = packet[2] & 1;
+ fin = packet[2] & 2;
+
+@@ -155,13 +169,12 @@ static void alps_process_packet(struct p
+ input_report_abs(dev, ABS_PRESSURE, z);
+ input_report_key(dev, BTN_TOOL_FINGER, z > 0);
+
+-
+ if (priv->i->flags & ALPS_WHEEL)
+ input_report_rel(dev, REL_WHEEL, ((packet[0] >> 4) & 0x07) | ((packet[2] >> 2) & 0x08));
+
+- if (priv->i->flags & ALPS_FW_BK) {
+- input_report_key(dev, BTN_FORWARD, packet[0] & 0x10);
+- input_report_key(dev, BTN_BACK, packet[2] & 0x04);
++ if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
++ input_report_key(dev, BTN_FORWARD, forward);
++ input_report_key(dev, BTN_BACK, back);
+ }
+
+ input_sync(dev);
+@@ -257,7 +270,6 @@ static struct alps_model_info *alps_get_
+ static int alps_passthrough_mode(struct psmouse *psmouse, int enable)
+ {
+ struct ps2dev *ps2dev = &psmouse->ps2dev;
+- unsigned char param[3];
+ int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11;
+
+ if (ps2_command(ps2dev, NULL, cmd) ||
+@@ -267,7 +279,7 @@ static int alps_passthrough_mode(struct
+ return -1;
+
+ /* we may get 3 more bytes, just ignore them */
+- ps2_command(ps2dev, param, 0x0300);
++ ps2_drain(ps2dev, 3, 100);
+
+ return 0;
+ }
+@@ -338,7 +350,6 @@ static int alps_tap_mode(struct psmouse
+ static int alps_reconnect(struct psmouse *psmouse)
+ {
+ struct alps_data *priv = psmouse->private;
+- unsigned char param[4];
+ int version;
+
+ psmouse_reset(psmouse);
+@@ -346,21 +357,20 @@ static int alps_reconnect(struct psmouse
+ if (!(priv->i = alps_get_model(psmouse, &version)))
+ return -1;
+
+- if (priv->i->flags & ALPS_PASS && alps_passthrough_mode(psmouse, 1))
++ if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))
+ return -1;
+
+- if (alps_get_status(psmouse, param))
++ if (alps_tap_mode(psmouse, 1)) {
++ printk(KERN_WARNING "alps.c: Failed to reenable hardware tapping\n");
+ return -1;
+-
+- if (!(param[0] & 0x04))
+- alps_tap_mode(psmouse, 1);
++ }
+
+ if (alps_absolute_mode(psmouse)) {
+- printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");
++ printk(KERN_ERR "alps.c: Failed to reenable absolute mode\n");
return -1;
}
- if (priv->i->flags == ALPS_PASS && alps_passthrough_mode(psmouse, 0))
-+ if (priv->i->flags & ALPS_PASS && alps_passthrough_mode(psmouse, 0))
++ if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0))
return -1;
return 0;
+@@ -377,7 +387,6 @@ static void alps_disconnect(struct psmou
+ int alps_init(struct psmouse *psmouse)
+ {
+ struct alps_data *priv;
+- unsigned char param[4];
+ int version;
+
+ psmouse->private = priv = kmalloc(sizeof(struct alps_data), GFP_KERNEL);
+@@ -391,16 +400,8 @@ int alps_init(struct psmouse *psmouse)
+ if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))
+ goto init_fail;
+
+- if (alps_get_status(psmouse, param)) {
+- printk(KERN_ERR "alps.c: touchpad status report request failed\n");
+- goto init_fail;
+- }
+-
+- if (param[0] & 0x04) {
+- printk(KERN_INFO "alps.c: Enabling hardware tapping\n");
+- if (alps_tap_mode(psmouse, 1))
+- printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");
+- }
++ if (alps_tap_mode(psmouse, 1))
++ printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");
+
+ if (alps_absolute_mode(psmouse)) {
+ printk(KERN_ERR "alps.c: Failed to enable absolute mode\n");
+@@ -425,7 +426,7 @@ int alps_init(struct psmouse *psmouse)
+ psmouse->dev.relbit[LONG(REL_WHEEL)] |= BIT(REL_WHEEL);
+ }
+
+- if (priv->i->flags & ALPS_FW_BK) {
++ if (priv->i->flags & (ALPS_FW_BK_1 | ALPS_FW_BK_2)) {
+ psmouse->dev.keybit[LONG(BTN_FORWARD)] |= BIT(BTN_FORWARD);
+ psmouse->dev.keybit[LONG(BTN_BACK)] |= BIT(BTN_BACK);
+ }
+@@ -436,8 +437,8 @@ int alps_init(struct psmouse *psmouse)
+ priv->dev2.id.bustype = BUS_I8042;
+ priv->dev2.id.vendor = 0x0002;
+ priv->dev2.id.product = PSMOUSE_ALPS;
+- priv->dev2.id.version = 0x0000;
+-
++ priv->dev2.id.version = 0x0000;
++
+ priv->dev2.evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+ priv->dev2.relbit[LONG(REL_X)] |= BIT(REL_X) | BIT(REL_Y);
+ priv->dev2.keybit[LONG(BTN_LEFT)] |= BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+@@ -461,17 +462,15 @@ init_fail:
+ int alps_detect(struct psmouse *psmouse, int set_properties)
+ {
+ int version;
+- struct alps_model_info *model;
++ struct alps_model_info *model;
+
+ if (!(model = alps_get_model(psmouse, &version)))
+ return -1;
+
+ if (set_properties) {
+ psmouse->vendor = "ALPS";
+- if (model->flags & ALPS_DUALPOINT)
+- psmouse->name = "DualPoint TouchPad";
+- else
+- psmouse->name = "GlidePoint";
++ psmouse->name = model->flags & ALPS_DUALPOINT ?
++ "DualPoint TouchPad" : "GlidePoint";
+ psmouse->model = version;
+ }
+ return 0;
More information about the fedora-cvs-commits
mailing list