X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/7a914840b833dba82398623bbde04a1744627398..47c41031c5ec29bb8d8047cd287aa8b0b7af1fd3:/net/net.c?ds=sidebyside

diff --git a/net/net.c b/net/net.c
index 575b5e4..9d99342 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1,28 +1,149 @@
 #include <pci.h>
+#include <smram.h>
 #include <pci-bother.h>
 #include <output.h>
+#include <minilib.h>
+#include <lwip/init.h>
 #include "net.h"
 
+#include "lwip/opt.h"
+#include "lwip/def.h"
+#include "lwip/mem.h"
+#include "lwip/pbuf.h"
+#include "lwip/sys.h"
+#include <lwip/stats.h>
+#include <lwip/snmp.h>
+#include "netif/etharp.h"
+#include "netif/ppp_oe.h"
+
 static struct nic *_nic = 0x0;
+static struct netif _netif;
 
 extern struct pci_driver a3c90x_driver;
 
 void eth_poll()
 {
-	if (_nic)
-		_nic->poll(_nic, 0);
+	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:
+		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;
+	}
+}
+
+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);
+
+	nic->transmit(len, pkt);
+
+	LINK_STATS_INC(link.xmit);
+
+	return ERR_OK;
+}
+
+static err_t _init(struct netif *netif)
+{
+	struct nic *nic = netif->state;
+	
+	LWIP_ASSERT("netif != NULL", (netif != NULL));
+		
+#if LWIP_NETIF_HOSTNAME
+	netif->hostname = "netwatch";
+#endif
+	
+	NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, 100000000);
+
+	netif->name[0] = 'e';
+	netif->name[1] = 'n';
+	netif->output = etharp_output;
+	netif->linkoutput = _transmit;
+	
+	memcpy(netif->hwaddr, nic->hwaddr, 6);
+	netif->mtu = 1500;
+	netif->hwaddr_len = ETHARP_HWADDR_LEN;
+	netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_LINK_UP;
+	
+	return ERR_OK;
 }
 
 int eth_register(struct nic *nic)
 {
+	static struct ip_addr ipa = { 0x2dba0280 } , netmask = { 0xF0FFFFFF } , gw = { 0x2eba0280 };
+	
 	if (_nic)
 		return -1;
+	netif_add(&_netif, &ipa, &netmask, &gw, (void*)nic, _init, ethernet_input);
+	netif_set_default(&_netif);
+	netif_set_up(&_netif);
 	_nic = nic;
 	return 0;
 }
 
 void eth_init()
 {
-	if (pci_probe_driver(a3c90x_driver))
-		outputf("found 3c90x, hopefully!");
+	/* Required for DMA to work. :( */
+	smram_tseg_set_state(SMRAM_TSEG_OPEN);
+	lwip_init();
+	pci_probe_driver(a3c90x_driver);
 }