X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/47c41031c5ec29bb8d8047cd287aa8b0b7af1fd3..bc9e1044fd166db4e75cdc39b2aaa17d942b3ca4:/net/net.c

diff --git a/net/net.c b/net/net.c
index 9d99342..5d0c75b 100644
--- a/net/net.c
+++ b/net/net.c
@@ -13,9 +13,13 @@
 #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;
 
@@ -23,79 +27,56 @@ 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)
 		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)
+	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 ((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);
 
@@ -129,21 +110,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();
+
 }