more keys

[netwatch.git] / aseg / counter.c

diff --git a/aseg/counter.c b/aseg/counter.c
index 76022187d255736ec87a396eef2f9593a49296bf..0ab5d4c6355efa6d9e4dadc51ccddd5231efa0b8 100644 (file)
--- a/aseg/counter.c
+++ b/aseg/counter.c
@@ -3,19 +3,20 @@
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>
 #include <video_defines.h>
 #include <minilib.h>
 #include <smi.h>

-
-char thestr[512];
-
+#include <pci-bother.h>
+#include "../net/net.h"

 #include "vga-overlay.h"
 #include "vga-overlay.h"

+#include "packet.h"
+#include "keyboard.h"

 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;
 
 void pci_dump() {
 
 unsigned int counter = 0;
 unsigned long pcisave;
 unsigned char vgasave;
 
 void pci_dump() {

-       char s[40];

        unsigned long cts;
        static int curdev = 0;  /* 0 if kbd, 1 if mouse */
        unsigned long cts;
        static int curdev = 0;  /* 0 if kbd, 1 if mouse */

+       static int takeover = 0;

                
        cts = inl(0x84C);
        
                
        cts = inl(0x84C);
        


@@ -26,12 +27,37 @@ void pci_dump() {
        case 0x20000:
        {
                unsigned char b;
        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;
        }
                *(unsigned char*)0xAFFD0 /* EAX */ = b;
                break;
        }


@@ -39,11 +65,8 @@ void pci_dump() {
        {
                unsigned char b;
                
        {
                unsigned char b;
                

-               strcpy(s, "WRITxxxxxxxxxxxxxxxx");

                b = *(unsigned char*)0xAFFD0 /* EAX */;
                b = *(unsigned char*)0xAFFD0 /* EAX */;

-               tohex(s+4, cts);
-               tohex(s+12, b);
-               dolog(s);
+               dologf("WRITE: %08x (%02x)", cts, b);

                outb(cts & 0xFFFF, b);
                break;
        }
                outb(cts & 0xFFFF, b);
                break;
        }


@@ -55,47 +78,73 @@ void pci_dump() {
        outl(0x840, 0x0100);
 }
 
        outl(0x840, 0x0100);
 }
 

+void timer_handler(smi_event_t ev)
+{
+       static unsigned int ticks = 0;
+       
+       smi_disable_event(SMI_EVENT_FAST_TIMER);
+       smi_enable_event(SMI_EVENT_FAST_TIMER);
+       
+       outb(0x80, (ticks++) & 0xFF);
+       
+       outlog();
+}
+
+void kbc_handler(smi_event_t ev)
+{
+       pci_dump();
+}
+
+void gbl_rls_handler(smi_event_t ev)
+{
+       unsigned long ecx;
+       
+       ecx = *(unsigned long*)0xAFFD4;
+
+       packet_t * packet = check_packet(ecx);
+       if (!packet)
+       {
+               dologf("WARN: bad packet at %08x", ecx);
+               return;
+       }
+
+       dologf("Got packet: type %08x", packet->type);
+
+       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;
+       }
+}
+

 void smi_entry(void)
 {
 void smi_entry(void)
 {

+       char statstr[512];
+       

        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);
        pcisave = inl(0xCF8);
        vgasave = inb(0x3D4);

+       pci_unbother_all();

        
        counter++;
        
        counter++;

-       outb(0x80, (counter & 0xFF));
+       sprintf(statstr, "15-412! %08x %08x", smi_status(), counter);
+       strblit(statstr, 0, 0);

        
        

-       sprintf(thestr, "15-412! %08x %08x", smi_status(), counter);
-       strblit(thestr, 0, 0);
+       eth_poll();

        
        

-       if (inl(0x834) & 0x20)
-               dolog("Warning: unhandled APM access");
-       if (inl(0x834) & 0x1000)
-       {
-               if (inl(0x844) & 0x1000)        /* devact_sts */
-               {
-                       pci_dump();
-                       outl(0x844, 0x1000);    /* ack it */
-               }
-       }
-       if (inl(0x834) & 0x4000)
-               dolog("Long periodic timer");

        if (inl(0x840) & 0x1000)
        {
                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
        }
        if (inl(0x840) & 0x1000)
        {
                pci_dump();
                outl(0x840, 0x1100);
                outl(0x840, 0x0100);
        }

-       if (inl(0x834) & ~(0x4160))
-               dologf("Unknown: %08x", inl(0x834) & ~(0x140));

 
 

-       outlog();
+       smi_poll();

        
        

+       pci_bother_all();

        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);
        outl(0xCF8, pcisave);
        outb(0x3D4, vgasave);

-       
-       outl(0x848, 0x1000);
-       outl(0x834, /*0x40*/0xFFFF);    // ack the periodic IRQ
-       outb(0x830, (inb(0x830) | 0x2) & ~0x40);
-       outb(0x830, inb(0x830) | 0x40);
-       

 }
 
 }