bcm5974-0.66-rc12

After fixing all the details regarding buttons, it seems I managed to leave out the part that actually reports them. :-)

From tester logs, it seems the pressure scale is *not* changed much after all. The click-with-moving-finger strategy generally means pressing harder on the trackpad. Adjusted the range somewhat.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>

1 files changed, 6 insertions, 1 deletions

diff --git a/bcm5974.c b/bcm5974.c
index 9965e8f..e858f0b 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -226,7 +226,7 @@ static const struct bcm5974_config bcm5974_config_table[] = {
                 USB_DEVICE_ID_APPLE_WELLSPRING3_JIS,
                 0x84, sizeof(struct bt_data),
                 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
-                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 768 },
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
                 { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
                 { DIM_X, DIM_X / SN_COORD, -4460, 5166 },
                 { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
@@ -387,6 +387,11 @@ static int report_tp_state(struct bcm5974 *dev, int size)
 
         }
 
+        if (HAS_INTEGRATED_BUTTON(c)) {
+                input_report_key(input, BTN_TOOL_PRESS, ibt);
+                input_report_key(input, BTN_LEFT, ibt);
+        }
+
         input_sync(input);
 
         return 0;