X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/03bcc4db7995b38ecda927e65d7bf2e657477664..a6327524107e76c689841eda10fbc19030b4cd15:/net/net.c

diff --git a/net/net.c b/net/net.c
index e7bb80a..d762b47 100644
--- 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 <tables.h>
 #include <lwip/init.h>
 #include "net.h"
 
@@ -18,17 +29,38 @@
 #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)
 {
-	struct pbuf *p;
 	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()
+{
 	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... */
 	
@@ -45,29 +77,12 @@ void eth_poll()
 		tcp_tmr();
 	ticks++;
 
-	while ((i--) && ((p = _nic->recv(_nic)) != NULL))
+	while (i > 0)
 	{
-//		outputf("NIC: Packet: %d bytes", p->tot_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;
-		}
 	}
 }
 
@@ -77,7 +92,7 @@ static err_t _transmit(struct netif *netif, struct pbuf *p)
 
 //	outputf("NIC: Transmit packet");
 
-	nic->transmit(p);
+	nic->transmit(nic, p);
 
 	LINK_STATS_INC(link.xmit);
 
@@ -123,15 +138,19 @@ int eth_register(struct nic *nic)
 	return 0;
 }
 
+typedef void(*thunk_t)();
+
+TABLE(thunk_t, protocols);
+
 void eth_init()
 {
-	extern void httpd_init();
+	int i;
 	
 	/* 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]();
 }