Remove demapper from pagingstub.c, since that code is now elsewhere. Correct locatio...

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index 7fa7c467164715abcb3c279eeafea4d6ed67bda1..d762b47fa85c9949b74dcc9595c02217e85cb07b 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1,8 +1,19 @@
+/* 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 <smram.h>
 #include <pci-bother.h>
 #include <output.h>
 #include <minilib.h>
 #include <pci.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 <lwip/init.h>
 #include "net.h"
 


@@ -18,21 +29,40 @@
 #include "netif/etharp.h"
 #include "netif/ppp_oe.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 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;
        struct eth_hdr *ethhdr;

-       int pos = 0;
+       
+       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()
+{

        static int ticks = 0;
        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;


@@ -47,68 +77,22 @@ void eth_poll()
                tcp_tmr();
        ticks++;
 
                tcp_tmr();
        ticks++;
 

-       if (_nic->poll(_nic, 0))
+       while (i > 0)

        {
        {

-               _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:
-                       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);
+               int n = _nic->recv(_nic);
+               i -= n;
+               if (n == 0)

                        break;
                        break;

-               }

        }
 }
 
 static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
        struct nic *nic = netif->state;
        }
 }
 
 static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
        struct nic *nic = netif->state;

-       struct pbuf *q;
-       unsigned char pkt[1600];
-       unsigned int len = 0;
-
-       for(q = p; q != NULL; q = q->next)
-       {
-               memcpy(pkt + len, q->payload, q->len);
-               len += q->len;
-       }

 
 

-       outputf("NIC: Transmit packet: %d bytes", len);
+//     outputf("NIC: Transmit packet");

 
 

-       nic->transmit(len, pkt);
+       nic->transmit(nic, p);

 
        LINK_STATS_INC(link.xmit);
 
 
        LINK_STATS_INC(link.xmit);
 


@@ -154,15 +138,19 @@ int eth_register(struct nic *nic)
        return 0;
 }
 
        return 0;
 }
 

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

 void eth_init()
 {
 void eth_init()
 {

-       extern void httpd_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);

-       lwip_init();
-       httpd_init();

 
 

-       rfb_init();
+       lwip_init();

 
 

+       for (i = 0; i < TABLE_LENGTH(protocols); i++)
+               protocols_table[i]();

 }
 }