diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-10-05 10:54:45 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-05 10:54:45 -0400 |
commit | da617c7cb915545dda4280df888dd6f8d5697420 (patch) | |
tree | c171c211f72c01d0541d23689bc265208601b6e5 /drivers/hid | |
parent | 4b086910ad1b889ddf3ef5598caec03178cf2bb4 (diff) |
HID: consolidate MacbookAir 4,1 mappings
MacbookAir 4,1 doesn't require extra mapping table, as the mappings
are identical to apple_fn_keys[].
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/hid-apple.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index b33bab9b72a5..4674556dcf5c 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
@@ -82,28 +82,6 @@ static const struct apple_key_translation macbookair_fn_keys[] = { | |||
82 | { } | 82 | { } |
83 | }; | 83 | }; |
84 | 84 | ||
85 | static const struct apple_key_translation macbookair4_fn_keys[] = { | ||
86 | { KEY_BACKSPACE, KEY_DELETE }, | ||
87 | { KEY_ENTER, KEY_INSERT }, | ||
88 | { KEY_F1, KEY_BRIGHTNESSDOWN, APPLE_FLAG_FKEY }, | ||
89 | { KEY_F2, KEY_BRIGHTNESSUP, APPLE_FLAG_FKEY }, | ||
90 | { KEY_F3, KEY_SCALE, APPLE_FLAG_FKEY }, | ||
91 | { KEY_F4, KEY_DASHBOARD, APPLE_FLAG_FKEY }, | ||
92 | { KEY_F5, KEY_KBDILLUMDOWN, APPLE_FLAG_FKEY }, | ||
93 | { KEY_F6, KEY_KBDILLUMUP, APPLE_FLAG_FKEY }, | ||
94 | { KEY_F7, KEY_PREVIOUSSONG, APPLE_FLAG_FKEY }, | ||
95 | { KEY_F8, KEY_PLAYPAUSE, APPLE_FLAG_FKEY }, | ||
96 | { KEY_F9, KEY_NEXTSONG, APPLE_FLAG_FKEY }, | ||
97 | { KEY_F10, KEY_MUTE, APPLE_FLAG_FKEY }, | ||
98 | { KEY_F11, KEY_VOLUMEDOWN, APPLE_FLAG_FKEY }, | ||
99 | { KEY_F12, KEY_VOLUMEUP, APPLE_FLAG_FKEY }, | ||
100 | { KEY_UP, KEY_PAGEUP }, | ||
101 | { KEY_DOWN, KEY_PAGEDOWN }, | ||
102 | { KEY_LEFT, KEY_HOME }, | ||
103 | { KEY_RIGHT, KEY_END }, | ||
104 | { } | ||
105 | }; | ||
106 | |||
107 | static const struct apple_key_translation apple_fn_keys[] = { | 85 | static const struct apple_key_translation apple_fn_keys[] = { |
108 | { KEY_BACKSPACE, KEY_DELETE }, | 86 | { KEY_BACKSPACE, KEY_DELETE }, |
109 | { KEY_ENTER, KEY_INSERT }, | 87 | { KEY_ENTER, KEY_INSERT }, |
@@ -208,9 +186,6 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, | |||
208 | else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI && | 186 | else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI && |
209 | hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) | 187 | hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) |
210 | table = macbookair_fn_keys; | 188 | table = macbookair_fn_keys; |
211 | else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI && | ||
212 | hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS) | ||
213 | table = macbookair4_fn_keys; | ||
214 | else if (hid->product < 0x21d || hid->product >= 0x300) | 189 | else if (hid->product < 0x21d || hid->product >= 0x300) |
215 | table = powerbook_fn_keys; | 190 | table = powerbook_fn_keys; |
216 | else | 191 | else |