tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from rlfnb/pckbd-init-fix

Browse Source 
absence of a keyboard controller should not panic
This commit is contained in:
rlfnb 2015-06-03 07:52:22 +02:00
commit 391ca249c3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
minix/drivers/hid/pckbd/pckbd.c
View File

@ -250,7 +250,7 @@ kbc_read(void)
/*
* Initialize the keyboard hardware.
*/
static void
static int
kb_init(void)
{
int r, ccb;
@ -272,8 +272,10 @@ kb_init(void)
/* Execute Controller Self Test. */
kbc_cmd0(0xAA);
r = kbc_read();
if (r != 0x55)
panic("PCKBD: Controller self-test failed.\n");
if (r != 0x55){
printf("PCKBD: Controller self-test failed.\n");
return EGENERIC;
}
/* Set interrupt handler and enable keyboard IRQ. */
irq_hook_id = KEYBOARD_IRQ; /* id to be returned on interrupt */
@ -316,6 +318,7 @@ kb_init(void)
kb_wait();
set_leds(0);
return OK;
}
/*
@ -466,7 +469,10 @@ pckbd_init(int UNUSED(type), sef_init_info_t *UNUSED(info))
init_timer(&tmr_kbd_wd);
/* Initialize the keyboard. */
kb_init();
int r;
if((r = kb_init())!=OK){
return r;
}
/* Announce the driver's presence. */
if (aux_available != 0)