more reliable keyboard injection

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 7f1932f3ba848d9e119cda80662053a4804b6956..e1c74446162042bd5aa788f6782e43b4ba6ac045 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1,38 +1,116 @@
 #include <pci.h>
 #include <pci.h>

+#include <io.h>
+#include <video_defines.h>
+#include <smram.h>
+#include <pci-bother.h>

 #include <output.h>
 #include <output.h>

+#include <minilib.h>

 #include "net.h"
 #include "net.h"

+#include "../aseg/keyboard.h"

 
 

-static int found = 0, _bus, _dev, _fn;
+static struct nic *_nic = 0x0;

 
 

-struct nic nic;
+extern struct pci_driver a3c90x_driver;

 
 

-static int bother_3c905(pci_dev_t *dev, void *nutrinus)
+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)

 {
 {

-       if (dev->vid == 0x10B7 || dev->did == 0x9200)
+       outb(CRTC_IDX_REG, idx);
+       return inb(CRTC_DATA_REG);
+}
+
+static unsigned int vga_base()
+{
+       return (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 9)
+            + (((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)

        {
        {

-               outputf("Found a 3c905 to bother");
-               
-               _bus = dev->bus;
-               _dev = dev->dev;
-               _fn = dev->fn;
-               found = 1;
-               
-               return 1;
+               for (i = 0; i < dl; i++)
+                       kbd_inject_key(p->data[i]);

        }
        }

-       return 0;

 }
 
 void eth_poll()
 {
 }
 
 void eth_poll()
 {

-       if (!found)
+       int i;
+//     static int c;
+       static short pos = 0x0;
+       unsigned short base = vga_base();
+       unsigned char *p = (unsigned char *)0xB8000;
+       smram_state_t old_state;
+       
+       if (!_nic)

                return;
                return;

-               
-       pci_write16(_bus, _dev, _fn, 0x04, 0xFF);
+
+       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;
+       
+       test[0] = pos >> 8;
+       test[1] = pos & 0xFF;
+       test[2] = base >> 8;
+       test[3] = base & 0xFF;
+
+       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);

        
        

-       pci_write16(_bus, _dev, _fn, 0x04, 0x00);
+       for (i = 4; i < 1024; i++)
+       {
+               test[i] = p[pos++];
+               pos %= 0x8000;
+       }
+       smram_restore_state(old_state);
+       _nic->transmit("\x00\x03\x93\x87\x84\x8C", 0x1337, 1024, test);
+}
+
+int eth_register(struct nic *nic)
+{
+       if (_nic)
+               return -1;
+       _nic = nic;
+       return 0;

 }
 
 void eth_init()
 {
 }
 
 void eth_init()
 {

-       pci_probe(bother_3c905, 0x0);
+       /* Required for DMA to work. :( */
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
+       pci_probe_driver(a3c90x_driver);

 }
 }