adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Input: atamouse - various cleanups

Browse source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov 2008-06-02 01:03:24 -04:00
parent 819561286b
commit 82547e9074
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/input/mouse/atarimouse.c
View file

@ -57,15 +57,12 @@ MODULE_AUTHOR("Michael Schmitz <schmitz@biophys.uni-duesseldorf.de>");
MODULE_DESCRIPTION("Atari mouse driver"); MODULE_DESCRIPTION("Atari mouse driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int mouse_threshold[2] = {2,2}; static int mouse_threshold[2] = {2, 2};
module_param_array(mouse_threshold, int, NULL, 0);
#ifdef __MODULE__
MODULE_PARM(mouse_threshold, "2i");
#endif
#ifdef FIXED_ATARI_JOYSTICK #ifdef FIXED_ATARI_JOYSTICK
extern int atari_mouse_buttons; extern int atari_mouse_buttons;
#endif #endif
static int atamouse_used = 0;
static struct input_dev *atamouse_dev; static struct input_dev *atamouse_dev;
@ -97,9 +94,6 @@ static void atamouse_interrupt(char *buf)
static int atamouse_open(struct input_dev *dev) static int atamouse_open(struct input_dev *dev)
{ {
if (atamouse_used++)
return 0;
#ifdef FIXED_ATARI_JOYSTICK #ifdef FIXED_ATARI_JOYSTICK
atari_mouse_buttons = 0; atari_mouse_buttons = 0;
#endif #endif
@ -107,23 +101,24 @@ static int atamouse_open(struct input_dev *dev)
ikbd_mouse_thresh(mouse_threshold[0], mouse_threshold[1]); ikbd_mouse_thresh(mouse_threshold[0], mouse_threshold[1]);
ikbd_mouse_rel_pos(); ikbd_mouse_rel_pos();
atari_input_mouse_interrupt_hook = atamouse_interrupt; atari_input_mouse_interrupt_hook = atamouse_interrupt;
return 0; return 0;
} }
static void atamouse_close(struct input_dev *dev) static void atamouse_close(struct input_dev *dev)
{ {
if (!--atamouse_used) { ikbd_mouse_disable();
ikbd_mouse_disable(); atari_mouse_interrupt_hook = NULL;
atari_mouse_interrupt_hook = NULL;
}
} }
static int __init atamouse_init(void) static int __init atamouse_init(void)
{ {
int error;
if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP)) if (!MACH_IS_ATARI || !ATARIHW_PRESENT(ST_MFP))
return -ENODEV; return -ENODEV;
if (!(atari_keyb_init())) if (!atari_keyb_init())
return -ENODEV; return -ENODEV;
atamouse_dev = input_allocate_device(); atamouse_dev = input_allocate_device();
@ -141,12 +136,14 @@ static int __init atamouse_init(void)
atamouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y); atamouse_dev->relbit[0] = BIT_MASK(REL_X) | BIT_MASK(REL_Y);
atamouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) | atamouse_dev->keybit[BIT_WORD(BTN_LEFT)] = BIT_MASK(BTN_LEFT) |
BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT); BIT_MASK(BTN_MIDDLE) | BIT_MASK(BTN_RIGHT);
atamouse_dev->open = atamouse_open; atamouse_dev->open = atamouse_open;
atamouse_dev->close = atamouse_close; atamouse_dev->close = atamouse_close;
if (input_register_device(atamouse_dev)) { error = input_register_device(atamouse_dev);
if (error) {
input_free_device(atamouse_dev); input_free_device(atamouse_dev);
return -ENOMEM; return error;
} }
return 0; return 0;