Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 825 → Rev 826

/shark/trunk/drivers/input/include/drivers/shark_keyb26.h
71,17 → 71,17
BYTE status;
} KEY_EVT;
 
#define isReleased(k) ((k).status == KEY_RELEASED)
#define isPressed(k) ((k).status == KEY_PRESSED)
#define isRepeated(k) ((k).status == KEY_REPEATED)
#define isReleased(k) ( ((k)->status & KEY_RELEASED) != 0 )
#define isPressed(k) ( ((k)->status & KEY_PRESSED) != 0 )
#define isRepeated(k) ( ((k)->status & KEY_REPEATED) != 0 )
 
#define isScanCode(k) ((k).flag & SCAN_BIT)
#define isLeftShift(k) ((k).flag & SHFL_BIT)
#define isRightShift(k) ((k).flag & SHFR_BIT)
#define isLeftCtrl(k) ((k).flag & CNTL_BIT)
#define isRightCtrl(k) ((k).flag & CNTR_BIT)
#define isLeftAlt(k) ((k).flag & ALTL_BIT)
#define isRightAlt(k) ((k).flag & ALTR_BIT)
#define isScanCode(k) ((k)->flag & SCAN_BIT)
#define isLeftShift(k) ((k)->flag & SHFL_BIT)
#define isRightShift(k) ((k)->flag & SHFR_BIT)
#define isLeftCtrl(k) ((k)->flag & CNTL_BIT)
#define isRightCtrl(k) ((k)->flag & CNTR_BIT)
#define isLeftAlt(k) ((k)->flag & ALTL_BIT)
#define isRightAlt(k) ((k)->flag & ALTR_BIT)
 
#define keyb_getchar() keyb_getch(BLOCK)
 
117,9 → 117,8
BYTE keyb_getch(BYTE wait);
int keyb_getcode(KEY_EVT *k, BYTE wait);
void keyb_hook(KEY_EVT k, void (*f)(KEY_EVT *k), unsigned char l);
int keyb_enable(void);
int keyb_disable(void);
int keyb_end(void);
void keyb_enable(void);
void keyb_disable(void);
int keyb_set_map(unsigned char m);
int keyb_get_map(void);
 
/shark/trunk/drivers/input/include/drivers/shark_joy26.h
27,11 → 27,11
#define BTN3_BIT 0x04
#define BTN4_BIT 0x08
 
#define isButton1(b) (b & BTN1_BIT)
#define isButton2(b) (b & BTN2_BIT)
#define isButton3(b) (b & BTN3_BIT)
#define isButton4(b) (b & BTN4_BIT)
#define isButton(b, n) (b & (1<<n))
#define isButton1Pressed(b) (b & BTN1_BIT)
#define isButton2Pressed(b) (b & BTN2_BIT)
#define isButton3Pressed(b) (b & BTN3_BIT)
#define isButton4Pressed(b) (b & BTN4_BIT)
#define isButtonPressed(b, n) (b & (1<<n))
 
void joy_getstatus(int *axe0, int *axe1, int *axe2, int *axe3, int *button);
void joy_setstatus(int axe0, int axe1, int axe2, int axe3, int button);
/shark/trunk/drivers/input/shark/shark_mouse.c
311,6 → 311,7
soft_task_def_met(base_m,500);
soft_task_def_period(base_m,8000);
soft_task_def_system(base_m);
soft_task_def_nokill (base_m);
soft_task_def_aperiodic(base_m);
m = (TASK_MODEL *)&base_m;
} else
/shark/trunk/drivers/input/shark/shark_keyb.c
384,7 → 384,7
#ifdef __KEYB_DEBUG__
printk("shark_keyb.c: GetChar ( %2x - %c - %2x - %1d)\n", ev.scan, ev.ascii, ev.flag, ev.status);
#endif
if (!isScanCode(ev) && !isReleased(ev))
if (!isScanCode(&ev) && !isReleased(&ev))
return (ev.ascii);
else
return 0;
396,7 → 396,7
* Function that returns a structure containing the flags status, the ascii
* code, and the scan code
*/
int keyb_getcode(KEY_EVT * k, BYTE wait)
int inline keyb_getcode(KEY_EVT * k, BYTE wait)
{
return (port_receive (ukeyPort, (BYTE *) (k), wait));
}
413,21 → 413,19
}
 
/* This function disable the keyboard */
int keyb_disable(void)
void inline keyb_disable(void)
{
kbd_disable();
return 0;
}
 
/* This function enable the keyboard */
int keyb_enable(void)
void inline keyb_enable(void)
{
kbd_enable();
return 0;
}
 
/**** End User Functions ****/
int KEYB26_installed(void)
int inline KEYB26_installed(void)
{
return keyb_installed;
}
493,6 → 491,7
soft_task_def_met (base_m, 800);
soft_task_def_period (base_m, 25000);
soft_task_def_system (base_m);
soft_task_def_nokill (base_m);
soft_task_def_aperiodic (base_m);
m = (TASK_MODEL *) & base_m;
} else
/shark/trunk/drivers/input/shark/shark_input.c
60,13 → 60,13
ret = serio_init();
if (ret) {
printk(KERN_ERR "Serio_Init return: %d\n", ret);
return -1;
return -2;
}
 
ret = i8042_init();
if (ret) {
printk(KERN_ERR "i8042_Init return: %d\n", ret);
return -1;
return -3;
}
 
/* TODO