diff options
| author | Henrik Rydberg <rydberg@euromail.se> | 2011-03-09 23:16:53 +0100 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2011-03-09 23:16:53 +0100 |
| commit | f890e70bc6d37777488781b29e74451f74a25848 (patch) | |
| tree | ac1e367fa2b2e28d4790881343e5b121938f85dc /usr | |
| parent | 27af164f9b037db4fca056e85ee7d85a19292117 (diff) | |
Add support for MBP8,2
Patch author: Andy Botting <andy@andybotting.com>
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/dkms_source_tree/bcm5974.c | 20 |
1 files changed, 20 insertions, 0 deletions
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 @@ | |||
| 63 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242 | 63 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI 0x0242 |
| 64 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243 | 64 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO 0x0243 |
| 65 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244 | 65 | #define USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS 0x0244 |
| 66 | /* Macbook8 (unibody, March 2011) */ | ||
| 67 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x0245 | ||
| 68 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0246 | ||
| 69 | #define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0247 | ||
| 66 | 70 | ||
| 67 | #define BCM5974_DEVICE(prod) { \ | 71 | #define BCM5974_DEVICE(prod) { \ |
| 68 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ | 72 | .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \ |
| @@ -96,6 +100,10 @@ static const struct usb_device_id bcm5974_table[] = { | |||
| 96 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI), | 100 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ANSI), |
| 97 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO), | 101 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_ISO), |
| 98 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS), | 102 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS), |
| 103 | /* MacbookPro8 */ | ||
| 104 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI), | ||
| 105 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_ISO), | ||
| 106 | BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING5_JIS), | ||
| 99 | /* Terminating entry */ | 107 | /* Terminating entry */ |
| 100 | {} | 108 | {} |
| 101 | }; | 109 | }; |
| @@ -274,6 +282,18 @@ static const struct bcm5974_config bcm5974_config_table[] = { | |||
| 274 | { DIM_X, DIM_X / SN_COORD, -4616, 5112 }, | 282 | { DIM_X, DIM_X / SN_COORD, -4616, 5112 }, |
| 275 | { DIM_Y, DIM_Y / SN_COORD, -142, 5234 } | 283 | { DIM_Y, DIM_Y / SN_COORD, -142, 5234 } |
| 276 | }, | 284 | }, |
| 285 | { | ||
| 286 | USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI, | ||
| 287 | USB_DEVICE_ID_APPLE_WELLSPRING5_ISO, | ||
| 288 | USB_DEVICE_ID_APPLE_WELLSPRING5_JIS, | ||
| 289 | HAS_INTEGRATED_BUTTON, | ||
| 290 | 0x84, sizeof(struct bt_data), | ||
| 291 | 0x81, TYPE2, FINGER_TYPE2, FINGER_TYPE2 + SIZEOF_ALL_FINGERS, | ||
| 292 | { DIM_PRESSURE, DIM_PRESSURE / SN_PRESSURE, 0, 300 }, | ||
| 293 | { DIM_WIDTH, DIM_WIDTH / SN_WIDTH, 0, 2048 }, | ||
| 294 | { DIM_X, DIM_X / SN_COORD, -4415, 5050 }, | ||
| 295 | { DIM_Y, DIM_Y / SN_COORD, -55, 6680 } | ||
| 296 | }, | ||
| 277 | {} | 297 | {} |
| 278 | }; | 298 | }; |
| 279 | 299 | ||
