| /shark/trunk/drivers/input/shark/shark_mouse.c |
|---|
| 35,8 → 35,6 |
| /* Functions */ |
| extern int mouse_get(int *dx, int *dy, int *dz, unsigned long *buttons); |
| extern int input_installed; |
| /* Mouse driver currently installed/actived */ |
| static int mouse_installed = FALSE; |
| static int mouse_enabled = FALSE; |
| 149,7 → 147,7 |
| mouse_enabled = FALSE; /* TODO */ |
| } |
| void mouse_getpos(int *x,int *y,int *z, unsigned long *buttons) |
| void mouse_getposition(int *x,int *y,int *z, unsigned long *buttons) |
| { |
| if (x) |
| *x = mouse_x; |
| 161,7 → 159,7 |
| *buttons = mouse_buttons; |
| } |
| void mouse_setpos(int x,int y, int z) |
| void mouse_setposition(int x,int y, int z) |
| { |
| mouse_enabled = FALSE; |
| 182,7 → 180,7 |
| mouse_enabled = TRUE; |
| } |
| void mouse_getlimit(int *xmin, int *ymin, int *xmax, int *ymax) |
| void mouse_getlimits(int *xmin, int *ymin, int *xmax, int *ymax) |
| { |
| if (xmin) |
| *xmin = mouse_xmin_tick / mouse_threshold; |
| 194,7 → 192,7 |
| *ymax = mouse_ymax_tick / mouse_threshold; |
| } |
| int mouse_setlimit(int xmin, int ymin, int xmax, int ymax) |
| int mouse_setlimits(int xmin, int ymin, int xmax, int ymax) |
| { |
| if ((xmin < 0) && (ymin < 0) && (xmax < xmin) && (ymax < ymin)) |
| return -1; |
| 238,6 → 236,11 |
| /**** End User Functions ****/ |
| /* Init the Linux Speaker Driver */ |
| int MOUSE26_installed(void) |
| { |
| return mouse_installed; |
| } |
| int MOUSE26_init(MOUSE_PARMS *s) |
| { |
| MOUSE_PARMS mparms = BASE_MOUSE; |
| 255,7 → 258,7 |
| s = &mparms; |
| /* set mouse threshold */ |
| if (s->threshold == (int) MOUSE_DEFAULT) |
| if ((s->threshold == (int) MOUSE_DEFAULT) || (s->threshold == 0)) |
| mouse_threshold = MOUSE_DEF_THRESHOLD; |
| else |
| mouse_threshold = s->threshold; |
| 281,6 → 284,26 |
| else |
| mouse_ymax_tick = s->ymax * mouse_threshold; |
| /* set initial mouse position */ |
| if (s->x0 == (int) MOUSE_DEFAULT) |
| mouse_x_tick = mouse_x = 0; |
| else { |
| mouse_x_tick = s->x0 * mouse_threshold; |
| mouse_x = mouse_x_tick / mouse_threshold; |
| } |
| if (s->y0 == (int) MOUSE_DEFAULT) |
| mouse_y_tick = mouse_y = 0; |
| else { |
| mouse_y_tick = s->y0 * mouse_threshold; |
| mouse_y = mouse_y_tick / mouse_threshold; |
| } |
| if (s->z0 == (int) MOUSE_DEFAULT) |
| mouse_z = 0; |
| else |
| mouse_z = s->z0; |
| #ifdef MOUSE_TASK |
| if (s->tm == (TASK_MODEL *)MOUSE_DEFAULT) { |
| soft_task_default_model(base_m); |
| 300,7 → 323,7 |
| } |
| #endif |
| if (input_installed == FALSE) { |
| if (INPUT26_installed() == FALSE) { |
| status = INPUT26_init(); |
| if (status) { |
| /shark/trunk/drivers/input/shark/shark_keyb.c |
|---|
| 45,8 → 45,6 |
| extern int kbd_rate(unsigned int *delay, unsigned int *period); |
| extern void kbd_mksound(unsigned int hz, unsigned int ticks); |
| extern int input_installed; |
| /* |
| * The following tables contains the ascii code corresponding to the |
| * scan codes, with shift & no shift... |
| 427,6 → 425,10 |
| } |
| /**** End User Functions ****/ |
| int KEYB26_installed(void) |
| { |
| return keyb_installed; |
| } |
| int KEYB26_init(KEYB_PARMS *s) |
| { |
| 507,7 → 509,7 |
| } |
| #endif |
| if (input_installed == FALSE) |
| if (INPUT26_installed() == FALSE) |
| if (INPUT26_init()) { |
| printk(KERN_ERR "shark_keyb.c: Unable to open Input SubSystem.\n"); |
| port_delete (pkeyPort); |
| 518,9 → 520,9 |
| return -1; |
| } |
| status = atkbd_init(); |
| status = kbd_init(); |
| if (status) { |
| printk(KERN_ERR "shark_keyb.c: AtKbd_Init return: %d\n", status); |
| printk(KERN_ERR "shark_keyb.c: Kbd_Init return: %d\n", status); |
| port_delete (pkeyPort); |
| port_delete (ukeyPort); |
| #ifdef KEYB_TASK |
| 528,10 → 530,10 |
| #endif |
| return -1; |
| } |
| status = kbd_init(); |
| status = atkbd_init(); |
| if (status) { |
| printk(KERN_ERR "shark_keyb.c: Kbd_Init return: %d\n", status); |
| printk(KERN_ERR "shark_keyb.c: AtKbd_Init return: %d\n", status); |
| port_delete (pkeyPort); |
| port_delete (ukeyPort); |
| #ifdef KEYB_TASK |
| 561,9 → 563,11 |
| if (!keyb_installed) |
| return -1; |
| kbd_disable(); |
| atkbd_exit(); |
| kbd_exit(); |
| atkbd_exit(); |
| #ifdef KEYB_TASK |
| f = kern_fsave(); |
| /shark/trunk/drivers/input/shark/shark_spk.c |
|---|
| 35,10 → 35,9 |
| extern void spk_mksound(unsigned int hz, unsigned int ticks); |
| extern void spk_nosound(unsigned long ignored); |
| extern int input_installed; |
| static int speaker_installed; |
| /* User Functions */ |
| void speaker_sound(unsigned int hz, unsigned int ticks) |
| { |
| spk_mksound(hz, ticks); |
| 50,11 → 49,18 |
| } |
| /* Init the Linux Speaker Driver */ |
| int SPEAK26_installed() |
| { |
| return speaker_installed; |
| } |
| int SPEAK26_init() |
| { |
| int ret; |
| if (input_installed == FALSE) |
| if (speaker_installed == TRUE) return 0; |
| if (INPUT26_installed() == FALSE) |
| if (INPUT26_init()) { |
| printk(KERN_ERR "Unable to open Input SubSystem.\n"); |
| return -1; |
| 71,14 → 77,22 |
| printk(KERN_ERR "Speaker_Init return: %d\n", ret); |
| return -1; |
| } |
| speaker_installed = TRUE; |
| return 0; |
| } |
| int SPEAK26_close() |
| { |
| if (!speaker_installed) |
| return -1; |
| speaker_exit(); |
| pcspkr_exit(); |
| speaker_installed = TRUE; |
| return 0; |
| } |
| /shark/trunk/drivers/input/shark/mcurtxt.c |
|---|
| 56,7 → 56,7 |
| static int mouse_cursor_state = 0; |
| /* mouse status */ |
| static int autocursormode = 0; |
| int autocursormode = 0; |
| /* saved mouse_position */ |
| static int saved_x, saved_y; |
| 214,7 → 214,7 |
| unsigned long lunused; \ |
| mouse_cursor_state--; \ |
| if (mouse_cursor_state == -1) { \ |
| mouse_getpos(&saved_x, &saved_y, &unused, &lunused); \ |
| mouse_getposition(&saved_x, &saved_y, &unused, &lunused); \ |
| show_cursor(saved_x, saved_y); \ |
| } \ |
| } |
| /shark/trunk/drivers/input/shark/shark_input.c |
|---|
| 36,9 → 36,15 |
| extern int evbug_init(void); |
| extern int evbug_exit(void); |
| int input_installed = FALSE; |
| static int input_installed = FALSE; |
| static int evbug_installed = FALSE; |
| /* Init the Linux Input Layer */ |
| int INPUT26_installed(void) |
| { |
| return input_installed; |
| } |
| int INPUT26_init() { |
| int ret; |
| 88,9 → 94,16 |
| } |
| /* Init the Linux Event Debug Driver */ |
| int EVBUG26_installed(void) |
| { |
| return evbug_installed; |
| } |
| int EVBUG26_init() { |
| evbug_init(); |
| evbug_installed = TRUE; |
| return 0; |
| } |
| 97,6 → 110,8 |
| int EVBUG26_close() { |
| evbug_exit(); |
| evbug_installed = FALSE; |
| return 0; |
| } |
| /shark/trunk/drivers/input/shark/shark_joy.c |
|---|
| 43,8 → 43,6 |
| /* Functions */ |
| extern int joystick_get(int *type, int *number, int *value); |
| extern int input_installed; |
| #define JS_EVENT_BUTTON 0x01 /* button pressed/released */ |
| #define JS_EVENT_AXIS 0x02 /* joystick moved */ |
| #define JS_EVENT_INIT 0x80 /* initial state of device */ |
| 129,11 → 127,15 |
| /* Init the Linux Joystick Driver */ |
| int JOY26_init() { |
| int JOY26_installed(void) { |
| return joystick_installed; |
| } |
| int JOY26_init(void) { |
| int ret; |
| if (input_installed == FALSE) |
| if (INPUT26_installed() == FALSE) |
| if (INPUT26_init()) { |
| printk(KERN_ERR "Unable to open Input SubSystem.\n"); |
| return -1; |
| 167,7 → 169,7 |
| return 0; |
| } |
| int JOY26_close() { |
| int JOY26_close(void) { |
| if (!joystick_installed) |
| return -1; |