5 files changed, 48 insertions, 219 deletions

diff --git a/CHANGES b/CHANGES
index f56506d..5bed2e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+bcm5974 (0.62) unstable; urgency=low
+
+  * Compatibility mode reverted
+  * BTN_TOUCH event added for mousedev
+
+ -- Henrik Rydberg <rydberg@euromail.se>  Tue, 02 Sep 2008 20:46:51 +0200
+
 bcm5974 (0.61) unstable; urgency=low
 
   * Smoother motion in mouse interface
diff --git a/bcm5974-dkms-mkdeb/debian/changelog b/bcm5974-dkms-mkdeb/debian/changelog
index 1ab2521..ccb4bc3 100644
--- a/bcm5974-dkms-mkdeb/debian/changelog
+++ b/bcm5974-dkms-mkdeb/debian/changelog
@@ -1,5 +1,6 @@
 MODULE_NAME-dkms (MODULE_VERSION) unstable; urgency=low
 
-  * Smoother motion in mouse interface
+  * Compatibility mode reverted
+  * BTN_TOUCH event added for mousedev
 
  -- Henrik Rydberg <rydberg@euromail.se>  DATE_STAMP
diff --git a/bcm5974.c b/bcm5974.c
index 9b67b2a..65281de 100644
--- a/bcm5974.c
+++ b/bcm5974.c
@@ -84,33 +84,10 @@ MODULE_LICENSE("GPL");
 #define dprintk(level, format, a...)\
         { if (debug >= level) printk(KERN_DEBUG format, ##a); }
 
-#define MODE_MOUSE      1
-#define MODE_TOUCHPAD   2
-
 static int debug = 1;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Activate debugging output");
 
-static int driver_mode = MODE_MOUSE;
-module_param(driver_mode, int, 0644);
-MODULE_PARM_DESC(driver_mode, "Driver mode (1 - mouse; 2 - touchpad)");
-
-static int mouse_motion_damping = 8;
-module_param(mouse_motion_damping, int, 0644);
-MODULE_PARM_DESC(mouse_motion_damping, "Mouse motion damping");
-
-static int mouse_wheel_damping = 256;
-module_param(mouse_wheel_damping, int, 0644);
-MODULE_PARM_DESC(mouse_wheel_damping, "Vertical mouse wheel damping");
-
-static int mouse_hwheel_damping = 256;
-module_param(mouse_hwheel_damping, int, 0644);
-MODULE_PARM_DESC(mouse_hwheel_damping, "Horizontal mouse wheel damping");
-
-static int mouse_button_mode = 2;
-module_param(mouse_button_mode, int, 0644);
-MODULE_PARM_DESC(mouse_button_mode, "Mouse button mode (1 - unix; 2 - macos)");
-
 /* button data structure */
 struct bt_data {
         u8 unknown1;            /* constant */
@@ -169,15 +146,6 @@ struct bcm5974_config {
         struct bcm5974_param y; /* vertical limits */
 };
 
-/* mouse driver state */
-struct bcm5974_mouse_state {
-        int fingers;                    /* number of fingers on trackpad */
-        int rel_x;                      /* horizontal relative counter */
-        int rel_y;                      /* vertical relative counter */
-        int wheel_x;                    /* horizontal wheel counter */
-        int wheel_y;                    /* vertical wheel counter */
-};
-
 /* logical device structure */
 struct bcm5974 {
         char phys[64];
@@ -191,7 +159,6 @@ struct bcm5974 {
         struct bt_data *bt_data;        /* button transferred data */
         struct urb *tp_urb;             /* trackpad usb request block */
         struct tp_data *tp_data;        /* trackpad transferred data */
-        struct bcm5974_mouse_state ms;  /* mouse state */
 };
 
 /* logical dimensions */
@@ -270,204 +237,73 @@ static inline int int2bound(const struct bcm5974_param *p, int x)
 static void setup_events_to_report(struct input_dev *input_dev,
                                    const struct bcm5974_config *cfg)
 {
-        __set_bit(EV_KEY, input_dev->evbit);
-        __set_bit(BTN_LEFT, input_dev->keybit);
+        __set_bit(EV_ABS, input_dev->evbit);
 
-        switch (driver_mode) {
-        case MODE_MOUSE:
-                __set_bit(EV_REL, input_dev->evbit);
-                __set_bit(REL_X, input_dev->relbit);
-                __set_bit(REL_Y, input_dev->relbit);
-                __set_bit(REL_HWHEEL, input_dev->relbit);
-                __set_bit(REL_WHEEL, input_dev->relbit);
-                __set_bit(BTN_MIDDLE, input_dev->keybit);
-                __set_bit(BTN_RIGHT, input_dev->keybit);
-                break;
-        case MODE_TOUCHPAD:
-                __set_bit(EV_ABS, input_dev->evbit);
-                __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
-                __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
-                __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
-
-                input_set_abs_params(input_dev, ABS_PRESSURE,
-                                        0, cfg->p.dim, cfg->p.fuzz, 0);
-                input_set_abs_params(input_dev, ABS_TOOL_WIDTH,
-                                        0, cfg->w.dim, cfg->w.fuzz, 0);
-                input_set_abs_params(input_dev, ABS_X,
-                                        0, cfg->x.dim, cfg->x.fuzz, 0);
-                input_set_abs_params(input_dev, ABS_Y,
-                                        0, cfg->y.dim, cfg->y.fuzz, 0);
-                break;
-        }
-}
+        input_set_abs_params(input_dev, ABS_PRESSURE,
+                                0, cfg->p.dim, cfg->p.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_TOOL_WIDTH,
+                                0, cfg->w.dim, cfg->w.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_X,
+                                0, cfg->x.dim, cfg->x.fuzz, 0);
+        input_set_abs_params(input_dev, ABS_Y,
+                                0, cfg->y.dim, cfg->y.fuzz, 0);
 
-/* update logical mouse button state */
-static void update_bt_mouse_state(struct input_dev *dev,
-                                const struct bcm5974_mouse_state *ms,
-                                const struct bt_data *bt)
-{
-        const int n = ms->fingers;
-
-        bool left, middle, right;
-        switch (mouse_button_mode) {
-        case 1:
-                left = n <= 1 && bt->button;
-                middle = n == 2 && bt->button;
-                right = n >= 3 && bt->button;
-                break;
-        case 2:
-                left = n <= 1 && bt->button;
-                middle = n >= 3 && bt->button;
-                right = n == 2 && bt->button;
-                break;
-        default:
-                left = bt->button;
-                middle = false;
-                right = false;
-                break;
-        };
-        input_report_key(dev, BTN_LEFT, left);
-        input_report_key(dev, BTN_MIDDLE, middle);
-        input_report_key(dev, BTN_RIGHT, right);
-}
-
-/* update logical touchpad button state */
-static void update_bt_touchpad_state(struct input_dev *dev,
-                                const struct bt_data *bt)
-{
-        input_report_key(dev, BTN_LEFT, bt->button);
+        __set_bit(EV_KEY, input_dev->evbit);
+        __set_bit(BTN_TOUCH, input_dev->keybit);
+        __set_bit(BTN_TOOL_FINGER, input_dev->keybit);
+        __set_bit(BTN_TOOL_DOUBLETAP, input_dev->keybit);
+        __set_bit(BTN_TOOL_TRIPLETAP, input_dev->keybit);
+        __set_bit(BTN_LEFT, input_dev->keybit);
 }
 
-/* report button data as logical mouse/touchpad button state */
+/* report button data as logical button state */
 static int report_bt_state(struct bcm5974 *dev, int size)
 {
         if (size != sizeof(struct bt_data))
                 return -EIO;
 
-        switch (driver_mode) {
-        case MODE_MOUSE:
-                update_bt_mouse_state(dev->input, &dev->ms, dev->bt_data);
-                break;
-        case MODE_TOUCHPAD:
-                update_bt_touchpad_state(dev->input, dev->bt_data);
-                break;
-        }
-
+        input_report_key(dev->input, BTN_LEFT, dev->bt_data->button);
         input_sync(dev->input);
 
         return 0;
 }
 
-/* update logical mouse motion state */
-static void update_tp_mouse_state(struct input_dev *dev,
-                                struct bcm5974_mouse_state *ms,
-                                const struct bcm5974_config *c,
-                                const struct tp_finger *f,
-                                int p, int n)
+/* report trackpad data as logical trackpad state */
+static int report_tp_state(struct bcm5974 *dev, int size)
 {
-        int dx = 0, dy = 0, sx = 0, sy = 0, swx = 0, swy = 0;
-
-        if (f) {
-                dx = raw2int(f->rel_x);
-                dy = raw2int(f->rel_y);
-
-                dprintk(9,
-                        "bcm5974: p: %+05d dx: %+05d dy: %+05d n: %d\n",
-                        p, dx, dy, n);
-        }
-
-        if (n >= 3) {
-                /* swipe */
-                ms->rel_x = 0;
-                ms->rel_y = 0;
-                ms->wheel_x += int2scale(&c->x, dx);
-                ms->wheel_y = 0;
-                swx = ms->wheel_x / mouse_hwheel_damping;
-                ms->wheel_x -= swx * mouse_hwheel_damping;
-        } else if (n == 2) {
-                /* scroll */
-                ms->rel_x = 0;
-                ms->rel_y = 0;
-                ms->wheel_x = 0;
-                ms->wheel_y += int2scale(&c->y, dy);
-                swy = ms->wheel_y / mouse_wheel_damping;
-                ms->wheel_y -= swy * mouse_wheel_damping;
-        } else {
-                /* pointer */
-                ms->rel_x += int2scale(&c->x, dx);
-                ms->rel_y += int2scale(&c->y, -dy);
-                ms->wheel_x = 0;
-                ms->wheel_y = 0;
-                sx = ms->rel_x / mouse_motion_damping;
-                sy = ms->rel_y / mouse_motion_damping;
-                ms->rel_x -= sx * mouse_motion_damping;
-                ms->rel_y -= sy * mouse_motion_damping;
-        }
-
-        ms->fingers = n;
-
-        input_report_rel(dev, REL_X, sx);
-        input_report_rel(dev, REL_Y, sy);
-        input_report_rel(dev, REL_HWHEEL, swx);
-        input_report_rel(dev, REL_WHEEL, swy);
-}
+        const struct bcm5974_config *c = &dev->cfg;
+        const struct tp_finger *f = dev->tp_data->finger;
+        struct input_dev *input = dev->input;
+        const int fingers = (size - 26) / 28;
+        int p = 0, w, x, y, n = 0;
 
-/* update logical touchpad state */
-static void update_tp_touchpad_state(struct input_dev *dev,
-                                const struct bcm5974_config *c,
-                                const struct tp_finger *f,
-                                int p, int n)
-{
-        int w, x, y;
+        if (size < 26 || (size - 26) % 28 != 0)
+                return -EIO;
 
-        if (f) {
+        if (fingers) {
+                p = raw2int(f->force_major);
                 w = raw2int(f->size_major);
                 x = raw2int(f->abs_x);
                 y = raw2int(f->abs_y);
+                n = p > 0 ? fingers : 0;
 
                 dprintk(9,
                         "bcm5974: p: %+05d w: %+05d x: %+05d y: %+05d n: %d\n",
                         p, w, x, y, n);
 
-                input_report_abs(dev, ABS_TOOL_WIDTH, int2bound(&c->w, w));
-                input_report_abs(dev, ABS_X, int2bound(&c->x, x - c->x.devmin));
-                input_report_abs(dev, ABS_Y, int2bound(&c->y, c->y.devmax - y));
+                input_report_abs(input, ABS_TOOL_WIDTH, int2bound(&c->w, w));
+                input_report_abs(input, ABS_X, int2bound(&c->x, x - c->x.devmin));
+                input_report_abs(input, ABS_Y, int2bound(&c->y, c->y.devmax - y));
         }
 
-        input_report_abs(dev, ABS_PRESSURE, int2bound(&c->p, p));
-
-        input_report_key(dev, BTN_TOOL_FINGER, n == 1);
-        input_report_key(dev, BTN_TOOL_DOUBLETAP, n == 2);
-        input_report_key(dev, BTN_TOOL_TRIPLETAP, n > 2);
-}
-
-/* report trackpad data as logical mouse/touchpad state */
-static int report_tp_state(struct bcm5974 *dev, int size)
-{
-        const struct bcm5974_config *c = &dev->cfg;
-        const int fingers = (size - 26) / 28;
-        const struct tp_finger *f = 0;
-        int p = 0, n = 0;
-
-        if (size < 26 || (size - 26) % 28 != 0)
-                return -EIO;
-
-        if (fingers) {
-                f = dev->tp_data->finger;
-                p = raw2int(f->force_major);
-                n = p > 0 ? fingers : 0;
-        }
+        input_report_abs(input, ABS_PRESSURE, int2bound(&c->p, p));
 
-        switch (driver_mode) {
-        case MODE_MOUSE:
-                update_tp_mouse_state(dev->input, &dev->ms, c, f, p, n);
-                break;
-        case MODE_TOUCHPAD:
-                update_tp_touchpad_state(dev->input, c, f, p, n);
-                break;
-        }
+        input_report_key(input, BTN_TOUCH, p > 0);
+        input_report_key(input, BTN_TOOL_FINGER, n == 1);
+        input_report_key(input, BTN_TOOL_DOUBLETAP, n == 2);
+        input_report_key(input, BTN_TOOL_TRIPLETAP, n > 2);
 
-        input_sync(dev->input);
+        input_sync(input);
 
         return 0;
 }
diff --git a/dkms.conf b/dkms.conf
index 07c7af3..0c75a98 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="bcm5974"
-PACKAGE_VERSION="0.61"
+PACKAGE_VERSION="0.62"
 MAKE[0]="make -C ${kernel_source_dir}
   SUBDIRS=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules"
 BUILT_MODULE_NAME[0]="bcm5974"
diff --git a/etc/modprobe.d/bcm5974 b/etc/modprobe.d/bcm5974
index 8a0e017..81cd5ce 100644
--- a/etc/modprobe.d/bcm5974
+++ b/etc/modprobe.d/bcm5974
@@ -8,18 +8,3 @@
 
 ## Debug level - uncomment this to get raw packets in /var/log/debug
 #options bcm5974 debug=99
-
-## Driver mode: 1 - mouse; 2 - touchpad
-options bcm5974 driver_mode=2
-
-## Mouse motion damping
-#options bcm5974 mouse_motion_damping=8
-
-## Vertical mouse wheel damping
-#options bcm5974 mouse_wheel_damping=256
-
-## Horizontal mouse wheel damping
-#options bcm5974 mouse_hwheel_damping=256
-
-## Mouse button mode: 0 - standard; 1 - unix three-button; 2 - mac three-button
-#options bcm5974 mouse_button_mode=2