More ICH2-specific code diked out.

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 7312fdec89426630cff34b898f5b1a764a915d05..d762b47fa85c9949b74dcc9595c02217e85cb07b 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1,94 +1,156 @@
+/* net.c
+ * Top-level network glue code
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+

 #include <pci.h>
 #include <pci.h>

-#include <io.h>
-#include <video_defines.h>

 #include <smram.h>
 #include <pci-bother.h>
 #include <output.h>
 #include <smram.h>
 #include <pci-bother.h>
 #include <output.h>

+#include <minilib.h>
+#include <tables.h>
+#include <lwip/init.h>

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

+#include "lwip/opt.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/sys.h"
+#include <lwip/stats.h>
+#include <lwip/snmp.h>
+#include <lwip/dhcp.h>
+#include <lwip/tcp.h>
+#include "netif/etharp.h"
+#include "netif/ppp_oe.h"
+

 static struct nic *_nic = 0x0;
 static struct nic *_nic = 0x0;

+static struct netif _netif;

 
 extern struct pci_driver a3c90x_driver;
 
 
 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;
-       char data[];
-} packet_t;
-
-static unsigned char vga_read(unsigned char idx)
+void eth_recv(struct nic *nic, struct pbuf *p)

 {
 {

-       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);
+       struct eth_hdr *ethhdr;
+       
+       LINK_STATS_INC(link.recv);
+       
+       ethhdr = p->payload;
+       
+       switch (htons(ethhdr->type)) {
+       case ETHTYPE_IP:
+       case ETHTYPE_ARP:
+               if (_netif.input(p, &_netif) != ERR_OK)
+               {
+                       LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n"));
+                       pbuf_free(p);
+               }
+               break;
+               
+       default:
+               outputf("Unhandled packet type %04x input", ethhdr->type);
+               pbuf_free(p);
+               break;
+       }

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

-       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;
+       static int ticks = 0;
+       int i = 15;     /* Don't process more than 15 packets at a time; we don't want the host to get TOO badly slowed down... */

        
        if (!_nic)
                return;
        
        if (!_nic)
                return;

+       
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
+       
+       if ((ticks % 1000) == 0)        /* About a minute */
+               dhcp_coarse_tmr();
+       if ((ticks % 8) == 0)   /* About 500msec*/
+               dhcp_fine_tmr();
+       if ((ticks % 4) == 0)   /* About 250msec*/
+               tcp_tmr();
+       ticks++;
+
+       while (i > 0)
+       {
+               int n = _nic->recv(_nic);
+               i -= n;
+               if (n == 0)
+                       break;
+       }
+}

 
 

-       if (_nic->poll(_nic, 0)) {
-               _nic->packet = packet;
-               _nic->poll(_nic, 1);
+static err_t _transmit(struct netif *netif, struct pbuf *p)
+{
+       struct nic *nic = netif->state;

 
 

-               packet_t * p = (packet_t *) packet;
+//     outputf("NIC: Transmit packet");

 
 

-               outputf("NIC: Packet: %d 0x%x", _nic->packetlen, p->ethertype);
-               if (p->ethertype == 0x3813) {
-                       outputf("NIC: Command: 0x%x", *((uint16_t *)p->data));
-               }
-       }
-       smram_tseg_set_state(SMRAM_TSEG_OPEN);
-       old_state = smram_save_state();
+       nic->transmit(nic, p);
+
+       LINK_STATS_INC(link.xmit);
+
+       return ERR_OK;
+}
+
+static err_t _init(struct netif *netif)
+{
+       struct nic *nic = netif->state;

        
        

-//     if ((c++) % 2)
-//             return;
+       LWIP_ASSERT("netif != NULL", (netif != NULL));
+               
+#if LWIP_NETIF_HOSTNAME
+       netif->hostname = "netwatch";
+#endif

        
        

-       test[0] = pos >> 8;
-       test[1] = pos & 0xFF;
-       test[2] = base >> 8;
-       test[3] = base & 0xFF;
+       NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, 100000000);

 
 

-       smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
+       netif->name[0] = 'e';
+       netif->name[1] = 'n';
+       netif->output = etharp_output;
+       netif->linkoutput = _transmit;

        
        

-       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);
+       memcpy(netif->hwaddr, nic->hwaddr, 6);
+       netif->mtu = 1500;
+       netif->hwaddr_len = ETHARP_HWADDR_LEN;
+       netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
+       
+       return ERR_OK;

 }
 
 int eth_register(struct nic *nic)
 {
 }
 
 int eth_register(struct nic *nic)
 {

+       static struct ip_addr ipa = { 0 } , netmask = { 0 } , gw = { 0 };
+       

        if (_nic)
                return -1;
        if (_nic)
                return -1;

+       netif_add(&_netif, &ipa, &netmask, &gw, (void*)nic, _init, ethernet_input);
+       netif_set_default(&_netif);
+       netif_set_up(&_netif);
+       dhcp_start(&_netif);

        _nic = nic;
        return 0;
 }
 
        _nic = nic;
        return 0;
 }
 

+typedef void(*thunk_t)();
+
+TABLE(thunk_t, protocols);
+

 void eth_init()
 {
 void eth_init()
 {

+       int i;
+       

        /* Required for DMA to work. :( */
        smram_tseg_set_state(SMRAM_TSEG_OPEN);
        /* Required for DMA to work. :( */
        smram_tseg_set_state(SMRAM_TSEG_OPEN);

-       pci_probe_driver(a3c90x_driver);
+
+       lwip_init();
+
+       for (i = 0; i < TABLE_LENGTH(protocols); i++)
+               protocols_table[i]();

 }
 }