double-thinker
commented
10 years ago When I apply the patch I get this errors:
File to patch: src/alps.c
patching file src/alps.c
Hunk #1 FAILED at 1003.
Hunk #2 FAILED at 1056.
Hunk #3 FAILED at 1236.
3 out of 3 hunks FAILED -- saving rejects to file src/alps.c.rej
File to patch: src/alps.h
patching file src/alps.h
Hunk #1 FAILED at 46.
1 out of 1 hunk FAILED -- saving rejects to file src/alps.h.rejBut when i add the rejections manually it works for me in Toshiba Z30-A-12N in 3.13.0-24-generic :+1: I get this rejections:
alps.h.rej:
--- alps.h
+++ alps.h
@@ -46,6 +46,7 @@
V7_PACKET_ID_TWO,
V7_PACKET_ID_MULTI,
V7_PACKET_ID_NEW,
+ V7_PACKET_ID_TRACKSTICK,
};
alps.c.rej:
--- alps.c
+++ alps.c
@@ -1003,6 +1003,8 @@
packet_id = V7_PACKET_ID_MULTI;
else if ((byte[0] & 0x10) && !(byte[4] & 0x43))
packet_id = V7_PACKET_ID_NEW;
+ else if (byte[1] & 0x08)
+ packet_id = V7_PACKET_ID_TRACKSTICK;
else
packet_id = V7_PACKET_ID_IDLE;
@@ -1056,8 +1058,6 @@
{
struct alps_data *priv = psmouse->private;
- priv->r.v7.pkt_id = alps_get_packet_id_v7(p);
-
alps_get_finger_coordinate_v7(f->pt_img, p, priv->r.v7.pkt_id);
priv->r.v7.rest_left = 0;
@@ -1236,12 +1236,60 @@
priv->prev_phy_btn = priv->phy_btn;
}
+static void alps_process_trackstick_packet_v7(struct psmouse *psmouse)
+{
+ unsigned char *packet = psmouse->packet;
+ struct alps_data *priv = psmouse->private;
+ struct input_dev *dev = priv->dev2;
+
+ int x, y; /* trackstick vector */
+
+ /* Buttons status is reported for any packet */
+ input_report_key(dev, BTN_LEFT, !!(0x01 & packet[1]));
+ input_report_key(dev, BTN_RIGHT, !!(0x02 & packet[1]));
+
+ /*
+ * AlpsPS/2 v7 trackstick produces 2D relative coorinates
+ * as signed integers (normal binary complement +1 encoding)
+ */
+
+ x = (0x3f & packet[2]); /* low 6 bits */
+ x |= (0x10 & packet[3]) << 2; /* bit 7 */
+ x |= (0x80 & packet[2]); /* bit 8 */
+
+ /* x sign */
+ if (0x10 & packet[1])
+ x |= -1 << 8;
+
+ y = (0x07 & packet[3]); /* low 3 bits */
+ y |= (0x20 & packet[3]) >> 2; /* bit 4 */
+ y |= (0x38 & packet[4]) << 1; /* bits 5 - 7 */
+ y |= (0x80 & packet[4]); /* bit 8 */
+
+ /* y sign */
+ if (0x20 & packet[1])
+ y |= -1 << 8;
+
+ /* Report trackstick vector */
+ input_report_rel(dev, REL_X, x / 6);
+ input_report_rel(dev, REL_Y, -y / 8);
+
+ input_sync(dev);
+}
+
static void alps_process_packet_v7(struct psmouse *psmouse)
{
struct alps_data *priv = psmouse->private;
struct alps_fields f = {0};
unsigned char *packet = psmouse->packet;
+ /* Resolve packet ID */
+ priv->r.v7.pkt_id = alps_get_packet_id_v7(packet);
+
+ /* Process trackstick packet separately */
+ if (priv->r.v7.pkt_id == V7_PACKET_ID_TRACKSTICK)
+ return alps_process_trackstick_packet_v7(psmouse);
+
priv->decode_fields(&f, packet, psmouse);
if (alps_drop_unsupported_packet_v7(psmouse))
vencik
wvidana
agren
koroki
alehandrof
chatox
jpffitch
Hello everyone,
I've taken the liberty to merge in support for the trackstick found on Toshiba Portege Z30-A models. See below.
If anyone has such a device with the trackstick, please could you test it? I already know of one guy (Hi Drejc!), but the more the better. Also, it would be great if someone without the TS could re-test the patch...
Btw, I've noticed that the tree is behind time; Elaine's latest patch adds more (finger rest zone I think, at the very least); does anyone know how active this project is (or is supposed to be)?
Thanks,
vencik