]> git.pld-linux.org Git - packages/kernel.git/blob - pbbuttons.patch
7157e1bbcb3e1275ecc09d16793d460a pbbuttons.patch
[packages/kernel.git] / pbbuttons.patch
1 diff -urN -X dontdiff kernel-2.4.16-benh/drivers/macintosh/adbhid.c kernel-2.4.16-mgr/drivers/macintosh/adbhid.c
2 --- kernel-2.4.16-benh/drivers/macintosh/adbhid.c       Tue Nov 27 00:07:02 2001
3 +++ kernel-2.4.16-mgr/drivers/macintosh/adbhid.c        Mon Feb  4 12:20:58 2002
4 @@ -42,9 +42,6 @@
5  #include <linux/adb.h>
6  #include <linux/cuda.h>
7  #include <linux/pmu.h>
8 -#ifdef CONFIG_PMAC_BACKLIGHT
9 -#include <asm/backlight.h>
10 -#endif
11  
12  MODULE_AUTHOR("Franz Sirl <Franz.Sirl-kernel@lauterbach.com>");
13
14 @@ -274,9 +271,7 @@
15         case 0x1f: /* Powerbook button device */
16           {
17                 int down = (data[1] == (data[1] & 0xf));
18 -#ifdef CONFIG_PMAC_BACKLIGHT
19 -               int backlight = get_backlight_level();
20 -#endif
21 +
22                 /*
23                  * XXX: Where is the contrast control for the passive?
24                  *  -- Cort
25 @@ -284,44 +279,28 @@
26
27                 switch (data[1] & 0x0f) {
28                 case 0x8:       /* mute */
29 -                       input_report_key(&adbhid[id]->input, KEY_MUTE,
30 -                               data[1] == (data[1] & 0xf));
31 +                       input_report_key(&adbhid[id]->input, KEY_MUTE, down);
32                         break;
33
34                 case 0x7:       /* volume decrease */
35 -                       input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN,
36 -                               data[1] == (data[1] & 0xf));
37 +                       input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN, down);
38                         break;
39
40                 case 0x6:       /* volume increase */
41 -                       input_report_key(&adbhid[id]->input, KEY_VOLUMEUP,
42 -                               data[1] == (data[1] & 0xf));
43 +                       input_report_key(&adbhid[id]->input, KEY_VOLUMEUP, down);
44                         break;
45
46                 case 0xb:       /* eject */
47 -                       input_report_key(&adbhid[id]->input, KEY_EJECTCD,
48 -                               data[1] == (data[1] & 0xf));
49 +                       input_report_key(&adbhid[id]->input, KEY_EJECTCD, down);
50                         break;
51
52 -#ifdef CONFIG_PMAC_BACKLIGHT
53                 case 0xa:       /* brightness decrease */
54 -                       if (!down || backlight < 0)
55 -                               break;
56 -                       if (backlight > BACKLIGHT_OFF)
57 -                               set_backlight_level(backlight-1);
58 -                       else
59 -                               set_backlight_level(BACKLIGHT_OFF);
60 +                       input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSDOWN, down);
61                         break;
62
63                 case 0x9:       /* brightness increase */
64 -                       if (!down || backlight < 0)
65 -                               break;
66 -                       if (backlight < BACKLIGHT_MAX)
67 -                               set_backlight_level(backlight+1);
68 -                       else
69 -                               set_backlight_level(BACKLIGHT_MAX);
70 +                       input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSUP, down);
71                         break;
72 -#endif /* CONFIG_PMAC_BACKLIGHT */
73                 }
74           }
75           break;
76 @@ -521,6 +500,8 @@
77                         set_bit(KEY_MUTE, adbhid[id]->input.keybit);
78                         set_bit(KEY_VOLUMEUP, adbhid[id]->input.keybit);
79                         set_bit(KEY_VOLUMEDOWN, adbhid[id]->input.keybit);
80 +                       set_bit(KEY_BRIGHTNESSUP, adbhid[id]->input.keybit);
81 +                       set_bit(KEY_BRIGHTNESSDOWN, adbhid[id]->input.keybit);
82                         set_bit(KEY_EJECTCD, adbhid[id]->input.keybit);
83                         break;
84                 }
85 diff -urN -X dontdiff kernel-2.4.16-benh/drivers/macintosh/mac_hid.c kernel-2.4.16-mgr/drivers/macintosh/mac_hid.c
86 --- kernel-2.4.16-benh/drivers/macintosh/mac_hid.c      Thu Feb  4 01:06:49 1904
87 +++ kernel-2.4.16-mgr/drivers/macintosh/mac_hid.c       Mon Feb  4 12:06:53 2002
88 @@ -204,7 +204,7 @@
89         0, 0, 0, 0, 0, KEY_VOLUMEDOWN, KEY_MUTE, 0,             /* 0x20-0x27 */
90         0, 0, 0, 0, 0, 0, 0, 0,                                 /* 0x28-0x2f */
91         0, 0, 0, 0, 0, KEY_KPSLASH, 0, KEY_SYSRQ,               /* 0x30-0x37 */
92 -       KEY_RIGHTALT, 0, 0, KEY_EJECTCD, 0, 0, 0, 0,            /* 0x38-0x3f */
93 +       KEY_RIGHTALT, KEY_BRIGHTNESSUP, KEY_BRIGHTNESSDOWN, KEY_EJECTCD, 0, 0, 0, 0,            /* 0x38-0x3f */
94         0, 0, 0, 0, 0, 0, 0, KEY_HOME,                          /* 0x40-0x47 */
95         KEY_UP, KEY_PAGEUP, 0, KEY_LEFT, 0, KEY_RIGHT, 0, KEY_END, /* 0x48-0x4f */
96         KEY_DOWN, KEY_PAGEDOWN, KEY_INSERT, KEY_DELETE, 0, 0, 0, 0, /* 0x50-0x57 */
97 diff -urN -X dontdiff kernel-2.4.16-benh/include/linux/input.h kernel-2.4.16-mgr/include/linux/input.h
98 --- kernel-2.4.16-benh/include/linux/input.h    Fri Nov 30 10:55:04 2001
99 +++ kernel-2.4.16-mgr/include/linux/input.h     Mon Feb  4 11:55:33 2002
100 @@ -305,6 +305,9 @@
101  #define KEY_SUSPEND            205
102  #define KEY_CLOSE              206
103
104 +#define KEY_BRIGHTNESSUP       225
105 +#define KEY_BRIGHTNESSDOWN     224
106 +
107  #define KEY_UNKNOWN            220
108
109  #define BTN_MISC               0x100
This page took 0.032018 seconds and 4 git commands to generate.