/shark/trunk/drivers/input/include/drivers/shark_joy26.h |
---|
39,7 → 39,6 |
void joy_enable(void); |
void joy_disable(void); |
int JOY26_installed(void); |
int JOY26_init(void); |
int JOY26_close(void); |
#endif |
/shark/trunk/drivers/input/include/drivers/shark_keyb26.h |
---|
109,7 → 109,6 |
#define keyb_def_ctrlC(s,f) (s).ctrlcfunc = (f) |
#define keyb_def_task(s,m) (s).tm = (TASK_MODEL *)(m) |
int KEYB26_installed(void); |
int KEYB26_init(KEYB_PARMS *s); |
int KEYB26_close(void); |
/shark/trunk/drivers/input/include/drivers/shark_spk26.h |
---|
21,7 → 21,6 |
#ifndef __SHARK_SPK26_H__ |
#define __SHARK_SPK26_H__ |
int SPEAK26_installed(void); |
int SPEAK26_init(void); |
int SPEAK26_close(void); |
/shark/trunk/drivers/input/include/drivers/shark_input26.h |
---|
29,11 → 29,9 |
#define TRUE 0 |
#endif |
int INPUT26_installed(void); |
int INPUT26_init(void); |
int INPUT26_close(void); |
int EVBUG26_installed(void); |
int EVBUG26_init(void); |
int EVBUG26_close(void); |
/shark/trunk/drivers/input/include/drivers/shark_mouse26.h |
---|
55,7 → 55,6 |
/* the MOUSE_PARMS structure used by MOUSE26_init() */ |
typedef struct mouse_parms { |
TASK_MODEL *tm; |
int x0, y0, z0; |
int xmin; |
int ymin; |
int xmax; |
71,31 → 70,22 |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT, \ |
(int)MOUSE_DEFAULT} |
/* to change the MOUSE_PARMS struct */ |
#define mouse_default_parms(s) (s).tm = (TASK_MODEL *)MOUSE_DEFAULT, \ |
(s).x0 = (int)MOUSE_DEFAULT, \ |
(s).y0 = (int)MOUSE_DEFAULT, \ |
(s).z0 = (int)MOUSE_DEFAULT, \ |
(s).xmin = (int)MOUSE_DEFAULT, \ |
(s).xmax = (int)MOUSE_DEFAULT, \ |
(s).ymin = (int)MOUSE_DEFAULT, \ |
(s).ymax = (int)MOUSE_DEFAULT, \ |
(s).threshold = (int)MOUSE_DEFAULT |
(s).xmin = (int)MOUSE_DEFAULT, \ |
(s).xmin = (int)MOUSE_DEFAULT, \ |
(s).xmin = (int)MOUSE_DEFAULT, \ |
(s).xmin = (int)MOUSE_DEFAULT |
#define mouse_def_task(s,m) (s).tm = (TASK_MODEL *)(m) |
#define mouse_def_threshold(s,v) (s).threshold = (v) |
#define mouse_def_thresh(s,v) (s).threshold = (v) |
#define mouse_def_xmin(s,v) (s).xmin = (v) |
#define mouse_def_ymin(s,v) (s).ymin = (v) |
#define mouse_def_xmax(s,v) (s).xmax = (v) |
#define mouse_def_ymax(s,v) (s).ymax = (v) |
#define mouse_def_x0(s,v) (s).x0 = (v) |
#define mouse_def_y0(s,v) (s).y0 = (v) |
#define mouse_def_z0(s,v) (s).y0 = (v) |
/* user mouse handler */ |
typedef void (*MOUSE_HANDLER)(MOUSE_EVT*); |
103,16 → 93,15 |
/* |
* user mouse interface |
*/ |
int MOUSE26_installed(void); |
int MOUSE26_init(MOUSE_PARMS *s); |
int MOUSE26_close(void); |
void mouse_enable(void); |
void mouse_disable(void); |
void mouse_getposition(int *x, int *y, int *z, unsigned long *buttons); |
void mouse_setposition(int x, int y, int z); |
void mouse_getlimits(int *xmin, int *ymin, int *xmax, int *ymax); |
int mouse_setlimits(int xmin, int ymin, int xmax, int ymax); |
void mouse_getpos(int *x, int *y, int *z, unsigned long *buttons); |
void mouse_setpos(int x, int y, int z); |
void mouse_getlimit(int *xmin, int *ymin, int *xmax, int *ymax); |
int mouse_setlimit(int xmin, int ymin, int xmax, int ymax); |
int mouse_getthreshold(void); |
int mouse_setthreshold(int t); |
void mouse_hook(MOUSE_HANDLER h); |
156,7 → 145,7 |
#define YMINLIMIT(dimx,dimy) (MOUSEHOTSPOTY) |
#define YMAXLIMIT(dimx,dimy) ((dimy)-MOUSESHAPEDY+MOUSEHOTSPOTY) |
#define mouse_grxlimits(dimx,dimy) mouse_setlimits(\ |
#define mouse_grxlimit(dimx,dimy) mouse_limit(\ |
XMINLIMIT(dimx,dimy), \ |
YMINLIMIT(dimx,dimy), \ |
XMAXLIMIT(dimx,dimy), \ |
/shark/trunk/drivers/input/shark/shark_mouse.c |
---|
35,6 → 35,8 |
/* 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; |
147,7 → 149,7 |
mouse_enabled = FALSE; /* TODO */ |
} |
void mouse_getposition(int *x,int *y,int *z, unsigned long *buttons) |
void mouse_getpos(int *x,int *y,int *z, unsigned long *buttons) |
{ |
if (x) |
*x = mouse_x; |
159,7 → 161,7 |
*buttons = mouse_buttons; |
} |
void mouse_setposition(int x,int y, int z) |
void mouse_setpos(int x,int y, int z) |
{ |
mouse_enabled = FALSE; |
180,7 → 182,7 |
mouse_enabled = TRUE; |
} |
void mouse_getlimits(int *xmin, int *ymin, int *xmax, int *ymax) |
void mouse_getlimit(int *xmin, int *ymin, int *xmax, int *ymax) |
{ |
if (xmin) |
*xmin = mouse_xmin_tick / mouse_threshold; |
192,7 → 194,7 |
*ymax = mouse_ymax_tick / mouse_threshold; |
} |
int mouse_setlimits(int xmin, int ymin, int xmax, int ymax) |
int mouse_setlimit(int xmin, int ymin, int xmax, int ymax) |
{ |
if ((xmin < 0) && (ymin < 0) && (xmax < xmin) && (ymax < ymin)) |
return -1; |
236,11 → 238,6 |
/**** 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; |
258,7 → 255,7 |
s = &mparms; |
/* set mouse threshold */ |
if ((s->threshold == (int) MOUSE_DEFAULT) || (s->threshold == 0)) |
if (s->threshold == (int) MOUSE_DEFAULT) |
mouse_threshold = MOUSE_DEF_THRESHOLD; |
else |
mouse_threshold = s->threshold; |
284,26 → 281,6 |
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); |
323,7 → 300,7 |
} |
#endif |
if (INPUT26_installed() == FALSE) { |
if (input_installed == FALSE) { |
status = INPUT26_init(); |
if (status) { |
/shark/trunk/drivers/input/shark/shark_joy.c |
---|
43,6 → 43,8 |
/* 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 */ |
127,15 → 129,11 |
/* Init the Linux Joystick Driver */ |
int JOY26_installed(void) { |
return joystick_installed; |
} |
int JOY26_init() { |
int JOY26_init(void) { |
int ret; |
if (INPUT26_installed() == FALSE) |
if (input_installed == FALSE) |
if (INPUT26_init()) { |
printk(KERN_ERR "Unable to open Input SubSystem.\n"); |
return -1; |
169,7 → 167,7 |
return 0; |
} |
int JOY26_close(void) { |
int JOY26_close() { |
if (!joystick_installed) |
return -1; |
/shark/trunk/drivers/input/shark/shark_keyb.c |
---|
45,6 → 45,8 |
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... |
425,10 → 427,6 |
} |
/**** End User Functions ****/ |
int KEYB26_installed(void) |
{ |
return keyb_installed; |
} |
int KEYB26_init(KEYB_PARMS *s) |
{ |
509,7 → 507,7 |
} |
#endif |
if (INPUT26_installed() == FALSE) |
if (input_installed == FALSE) |
if (INPUT26_init()) { |
printk(KERN_ERR "shark_keyb.c: Unable to open Input SubSystem.\n"); |
port_delete (pkeyPort); |
520,9 → 518,9 |
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 |
530,10 → 528,10 |
#endif |
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 |
563,11 → 561,9 |
if (!keyb_installed) |
return -1; |
kbd_disable(); |
kbd_exit(); |
atkbd_exit(); |
kbd_exit(); |
#ifdef KEYB_TASK |
f = kern_fsave(); |
/shark/trunk/drivers/input/shark/shark_spk.c |
---|
35,9 → 35,10 |
extern void spk_mksound(unsigned int hz, unsigned int ticks); |
extern void spk_nosound(unsigned long ignored); |
static int speaker_installed; |
extern int input_installed; |
/* User Functions */ |
void speaker_sound(unsigned int hz, unsigned int ticks) |
{ |
spk_mksound(hz, ticks); |
49,18 → 50,11 |
} |
/* Init the Linux Speaker Driver */ |
int SPEAK26_installed() |
{ |
return speaker_installed; |
} |
int SPEAK26_init() |
{ |
int ret; |
if (speaker_installed == TRUE) return 0; |
if (INPUT26_installed() == FALSE) |
if (input_installed == FALSE) |
if (INPUT26_init()) { |
printk(KERN_ERR "Unable to open Input SubSystem.\n"); |
return -1; |
77,22 → 71,14 |
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 */ |
int autocursormode = 0; |
static 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_getposition(&saved_x, &saved_y, &unused, &lunused); \ |
mouse_getpos(&saved_x, &saved_y, &unused, &lunused); \ |
show_cursor(saved_x, saved_y); \ |
} \ |
} |
/shark/trunk/drivers/input/shark/shark_input.c |
---|
36,15 → 36,9 |
extern int evbug_init(void); |
extern int evbug_exit(void); |
static int input_installed = FALSE; |
static int evbug_installed = FALSE; |
int input_installed = FALSE; |
/* Init the Linux Input Layer */ |
int INPUT26_installed(void) |
{ |
return input_installed; |
} |
int INPUT26_init() { |
int ret; |
94,16 → 88,9 |
} |
/* Init the Linux Event Debug Driver */ |
int EVBUG26_installed(void) |
{ |
return evbug_installed; |
} |
int EVBUG26_init() { |
evbug_init(); |
evbug_installed = TRUE; |
return 0; |
} |
110,8 → 97,6 |
int EVBUG26_close() { |
evbug_exit(); |
evbug_installed = FALSE; |
return 0; |
} |