--- np2/io/serial.c 2004/03/30 08:48:46 1.16 +++ np2/io/serial.c 2004/03/30 20:01:30 1.17 @@ -1,4 +1,5 @@ #include "compiler.h" +#include "cpucore.h" #include "commng.h" #include "pccore.h" #include "iocore.h" @@ -41,13 +42,14 @@ static void IOOUTCALL keyboard_o41(UINT if (keybrd.cmd & 1) { TRACEOUT(("send -> %02x", dat)); - keystat_ctrl(dat); + keystat_ctrlsend(dat); } (void)port; } static void IOOUTCALL keyboard_o43(UINT port, REG8 dat) { + TRACEOUT(("out43 -> %02x %.4x:%.8x", dat, CPU_CS, CPU_EIP)); if ((!(dat & 0x08)) && (keybrd.cmd & 0x08)) { keyboard_resetsignal(); } @@ -62,12 +64,14 @@ static REG8 IOINPCALL keyboard_i41(UINT (void)port; keybrd.status &= ~2; + TRACEOUT(("in41 -> %02x %.4x:%.8x", keybrd.data, CPU_CS, CPU_EIP)); return(keybrd.data); } static REG8 IOINPCALL keyboard_i43(UINT port) { (void)port; + TRACEOUT(("in43 -> %02x %.4x:%.8x", keybrd.status, CPU_CS, CPU_EIP)); return(keybrd.status); } @@ -100,6 +104,7 @@ void keyboard_resetsignal(void) { keybrd.status = 0; keybrd.ctrls = 0; keybrd.buffers = 0; + keystat_ctrlreset(); keystat_resendstat(); }