Tweak some values up a bit. Try harder to unstall the upload engine. Remove dead...

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 9d99342a48a6c9f3dd46aa7f340c17c88e0976c1..0b573214256e4c975af7a78a1c68d0f1dd538c6c 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -13,56 +13,26 @@
 #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;
 
-void eth_poll()
+void eth_recv(struct nic *nic, struct pbuf *p)
 {
-       unsigned char pkt[1600];
-       int len;
-       struct pbuf *p, *q;
        struct eth_hdr *ethhdr;
-       int pos = 0;
-       
-       if (!_nic)
-               return;
        
-       smram_tseg_set_state(SMRAM_TSEG_OPEN);
-
-       if (!_nic->poll(_nic, 0))
-               return;
-       
-       _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)
-       {
-               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:
@@ -72,7 +42,7 @@ void eth_poll()
                        pbuf_free(p);
                }
                break;
-
+               
        default:
                outputf("Unhandled packet type %04x input", ethhdr->type);
                pbuf_free(p);
@@ -80,22 +50,40 @@ void eth_poll()
        }
 }
 
-static err_t _transmit(struct netif *netif, struct pbuf *p)
+void eth_poll()
 {
-       struct nic *nic = netif->state;
-       struct pbuf *q;
-       unsigned char pkt[1600];
-       unsigned int len = 0;
-
-       for(q = p; q != NULL; q = q->next)
+       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;
+       
+       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)
        {
-               memcpy(pkt + len, q->payload, q->len);
-               len += q->len;
+               int n = _nic->recv(_nic);
+               i -= n;
+               if (n == 0)
+                       break;
        }
+}
+
+static err_t _transmit(struct netif *netif, struct pbuf *p)
+{
+       struct nic *nic = netif->state;
 
-       outputf("NIC: Transmit packet: %d bytes", len);
+//     outputf("NIC: Transmit packet");
 
-       nic->transmit(len, pkt);
+       nic->transmit(p);
 
        LINK_STATS_INC(link.xmit);
 
@@ -129,21 +117,27 @@ static err_t _init(struct netif *netif)
 
 int eth_register(struct nic *nic)
 {
-       static struct ip_addr ipa = { 0x2dba0280 } , netmask = { 0xF0FFFFFF } , gw = { 0x2eba0280 };
+       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()
 {
+       extern void httpd_init();
+       
        /* Required for DMA to work. :( */
        smram_tseg_set_state(SMRAM_TSEG_OPEN);
        lwip_init();
-       pci_probe_driver(a3c90x_driver);
+       httpd_init();
+
+       rfb_init();
+
 }