Add support for MBP8,2

Patch author: Andy Botting <andy@andybotting.com>

3 files changed, 23 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 43f2f57..b70c85f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 bcm5974-dkms (1.1.8) maverick; urgency=low
 
   * Prepare for new upstream version.
+  * Add support for MPB8,2
 
- -- Henrik Rydberg <rydberg@bitmath.org>  Wed, 09 Mar 2011 23:10:12 +0100
+ -- Henrik Rydberg <rydberg@bitmath.org>  Wed, 09 Mar 2011 23:12:56 +0100
 
 bcm5974-dkms (1.1.7) maverick; urgency=low
 
diff --git a/debian/control b/debian/control
index 21893be..7411e5b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://bitmath.org/code/bcm5974-dkms/
 
 Package: bcm5974-dkms
 Architecture: all
-Depends: dkms (>= 1.95), bash (>> 1.99), hid-dkms (>= 1.0.6)
+Depends: dkms (>= 1.95), bash (>> 1.99), hid-dkms (>= 1.1.1)
 Description: Apple USB BCM5974 Multitouch trackpad support (DKMS)
  This driver adds support for the multitouch trackpad on the new
  Apple Macbook Air and Macbook Pro Penryn laptops. It replaces the
diff --git a/usr/src/dkms_source_tree/bcm5974.c b/usr/src/dkms_source_tree/bcm5974.c
index 0efaf66..3aead91 100644
--- a/usr/src/dkms_source_tree/bcm5974.c
+++ b/usr/src/dkms_source_tree/bcm5974.c
@@ -63,6 +63,10 @@
 #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI   0x0242
 #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO    0x0243
 #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS    0x0244
+/* Macbook8 (unibody, March 2011) */
+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI    0x0245
+#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO     0x0246
+#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS     0x0247
 
 #define BCM5974_DEVICE(prod) {                                  \
         .match_flags = (USB_DEVICE_ID_MATCH_DEVICE |            \
@@ -96,6 +100,10 @@ static const struct usb_device_id bcm5974_table[] = {
         BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI),
         BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO),
         BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS),
+        /* MacbookPro8 */
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
+        BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
         /* Terminating entry */
         {}
 };
@@ -274,6 +282,18 @@ static const struct bcm5974_config bcm5974_config_table[] = {
                 { DIM_X, DIM_X / SN_COORD, -4616, 5112 },
                 { DIM_Y, DIM_Y / SN_COORD, -142, 5234 }
         },
+        {
+                USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI,
+                USB_DEVICE_ID_APPLE_WELLSPRING5_ISO,
+                USB_DEVICE_ID_APPLE_WELLSPRING5_JIS,
+                HAS_INTEGRATED_BUTTON,
+                0x84, sizeof(struct bt_data),
+                0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS,
+                { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 },
+                { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 },
+                { DIM_X, DIM_X / SN_COORD, -4415, 5050 },
+                { DIM_Y, DIM_Y / SN_COORD, -55, 6680 }
+        },
         {}
 };