X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/6f9272bdabcda81425ec1aaecf26a160535d4749..80c7c8bffb0bdf3bc667a00bccae4dfe877906d4:/net/net.c

diff --git a/net/net.c b/net/net.c
index 8390f04..3e6130f 100644
--- a/net/net.c
+++ b/net/net.c
@@ -18,6 +18,8 @@
 #include "netif/etharp.h"
 #include "netif/ppp_oe.h"
 
+#include "rfb.h"
+
 static struct nic *_nic = 0x0;
 static struct netif _netif;
 
@@ -25,11 +27,8 @@ extern struct pci_driver a3c90x_driver;
 
 void eth_poll()
 {
-	unsigned char pkt[1600];
-	int len;
-	struct pbuf *p, *q;
+	struct pbuf *p;
 	struct eth_hdr *ethhdr;
-	int pos = 0;
 	static int ticks = 0;
 	
 	if (!_nic)
@@ -45,68 +44,39 @@ void eth_poll()
 		tcp_tmr();
 	ticks++;
 
-	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)
+	if ((p = _nic->recv(_nic)) != 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"));
+		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);
+			break;
 		}
-		break;
-
-	default:
-		outputf("Unhandled packet type %04x input", ethhdr->type);
-		pbuf_free(p);
-		break;
 	}
 }
 
 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(p);
 
 	LINK_STATS_INC(link.xmit);
 
@@ -159,6 +129,8 @@ void eth_init()
 	/* Required for DMA to work. :( */
 	smram_tseg_set_state(SMRAM_TSEG_OPEN);
 	lwip_init();
-	pci_probe_driver(a3c90x_driver);
 	httpd_init();
+
+	rfb_init();
+
 }