Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -uNr linux-2.6.35/drivers/hid/hid-apple.c linux-2.6.35-MacbookAir/drivers/hid/hid-apple.c
- --- linux-2.6.35/drivers/hid/hid-apple.c 2010-08-02 00:11:14.000000000 +0200
- +++ linux-2.6.35-MacbookAir/drivers/hid/hid-apple.c 2010-10-24 16:33:20.722918002 +0200
- @@ -59,6 +59,27 @@
- u8 flags;
- };
- +static const struct apple_key_translation macbookair_fn_keys[] = {
- + { KEY_BACKSPACE, KEY_DELETE },
- + { KEY_ENTER, KEY_INSERT },
- + { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY },
- + { KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY },
- + { KEY_F3, KEY_SCALE, APPLE_FLAG_FKEY },
- + { KEY_F4, KEY_DASHBOARD, APPLE_FLAG_FKEY },
- + { KEY_F6, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY },
- + { KEY_F7, KEY_PLAYPAUSE, APPLE_FLAG_FKEY },
- + { KEY_F8, KEY_NEXTSONG, APPLE_FLAG_FKEY },
- + { KEY_F9, KEY_MUTE, APPLE_FLAG_FKEY },
- + { KEY_F10, KEY_VOLUMEDOWN, APPLE_FLAG_FKEY },
- + { KEY_F11, KEY_VOLUMEUP, APPLE_FLAG_FKEY },
- + { KEY_F12, KEY_EJECTCD, APPLE_FLAG_FKEY },
- + { KEY_UP, KEY_PAGEUP },
- + { KEY_DOWN, KEY_PAGEDOWN },
- + { KEY_LEFT, KEY_HOME },
- + { KEY_RIGHT, KEY_END },
- + { }
- +};
- +
- static const struct apple_key_translation apple_fn_keys[] = {
- { KEY_BACKSPACE, KEY_DELETE },
- { KEY_ENTER, KEY_INSERT },
- @@ -157,10 +178,14 @@
- if (fnmode) {
- int do_translate;
- - trans = apple_find_translation((hid->product < 0x21d ||
- + if(hid->product >= 0x023f && hid->product <= 0x0244 ) {
- + trans = apple_find_translation(macbookair_fn_keys, usage->code);
- + } else {
- + trans = apple_find_translation((hid->product < 0x21d ||
- hid->product >= 0x300) ?
- powerbook_fn_keys : apple_fn_keys,
- usage->code);
- + }
- if (trans) {
- if (test_bit(usage->code, asc->pressed_fn))
- do_translate = 1;
- @@ -439,6 +464,18 @@
- .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
- .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
- + .driver_data = APPLE_HAS_FN },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
- + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
- + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI),
- + .driver_data = APPLE_HAS_FN },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO),
- + .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
- + .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
- .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
- diff -uNr linux-2.6.35/drivers/hid/hid-core.c linux-2.6.35-MacbookAir/drivers/hid/hid-core.c
- --- linux-2.6.35/drivers/hid/hid-core.c 2010-10-23 06:59:31.000000000 +0200
- +++ linux-2.6.35-MacbookAir/drivers/hid/hid-core.c 2010-10-24 07:40:57.055679001 +0200
- @@ -1276,6 +1276,12 @@
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO) },
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS) },
- @@ -1736,6 +1742,12 @@
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_ISO) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING3_JIS) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_ISO) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING4_JIS) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_ISO) },
- + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY) },
- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) },
- { }
- diff -uNr linux-2.6.35/drivers/hid/hid-ids.h linux-2.6.35-MacbookAir/drivers/hid/hid-ids.h
- --- linux-2.6.35/drivers/hid/hid-ids.h 2010-10-23 06:59:31.000000000 +0200
- +++ linux-2.6.35-MacbookAir/drivers/hid/hid-ids.h 2010-10-24 07:34:52.632586002 +0200
- @@ -94,6 +94,12 @@
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x0242
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0243
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0244
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x023f
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0240
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0241
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI 0x0239
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO 0x023a
- #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
- diff -uNr linux-2.6.35/drivers/hid/Module.symvers linux-2.6.35-MacbookAir/drivers/hid/Module.symvers
- --- linux-2.6.35/drivers/hid/Module.symvers 1970-01-01 01:00:00.000000000 +0100
- +++ linux-2.6.35-MacbookAir/drivers/hid/Module.symvers 2010-10-24 07:48:15.385679001 +0200
- @@ -0,0 +1,35 @@
- +0x7f12da61 roccat_connect drivers/hid/hid-roccat EXPORT_SYMBOL_GPL
- +0x6bdee2e0 hidinput_connect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x2f622ea1 roccat_disconnect drivers/hid/hid-roccat EXPORT_SYMBOL_GPL
- +0xb9029e46 hid_set_field drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xc7c4bc9c hid_destroy_device drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x8f0cfe18 hid_input_report drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x3fa98af1 hiddev_hid_event drivers/hid/usbhid/usbhid EXPORT_SYMBOL_GPL
- +0xb0cf1343 usbhid_wait_io drivers/hid/usbhid/usbhid EXPORT_SYMBOL_GPL
- +0x27c2bc49 hidinput_find_field drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xe57d28ec hid_report_raw_event drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x745ce5a5 hidinput_disconnect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x89b5cd12 usbhid_set_leds drivers/hid/usbhid/usbhid EXPORT_SYMBOL_GPL
- +0xce2d30ff hid_allocate_device drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x01fd453e usbhid_lookup_quirk drivers/hid/usbhid/usbhid EXPORT_SYMBOL_GPL
- +0x41b6744a __hid_register_driver drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xdfdb2880 hid_disconnect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x54d45ada hid_unregister_driver drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x99c614cc hid_dump_device drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xa226e724 hidraw_report_event drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xc0ac74a7 hid_register_report drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xa6ae1e30 hid_debug_event drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x71515505 hidraw_connect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x1e59201f hid_check_keys_pressed drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x8bea11e1 hidraw_disconnect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x29294e92 hid_output_report drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x1a2b92f4 usbhid_submit_report drivers/hid/usbhid/usbhid EXPORT_SYMBOL_GPL
- +0x68e17740 hid_dump_field drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x2242b42f hid_connect drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xea6560d3 hid_parse_report drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x34179ad5 hid_resolv_usage drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x05495392 hid_debug drivers/hid/hid EXPORT_SYMBOL_GPL
- +0xa2e6d589 hid_add_device drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x7e977c46 hid_dump_input drivers/hid/hid EXPORT_SYMBOL_GPL
- +0x75646916 roccat_report_event drivers/hid/hid-roccat EXPORT_SYMBOL_GPL
- +0x7e2d0fc2 hidinput_report_event drivers/hid/hid EXPORT_SYMBOL_GPL
- diff -uNr linux-2.6.35/drivers/hwmon/applesmc.c linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c
- --- linux-2.6.35/drivers/hwmon/applesmc.c 2010-08-02 00:11:14.000000000 +0200
- +++ linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c 2010-10-24 07:45:02.085679002 +0200
- @@ -162,6 +162,8 @@
- /* Set 22: MacBook Pro 7,1 */
- { "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S",
- "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL },
- +/* Set 23: MacBook Air 3,1 */
- + { "TB0T", "TB1T", "TB2T", "TC0D", "TN0D", "Tp0P", "Ts0P", "Ts0S", NULL },
- };
- /* List of keys used to read/write fan speeds */
- @@ -1524,11 +1526,21 @@
- { .accelerometer = 1, .light = 1, .temperature_set = 21 },
- /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
- { .accelerometer = 1, .light = 1, .temperature_set = 22 },
- +/* MacBook Air 3,1: accelerometer, backlight and temperature set 15 */
- + { .accelerometer = 0, .light = 0, .temperature_set = 23 },
- };
- /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
- * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
- static __initdata struct dmi_system_id applesmc_whitelist[] = {
- + { applesmc_dmi_match, "Apple MacBook Air 3", {
- + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
- + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2") },
- + &applesmc_dmi_data[23]},
- + { applesmc_dmi_match, "Apple MacBook Air 3", {
- + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
- + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1") },
- + &applesmc_dmi_data[23]},
- { applesmc_dmi_match, "Apple MacBook Air 2", {
- DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
- DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") },
- diff -uNr linux-2.6.35/drivers/hwmon/Module.symvers linux-2.6.35-MacbookAir/drivers/hwmon/Module.symvers
- --- linux-2.6.35/drivers/hwmon/Module.symvers 1970-01-01 01:00:00.000000000 +0100
- +++ linux-2.6.35-MacbookAir/drivers/hwmon/Module.symvers 2010-10-23 07:23:13.500291002 +0200
- @@ -0,0 +1,9 @@
- +0x6c33e494 lis3lv02d_joystick_disable drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0x3c313751 lis3_dev drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0x3bfe0261 lis3lv02d_init_device drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0xe6af28c8 lis3lv02d_joystick_enable drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0xbf3e2036 lis3lv02d_poweron drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0x7f2fdb99 lis3lv02d_poweroff drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- +0x0903c239 vid_from_reg drivers/hwmon/hwmon-vid EXPORT_SYMBOL
- +0xef1c781c vid_which_vrm drivers/hwmon/hwmon-vid EXPORT_SYMBOL
- +0x8af65828 lis3lv02d_remove_fs drivers/hwmon/lis3lv02d EXPORT_SYMBOL_GPL
- diff -uNr linux-2.6.35/drivers/input/mouse/bcm5974.c linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c
- --- linux-2.6.35/drivers/input/mouse/bcm5974.c 2010-10-23 06:59:31.000000000 +0200
- +++ linux-2.6.35-MacbookAir/drivers/input/mouse/bcm5974.c 2010-10-24 07:38:15.795679002 +0200
- @@ -55,6 +55,14 @@
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI 0x0236
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_ISO 0x0237
- #define USB_DEVICE_ID_APPLE_WELLSPRING3_JIS 0x0238
- +/* MacbookAir3,1 (unibody), aka wellspring4 */
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI 0x0242
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_ISO 0x0243
- +#define USB_DEVICE_ID_APPLE_WELLSPRING4_JIS 0x0244
- +/* MacbookAir3,2 (unibody), aka wellspring5 */
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ANSI 0x023f
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_ISO 0x0240
- +#define USB_DEVICE_ID_APPLE_WELLSPRING5_JIS 0x0241
- #define BCM5974_DEVICE(prod) { \
- .match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
- @@ -80,6 +88,14 @@
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ANSI),
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_ISO),
- BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING3_JIS),
- + /* MacbookAir3,1 */
- + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI),
- + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_ISO),
- + BCM5974_DEVICE(USB_DEVICE_ID_APPLE_WELLSPRING4_JIS),
- + /* MacbookAir3,2 */
- + 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 */
- {}
- };
- @@ -229,6 +245,30 @@
- 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, -4460, 5166 },
- + { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
- + },
- + {
- + USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI,
- + USB_DEVICE_ID_APPLE_WELLSPRING4_ISO,
- + USB_DEVICE_ID_APPLE_WELLSPRING4_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, -4460, 5166 },
- + { DIM_Y, DIM_Y / SN_COORD, -75, 6700 }
- + },
- + {
- + 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, -4460, 5166 },
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement