From 34c8a5af880ea569861bacd4e7acee15c95d002d Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 30 Mar 2015 23:52:22 +0100 Subject: [PATCH] nc100: tty bits Fix the keymap for NC100 Output kernel messages to both serial and vt. This is useful as the emulator defaults to exiting on DI HLT and doesn't let you read the messages --- Kernel/platform-nc100/devtty.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Kernel/platform-nc100/devtty.c b/Kernel/platform-nc100/devtty.c index e394142f..f3e92d82 100644 --- a/Kernel/platform-nc100/devtty.c +++ b/Kernel/platform-nc100/devtty.c @@ -81,9 +81,12 @@ int nc100_tty_close(uint8_t minor) /* Output for the system console (kprintf etc) */ void kputchar(char c) { - if (c == '\n') + if (c == '\n') { tty_putc(1, '\r'); + tty_putc(2, '\r'); + } tty_putc(1, c); + tty_putc(2, c); } ttyready_t tty_writeready(uint8_t minor) @@ -236,7 +239,7 @@ uint8_t shiftkeyboard[10][8] = { {'D', 'S', 0, 'E', 'W', 'Q', '"', KEY_POUND }, {'F', 'R', 0, 'A', 'X', 'Z', 0, '$'}, {'C', 'G', 'Y', 'T', 'V', 'B', 0, 0}, - {'N', 'H', '?', '~', KEY_RIGHT , 127, '?' KEY_DOWN , '^'}, + {'N', 'H', '?', '~', KEY_RIGHT , 127, KEY_DOWN , '^'}, {'K', 'M', 'U', 0, KEY_UP, '|', '&', '+'}, {'<', 'J', 'I', '@', '{', '}', '_', '*'}, {'>', 'O', 'L', ':', 'P', 8, '(', ')'} -- 2.34.1