--- Gnu-Mach/xen/console.c 2020/09/02 04:45:34 1.1 +++ Gnu-Mach/xen/console.c 2020/09/02 04:54:20 1.1.1.4 @@ -47,7 +47,7 @@ int hypputc(int c) hyp_console_io(CONSOLEIO_write, 1, kvtolin(&d)); } else { spl_t spl = splhigh(); - int complain; + static int complain; simple_lock(&outlock); while (hyp_ring_smash(console->out, console->out_prod, console->out_cons)) { if (!complain) { @@ -116,8 +116,8 @@ static void hypcnintr(int unit, spl_t sp mb(); console->in_cons++; #if MACH_KDB - if (c == (char)'£') { - printf("£ pressed\n"); + if (c == (char)0xA3) { + printf("pound pressed\n"); kdb_kintr(); continue; } @@ -129,14 +129,14 @@ static void hypcnintr(int unit, spl_t sp simple_unlock(&inlock); } -int hypcnread(int dev, io_req_t ior) +int hypcnread(dev_t dev, io_req_t ior) { struct tty *tp = &hypcn_tty; tp->t_state |= TS_CARR_ON; return char_read(tp, ior); } -int hypcnwrite(int dev, io_req_t ior) +int hypcnwrite(dev_t dev, io_req_t ior) { return char_write(&hypcn_tty, ior); } @@ -207,7 +207,7 @@ int hypcnopen(dev_t dev, int flag, io_re return (char_open(dev, tp, flag, ior)); } -int hypcnclose(int dev, int flag) +void hypcnclose(dev_t dev, int flag) { struct tty *tp = &hypcn_tty; spl_t s = spltty(); @@ -215,7 +215,6 @@ int hypcnclose(int dev, int flag) ttyclose(tp); simple_unlock(&tp->t_lock); splx(s); - return 0; } int hypcnprobe(struct consdev *cp)