Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 825 → Rev 826

/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