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(); |