Merge branch 'master' of git+ssh://jacob@git.joshuawise.com/storage/git/netwatch

diff --git a/aseg/Makefile b/aseg/Makefile
index 64b3c5a987ce0a15d4b5fa89cf56710e44f5c1f4..c976b1ede0de89edd8b47eaf019b64c40d398502 100644 (file)
--- a/aseg/Makefile
+++ b/aseg/Makefile
@@ -4,7 +4,7 @@ CFLAGS=-I../include -I../include/raw -nostdlib -nostdinc -fno-builtin -D__RAW__
 OBJS=counter.o firstrun.o ../pci/pci-raw.o ../lib/minilib.o ../lib/console.o \
        ../ich2/smram-ich2.o ../ich2/smi.o vga-overlay.o packet.o \
        ../lib/sprintf.o ../lib/doprnt.o ../pci/pci.o ../net/net.o \
-       ../ich2/ich2-timer.o ../pci/pci-bother.o ../net/3c90x.o
+       ../ich2/ich2-timer.o ../pci/pci-bother.o ../net/3c90x.o keyboard.o
 
 all: aseg.elf
 

diff --git a/aseg/counter.c b/aseg/counter.c
index f5a2602da9344fe7d1a4d7dbd9338034934e0997..055ceec1609f8da0a4f917273bb34f2185d0a217 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -7,30 +7,76 @@
 #include "../net/net.h"
 #include "vga-overlay.h"
 #include "packet.h"
+#include "keyboard.h"
 
 unsigned int counter = 0;
+unsigned int lastctr = 0;
 unsigned long pcisave;
 unsigned char vgasave;
+static int curdev = 0; /* 0 if kbd, 1 if mouse */
+
+static void cause_kbd_irq()
+{
+       outl(0x844, 0x0);
+       outl(0x848, 0x0);
+       while (inb(0x64) & 0x1)
+               inb(0x60);
+       outb(0x60, 0xee);       /* Cause an IRQ. */
+       while (inb(0x60) != 0xEE)
+               ;
+}
 
 void pci_dump() {
        unsigned long cts;
-       static int curdev = 0;  /* 0 if kbd, 1 if mouse */
                
        cts = inl(0x84C);
        
-       outl(0x848, 0x0);
        outl(0x840, 0x0);
+       outl(0x848, 0x0);
        switch(cts&0xF0000)
        {
        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())
+                       {
+                               dologf("OS wants to know; we have data");
+                               lastctr = counter;
+                               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 (kbd_has_injected_scancode())
+                       {
+                               b = kbd_get_injected_scancode();
+                               lastctr = counter;
+                               while (inb(0x64) & 0x1)
+                                       inb(0x60);
+                       } else
+                               b = inb(0x60);
+                       if ((curdev == 0) && (b == 0x01)) {     /* Escape */
+                               outb(0xCF9, 0x4);       /* Reboot */
+                               return;
+                       }
+                       
+                       /* If there is more nus to come, generate another IRQ. */
+                       if (kbd_has_injected_scancode())
+                               cause_kbd_irq();
+                       
+                       *(unsigned char*)0xAFFD0 /* EAX */ = b;
+                       break;
+               }
+
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }
@@ -47,8 +93,8 @@ void pci_dump() {
                dolog("Unhandled PCI cycle");
        }
        
+       outl(0x844, 0x1000);
        outl(0x848, 0x1000);
-       outl(0x840, 0x0100);
 }
 
 void timer_handler(smi_event_t ev)
@@ -58,6 +104,14 @@ void timer_handler(smi_event_t ev)
        smi_disable_event(SMI_EVENT_FAST_TIMER);
        smi_enable_event(SMI_EVENT_FAST_TIMER);
        
+       if (kbd_has_injected_scancode() && (counter > (lastctr + 2)))
+       {
+               smi_disable_event(SMI_EVENT_DEVTRAP_KBC);
+               dolog("Kicking timer");
+               cause_kbd_irq();
+               smi_enable_event(SMI_EVENT_DEVTRAP_KBC);
+       }
+       
        outb(0x80, (ticks++) & 0xFF);
        
        outlog();
@@ -86,6 +140,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;
        }

diff --git a/aseg/keyboard.c b/aseg/keyboard.c
new file mode 100644 (file)
index 0000000..4b84b4f
--- /dev/null
+++ b/aseg/keyboard.c
@@ -0,0 +1,207 @@
+#include "keyboard.h"
+#include <output.h>
+
+static unsigned char kbd_inj_buffer[128];
+static int kbd_inj_start = 0;
+static int kbd_inj_end = 0;
+int kbd_mode = 1;
+
+static const char scancodes2[][8] = {
+       ['a'] = "\x1c\xf0\x1c",
+       ['b'] = "\x32\xf0\x32",
+       ['c'] = "\x21\xf0\x21",
+       ['d'] = "\x23\xf0\x23",
+       ['e'] = "\x24\xf0\x24",
+       ['f'] = "\x2b\xf0\x2b",
+       ['g'] = "\x34\xf0\x34",
+       ['h'] = "\x33\xf0\x33",
+       ['i'] = "\x43\xf0\x43",
+       ['j'] = "\x3b\xf0\x3b",
+       ['k'] = "\x42\xf0\x42",
+       ['l'] = "\x4b\xf0\x4b",
+       ['m'] = "\x3a\xf0\x3a",
+       ['n'] = "\x31\xf0\x31",
+       ['o'] = "\x44\xf0\x44",
+       ['p'] = "\x4d\xf0\x4d",
+       ['q'] = "\x15\xf0\x15",
+       ['r'] = "\x2d\xf0\x2d",
+       ['s'] = "\x1b\xf0\x1b",
+       ['t'] = "\x2c\xf0\x2c",
+       ['u'] = "\x3c\xf0\x3c",
+       ['v'] = "\x2a\xf0\x2a",
+       ['w'] = "\x1d\xf0\x1d",
+       ['x'] = "\x22\xf0\x22",
+       ['y'] = "\x35\xf0\x35",
+       ['z'] = "\x1a\xf0\x1a",
+       ['A'] = "\x12\x1c\xf0\x1c\xf0\x12",
+       ['B'] = "\x12\x32\xf0\x32\xf0\x12",
+       ['C'] = "\x12\x21\xf0\x21\xf0\x12",
+       ['D'] = "\x12\x23\xf0\x23\xf0\x12",
+       ['E'] = "\x12\x24\xf0\x24\xf0\x12",
+       ['F'] = "\x12\x2b\xf0\x2b\xf0\x12",
+       ['G'] = "\x12\x34\xf0\x34\xf0\x12",
+       ['H'] = "\x12\x33\xf0\x33\xf0\x12",
+       ['I'] = "\x12\x43\xf0\x43\xf0\x12",
+       ['J'] = "\x12\x3b\xf0\x3b\xf0\x12",
+       ['K'] = "\x12\x42\xf0\x42\xf0\x12",
+       ['L'] = "\x12\x4b\xf0\x4b\xf0\x12",
+       ['M'] = "\x12\x3a\xf0\x3a\xf0\x12",
+       ['N'] = "\x12\x31\xf0\x31\xf0\x12",
+       ['O'] = "\x12\x44\xf0\x44\xf0\x12",
+       ['P'] = "\x12\x4d\xf0\x4d\xf0\x12",
+       ['Q'] = "\x12\x15\xf0\x15\xf0\x12",
+       ['R'] = "\x12\x2d\xf0\x2d\xf0\x12",
+       ['S'] = "\x12\x1b\xf0\x1b\xf0\x12",
+       ['T'] = "\x12\x2c\xf0\x2c\xf0\x12",
+       ['U'] = "\x12\x3c\xf0\x3c\xf0\x12",
+       ['V'] = "\x12\x2a\xf0\x2a\xf0\x12",
+       ['W'] = "\x12\x1d\xf0\x1d\xf0\x12",
+       ['X'] = "\x12\x22\xf0\x22\xf0\x12",
+       ['Y'] = "\x12\x35\xf0\x35\xf0\x12",
+       ['Z'] = "\x12\x1a\xf0\x1a\xf0\x12",
+       ['`'] = "\x0e\xf0\x0e",
+       ['~'] = "\x12\x0e\xf0\x0e\xf0\x12",
+       ['1'] = "\x16\xf0\x16",
+       ['!'] = "\x12\x16\xf0\x16\xf0\x12",
+       ['2'] = "\x1e\xf0\x1e",
+       ['@'] = "\x12\x1e\xf0\x1e\xf0\x12",
+       ['3'] = "\x26\xf0\x26",
+       ['#'] = "\x12\x26\xf0\x26\xf0\x12",
+       ['4'] = "\x25\xf0\x25",
+       ['$'] = "\x12\x25\xf0\x25\xf0\x12",
+       ['5'] = "\x2e\xf0\x2e",
+       ['%'] = "\x12\x2e\xf0\x2e\xf0\x12",
+       ['6'] = "\x36\xf0\x36",
+       ['^'] = "\x12\x36\xf0\x36\xf0\x12",
+       ['7'] = "\x3d\xf0\x3d",
+       ['&'] = "\x12\x3d\xf0\x3d\xf0\x12",
+       ['8'] = "\x3e\xf0\x3e",
+       ['*'] = "\x12\x3e\xf0\x3e\xf0\x12",
+       ['9'] = "\x46\xf0\x46",
+       ['('] = "\x12\x46\xf0\x46\xf0\x12",
+       ['0'] = "\x45\xf0\x45",
+       [')'] = "\x12\x45\xf0\x45\xf0\x12",
+       ['-'] = "\x4e\xf0\x4e",
+       ['_'] = "\x12\x4e\xf0\x4e\xf0\x12",
+       ['='] = "\x55\xf0\x55",
+       ['+'] = "\x12\x55\xf0\x55\xf0\x12",
+       ['['] = "\x54\xf0\x54",
+       ['{'] = "\x12\x54\xf0\x54\xf0\x12",
+       [']'] = "\x5b\xf0\x5b",
+       ['}'] = "\x12\x5b\xf0\x5b\xf0\x12",
+       ['\\'] = "\x5d\xf0\x5d",
+       ['|'] = "\x12\x5d\xf0\x5d\xf0\x12",
+       [';'] = "\x4c\xf0\x4c",
+       [':'] = "\x12\x4c\xf0\x4c\xf0\x12",
+       ['\''] = "\x52\xf0\x52",
+       ['"'] = "\x12\x52\xf0\x52\xf0\x12",
+       [','] = "\x41\xf0\x41",
+       ['<'] = "\x12\x41\xf0\x41\xf0\x12",
+       ['.'] = "\x49\xf0\x49",
+       ['>'] = "\x12\x49\xf0\x49\xf0\x12",
+       ['/'] = "\x4a\xf0\x4a",
+       ['?'] = "\x12\x4a\xf0\x4a\xf0\x12",
+       ['\n'] = "\x5a\xf0\x5a",
+       ['\t'] = "\x0d\xf0\x0d",
+       ['\b'] = "\x66\xf0\x66",
+       [' '] = "\x29\xf0\x29",
+        [0x82] = "\xE0\x75\xE0\xF0\x75",
+        [0x83] = "\xE0\x72\xE0\xF0\x72",
+        [0x84] = "\xE0\x6B\xE0\xF0\x6B",
+        [0x85] = "\xE0\x74\xE0\xF0\x74"
+};
+
+const unsigned char convert_table[] = {
+       0xff, 0x43, 0x41, 0x3f, 0x3d, 0x3b, 0x3c, 0x58, 0x64, 0x44, 0x42, 0x40, 0x3e, 0x0f, 0x29, 0x59,
+       0x65, 0x38, 0x2a, 0x70, 0x1d, 0x10, 0x02, 0x5a, 0x66, 0x71, 0x2c, 0x1f, 0x1e, 0x11, 0x03, 0x5b,
+       0x67, 0x2e, 0x2d, 0x20, 0x12, 0x05, 0x04, 0x5c, 0x68, 0x39, 0x2f, 0x21, 0x14, 0x13, 0x06, 0x5d,
+       0x69, 0x31, 0x30, 0x23, 0x22, 0x15, 0x07, 0x5e, 0x6a, 0x72, 0x32, 0x24, 0x16, 0x08, 0x09, 0x5f,
+       0x6b, 0x33, 0x25, 0x17, 0x18, 0x0b, 0x0a, 0x60, 0x6c, 0x34, 0x35, 0x26, 0x27, 0x19, 0x0c, 0x61,
+       0x6d, 0x73, 0x28, 0x74, 0x1a, 0x0d, 0x62, 0x6e, 0x3a, 0x36, 0x1c, 0x1b, 0x75, 0x2b, 0x63, 0x76,
+       0x55, 0x56, 0x77, 0x78, 0x79, 0x7a, 0x0e, 0x7b, 0x7c, 0x4f, 0x7d, 0x4b, 0x47, 0x7e, 0x7f, 0x6f,
+       0x52, 0x53, 0x50, 0x4c, 0x4d, 0x48, 0x01, 0x45, 0x57, 0x4e, 0x51, 0x4a, 0x37, 0x49, 0x46, 0x54,
+       0x80, 0x81, 0x82, 0x41, 0x54, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+       0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+       0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+       0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+       0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+       0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+       0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+       0x00, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+unsigned char sc_convert_1(unsigned char in)
+{
+       static int shifted = 0;
+
+       if (shifted)
+       {
+               shifted = 0;
+               return convert_table[in] | 0x80;
+       }
+
+       if (in == 0xF0)
+       {
+               shifted = 1;
+               return 0;
+       } else {
+               return convert_table[in];
+       } 
+}
+
+void kbd_inject_scancode (unsigned char sc)
+{
+       outputf("Buffering %02x", sc);
+       kbd_inj_buffer[kbd_inj_end] = sc;
+       kbd_inj_end += 1;
+       kbd_inj_end %= sizeof(kbd_inj_buffer);
+}
+
+void kbd_inject_key(unsigned char k)
+{
+       const char * c;
+
+       if (kbd_mode == 1) {
+               c = scancodes2[k];
+               if (!c) return;
+               while (*c) {
+                       char cconv = sc_convert_1(*c);
+                       if (cconv) kbd_inject_scancode(cconv);
+                       c++;
+               }
+       } else {
+               c = scancodes2[k];
+               if (!c) return;
+               while (*c) {
+                       kbd_inject_scancode(*c);
+                       c++;
+               }
+       }
+}
+
+unsigned char kbd_get_injected_scancode()
+{
+       unsigned char b;
+
+       if (kbd_inj_end != kbd_inj_start)
+       {
+               b = kbd_inj_buffer[kbd_inj_start];
+               kbd_inj_start += 1;
+               kbd_inj_start %= sizeof(kbd_inj_buffer);
+               outputf("Injecting %02x", b);
+               return b;
+       } else {
+               outputf("Not injecting");
+               return 0;
+       }
+}
+
+int kbd_has_injected_scancode()
+{
+       if (kbd_inj_end != kbd_inj_start)
+       {
+               return 1;
+       } else {
+               return 0;
+       }
+}

diff --git a/aseg/keyboard.h b/aseg/keyboard.h
new file mode 100644 (file)
index 0000000..3f66867
--- /dev/null
+++ b/aseg/keyboard.h
@@ -0,0 +1,11 @@
+#ifndef KEYBOARD_H
+#define KEYBOARD_H
+
+void kbd_inject_key(unsigned char k);
+
+unsigned char kbd_get_injected_scancode();
+int kbd_has_injected_scancode();
+
+extern int kbd_mode;
+
+#endif

diff --git a/net/net.c b/net/net.c
index 98571b0bfb14a13355fb282277ee19212110b814..46ea9cd75bb9d1ab345eccaebbede9bd20028064 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -4,7 +4,9 @@
 #include <smram.h>
 #include <pci-bother.h>
 #include <output.h>
+#include <minilib.h>
 #include "net.h"
+#include "../aseg/keyboard.h"
 
 static struct nic *_nic = 0x0;
 
@@ -12,6 +14,17 @@ extern struct pci_driver a3c90x_driver;
 
 static char test[1024] = {0};
 
+static char packet[4096] = {0};
+
+typedef struct packet_t {
+       char from[6];
+       char to[6];
+       unsigned short ethertype;
+       unsigned short datalen;
+       unsigned char command;
+       char data[];
+} packet_t;
+
 static unsigned char vga_read(unsigned char idx)
 {
        outb(CRTC_IDX_REG, idx);
@@ -24,6 +37,20 @@ static unsigned int vga_base()
             + (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 1);
 }
 
+void handle_command(packet_t * p)
+{
+       uint16_t dl = htons(p->datalen);
+       int i;
+
+       outputf("NIC: Command: 0x%x, %d bytes", p->command, dl);
+
+       if (p->command == 0x42)
+       {
+               for (i = 0; i < dl; i++)
+                       kbd_inject_key(p->data[i]);
+       }
+}
+
 void eth_poll()
 {
        int i;
@@ -36,12 +63,33 @@ void eth_poll()
        if (!_nic)
                return;
 
-       _nic->poll(_nic, 0);
+       if (_nic->poll(_nic, 0)) {
+               _nic->packet = packet;
+               _nic->poll(_nic, 1);
+
+               packet_t * p = (packet_t *) packet;
+
+               outputf("NIC: Packet: %d 0x%x", _nic->packetlen, htons(p->ethertype));
+               if (htons(p->ethertype) == 0x1338) {
+                       if (htons(p->datalen) + sizeof(packet_t) > _nic->packetlen) {
+                               outputf("NIC: Malformed packet");
+                       } else {
+                               handle_command(p);
+                       }
+               }
+       }
        smram_tseg_set_state(SMRAM_TSEG_OPEN);
        old_state = smram_save_state();
        
 //     if ((c++) % 2)
 //             return;
+
+       if (((base + 80*25*2)%0x8000) < base)
+       {
+               if ((pos > ((base + 80*25*2)%0x8000)) && (pos < base))
+                       pos = base;
+       } else if ((pos > base + 80*25*2) || (pos < base))
+               pos = base;
        
        test[0] = pos >> 8;
        test[1] = pos & 0xFF;

diff --git a/tools/Makefile b/tools/Makefile
index 3bd46a56de2a618e9473fd07970abc109bd3cdef..4b0978bfd3c94bda0d2f0e0902ff8e61cd3b6f5c 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -3,6 +3,7 @@ CC=gcc
 SMRAM_ICH2_OBJS=smram-linux-tool.o ../pci/pci-linux.o ../ich2/smram-ich2.noraw.o
 PCI_OBJS=pci.o ../pci/pci-linux.o
 POKE_RLS_OBJS=poke-rls.o poke-rls-asm.o ../pci/pci-linux.o
+FROB_RLS_OBJS=frob-rls.o poke-rls-asm.o ../pci/pci-linux.o
 
 all: smram-ich2 port pci poke-rls
 
@@ -18,8 +19,8 @@ port: port.o
 pci: $(PCI_OBJS)
        gcc $(CFLAGS) -o pci $(PCI_OBJS)
 
-poke-rls: $(POKE_RLS_OBJS)
-       gcc $(CFLAGS) -o poke-rls $(POKE_RLS_OBJS)
+frob-rls: $(FROB_RLS_OBJS)
+       gcc $(CFLAGS) -o frob-rls $(FROB_RLS_OBJS)
 
 clean:
        rm -f $(SMRAM_ICH2_OBJS) smram-ich2

diff --git a/tools/frob-rls.c b/tools/frob-rls.c
new file mode 100644 (file)
index 0000000..3ff4e53
--- /dev/null
+++ b/tools/frob-rls.c
@@ -0,0 +1,48 @@
+#include <sys/io.h>
+#include <reg-82801b.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+static uint16_t _get_PMBASE()
+{
+       static long pmbase = -1;
+
+       if (pmbase == -1) 
+               pmbase = pci_read32(ICH2_LPC_BUS, ICH2_LPC_DEV, ICH2_LPC_FN, ICH2_LPC_PCI_PMBASE) & ICH2_PMBASE_MASK;
+
+       return pmbase;
+}
+
+typedef struct {
+       uint32_t signature;
+       uint32_t type;
+       uint8_t data[];
+} packet_t;
+
+extern unsigned int poke(unsigned long addr, unsigned long * value);
+
+int main(int argc, char **argv)
+{
+       unsigned int res;
+       packet_t * packet = (packet_t *)memalign(4096, sizeof(packet_t));
+
+       packet->signature = 0x1BADD00D;
+       packet->type = 0xAA;
+       strcpy(packet->data, "hello, world!");
+
+       if (iopl(3) < 0)
+       {
+               perror("iopl");
+               return 1;
+       }
+       
+       res = poke(_get_PMBASE() + 0x04, (void *)packet);
+       printf("returned %p\n", res);
+
+       if (res == 42) {
+               int i;
+               for (i = 0; i < 96; i++)
+                       printf("%s\n", packet->data + i * 41);
+       }
+}