Manage to get a nice big packet queue going inside lwIP.

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 04eaff5f5c75b521d3f43444511553eb00524f28..598ea757b45e218fcf8e3c0c0c5dd36cce081745 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1,53 +1,165 @@
 #include <pci.h>
+#include <smram.h>
 #include <pci-bother.h>
 #include <output.h>
+#include <minilib.h>
+#include <lwip/init.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"
+
+#include "rfb.h"
+
 static struct nic *_nic = 0x0;
+static struct netif _netif;
 
 extern struct pci_driver a3c90x_driver;
 
-static char test[1024] = {0};
-
 void eth_poll()
 {
-       int i;
-       static int c;
+       unsigned char pkt[1600];
+       int len;
+       struct pbuf *p, *q;
+       struct eth_hdr *ethhdr;
+       int pos = 0;
+       static int ticks = 0;
        
        if (!_nic)
                return;
-
-       _nic->poll(_nic, 0);
        
-       if ((c++) % 30)
-               return;
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
        
-       for (i = 0; i < 1024; i++)
+       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++;
+
+       if (_nic->poll(_nic, 0))
        {
-               switch(i%5)
+               _nic->packet = pkt;
+               _nic->poll(_nic, 1);
+               
+               len = _nic->packetlen;
+               
+               outputf("NIC: Packet: %d bytes", len);
+                       
+               p = pbuf_alloc(PBUF_RAW, len, PBUF_POOL);
+               if (p == NULL)
+               {
+                       outputf("NIC: out of memory for packet?");
+                       LINK_STATS_INC(link.memerr);
+                       LINK_STATS_INC(link.drop);
+                       return;
+               }
+       
+               for(q = p; q != NULL; q = q->next)
                {
-               case 0: test[i] = 'H'; break;
-               case 1: test[i] = 'A'; break;
-               case 2: test[i] = 'R'; break;
-               case 3: test[i] = 'B'; break;
-               case 4: test[i] = 'L'; break;
+                       memcpy(q->payload, pkt+pos, q->len);
+                       pos += q->len;
+               }
+               
+               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;
                }
        }
-       outputf("eth_poll: Attempting to tx");
-       _nic->transmit("\x00\x03\x93\x87\x84\x8C", 0x1337, 1024, test);
-       outputf("eth_poll: tx complete");
+}
+
+static err_t _transmit(struct netif *netif, struct pbuf *p)
+{
+       struct nic *nic = netif->state;
+
+/*     for(q = p; q != NULL; q = q->next)
+       {
+               memcpy(pkt + len, q->payload, q->len);
+               len += q->len;
+       }*/
+
+       outputf("NIC: Transmit packet");
+
+       nic->transmit(p);
+
+       LINK_STATS_INC(link.xmit);
+
+       return ERR_OK;
+}
+
+static err_t _init(struct netif *netif)
+{
+       struct nic *nic = netif->state;
+       
+       LWIP_ASSERT("netif != NULL", (netif != NULL));
+               
+#if LWIP_NETIF_HOSTNAME
+       netif->hostname = "netwatch";
+#endif
+       
+       NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, 100000000);
+
+       netif->name[0] = 'e';
+       netif->name[1] = 'n';
+       netif->output = etharp_output;
+       netif->linkoutput = _transmit;
+       
+       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)
 {
+       static struct ip_addr ipa = { 0 } , netmask = { 0 } , gw = { 0 };
+       
        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;
 }
 
 void eth_init()
 {
-       if (pci_probe_driver(a3c90x_driver))
-               outputf("found 3c90x, hopefully!");
+       extern void httpd_init();
+       
+       /* Required for DMA to work. :( */
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
+       lwip_init();
+       httpd_init();
+
+       rfb_init();
+
 }