Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if pm_adb_op times out waiting for an interrupt, attempt to take

Browse Source 
an interrupt anyway, just in case.  Otherwise, report the timout condition.
This works around a problem in my ibook if a key is pressed after boot
and before adb is configured, such as when booting with -d.
This commit is contained in:
dbj 2002-01-02 20:28:43 +00:00
parent 539d8cbd30
commit 32eabd8148
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/arch/macppc/dev/pm_direct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pm_direct.c,v 1.16 2001/09/16 16:40:44 wiz Exp $ */ /* $NetBSD: pm_direct.c,v 1.17 2002/01/02 20:28:43 dbj Exp $ */
/* /*
* Copyright (C) 1997 Takashi Hamada * Copyright (C) 1997 Takashi Hamada
@ -1034,8 +1034,22 @@ pm_adb_op(buffer, compRout, data, command)
#endif #endif
#endif #endif
if ((--timo) < 0) { if ((--timo) < 0) {
splx(s); /* Try to take an interrupt anyway, just in case.
return 1; * This has been observed to happen on my ibook
* when i press a key after boot and before adb
* is attached; For example, when booting with -d.
*/
pm_intr();
if (adbWaiting) {
printf("pm_adb_op: timeout. command = 0x%x\n",command);
splx(s);
return 1;
}
#ifdef ADB_DEBUG
else {
printf("pm_adb_op: missed interrupt. cmd=0x%x\n",command);
}
#endif
} }
} }