summaryrefslogtreecommitdiffstats
path: root/sys/dev/adb
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-14 01:16:05 +0000
committerian <ian@FreeBSD.org>2014-05-14 01:16:05 +0000
commit147aa314a7ea59fab69a92349cee312e49cae2bb (patch)
treeb553b4077fe2c8c6098e20d3d69729a8bc8e9c11 /sys/dev/adb
parent2963fd0dfbdafac049cadecf0774e0c027b28c88 (diff)
downloadFreeBSD-src-147aa314a7ea59fab69a92349cee312e49cae2bb.zip
FreeBSD-src-147aa314a7ea59fab69a92349cee312e49cae2bb.tar.gz
MFC r257180, r257195, r257196, r257198, r257209, r257295
Add some extra sanity checking and checks to printf format specifiers. Try even harder to find a console before giving up. Make devices with registers into the KVA region work reliably. Turn on VM_KMEM_SIZE_SCALE on 32-bit as well as 64-bit PowerPC. Return NOKEY instead of 0 if there are no more key presses queued.
Diffstat (limited to 'sys/dev/adb')
-rw-r--r--sys/dev/adb/adb_kbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 6fca5ff..76d4e88 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -621,7 +621,7 @@ akbd_read_char(keyboard_t *kbd, int wait)
if (!sc->buffers) {
mtx_unlock(&sc->sc_mutex);
- return (0);
+ return (NOKEY);
}
adb_code = sc->buffer[0];
OpenPOWER on IntegriCloud