X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/3309f0f4c6885cc382fb6fa77493ae68bd4eb5b0..e943799317ad3a952999f1deca7ddf43633bfd80:/aseg/counter.c?ds=inline diff --git a/aseg/counter.c b/aseg/counter.c index eaeec52..0ab5d4c 100644 --- a/aseg/counter.c +++ b/aseg/counter.c @@ -3,9 +3,11 @@ #include #include #include -#include "3c905.h" +#include +#include "../net/net.h" #include "vga-overlay.h" #include "packet.h" +#include "keyboard.h" unsigned int counter = 0; unsigned long pcisave; @@ -14,6 +16,7 @@ unsigned char vgasave; void pci_dump() { unsigned long cts; static int curdev = 0; /* 0 if kbd, 1 if mouse */ + static int takeover = 0; cts = inl(0x84C); @@ -24,12 +27,37 @@ void pci_dump() { case 0x20000: { unsigned char b; - b = inb(cts & 0xFFFF); - dologf("READ: %08x (%02x)", cts, b); - if ((cts & 0xFFFF) == 0x64) - curdev = (b & 0x20) ? 1 : 0; - if ((curdev == 0) && ((cts & 0xFFFF) == 0x60) && (b == 0x01)) - outb(0xCF9, 0x4); + + switch (cts & 0xFFFF) + { + case 0x64: + /* Read the real hardware and mask in our OBF if need be. */ + b = inb(0x64); + if (kbd_has_injected_scancode()) + { + takeover = 1; + b |= 0x01; + b &= ~0x20; /* no mouse for you! */ + curdev = 0; + } else + curdev = (b & 0x20) ? 1 : 0; + *(unsigned char*)0xAFFD0 /* EAX */ = b; + break; + case 0x60: + if (takeover) + { + b = kbd_get_injected_scancode(); + takeover = 0; + } else + b = inb(0x60); + if ((curdev == 0) && (b == 0x01)) { /* Escape */ + outb(0xCF9, 0x4); /* Reboot */ + return; + } + *(unsigned char*)0xAFFD0 /* EAX */ = b; + break; + } + *(unsigned char*)0xAFFD0 /* EAX */ = b; break; } @@ -85,6 +113,8 @@ void gbl_rls_handler(smi_event_t ev) if (packet->type == 42) { dump_log((char *)packet->data); *(unsigned long*)0xAFFD4 = 42; + } else if (packet->type == 0xAA) { + kbd_inject_key('A'); } else { *(unsigned long*)0xAFFD4 = 0x2BADD00D; } @@ -96,6 +126,7 @@ void smi_entry(void) pcisave = inl(0xCF8); vgasave = inb(0x3D4); + pci_unbother_all(); counter++; sprintf(statstr, "15-412! %08x %08x", smi_status(), counter); @@ -112,6 +143,7 @@ void smi_entry(void) smi_poll(); + pci_bother_all(); outl(0xCF8, pcisave); outb(0x3D4, vgasave); }