Version 0.1.1rel-0.1.1

15 files changed, 1010 insertions, 55 deletions

diff --git a/Makefile b/Makefile
index 28ac276..a704cd9 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@
 OUT=out/
 
 # Source files
-SRC16=floppy.c disk.c system.c clock.c serial.c kbd.c output.c boot.c
+SRC16=floppy.c disk.c system.c clock.c serial.c kbd.c mouse.c output.c boot.c
 SRC32=post.c output.c
 
 # Default compiler flags (note -march=armv4 is needed for 16 bit insns)
diff --git a/src/biosvar.h b/src/biosvar.h
index 8b15f5b..a6c6fb3 100644
--- a/src/biosvar.h
+++ b/src/biosvar.h
@@ -32,7 +32,8 @@ struct bios_data_area_s {
     u16 mem_size_kb;
     u8 pad2;
     u8 ps2_ctrl_flag;
-    u16 kbd_flag;
+    u8 kbd_flag0;
+    u8 kbd_flag1;
     u8 alt_keypad;
     u16 kbd_buf_head;
     u16 kbd_buf_tail;
@@ -85,13 +86,10 @@ struct bios_data_area_s {
 #define FMS_DATA_RATE_MASK          (0xc0)
 
 // Accessor functions
-#define GET_BDA(var) ({                                         \
-    SET_SEG(ES, 0x0000);                                        \
-    GET_VAR(ES, ((struct bios_data_area_s *)0)->var); })
-#define SET_BDA(var, val) do {                                  \
-        SET_SEG(ES, 0x0000);                                    \
-        SET_VAR(ES, ((struct bios_data_area_s *)0)->var, val);  \
-    } while (0)
+#define GET_BDA(var) \
+    GET_FARVAR(0x0000, ((struct bios_data_area_s *)0)->var)
+#define SET_BDA(var, val) \
+    SET_FARVAR(0x0000, ((struct bios_data_area_s *)0)->var, (val))
 #define CLEARBITS_BDA(var, val) do {                                    \
         typeof(((struct bios_data_area_s *)0)->var) __val = GET_BDA(var); \
         SET_BDA(var, (__val & ~(val)));                                 \
@@ -149,7 +147,8 @@ struct bregs {
 } __attribute__((packed));
 
 // bregs flags bitdefs
-#define F_CF (1<<9)
+#define F_ZF (1<<6)
+#define F_CF (1<<0)
 
 static inline void
 set_cf(struct bregs *regs, int cond)
diff --git a/src/clock.c b/src/clock.c
index 5ca2b5c..d45a8c7 100644
--- a/src/clock.c
+++ b/src/clock.c
@@ -8,13 +8,242 @@
 #include "biosvar.h" // struct bregs
 #include "util.h" // debug_enter
 #include "disk.h" // floppy_tick
+#include "cmos.h" // inb_cmos
+
+static void
+init_rtc()
+{
+    outb_cmos(0x26, CMOS_STATUS_A);
+    outb_cmos(0x02, CMOS_STATUS_B);
+    inb_cmos(CMOS_STATUS_C);
+    inb_cmos(CMOS_STATUS_D);
+}
+
+static u8
+rtc_updating()
+{
+    // This function checks to see if the update-in-progress bit
+    // is set in CMOS Status Register A.  If not, it returns 0.
+    // If it is set, it tries to wait until there is a transition
+    // to 0, and will return 0 if such a transition occurs.  A 1
+    // is returned only after timing out.  The maximum period
+    // that this bit should be set is constrained to 244useconds.
+    // The count I use below guarantees coverage or more than
+    // this time, with any reasonable IPS setting.
+
+    u16 count = 25000;
+    while (--count != 0) {
+        if ( (inb_cmos(CMOS_STATUS_A) & 0x80) == 0 )
+            return 0;
+    }
+    return 1; // update-in-progress never transitioned to 0
+}
+
+// get current clock count
+static void
+handle_1a00(struct bregs *regs)
+{
+    u32 ticks = GET_BDA(timer_counter);
+    regs->cx = ticks >> 16;
+    regs->dx = ticks;
+    regs->al = GET_BDA(timer_rollover);
+    SET_BDA(timer_rollover, 0); // reset flag
+    set_cf(regs, 0);
+}
+
+// Set Current Clock Count
+static void
+handle_1a01(struct bregs *regs)
+{
+    u32 ticks = (regs->cx << 16) | regs->dx;
+    SET_BDA(timer_counter, ticks);
+    SET_BDA(timer_rollover, 0); // reset flag
+    regs->ah = 0;
+    set_cf(regs, 0);
+}
+
+// Read CMOS Time
+static void
+handle_1a02(struct bregs *regs)
+{
+    if (rtc_updating()) {
+        set_cf(regs, 1);
+        return;
+    }
+
+    regs->dh = inb_cmos(CMOS_RTC_SECONDS);
+    regs->cl = inb_cmos(CMOS_RTC_MINUTES);
+    regs->ch = inb_cmos(CMOS_RTC_HOURS);
+    regs->dl = inb_cmos(CMOS_STATUS_B) & 0x01;
+    regs->ah = 0;
+    regs->al = regs->ch;
+    set_cf(regs, 0);
+}
+
+// Set CMOS Time
+static void
+handle_1a03(struct bregs *regs)
+{
+    // Using a debugger, I notice the following masking/setting
+    // of bits in Status Register B, by setting Reg B to
+    // a few values and getting its value after INT 1A was called.
+    //
+    //        try#1       try#2       try#3
+    // before 1111 1101   0111 1101   0000 0000
+    // after  0110 0010   0110 0010   0000 0010
+    //
+    // Bit4 in try#1 flipped in hardware (forced low) due to bit7=1
+    // My assumption: RegB = ((RegB & 01100000b) | 00000010b)
+    if (rtc_updating()) {
+        init_rtc();
+        // fall through as if an update were not in progress
+    }
+    outb_cmos(regs->dh, CMOS_RTC_SECONDS);
+    outb_cmos(regs->cl, CMOS_RTC_MINUTES);
+    outb_cmos(regs->ch, CMOS_RTC_HOURS);
+    // Set Daylight Savings time enabled bit to requested value
+    u8 val8 = (inb_cmos(CMOS_STATUS_B) & 0x60) | 0x02 | (regs->dl & 0x01);
+    outb_cmos(val8, CMOS_STATUS_B);
+    regs->ah = 0;
+    regs->al = val8; // val last written to Reg B
+    set_cf(regs, 0);
+}
+
+// Read CMOS Date
+static void
+handle_1a04(struct bregs *regs)
+{
+    regs->ah = 0;
+    if (rtc_updating()) {
+        set_cf(regs, 1);
+        return;
+    }
+    regs->cl = inb_cmos(CMOS_RTC_YEAR);
+    regs->dh = inb_cmos(CMOS_RTC_MONTH);
+    regs->dl = inb_cmos(CMOS_RTC_DAY_MONTH);
+    regs->ch = inb_cmos(CMOS_CENTURY);
+    regs->al = regs->ch;
+    set_cf(regs, 0);
+}
+
+// Set CMOS Date
+static void
+handle_1a05(struct bregs *regs)
+{
+    // Using a debugger, I notice the following masking/setting
+    // of bits in Status Register B, by setting Reg B to
+    // a few values and getting its value after INT 1A was called.
+    //
+    //        try#1       try#2       try#3       try#4
+    // before 1111 1101   0111 1101   0000 0010   0000 0000
+    // after  0110 1101   0111 1101   0000 0010   0000 0000
+    //
+    // Bit4 in try#1 flipped in hardware (forced low) due to bit7=1
+    // My assumption: RegB = (RegB & 01111111b)
+    if (rtc_updating()) {
+        init_rtc();
+        set_cf(regs, 1);
+        return;
+    }
+    outb_cmos(regs->cl, CMOS_RTC_YEAR);
+    outb_cmos(regs->dh, CMOS_RTC_MONTH);
+    outb_cmos(regs->dl, CMOS_RTC_DAY_MONTH);
+    outb_cmos(regs->ch, CMOS_CENTURY);
+    u8 val8 = inb_cmos(CMOS_STATUS_B) & 0x7f; // clear halt-clock bit
+    outb_cmos(val8, CMOS_STATUS_B);
+    regs->ah = 0;
+    regs->al = val8; // AL = val last written to Reg B
+    set_cf(regs, 0);
+}
+
+// Set Alarm Time in CMOS
+static void
+handle_1a06(struct bregs *regs)
+{
+    // Using a debugger, I notice the following masking/setting
+    // of bits in Status Register B, by setting Reg B to
+    // a few values and getting its value after INT 1A was called.
+    //
+    //        try#1       try#2       try#3
+    // before 1101 1111   0101 1111   0000 0000
+    // after  0110 1111   0111 1111   0010 0000
+    //
+    // Bit4 in try#1 flipped in hardware (forced low) due to bit7=1
+    // My assumption: RegB = ((RegB & 01111111b) | 00100000b)
+    u8 val8 = inb_cmos(CMOS_STATUS_B); // Get Status Reg B
+    regs->ax = 0;
+    if (val8 & 0x20) {
+        // Alarm interrupt enabled already
+        set_cf(regs, 1);
+        return;
+    }
+    if (rtc_updating()) {
+        init_rtc();
+        // fall through as if an update were not in progress
+    }
+    outb_cmos(regs->dh, CMOS_RTC_SECONDS_ALARM);
+    outb_cmos(regs->cl, CMOS_RTC_MINUTES_ALARM);
+    outb_cmos(regs->ch, CMOS_RTC_HOURS_ALARM);
+    outb(inb(PORT_PIC2_DATA) & ~PIC2_IRQ8, PORT_PIC2_DATA); // enable IRQ 8
+    // enable Status Reg B alarm bit, clear halt clock bit
+    outb_cmos((val8 & 0x7f) | 0x20, CMOS_STATUS_B);
+    set_cf(regs, 0);
+}
+
+// Turn off Alarm
+static void
+handle_1a07(struct bregs *regs)
+{
+    // Using a debugger, I notice the following masking/setting
+    // of bits in Status Register B, by setting Reg B to
+    // a few values and getting its value after INT 1A was called.
+    //
+    //        try#1       try#2       try#3       try#4
+    // before 1111 1101   0111 1101   0010 0000   0010 0010
+    // after  0100 0101   0101 0101   0000 0000   0000 0010
+    //
+    // Bit4 in try#1 flipped in hardware (forced low) due to bit7=1
+    // My assumption: RegB = (RegB & 01010111b)
+    u8 val8 = inb_cmos(CMOS_STATUS_B); // Get Status Reg B
+    // clear clock-halt bit, disable alarm bit
+    outb_cmos(val8 & 0x57, CMOS_STATUS_B); // disable alarm bit
+    regs->ah = 0;
+    regs->al = val8; // val last written to Reg B
+    set_cf(regs, 0);
+}
+
+static void
+handle_1ab1(struct bregs *regs)
+{
+    // XXX - pcibios stuff
+    set_cf(regs, 1);
+}
+
+// Unsupported
+static void
+handle_1aXX(struct bregs *regs)
+{
+    set_cf(regs, 1);
+}
 
 // INT 1Ah Time-of-day Service Entry Point
 void VISIBLE
 handle_1a(struct bregs *regs)
 {
-    debug_enter(regs);
-    set_cf(regs, 1);
+    //debug_enter(regs);
+    switch (regs->ah) {
+    case 0x00: handle_1a00(regs); break;
+    case 0x01: handle_1a01(regs); break;
+    case 0x02: handle_1a02(regs); break;
+    case 0x03: handle_1a03(regs); break;
+    case 0x04: handle_1a04(regs); break;
+    case 0x05: handle_1a05(regs); break;
+    case 0x06: handle_1a06(regs); break;
+    case 0x07: handle_1a07(regs); break;
+    case 0xb1: handle_1ab1(regs); break;
+    default:   handle_1aXX(regs); break;
+    }
+    debug_exit(regs);
 }
 
 // User Timer Tick
diff --git a/src/cmos.h b/src/cmos.h
index 33cde16..0295fa3 100644
--- a/src/cmos.h
+++ b/src/cmos.h
@@ -14,12 +14,20 @@
 #define CMOS_RTC_MINUTES_ALARM   0x03
 #define CMOS_RTC_HOURS           0x04
 #define CMOS_RTC_HOURS_ALARM     0x05
+#define CMOS_RTC_DAY_WEEK        0x06
+#define CMOS_RTC_DAY_MONTH       0x07
+#define CMOS_RTC_MONTH           0x08
+#define CMOS_RTC_YEAR            0x09
+#define CMOS_STATUS_A            0x0a
 #define CMOS_STATUS_B            0x0b
+#define CMOS_STATUS_C            0x0c
+#define CMOS_STATUS_D            0x0d
 #define CMOS_RESET_CODE          0x0f
 #define CMOS_FLOPPY_DRIVE_TYPE   0x10
 #define CMOS_EQUIPMENT_INFO      0x14
 #define CMOS_EXTMEM_LOW          0x30
 #define CMOS_EXTMEM_HIGH         0x31
+#define CMOS_CENTURY             0x32
 #define CMOS_EXTMEM2_LOW         0x34
 #define CMOS_EXTMEM2_HIGH        0x35
 
diff --git a/src/disk.c b/src/disk.c
index 8901b7d..144e42f 100644
--- a/src/disk.c
+++ b/src/disk.c
@@ -44,7 +44,7 @@ handle_40(struct bregs *regs)
 void VISIBLE
 handle_13(struct bregs *regs)
 {
-    debug_enter(regs);
+    //debug_enter(regs);
     u8 drive = regs->dl;
 #if BX_ELTORITO_BOOT
     if (regs->ah >= 0x4a || regs->ah <= 0x4d) {
diff --git a/src/disk.h b/src/disk.h
index d7b3547..04600f5 100644
--- a/src/disk.h
+++ b/src/disk.h
@@ -14,19 +14,6 @@
 #define DISK_RET_ETIMEOUT    0x80
 #define DISK_RET_EMEDIA      0xC0
 
-static inline void
-eoi_master_pic()
-{
-    outb(PIC1_IRQ5, PORT_PIC1);
-}
-
-static inline void
-eoi_both_pics()
-{
-    outb(PIC2_IRQ13, PORT_PIC2);
-    eoi_master_pic();
-}
-
 // floppy.c
 struct bregs;
 void floppy_13(struct bregs *regs, u8 drive);
diff --git a/src/farptr.h b/src/farptr.h
index 1c3044b..34c3ac2 100644
--- a/src/farptr.h
+++ b/src/farptr.h
@@ -29,7 +29,7 @@
     __asm__ __volatile__("movl %0, %%" #SEG ":%1"       \
                          : : "r"(value), "m"(var))
 
-#define GET_VAR(seg, var) ({                                    \
+#define __GET_VAR(seg, var) ({                                  \
     typeof(var) __val;                                          \
     if (__builtin_types_compatible_p(typeof(__val), u8))        \
         __val = READ8_SEG(seg, var);                            \
@@ -39,7 +39,7 @@
         __val = READ32_SEG(seg, var);                           \
     __val; })
 
-#define SET_VAR(seg, var, val) do {                               \
+#define __SET_VAR(seg, var, val) do {                             \
         if (__builtin_types_compatible_p(typeof(var), u8))        \
             WRITE8_SEG(seg, var, (val));                          \
         else if (__builtin_types_compatible_p(typeof(var), u16))  \
@@ -48,10 +48,30 @@
             WRITE32_SEG(seg, var, (val));                         \
     } while (0)
 
-#define SET_SEG(SEG, value)                                     \
+#define __SET_SEG(SEG, value)                                   \
     __asm__ __volatile__("movw %w0, %%" #SEG : : "r"(value))
-#define GET_SEG(SEG) ({                                         \
+#define __GET_SEG(SEG) ({                                       \
     u16 __seg;                                                  \
     __asm__ __volatile__("movw %%" #SEG ", %w0" : "=r"(__seg)); \
     __seg;})
 
+#ifdef MODE16
+#define GET_VAR(seg, var) __GET_VAR(seg, var)
+#define SET_VAR(seg, var, val) __SET_VAR(seg, var, val)
+#define SET_SEG(SEG, value) __SET_SEG(SEG, value)
+#define GET_SEG(SEG) __GET_SEG(SEG)
+#else
+// In 32-bit mode there is no need to mess with the segments.
+#define GET_VAR(seg, var) (var)
+#define SET_VAR(seg, var, val) (var) = (val)
+#define SET_SEG(SEG, value) ((void)(value))
+#define GET_SEG(SEG) 0
+#endif
+
+#define GET_FARVAR(seg, var) ({                 \
+    SET_SEG(ES, (seg));                         \
+    GET_VAR(ES, (var)); })
+#define SET_FARVAR(seg, var, val) do {          \
+        SET_SEG(ES, (seg));                     \
+        SET_VAR(ES, (var), val);                \
+    } while (0)
diff --git a/src/floppy.c b/src/floppy.c
index 5e70df2..fb4e2b5 100644
--- a/src/floppy.c
+++ b/src/floppy.c
@@ -727,7 +727,7 @@ floppy_13(struct bregs *regs, u8 drive)
 void VISIBLE
 handle_0e(struct bregs *regs)
 {
-    debug_enter(regs);
+    //debug_enter(regs);
     if ((inb(PORT_FD_STATUS) & 0xc0) != 0xc0) {
         outb(0x08, PORT_FD_DATA); // sense interrupt status
         while ((inb(PORT_FD_STATUS) & 0xc0) != 0xc0)
diff --git a/src/ioport.h b/src/ioport.h
index 344803e..030a8ec 100644
--- a/src/ioport.h
+++ b/src/ioport.h
@@ -20,9 +20,12 @@
 #define PORT_PIT_COUNTER1      0x0041
 #define PORT_PIT_COUNTER2      0x0042
 #define PORT_PIT_MODE          0x0043
+#define PORT_KBD_DATA          0x0060
 #define PORT_KBD_CTRLB         0x0061
+#define PORT_KBD_STATUS        0x0064
 #define PORT_CMOS_INDEX        0x0070
 #define PORT_CMOS_DATA         0x0071
+#define PORT_DIAG              0x0080
 #define PORT_DMA_PAGE_2        0x0081
 #define PORT_A20               0x0092
 #define PORT_PIC2              0x00a0
diff --git a/src/kbd.c b/src/kbd.c
index bcc1a59..4115aa7 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -8,28 +8,562 @@
 #include "biosvar.h" // struct bregs
 #include "util.h" // debug_enter
 
-void
-handle_15c2(struct bregs *regs)
+static u8
+enqueue_key(u8 scan_code, u8 ascii_code)
 {
+    u16 buffer_start = GET_BDA(kbd_buf_start_offset);
+    u16 buffer_end   = GET_BDA(kbd_buf_end_offset);
+
+    u16 buffer_head = GET_BDA(kbd_buf_head);
+    u16 buffer_tail = GET_BDA(kbd_buf_tail);
+
+    u16 temp_tail = buffer_tail;
+    buffer_tail += 2;
+    if (buffer_tail >= buffer_end)
+        buffer_tail = buffer_start;
+
+    if (buffer_tail == buffer_head)
+        return 0;
+
+    SET_FARVAR(0x0000, *(u8*)(temp_tail+0x400+0), ascii_code);
+    SET_FARVAR(0x0000, *(u8*)(temp_tail+0x400+1), scan_code);
+    SET_BDA(kbd_buf_tail, buffer_tail);
+    return 1;
+}
+
+static u8
+dequeue_key(u8 *scan_code, u8 *ascii_code, u8 incr)
+{
+    u16 buffer_head;
+    u16 buffer_tail;
+    for (;;) {
+        buffer_head = GET_BDA(kbd_buf_head);
+        buffer_tail = GET_BDA(kbd_buf_tail);
+
+        if (buffer_head != buffer_tail)
+            break;
+        if (!incr)
+            return 0;
+    }
+
+    *ascii_code = GET_FARVAR(0x0000, *(u8*)(buffer_head+0x400+0));
+    *scan_code  = GET_FARVAR(0x0000, *(u8*)(buffer_head+0x400+1));
+
+    if (incr) {
+        u16 buffer_start = GET_BDA(kbd_buf_start_offset);
+        u16 buffer_end   = GET_BDA(kbd_buf_end_offset);
+
+        buffer_head += 2;
+        if (buffer_head >= buffer_end)
+            buffer_head = buffer_start;
+        SET_BDA(kbd_buf_head, buffer_head);
+    }
+    return 1;
+}
+
+// read keyboard input
+static void
+handle_1600(struct bregs *regs)
+{
+    u8 scan_code, ascii_code;
+    dequeue_key(&scan_code, &ascii_code, 1);
+    if (scan_code != 0 && ascii_code == 0xF0)
+        ascii_code = 0;
+    else if (ascii_code == 0xE0)
+        ascii_code = 0;
+    regs->ax = (scan_code << 8) | ascii_code;
+}
+
+// check keyboard status
+static void
+handle_1601(struct bregs *regs)
+{
+    u8 scan_code, ascii_code;
+    if (!dequeue_key(&scan_code, &ascii_code, 0)) {
+        regs->flags |= F_ZF;
+        return;
+    }
+    if (scan_code != 0 && ascii_code == 0xF0)
+        ascii_code = 0;
+    else if (ascii_code == 0xE0)
+        ascii_code = 0;
+    regs->ax = (scan_code << 8) | ascii_code;
+    regs->flags &= ~F_ZF;
+}
+
+// get shift flag status
+static void
+handle_1602(struct bregs *regs)
+{
+    regs->al = GET_BDA(kbd_flag0);
+}
+
+// store key-stroke into buffer
+static void
+handle_1605(struct bregs *regs)
+{
+    regs->al = !enqueue_key(regs->ch, regs->cl);
+}
+
+// GET KEYBOARD FUNCTIONALITY
+static void
+handle_1609(struct bregs *regs)
+{
+    // bit Bochs Description
+    //  7    0   reserved
+    //  6    0   INT 16/AH=20h-22h supported (122-key keyboard support)
+    //  5    1   INT 16/AH=10h-12h supported (enhanced keyboard support)
+    //  4    1   INT 16/AH=0Ah supported
+    //  3    0   INT 16/AX=0306h supported
+    //  2    0   INT 16/AX=0305h supported
+    //  1    0   INT 16/AX=0304h supported
+    //  0    0   INT 16/AX=0300h supported
+    //
+    regs->al = 0x30;
+}
+
+// GET KEYBOARD ID
+static void
+handle_160a(struct bregs *regs)
+{
+    outb(0xf2, PORT_KBD_DATA);
+    /* Wait for data */
+    u16 max=0xffff;
+    while ( ((inb(PORT_KBD_STATUS) & 0x01) == 0) && (--max>0) )
+        outb(0x00, PORT_DIAG);
+    if (!max)
+        return;
+    if (inb(PORT_KBD_DATA) != 0xfa) {
+        regs->bx = 0;
+        return;
+    }
+    u16 kbd_code = 0;
+    u8 count = 2;
+    do {
+        max=0xffff;
+        while ( ((inb(PORT_KBD_STATUS) & 0x01) == 0) && (--max>0) )
+            outb(0x00, PORT_DIAG);
+        if (max>0x0) {
+            kbd_code >>= 8;
+            kbd_code |= (inb(PORT_KBD_DATA) << 8);
+        }
+    } while (--count>0);
+    regs->bx = kbd_code;
+}
+
+// read MF-II keyboard input
+static void
+handle_1610(struct bregs *regs)
+{
+    u8 scan_code, ascii_code;
+    dequeue_key(&scan_code, &ascii_code, 1);
+    if (scan_code != 0 && ascii_code == 0xF0)
+        ascii_code = 0;
+    regs->ax = (scan_code << 8) | ascii_code;
+}
+
+// check MF-II keyboard status
+static void
+handle_1611(struct bregs *regs)
+{
+    u8 scan_code, ascii_code;
+    if (!dequeue_key(&scan_code, &ascii_code, 0)) {
+        regs->flags |= F_ZF;
+        return;
+    }
+    if (scan_code != 0 && ascii_code == 0xF0)
+        ascii_code = 0;
+    regs->ax = (scan_code << 8) | ascii_code;
+    regs->flags &= ~F_ZF;
+}
+
+// get extended keyboard status
+static void
+handle_1612(struct bregs *regs)
+{
+    regs->al = GET_BDA(kbd_flag0);
+    regs->ah = (GET_BDA(kbd_flag1) & 0x73) | (GET_BDA(kbd_mode) & 0x0c);
+    //BX_DEBUG_INT16("int16: func 12 sending %04x\n",AX);
+}
+
+static void
+handle_166f(struct bregs *regs)
+{
+    if (regs->al == 0x08)
+        // unsupported, aka normal keyboard
+        regs->ah = 2;
+}
+
+// keyboard capability check called by DOS 5.0+ keyb
+static void
+handle_1692(struct bregs *regs)
+{
+    // function int16 ah=0x10-0x12 supported
+    regs->ah = 0x80;
+}
+
+// 122 keys capability check called by DOS 5.0+ keyb
+static void
+handle_16a2(struct bregs *regs)
+{
+    // don't change AH : function int16 ah=0x20-0x22 NOT supported
+}
+
+static void
+set_leds()
+{
+    u8 shift_flags = GET_BDA(kbd_flag0);
+    u8 led_flags = GET_BDA(kbd_led);
+    if (((shift_flags >> 4) & 0x07) ^ ((led_flags & 0x07) == 0))
+        return;
+
+    outb(0xed, PORT_KBD_DATA);
+    while ((inb(PORT_KBD_STATUS) & 0x01) == 0)
+        outb(0x21, PORT_DIAG);
+    if (inb(PORT_KBD_DATA) == 0xfa) {
+        led_flags &= 0xf8;
+        led_flags |= (shift_flags >> 4) & 0x07;
+        outb(led_flags & 0x07, PORT_KBD_DATA);
+        while ((inb(PORT_KBD_STATUS) & 0x01) == 0)
+            outb(0x21, PORT_DIAG);
+        inb(PORT_KBD_DATA);
+        SET_BDA(kbd_led, led_flags);
+    }
 }
 
 // INT 16h Keyboard Service Entry Point
 void VISIBLE
 handle_16(struct bregs *regs)
 {
-    //debug_enter(regs);
+//    debug_enter(regs);
+
+    set_leds();
+
+    irq_enable();
+
+    switch (regs->ah) {
+    case 0x00: handle_1600(regs); break;
+    case 0x01: handle_1601(regs); break;
+    case 0x02: handle_1602(regs); break;
+    case 0x05: handle_1605(regs); break;
+    case 0x09: handle_1609(regs); break;
+    case 0x0a: handle_160a(regs); break;
+    case 0x10: handle_1610(regs); break;
+    case 0x11: handle_1611(regs); break;
+    case 0x12: handle_1612(regs); break;
+    case 0x92: handle_1692(regs); break;
+    case 0xa2: handle_16a2(regs); break;
+    case 0x6f: handle_166f(regs); break;
+    }
 }
 
-// INT09h : Keyboard Hardware Service Entry Point
-void VISIBLE
-handle_09(struct bregs *regs)
+#define none 0
+#define MAX_SCAN_CODE 0x58
+
+static struct scaninfo {
+    u16 normal;
+    u16 shift;
+    u16 control;
+    u16 alt;
+    u8 lock_flags;
+} scan_to_scanascii[MAX_SCAN_CODE + 1] = {
+    {   none,   none,   none,   none, none },
+    { 0x011b, 0x011b, 0x011b, 0x0100, none }, /* escape */
+    { 0x0231, 0x0221,   none, 0x7800, none }, /* 1! */
+    { 0x0332, 0x0340, 0x0300, 0x7900, none }, /* 2@ */
+    { 0x0433, 0x0423,   none, 0x7a00, none }, /* 3# */
+    { 0x0534, 0x0524,   none, 0x7b00, none }, /* 4$ */
+    { 0x0635, 0x0625,   none, 0x7c00, none }, /* 5% */
+    { 0x0736, 0x075e, 0x071e, 0x7d00, none }, /* 6^ */
+    { 0x0837, 0x0826,   none, 0x7e00, none }, /* 7& */
+    { 0x0938, 0x092a,   none, 0x7f00, none }, /* 8* */
+    { 0x0a39, 0x0a28,   none, 0x8000, none }, /* 9( */
+    { 0x0b30, 0x0b29,   none, 0x8100, none }, /* 0) */
+    { 0x0c2d, 0x0c5f, 0x0c1f, 0x8200, none }, /* -_ */
+    { 0x0d3d, 0x0d2b,   none, 0x8300, none }, /* =+ */
+    { 0x0e08, 0x0e08, 0x0e7f,   none, none }, /* backspace */
+    { 0x0f09, 0x0f00,   none,   none, none }, /* tab */
+    { 0x1071, 0x1051, 0x1011, 0x1000, 0x40 }, /* Q */
+    { 0x1177, 0x1157, 0x1117, 0x1100, 0x40 }, /* W */
+    { 0x1265, 0x1245, 0x1205, 0x1200, 0x40 }, /* E */
+    { 0x1372, 0x1352, 0x1312, 0x1300, 0x40 }, /* R */
+    { 0x1474, 0x1454, 0x1414, 0x1400, 0x40 }, /* T */
+    { 0x1579, 0x1559, 0x1519, 0x1500, 0x40 }, /* Y */
+    { 0x1675, 0x1655, 0x1615, 0x1600, 0x40 }, /* U */
+    { 0x1769, 0x1749, 0x1709, 0x1700, 0x40 }, /* I */
+    { 0x186f, 0x184f, 0x180f, 0x1800, 0x40 }, /* O */
+    { 0x1970, 0x1950, 0x1910, 0x1900, 0x40 }, /* P */
+    { 0x1a5b, 0x1a7b, 0x1a1b,   none, none }, /* [{ */
+    { 0x1b5d, 0x1b7d, 0x1b1d,   none, none }, /* ]} */
+    { 0x1c0d, 0x1c0d, 0x1c0a,   none, none }, /* Enter */
+    {   none,   none,   none,   none, none }, /* L Ctrl */
+    { 0x1e61, 0x1e41, 0x1e01, 0x1e00, 0x40 }, /* A */
+    { 0x1f73, 0x1f53, 0x1f13, 0x1f00, 0x40 }, /* S */
+    { 0x2064, 0x2044, 0x2004, 0x2000, 0x40 }, /* D */
+    { 0x2166, 0x2146, 0x2106, 0x2100, 0x40 }, /* F */
+    { 0x2267, 0x2247, 0x2207, 0x2200, 0x40 }, /* G */
+    { 0x2368, 0x2348, 0x2308, 0x2300, 0x40 }, /* H */
+    { 0x246a, 0x244a, 0x240a, 0x2400, 0x40 }, /* J */
+    { 0x256b, 0x254b, 0x250b, 0x2500, 0x40 }, /* K */
+    { 0x266c, 0x264c, 0x260c, 0x2600, 0x40 }, /* L */
+    { 0x273b, 0x273a,   none,   none, none }, /* ;: */
+    { 0x2827, 0x2822,   none,   none, none }, /* '" */
+    { 0x2960, 0x297e,   none,   none, none }, /* `~ */
+    {   none,   none,   none,   none, none }, /* L shift */
+    { 0x2b5c, 0x2b7c, 0x2b1c,   none, none }, /* |\ */
+    { 0x2c7a, 0x2c5a, 0x2c1a, 0x2c00, 0x40 }, /* Z */
+    { 0x2d78, 0x2d58, 0x2d18, 0x2d00, 0x40 }, /* X */
+    { 0x2e63, 0x2e43, 0x2e03, 0x2e00, 0x40 }, /* C */
+    { 0x2f76, 0x2f56, 0x2f16, 0x2f00, 0x40 }, /* V */
+    { 0x3062, 0x3042, 0x3002, 0x3000, 0x40 }, /* B */
+    { 0x316e, 0x314e, 0x310e, 0x3100, 0x40 }, /* N */
+    { 0x326d, 0x324d, 0x320d, 0x3200, 0x40 }, /* M */
+    { 0x332c, 0x333c,   none,   none, none }, /* ,< */
+    { 0x342e, 0x343e,   none,   none, none }, /* .> */
+    { 0x352f, 0x353f,   none,   none, none }, /* /? */
+    {   none,   none,   none,   none, none }, /* R Shift */
+    { 0x372a, 0x372a,   none,   none, none }, /* * */
+    {   none,   none,   none,   none, none }, /* L Alt */
+    { 0x3920, 0x3920, 0x3920, 0x3920, none }, /* space */
+    {   none,   none,   none,   none, none }, /* caps lock */
+    { 0x3b00, 0x5400, 0x5e00, 0x6800, none }, /* F1 */
+    { 0x3c00, 0x5500, 0x5f00, 0x6900, none }, /* F2 */
+    { 0x3d00, 0x5600, 0x6000, 0x6a00, none }, /* F3 */
+    { 0x3e00, 0x5700, 0x6100, 0x6b00, none }, /* F4 */
+    { 0x3f00, 0x5800, 0x6200, 0x6c00, none }, /* F5 */
+    { 0x4000, 0x5900, 0x6300, 0x6d00, none }, /* F6 */
+    { 0x4100, 0x5a00, 0x6400, 0x6e00, none }, /* F7 */
+    { 0x4200, 0x5b00, 0x6500, 0x6f00, none }, /* F8 */
+    { 0x4300, 0x5c00, 0x6600, 0x7000, none }, /* F9 */
+    { 0x4400, 0x5d00, 0x6700, 0x7100, none }, /* F10 */
+    {   none,   none,   none,   none, none }, /* Num Lock */
+    {   none,   none,   none,   none, none }, /* Scroll Lock */
+    { 0x4700, 0x4737, 0x7700,   none, 0x20 }, /* 7 Home */
+    { 0x4800, 0x4838,   none,   none, 0x20 }, /* 8 UP */
+    { 0x4900, 0x4939, 0x8400,   none, 0x20 }, /* 9 PgUp */
+    { 0x4a2d, 0x4a2d,   none,   none, none }, /* - */
+    { 0x4b00, 0x4b34, 0x7300,   none, 0x20 }, /* 4 Left */
+    { 0x4c00, 0x4c35,   none,   none, 0x20 }, /* 5 */
+    { 0x4d00, 0x4d36, 0x7400,   none, 0x20 }, /* 6 Right */
+    { 0x4e2b, 0x4e2b,   none,   none, none }, /* + */
+    { 0x4f00, 0x4f31, 0x7500,   none, 0x20 }, /* 1 End */
+    { 0x5000, 0x5032,   none,   none, 0x20 }, /* 2 Down */
+    { 0x5100, 0x5133, 0x7600,   none, 0x20 }, /* 3 PgDn */
+    { 0x5200, 0x5230,   none,   none, 0x20 }, /* 0 Ins */
+    { 0x5300, 0x532e,   none,   none, 0x20 }, /* Del */
+    {   none,   none,   none,   none, none },
+    {   none,   none,   none,   none, none },
+    { 0x565c, 0x567c,   none,   none, none }, /* \| */
+    { 0x5700, 0x5700,   none,   none, none }, /* F11 */
+    { 0x5800, 0x5800,   none,   none, none }  /* F12 */
+};
+
+static void
+process_key(u8 scancode)
 {
-    debug_enter(regs);
+    u8 shift_flags = GET_BDA(kbd_flag0);
+    u8 mf2_flags = GET_BDA(kbd_flag1);
+    u8 mf2_state = GET_BDA(kbd_mode);
+
+    switch (scancode) {
+    case 0x00:
+        BX_INFO("KBD: int09 handler: AL=0\n");
+        return;
+
+    case 0x3a: /* Caps Lock press */
+        shift_flags ^= 0x40;
+        SET_BDA(kbd_flag0, shift_flags);
+        mf2_flags |= 0x40;
+        SET_BDA(kbd_flag1, mf2_flags);
+        break;
+    case 0xba: /* Caps Lock release */
+        mf2_flags &= ~0x40;
+        SET_BDA(kbd_flag1, mf2_flags);
+        break;
+
+    case 0x2a: /* L Shift press */
+        shift_flags |= 0x02;
+        SET_BDA(kbd_flag0, shift_flags);
+        break;
+    case 0xaa: /* L Shift release */
+        shift_flags &= ~0x02;
+        SET_BDA(kbd_flag0, shift_flags);
+        break;
+
+    case 0x36: /* R Shift press */
+        shift_flags |= 0x01;
+        SET_BDA(kbd_flag0, shift_flags);
+        break;
+    case 0xb6: /* R Shift release */
+        shift_flags &= ~0x01;
+        SET_BDA(kbd_flag0, shift_flags);
+        break;
+
+    case 0x1d: /* Ctrl press */
+        if ((mf2_state & 0x01) == 0) {
+            shift_flags |= 0x04;
+            SET_BDA(kbd_flag0, shift_flags);
+            if (mf2_state & 0x02) {
+                mf2_state |= 0x04;
+                SET_BDA(kbd_mode, mf2_state);
+            } else {
+                mf2_flags |= 0x01;
+                SET_BDA(kbd_flag1, mf2_flags);
+            }
+        }
+        break;
+    case 0x9d: /* Ctrl release */
+        if ((mf2_state & 0x01) == 0) {
+            shift_flags &= ~0x04;
+            SET_BDA(kbd_flag0, shift_flags);
+            if (mf2_state & 0x02) {
+                mf2_state &= ~0x04;
+                SET_BDA(kbd_mode, mf2_state);
+            } else {
+                mf2_flags &= ~0x01;
+                SET_BDA(kbd_flag1, mf2_flags);
+            }
+        }
+        break;
+
+    case 0x38: /* Alt press */
+        shift_flags |= 0x08;
+        SET_BDA(kbd_flag0, shift_flags);
+        if (mf2_state & 0x02) {
+            mf2_state |= 0x08;
+            SET_BDA(kbd_mode, mf2_state);
+        } else {
+            mf2_flags |= 0x02;
+            SET_BDA(kbd_flag1, mf2_flags);
+        }
+        break;
+    case 0xb8: /* Alt release */
+        shift_flags &= ~0x08;
+        SET_BDA(kbd_flag0, shift_flags);
+        if (mf2_state & 0x02) {
+            mf2_state &= ~0x08;
+            SET_BDA(kbd_mode, mf2_state);
+        } else {
+            mf2_flags &= ~0x02;
+            SET_BDA(kbd_flag1, mf2_flags);
+        }
+        break;
+
+    case 0x45: /* Num Lock press */
+        if ((mf2_state & 0x03) == 0) {
+            mf2_flags |= 0x20;
+            SET_BDA(kbd_flag1, mf2_flags);
+            shift_flags ^= 0x20;
+            SET_BDA(kbd_flag0, shift_flags);
+        }
+        break;
+    case 0xc5: /* Num Lock release */
+        if ((mf2_state & 0x03) == 0) {
+            mf2_flags &= ~0x20;
+            SET_BDA(kbd_flag1, mf2_flags);
+        }
+        break;
+
+    case 0x46: /* Scroll Lock press */
+        mf2_flags |= 0x10;
+        SET_BDA(kbd_flag1, mf2_flags);
+        shift_flags ^= 0x10;
+        SET_BDA(kbd_flag0, shift_flags);
+        break;
+    case 0xc6: /* Scroll Lock release */
+        mf2_flags &= ~0x10;
+        SET_BDA(kbd_flag1, mf2_flags);
+        break;
+
+    case 0xe0:
+        // Extended key
+        SETBITS_BDA(kbd_mode, 0x02);
+        return;
+    case 0xe1:
+        // Pause key
+        SETBITS_BDA(kbd_mode, 0x01);
+        return;
+
+    default:
+        if (scancode & 0x80) {
+            break; /* toss key releases ... */
+        }
+        if (scancode > MAX_SCAN_CODE) {
+            BX_INFO("KBD: int09h_handler(): unknown scancode read: 0x%02x!\n", scancode);
+            return;
+        }
+        u8 asciicode;
+        struct scaninfo *info = &scan_to_scanascii[scancode];
+        if (shift_flags & 0x08) { /* ALT */
+            asciicode = GET_VAR(CS, info->alt);
+            scancode = GET_VAR(CS, info->alt) >> 8;
+        } else if (shift_flags & 0x04) { /* CONTROL */
+            asciicode = GET_VAR(CS, info->control);
+            scancode = GET_VAR(CS, info->control) >> 8;
+        } else if (((mf2_state & 0x02) > 0) && ((scancode >= 0x47) && (scancode <= 0x53))) {
+            /* extended keys handling */
+            asciicode = 0xe0;
+            scancode = GET_VAR(CS, info->normal) >> 8;
+        } else if (shift_flags & 0x03) { /* LSHIFT + RSHIFT */
+            /* check if lock state should be ignored
+             * because a SHIFT key are pressed */
+
+            if (shift_flags & GET_VAR(CS, info->lock_flags)) {
+                asciicode = GET_VAR(CS, info->normal);
+                scancode = GET_VAR(CS, info->normal) >> 8;
+            } else {
+                asciicode = GET_VAR(CS, info->shift);
+                scancode = GET_VAR(CS, info->shift) >> 8;
+            }
+        } else {
+            /* check if lock is on */
+            if (shift_flags & GET_VAR(CS, info->lock_flags)) {
+                asciicode = GET_VAR(CS, info->shift);
+                scancode = GET_VAR(CS, info->shift) >> 8;
+            } else {
+                asciicode = GET_VAR(CS, info->normal);
+                scancode = GET_VAR(CS, info->normal) >> 8;
+            }
+        }
+        if (scancode==0 && asciicode==0) {
+            BX_INFO("KBD: int09h_handler(): scancode & asciicode are zero?\n");
+        }
+        enqueue_key(scancode, asciicode);
+        break;
+    }
+    if ((scancode & 0x7f) != 0x1d) {
+        mf2_state &= ~0x01;
+    }
+    mf2_state &= ~0x02;
+    SET_BDA(kbd_mode, mf2_state);
 }
 
-// INT74h : PS/2 mouse hardware interrupt
+// INT09h : Keyboard Hardware Service Entry Point
 void VISIBLE
-handle_74(struct bregs *regs)
+handle_09(struct bregs *regs)
 {
-    debug_enter(regs);
+//    debug_enter(regs);
+
+    outb(0x0b, PORT_PIC1);
+    if ((inb(PORT_PIC1) & 0x02) == 0)
+        return;
+
+    // disable keyboard
+    outb(0xad, PORT_KBD_STATUS);
+
+    // read key from keyboard controller
+    u8 key = inb(PORT_KBD_DATA);
+    irq_enable();
+#if 0
+    if (CONFIG_KBD_CALL_INT15_4F) {
+        // XXX
+    }
+#endif
+    process_key(key);
+
+    irq_disable();
+    eoi_master_pic();
+
+    // enable keyboard
+    outb(0xae, PORT_KBD_STATUS);
 }
diff --git a/src/mouse.c b/src/mouse.c
new file mode 100644
index 0000000..6364c68
--- /dev/null
+++ b/src/mouse.c
@@ -0,0 +1,35 @@
+// 16bit code to handle mouse events.
+//
+// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2002  MandrakeSoft S.A.
+//
+// This file may be distributed under the terms of the GNU GPLv3 license.
+
+#include "biosvar.h" // struct bregs
+#include "util.h" // debug_enter
+
+void
+handle_15c2(struct bregs *regs)
+{
+}
+
+static u8
+int74_function()
+{
+    return 0;
+}
+
+// INT74h : PS/2 mouse hardware interrupt
+void VISIBLE
+handle_74(struct bregs *regs)
+{
+    debug_enter(regs);
+
+    irq_enable();
+    u8 ret = int74_function();
+    if (ret) {
+        // XXX - far call to ptr at ebda:0022
+    }
+    irq_disable();
+    eoi_both_pics();
+}
diff --git a/src/output.c b/src/output.c
index 9670163..efb6411 100644
--- a/src/output.c
+++ b/src/output.c
@@ -55,7 +55,7 @@ putuint(u16 action, u32 val)
     char *d = &buf[sizeof(buf) - 1];
     *d-- = '\0';
     for (;;) {
-        *d = val % 10;
+        *d = (val % 10) + '0';
         val /= 10;
         if (!val)
             break;
@@ -147,14 +147,13 @@ __debug_enter(const char *fname, struct bregs *regs)
     bprintf(0, "enter %s: a=%x b=%x c=%x d=%x si=%x di=%x\n"
             , fname, regs->eax, regs->ebx, regs->ecx, regs->edx
             , regs->esi, regs->edi);
-    bprintf(0, "&=%x ds=%x es=%x bp=%x sp=%x ip=%x cs=%x f=%x\n"
-            , (u32)regs, regs->ds, regs->es, regs->ebp, regs->esp
-            , regs->ip, regs->cs, regs->flags);
 }
 
 void
 __debug_exit(const char *fname, struct bregs *regs)
 {
+    if (! (regs->flags & F_CF))
+        return;
     bprintf(0, "exit %s: a=%x b=%x c=%x d=%x s=%x i=%x\n"
             , fname, regs->eax, regs->ebx, regs->ecx, regs->edx
             , regs->esi, regs->edi);
diff --git a/src/post.c b/src/post.c
index 8d35f97..a6dd424 100644
--- a/src/post.c
+++ b/src/post.c
@@ -80,19 +80,147 @@ pit_setup()
     outb(0x0, PORT_PIT_COUNTER0);
 }
 
+//--------------------------------------------------------------------------
+// keyboard_panic
+//--------------------------------------------------------------------------
 static void
-kbd_init()
+keyboard_panic(u16 status)
 {
+  // If you're getting a 993 keyboard panic here,
+  // please see the comment in keyboard_init
+
+  BX_PANIC("Keyboard error:%u\n",status);
+}
+
+static void
+kbd_wait(u8 mask, u8 code)
+{
+    u16 max = 0xffff;
+    while ( ((inb(PORT_KBD_STATUS) & mask) == 0) && (--max>0) )
+        outb(code, PORT_DIAG);
+    if (!max)
+        keyboard_panic(code);
+}
+
+static inline void kbd_flush(u8 code) {
+    kbd_wait(0x02, code);
+}
+static inline void kbd_waitdata(u8 code) {
+    kbd_wait(0x01, code);
+}
+
+//--------------------------------------------------------------------------
+// keyboard_init
+//--------------------------------------------------------------------------
+// this file is based on LinuxBIOS implementation of keyboard.c
+// could convert to #asm to gain space
+static void
+keyboard_init()
+{
+    /* ------------------- Flush buffers ------------------------*/
+    /* Wait until buffer is empty */
+    kbd_flush(0x00);
+
+    /* flush incoming keys */
+    u16 max=0x2000;
+    while (--max > 0) {
+        outb(0x00, PORT_DIAG);
+        if (inb(PORT_KBD_STATUS) & 0x01) {
+            inb(PORT_KBD_DATA);
+            max = 0x2000;
+            }
+        }
+
+    // Due to timer issues, and if the IPS setting is > 15000000,
+    // the incoming keys might not be flushed here. That will
+    // cause a panic a few lines below.  See sourceforge bug report :
+    // [ 642031 ] FATAL: Keyboard RESET error:993
+
+    /* ------------------- controller side ----------------------*/
+    /* send cmd = 0xAA, self test 8042 */
+    outb(0xaa, PORT_KBD_STATUS);
+
+    kbd_flush(0x00);
+    kbd_waitdata(0x01);
+
+    /* read self-test result, 0x55 should be returned from 0x60 */
+    if ((inb(PORT_KBD_DATA) != 0x55))
+        keyboard_panic(991);
+
+    /* send cmd = 0xAB, keyboard interface test */
+    outb(0xab, PORT_KBD_STATUS);
+
+    kbd_flush(0x10);
+    kbd_waitdata(0x11);
+
+    /* read keyboard interface test result, */
+    /* 0x00 should be returned form 0x60 */
+    if ((inb(PORT_KBD_DATA) != 0x00))
+        keyboard_panic(992);
+
+    /* Enable Keyboard clock */
+    outb(0xae, PORT_KBD_STATUS);
+    outb(0xa8, PORT_KBD_STATUS);
+
+    /* ------------------- keyboard side ------------------------*/
+    /* reset kerboard and self test  (keyboard side) */
+    outb(0xff, PORT_KBD_DATA);
+
+    kbd_flush(0x20);
+    kbd_waitdata(0x21);
+
+    /* keyboard should return ACK */
+    if ((inb(PORT_KBD_DATA) != 0xfa))
+        keyboard_panic(993);
+
+    kbd_waitdata(0x31);
+
+    if ((inb(PORT_KBD_DATA) != 0xaa))
+        keyboard_panic(994);
+
+    /* Disable keyboard */
+    outb(0xf5, PORT_KBD_DATA);
+
+    kbd_flush(0x40);
+    kbd_waitdata(0x41);
+
+    /* keyboard should return ACK */
+    if ((inb(PORT_KBD_DATA) != 0xfa))
+        keyboard_panic(995);
+
+    /* Write Keyboard Mode */
+    outb(0x60, PORT_KBD_STATUS);
+
+    kbd_flush(0x50);
+
+    /* send cmd: scan code convert, disable mouse, enable IRQ 1 */
+    outb(0x61, PORT_KBD_DATA);
+
+    kbd_flush(0x60);
+
+    /* Enable keyboard */
+    outb(0xf4, PORT_KBD_DATA);
+
+    kbd_flush(0x70);
+    kbd_waitdata(0x71);
+
+    /* keyboard should return ACK */
+    if ((inb(PORT_KBD_DATA) != 0xfa))
+        keyboard_panic(996);
+
+    outb(0x77, PORT_DIAG);
 }
 
 static void
 kbd_setup()
 {
     bda->kbd_mode = 0x10;
-    bda->kbd_buf_head = bda->kbd_buf_tail = offsetof(struct bios_data_area_s, kbd_buf);
-    bda->kbd_buf_start_offset = offsetof(struct bios_data_area_s, kbd_buf);
-    bda->kbd_buf_end_offset = offsetof(struct bios_data_area_s, kbd_buf[sizeof(bda->kbd_buf)]);
-    kbd_init();
+    bda->kbd_buf_head = bda->kbd_buf_tail = bda->kbd_buf_start_offset
+        = offsetof(struct bios_data_area_s, kbd_buf) - 0x400;
+    bda->kbd_buf_end_offset
+        = (offsetof(struct bios_data_area_s, kbd_buf[sizeof(bda->kbd_buf)])
+           - 0x400);
+    keyboard_init();
 
     // XXX
     u16 eqb = bda->equipment_list_flags;
diff --git a/src/romlayout.S b/src/romlayout.S
index c9cc6ef..4d648bf 100644
--- a/src/romlayout.S
+++ b/src/romlayout.S
@@ -22,8 +22,8 @@ _start:
         .globl post16
 post16:
 
-        // Entry point of rombios32 code - the actual instruction is
-        // altered later in the build process.
+        // Set entry point of rombios32 code - the actual instruction
+	// is altered later in the build process.
         .globl set_entry32
 set_entry32:
         mov $0xf0000000, %ebx
@@ -50,7 +50,7 @@ transition32:
         movl  %eax, %cr0
 
         // start protected mode code
-        .word 0xea66, 1f, 0x000f, 0x0010 // ljmpl $0x10, $(post32 | 0xf0000)
+        .word 0xea66, 1f, 0x000f, 0x0010 // ljmpl $0x10, $(1f | 0xf0000)
 
         .code32
 1:
@@ -125,8 +125,8 @@ call16:
         popl %eax
         popl %esp
 
-        // Resume point of rombios32 code - the actual instruction is
-        // altered later in the build process.
+        // Set resume point of rombios32 code - the actual instruction
+	// is altered later in the build process.
         .globl set_resume32
 set_resume32:
         mov $0xf0000000, %ebx
diff --git a/src/util.h b/src/util.h
index 0870ad5..d83820e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -38,6 +38,19 @@ memset(void *s, int c, size_t n)
         ((char *)s)[n--] = c;
 }
 
+static inline void
+eoi_master_pic()
+{
+    outb(PIC1_IRQ5, PORT_PIC1);
+}
+
+static inline void
+eoi_both_pics()
+{
+    outb(PIC2_IRQ13, PORT_PIC2);
+    eoi_master_pic();
+}
+
 // output.c
 void bprintf(u16 action, const char *fmt, ...)
     __attribute__ ((format (printf, 2, 3)));