Skip to content

L
linux-davinci-2.6.23
Commit c7f7a569 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman
Browse files
Options

[PATCH] Input: convert drivers/macintosh to dynamic input_dev allocation 

Input: convert drivers/macntosh to dynamic input_dev allocation

This is required for input_dev sysfs integration
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b7df3910
Hide whitespace changes
Inline Side-by-side
Showing with 138 additions and 124 deletions
drivers/macintosh/adbhid.c
View file @ c7f7a569
...@@ -206,7 +206,7 @@ u8 adb_to_linux_keycodes[128] = { ...@@ -206,7 +206,7 @@ u8 adb_to_linux_keycodes[128] = {
}; };
struct adbhid { struct adbhid {
struct input_dev input; struct input_dev *input;
int id; int id;
int default_id; int default_id;
int original_handler_id; int original_handler_id;
...@@ -291,10 +291,10 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs) ...@@ -291,10 +291,10 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
switch (keycode) { switch (keycode) {
case ADB_KEY_CAPSLOCK: /* Generate down/up events for CapsLock everytime. */ case ADB_KEY_CAPSLOCK: /* Generate down/up events for CapsLock everytime. */
input_regs(&ahid->input, regs); input_regs(ahid->input, regs);
input_report_key(&ahid->input, KEY_CAPSLOCK, 1); input_report_key(ahid->input, KEY_CAPSLOCK, 1);
input_report_key(&ahid->input, KEY_CAPSLOCK, 0); input_report_key(ahid->input, KEY_CAPSLOCK, 0);
input_sync(&ahid->input); input_sync(ahid->input);
return; return;
#ifdef CONFIG_PPC_PMAC #ifdef CONFIG_PPC_PMAC
case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */ case ADB_KEY_POWER_OLD: /* Power key on PBook 3400 needs remapping */
...@@ -347,10 +347,10 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs) ...@@ -347,10 +347,10 @@ adbhid_input_keycode(int id, int keycode, int repeat, struct pt_regs *regs)
} }
if (adbhid[id]->keycode[keycode]) { if (adbhid[id]->keycode[keycode]) {
input_regs(&adbhid[id]->input, regs); input_regs(adbhid[id]->input, regs);
input_report_key(&adbhid[id]->input, input_report_key(adbhid[id]->input,
adbhid[id]->keycode[keycode], !up_flag); adbhid[id]->keycode[keycode], !up_flag);
input_sync(&adbhid[id]->input); input_sync(adbhid[id]->input);
} else } else
printk(KERN_INFO "Unhandled ADB key (scancode %#02x) %s.\n", keycode, printk(KERN_INFO "Unhandled ADB key (scancode %#02x) %s.\n", keycode,
up_flag ? "released" : "pressed"); up_flag ? "released" : "pressed");
...@@ -441,20 +441,20 @@ adbhid_mouse_input(unsigned char *data, int nb, struct pt_regs *regs, int autopo ...@@ -441,20 +441,20 @@ adbhid_mouse_input(unsigned char *data, int nb, struct pt_regs *regs, int autopo
break; break;
} }
input_regs(&adbhid[id]->input, regs); input_regs(adbhid[id]->input, regs);
input_report_key(&adbhid[id]->input, BTN_LEFT, !((data[1] >> 7) & 1)); input_report_key(adbhid[id]->input, BTN_LEFT, !((data[1] >> 7) & 1));
input_report_key(&adbhid[id]->input, BTN_MIDDLE, !((data[2] >> 7) & 1)); input_report_key(adbhid[id]->input, BTN_MIDDLE, !((data[2] >> 7) & 1));
if (nb >= 4 && adbhid[id]->mouse_kind != ADBMOUSE_TRACKPAD) if (nb >= 4 && adbhid[id]->mouse_kind != ADBMOUSE_TRACKPAD)
input_report_key(&adbhid[id]->input, BTN_RIGHT, !((data[3] >> 7) & 1)); input_report_key(adbhid[id]->input, BTN_RIGHT, !((data[3] >> 7) & 1));
input_report_rel(&adbhid[id]->input, REL_X, input_report_rel(adbhid[id]->input, REL_X,
((data[2]&0x7f) < 64 ? (data[2]&0x7f) : (data[2]&0x7f)-128 )); ((data[2]&0x7f) < 64 ? (data[2]&0x7f) : (data[2]&0x7f)-128 ));
input_report_rel(&adbhid[id]->input, REL_Y, input_report_rel(adbhid[id]->input, REL_Y,
((data[1]&0x7f) < 64 ? (data[1]&0x7f) : (data[1]&0x7f)-128 )); ((data[1]&0x7f) < 64 ? (data[1]&0x7f) : (data[1]&0x7f)-128 ));
input_sync(&adbhid[id]->input); input_sync(adbhid[id]->input);
} }
static void static void
...@@ -467,7 +467,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -467,7 +467,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
return; return;
} }
input_regs(&adbhid[id]->input, regs); input_regs(adbhid[id]->input, regs);
switch (adbhid[id]->original_handler_id) { switch (adbhid[id]->original_handler_id) {
default: default:
...@@ -477,19 +477,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -477,19 +477,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
switch (data[1] & 0x0f) { switch (data[1] & 0x0f) {
case 0x0: /* microphone */ case 0x0: /* microphone */
input_report_key(&adbhid[id]->input, KEY_SOUND, down); input_report_key(adbhid[id]->input, KEY_SOUND, down);
break; break;
case 0x1: /* mute */ case 0x1: /* mute */
input_report_key(&adbhid[id]->input, KEY_MUTE, down); input_report_key(adbhid[id]->input, KEY_MUTE, down);
break; break;
case 0x2: /* volume decrease */ case 0x2: /* volume decrease */
input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN, down); input_report_key(adbhid[id]->input, KEY_VOLUMEDOWN, down);
break; break;
case 0x3: /* volume increase */ case 0x3: /* volume increase */
input_report_key(&adbhid[id]->input, KEY_VOLUMEUP, down); input_report_key(adbhid[id]->input, KEY_VOLUMEUP, down);
break; break;
default: default:
...@@ -513,19 +513,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -513,19 +513,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
switch (data[1] & 0x0f) { switch (data[1] & 0x0f) {
case 0x8: /* mute */ case 0x8: /* mute */
input_report_key(&adbhid[id]->input, KEY_MUTE, down); input_report_key(adbhid[id]->input, KEY_MUTE, down);
break; break;
case 0x7: /* volume decrease */ case 0x7: /* volume decrease */
input_report_key(&adbhid[id]->input, KEY_VOLUMEDOWN, down); input_report_key(adbhid[id]->input, KEY_VOLUMEDOWN, down);
break; break;
case 0x6: /* volume increase */ case 0x6: /* volume increase */
input_report_key(&adbhid[id]->input, KEY_VOLUMEUP, down); input_report_key(adbhid[id]->input, KEY_VOLUMEUP, down);
break; break;
case 0xb: /* eject */ case 0xb: /* eject */
input_report_key(&adbhid[id]->input, KEY_EJECTCD, down); input_report_key(adbhid[id]->input, KEY_EJECTCD, down);
break; break;
case 0xa: /* brightness decrease */ case 0xa: /* brightness decrease */
...@@ -539,7 +539,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -539,7 +539,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
} }
} }
#endif /* CONFIG_PMAC_BACKLIGHT */ #endif /* CONFIG_PMAC_BACKLIGHT */
input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSDOWN, down); input_report_key(adbhid[id]->input, KEY_BRIGHTNESSDOWN, down);
break; break;
case 0x9: /* brightness increase */ case 0x9: /* brightness increase */
...@@ -553,19 +553,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -553,19 +553,19 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
} }
} }
#endif /* CONFIG_PMAC_BACKLIGHT */ #endif /* CONFIG_PMAC_BACKLIGHT */
input_report_key(&adbhid[id]->input, KEY_BRIGHTNESSUP, down); input_report_key(adbhid[id]->input, KEY_BRIGHTNESSUP, down);
break; break;
case 0xc: /* videomode switch */ case 0xc: /* videomode switch */
input_report_key(&adbhid[id]->input, KEY_SWITCHVIDEOMODE, down); input_report_key(adbhid[id]->input, KEY_SWITCHVIDEOMODE, down);
break; break;
case 0xd: /* keyboard illumination toggle */ case 0xd: /* keyboard illumination toggle */
input_report_key(&adbhid[id]->input, KEY_KBDILLUMTOGGLE, down); input_report_key(adbhid[id]->input, KEY_KBDILLUMTOGGLE, down);
break; break;
case 0xe: /* keyboard illumination decrease */ case 0xe: /* keyboard illumination decrease */
input_report_key(&adbhid[id]->input, KEY_KBDILLUMDOWN, down); input_report_key(adbhid[id]->input, KEY_KBDILLUMDOWN, down);
break; break;
case 0xf: case 0xf:
...@@ -573,7 +573,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -573,7 +573,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
case 0x8f: case 0x8f:
case 0x0f: case 0x0f:
/* keyboard illumination increase */ /* keyboard illumination increase */
input_report_key(&adbhid[id]->input, KEY_KBDILLUMUP, down); input_report_key(adbhid[id]->input, KEY_KBDILLUMUP, down);
break; break;
case 0x7f: case 0x7f:
...@@ -596,7 +596,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto ...@@ -596,7 +596,7 @@ adbhid_buttons_input(unsigned char *data, int nb, struct pt_regs *regs, int auto
break; break;
} }
input_sync(&adbhid[id]->input); input_sync(adbhid[id]->input);
} }
static struct adb_request led_request; static struct adb_request led_request;
...@@ -683,7 +683,7 @@ adb_message_handler(struct notifier_block *this, unsigned long code, void *x) ...@@ -683,7 +683,7 @@ adb_message_handler(struct notifier_block *this, unsigned long code, void *x)
int i; int i;
for (i = 1; i < 16; i++) { for (i = 1; i < 16; i++) {
if (adbhid[i]) if (adbhid[i])
del_timer_sync(&adbhid[i]->input.timer); del_timer_sync(&adbhid[i]->input->timer);
} }
} }
...@@ -699,153 +699,163 @@ adb_message_handler(struct notifier_block *this, unsigned long code, void *x) ...@@ -699,153 +699,163 @@ adb_message_handler(struct notifier_block *this, unsigned long code, void *x)
return NOTIFY_DONE; return NOTIFY_DONE;
} }
static void static int
adbhid_input_register(int id, int default_id, int original_handler_id, adbhid_input_register(int id, int default_id, int original_handler_id,
int current_handler_id, int mouse_kind) int current_handler_id, int mouse_kind)
{ {
struct adbhid *hid;
struct input_dev *input_dev;
int err;
int i; int i;
if (adbhid[id]) { if (adbhid[id]) {
printk(KERN_ERR "Trying to reregister ADB HID on ID %d\n", id); printk(KERN_ERR "Trying to reregister ADB HID on ID %d\n", id);
return; return -EEXIST;
} }
if (!(adbhid[id] = kmalloc(sizeof(struct adbhid), GFP_KERNEL))) adbhid[id] = hid = kzalloc(sizeof(struct adbhid), GFP_KERNEL);
return; input_dev = input_allocate_device();
if (!hid || !input_dev) {
memset(adbhid[id], 0, sizeof(struct adbhid)); err = -ENOMEM;
sprintf(adbhid[id]->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id); goto fail;
init_input_dev(&adbhid[id]->input); }
adbhid[id]->id = default_id; sprintf(hid->phys, "adb%d:%d.%02x/input", id, default_id, original_handler_id);
adbhid[id]->original_handler_id = original_handler_id;
adbhid[id]->current_handler_id = current_handler_id; hid->id = default_id;
adbhid[id]->mouse_kind = mouse_kind; hid->original_handler_id = original_handler_id;
adbhid[id]->flags = 0; hid->current_handler_id = current_handler_id;
adbhid[id]->input.private = adbhid[id]; hid->mouse_kind = mouse_kind;
adbhid[id]->input.name = adbhid[id]->name; hid->flags = 0;
adbhid[id]->input.phys = adbhid[id]->phys; input_dev->private = hid;
adbhid[id]->input.id.bustype = BUS_ADB; input_dev->name = hid->name;
adbhid[id]->input.id.vendor = 0x0001; input_dev->phys = hid->phys;
adbhid[id]->input.id.product = (id << 12) | (default_id << 8) | original_handler_id; input_dev->id.bustype = BUS_ADB;
adbhid[id]->input.id.version = 0x0100; input_dev->id.vendor = 0x0001;
input_dev->id.product = (id << 12) | (default_id << 8) | original_handler_id;
input_dev->id.version = 0x0100;
switch (default_id) { switch (default_id) {
case ADB_KEYBOARD: case ADB_KEYBOARD:
if (!(adbhid[id]->keycode = kmalloc(sizeof(adb_to_linux_keycodes), GFP_KERNEL))) { hid->keycode = kmalloc(sizeof(adb_to_linux_keycodes), GFP_KERNEL);
kfree(adbhid[id]); if (!hid->keycode) {
return; err = -ENOMEM;
goto fail;
} }
sprintf(adbhid[id]->name, "ADB keyboard"); sprintf(hid->name, "ADB keyboard");
memcpy(adbhid[id]->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes)); memcpy(hid->keycode, adb_to_linux_keycodes, sizeof(adb_to_linux_keycodes));
printk(KERN_INFO "Detected ADB keyboard, type "); printk(KERN_INFO "Detected ADB keyboard, type ");
switch (original_handler_id) { switch (original_handler_id) {
default: default:
printk("<unknown>.\n"); printk("<unknown>.\n");
adbhid[id]->input.id.version = ADB_KEYBOARD_UNKNOWN; input_dev->id.version = ADB_KEYBOARD_UNKNOWN;
break; break;
case 0x01: case 0x02: case 0x03: case 0x06: case 0x08: case 0x01: case 0x02: case 0x03: case 0x06: case 0x08:
case 0x0C: case 0x10: case 0x18: case 0x1B: case 0x1C: case 0x0C: case 0x10: case 0x18: case 0x1B: case 0x1C:
case 0xC0: case 0xC3: case 0xC6: case 0xC0: case 0xC3: case 0xC6:
printk("ANSI.\n"); printk("ANSI.\n");
adbhid[id]->input.id.version = ADB_KEYBOARD_ANSI; input_dev->id.version = ADB_KEYBOARD_ANSI;
break; break;
case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D: case 0x04: case 0x05: case 0x07: case 0x09: case 0x0D:
case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1: case 0x11: case 0x14: case 0x19: case 0x1D: case 0xC1:
case 0xC4: case 0xC7: case 0xC4: case 0xC7:
printk("ISO, swapping keys.\n"); printk("ISO, swapping keys.\n");
adbhid[id]->input.id.version = ADB_KEYBOARD_ISO; input_dev->id.version = ADB_KEYBOARD_ISO;
i = adbhid[id]->keycode[10]; i = hid->keycode[10];
adbhid[id]->keycode[10] = adbhid[id]->keycode[50]; hid->keycode[10] = hid->keycode[50];
adbhid[id]->keycode[50] = i; hid->keycode[50] = i;
break; break;
case 0x12: case 0x15: case 0x16: case 0x17: case 0x1A: case 0x12: case 0x15: case 0x16: case 0x17: case 0x1A:
case 0x1E: case 0xC2: case 0xC5: case 0xC8: case 0xC9: case 0x1E: case 0xC2: case 0xC5: case 0xC8: case 0xC9:
printk("JIS.\n"); printk("JIS.\n");
adbhid[id]->input.id.version = ADB_KEYBOARD_JIS; input_dev->id.version = ADB_KEYBOARD_JIS;
break; break;
} }
for (i = 0; i < 128; i++) for (i = 0; i < 128; i++)
if (adbhid[id]->keycode[i]) if (hid->keycode[i])
set_bit(adbhid[id]->keycode[i], adbhid[id]->input.keybit); set_bit(hid->keycode[i], input_dev->keybit);
adbhid[id]->input.evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP); input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_LED) | BIT(EV_REP);
adbhid[id]->input.ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML); input_dev->ledbit[0] = BIT(LED_SCROLLL) | BIT(LED_CAPSL) | BIT(LED_NUML);
adbhid[id]->input.event = adbhid_kbd_event; input_dev->event = adbhid_kbd_event;
adbhid[id]->input.keycodemax = 127; input_dev->keycodemax = 127;
adbhid[id]->input.keycodesize = 1; input_dev->keycodesize = 1;
break; break;
case ADB_MOUSE: case ADB_MOUSE:
sprintf(adbhid[id]->name, "ADB mouse"); sprintf(hid->name, "ADB mouse");
adbhid[id]->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REL); input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
adbhid[id]->input.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); input_dev->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
adbhid[id]->input.relbit[0] = BIT(REL_X) | BIT(REL_Y); input_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
break; break;
case ADB_MISC: case ADB_MISC:
switch (original_handler_id) { switch (original_handler_id) {
case 0x02: /* Adjustable keyboard button device */ case 0x02: /* Adjustable keyboard button device */
sprintf(adbhid[id]->name, "ADB adjustable keyboard buttons"); sprintf(hid->name, "ADB adjustable keyboard buttons");
adbhid[id]->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
set_bit(KEY_SOUND, adbhid[id]->input.keybit); set_bit(KEY_SOUND, input_dev->keybit);
set_bit(KEY_MUTE, adbhid[id]->input.keybit); set_bit(KEY_MUTE, input_dev->keybit);
set_bit(KEY_VOLUMEUP, adbhid[id]->input.keybit); set_bit(KEY_VOLUMEUP, input_dev->keybit);
set_bit(KEY_VOLUMEDOWN, adbhid[id]->input.keybit); set_bit(KEY_VOLUMEDOWN, input_dev->keybit);
break; break;
case 0x1f: /* Powerbook button device */ case 0x1f: /* Powerbook button device */
sprintf(adbhid[id]->name, "ADB Powerbook buttons"); sprintf(hid->name, "ADB Powerbook buttons");
adbhid[id]->input.evbit[0] = BIT(EV_KEY) | BIT(EV_REP); input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
set_bit(KEY_MUTE, adbhid[id]->input.keybit); set_bit(KEY_MUTE, input_dev->keybit);
set_bit(KEY_VOLUMEUP, adbhid[id]->input.keybit); set_bit(KEY_VOLUMEUP, input_dev->keybit);
set_bit(KEY_VOLUMEDOWN, adbhid[id]->input.keybit); set_bit(KEY_VOLUMEDOWN, input_dev->keybit);
set_bit(KEY_BRIGHTNESSUP, adbhid[id]->input.keybit); set_bit(KEY_BRIGHTNESSUP, input_dev->keybit);
set_bit(KEY_BRIGHTNESSDOWN, adbhid[id]->input.keybit); set_bit(KEY_BRIGHTNESSDOWN, input_dev->keybit);
set_bit(KEY_EJECTCD, adbhid[id]->input.keybit); set_bit(KEY_EJECTCD, input_dev->keybit);
set_bit(KEY_SWITCHVIDEOMODE, adbhid[id]->input.keybit); set_bit(KEY_SWITCHVIDEOMODE, input_dev->keybit);
set_bit(KEY_KBDILLUMTOGGLE, adbhid[id]->input.keybit); set_bit(KEY_KBDILLUMTOGGLE, input_dev->keybit);
set_bit(KEY_KBDILLUMDOWN, adbhid[id]->input.keybit); set_bit(KEY_KBDILLUMDOWN, input_dev->keybit);
set_bit(KEY_KBDILLUMUP, adbhid[id]->input.keybit); set_bit(KEY_KBDILLUMUP, input_dev->keybit);
break; break;
} }
if (adbhid[id]->name[0]) if (hid->name[0])
break; break;
/* else fall through */ /* else fall through */
default: default:
printk(KERN_INFO "Trying to register unknown ADB device to input layer.\n"); printk(KERN_INFO "Trying to register unknown ADB device to input layer.\n");
kfree(adbhid[id]); err = -ENODEV;
return; goto fail;
} }
adbhid[id]->input.keycode = adbhid[id]->keycode; input_dev->keycode = hid->keycode;
input_register_device(&adbhid[id]->input);
printk(KERN_INFO "input: %s on %s\n", input_register_device(input_dev);
adbhid[id]->name, adbhid[id]->phys);
if (default_id == ADB_KEYBOARD) { if (default_id == ADB_KEYBOARD) {
/* HACK WARNING!! This should go away as soon there is an utility /* HACK WARNING!! This should go away as soon there is an utility
* to control that for event devices. * to control that for event devices.
*/ */
adbhid[id]->input.rep[REP_DELAY] = 500; /* input layer default: 250 */ input_dev->rep[REP_DELAY] = 500; /* input layer default: 250 */
adbhid[id]->input.rep[REP_PERIOD] = 66; /* input layer default: 33 */ input_dev->rep[REP_PERIOD] = 66; /* input layer default: 33 */
} }
return 0;
fail: input_free_device(input_dev);
kfree(hid);
adbhid[id] = NULL;
return err;
} }
static void adbhid_input_unregister(int id) static void adbhid_input_unregister(int id)
{ {
input_unregister_device(&adbhid[id]->input); input_unregister_device(adbhid[id]->input);
if (adbhid[id]->keycode) if (adbhid[id]->keycode)
kfree(adbhid[id]->keycode); kfree(adbhid[id]->keycode);
kfree(adbhid[id]); kfree(adbhid[id]);
...@@ -858,7 +868,7 @@ adbhid_input_reregister(int id, int default_id, int org_handler_id, ...@@ -858,7 +868,7 @@ adbhid_input_reregister(int id, int default_id, int org_handler_id,
int cur_handler_id, int mk) int cur_handler_id, int mk)
{ {
if (adbhid[id]) { if (adbhid[id]) {
if (adbhid[id]->input.id.product != if (adbhid[id]->input->id.product !=
((id << 12)|(default_id << 8)|org_handler_id)) { ((id << 12)|(default_id << 8)|org_handler_id)) {
adbhid_input_unregister(id); adbhid_input_unregister(id);
adbhid_input_register(id, default_id, org_handler_id, adbhid_input_register(id, default_id, org_handler_id,
......
drivers/macintosh/mac_hid.c
View file @ c7f7a569
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include <linux/module.h> #include <linux/module.h>
static struct input_dev emumousebtn; static struct input_dev *emumousebtn;
static void emumousebtn_input_register(void); static int emumousebtn_input_register(void);
static int mouse_emulate_buttons = 0; static int mouse_emulate_buttons = 0;
static int mouse_button2_keycode = KEY_RIGHTCTRL; /* right control key */ static int mouse_button2_keycode = KEY_RIGHTCTRL; /* right control key */
static int mouse_button3_keycode = KEY_RIGHTALT; /* right option key */ static int mouse_button3_keycode = KEY_RIGHTALT; /* right option key */
...@@ -90,10 +90,10 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down) ...@@ -90,10 +90,10 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down)
&& (keycode == mouse_button2_keycode && (keycode == mouse_button2_keycode
|| keycode == mouse_button3_keycode)) { || keycode == mouse_button3_keycode)) {
if (mouse_emulate_buttons == 1) { if (mouse_emulate_buttons == 1) {
input_report_key(&emumousebtn, input_report_key(emumousebtn,
keycode == mouse_button2_keycode ? BTN_MIDDLE : BTN_RIGHT, keycode == mouse_button2_keycode ? BTN_MIDDLE : BTN_RIGHT,
down); down);
input_sync(&emumousebtn); input_sync(emumousebtn);
return 1; return 1;
} }
mouse_last_keycode = down ? keycode : 0; mouse_last_keycode = down ? keycode : 0;
...@@ -105,30 +105,34 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down) ...@@ -105,30 +105,34 @@ int mac_hid_mouse_emulate_buttons(int caller, unsigned int keycode, int down)
EXPORT_SYMBOL(mac_hid_mouse_emulate_buttons); EXPORT_SYMBOL(mac_hid_mouse_emulate_buttons);
static void emumousebtn_input_register(void) static int emumousebtn_input_register(void)
{ {
emumousebtn.name = "Macintosh mouse button emulation"; emumousebtn = input_allocate_device();
if (!emumousebtn)
return -ENOMEM;
init_input_dev(&emumousebtn); emumousebtn->name = "Macintosh mouse button emulation";
emumousebtn->id.bustype = BUS_ADB;
emumousebtn->id.vendor = 0x0001;
emumousebtn->id.product = 0x0001;
emumousebtn->id.version = 0x0100;
emumousebtn.evbit[0] = BIT(EV_KEY) | BIT(EV_REL); emumousebtn->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
emumousebtn.keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT); emumousebtn->keybit[LONG(BTN_MOUSE)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
emumousebtn.relbit[0] = BIT(REL_X) | BIT(REL_Y); emumousebtn->relbit[0] = BIT(REL_X) | BIT(REL_Y);
emumousebtn.id.bustype = BUS_ADB; input_register_device(emumousebtn);
emumousebtn.id.vendor = 0x0001;
emumousebtn.id.product = 0x0001;
emumousebtn.id.version = 0x0100;
input_register_device(&emumousebtn); return 0;
printk(KERN_INFO "input: Macintosh mouse button emulation\n");
} }
int __init mac_hid_init(void) int __init mac_hid_init(void)
{ {
int err;
emumousebtn_input_register(); err = emumousebtn_input_register();
if (err)
return err;
#if defined(CONFIG_SYSCTL) #if defined(CONFIG_SYSCTL)
mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir, 1); mac_hid_sysctl_header = register_sysctl_table(mac_hid_root_dir, 1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment