Merge nyus.joshuawise.com:/storage/git/netwatch

diff --combined aseg-paging/main.c
index 1bc502e6dc1663bd2a9177d0f15c598920456849,d8fecdd81c4e4f9eac9017136ace40c573ff05bd..d41e8c2c09a7c7754142ae0601798dcf7b81445c
--- 1/aseg-paging/main.c
--- 2/aseg-paging/main.c
+++ b/aseg-paging/main.c
@@@ -9,7 -9,7 +9,7 @@@
  #include "../net/net.h"
  #include "vga-overlay.h"
  #include "../aseg/packet.h"
- #include "../aseg/keyboard.h"
+ #include "keyboard.h"
  
  unsigned int lastctr = 0;
  extern unsigned int counter;
@@@ -107,8 -107,7 +107,8 @@@ void timer_handler(smi_event_t ev
                while (inb(0x64) & 0x02)        /* wait for completion */
                        ;
                smi_enable_event(SMI_EVENT_DEVTRAP_KBC);
 -      }
 +      } else if (kbd_has_injected_scancode())
 +              outputf("Would like to inject, but %d %d", _ibf_ready, _waiting_for_data);
        
        outb(0x80, (ticks++) & 0xFF);
        
@@@ -140,7 -139,8 +140,8 @@@ void gbl_rls_handler(smi_event_t ev
                dump_log((char *)packet->data);
                *(unsigned long*)0xAFFD4 = 42;
        } else if (packet->type == 0xAA) {
-               kbd_inject_key('A');
+               kbd_inject_keysym('A', 1);
+               kbd_inject_keysym('A', 0);
        } else {
                *(unsigned long*)0xAFFD4 = 0x2BADD00D;
        }