X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d3411e0d51c282841fb0137fb3764860c9006002..421ccff4aaad4ddaba92ae0dba69fe6dbc9c1105:/net/net.c?ds=sidebyside

diff --git a/net/net.c b/net/net.c
index 46ea9cd..0b57321 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1,123 +1,143 @@
 #include <pci.h>
-#include <io.h>
-#include <video_defines.h>
 #include <smram.h>
 #include <pci-bother.h>
 #include <output.h>
 #include <minilib.h>
+#include <lwip/init.h>
 #include "net.h"
-#include "../aseg/keyboard.h"
 
-static struct nic *_nic = 0x0;
-
-extern struct pci_driver a3c90x_driver;
+#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 <lwip/dhcp.h>
+#include <lwip/tcp.h>
+#include "netif/etharp.h"
+#include "netif/ppp_oe.h"
 
-static char test[1024] = {0};
+#include "rfb.h"
 
-static char packet[4096] = {0};
+static struct nic *_nic = 0x0;
+static struct netif _netif;
 
-typedef struct packet_t {
-	char from[6];
-	char to[6];
-	unsigned short ethertype;
-	unsigned short datalen;
-	unsigned char command;
-	char data[];
-} packet_t;
+extern struct pci_driver a3c90x_driver;
 
-static unsigned char vga_read(unsigned char idx)
+void eth_recv(struct nic *nic, struct pbuf *p)
 {
-	outb(CRTC_IDX_REG, idx);
-	return inb(CRTC_DATA_REG);
+	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;
+	}
 }
 
-static unsigned int vga_base()
+void eth_poll()
 {
-	return (((unsigned int) vga_read(CRTC_START_ADDR_MSB_IDX)) << 9)
-	     + (((unsigned int) vga_read(CRTC_START_ADDR_LSB_IDX)) << 1);
+	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;
+	
+	smram_tseg_set_state(SMRAM_TSEG_OPEN);
+	
+	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++;
+
+	while (i > 0)
+	{
+		int n = _nic->recv(_nic);
+		i -= n;
+		if (n == 0)
+			break;
+	}
 }
 
-void handle_command(packet_t * p)
+static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
-	uint16_t dl = htons(p->datalen);
-	int i;
+	struct nic *nic = netif->state;
 
-	outputf("NIC: Command: 0x%x, %d bytes", p->command, dl);
+//	outputf("NIC: Transmit packet");
 
-	if (p->command == 0x42)
-	{
-		for (i = 0; i < dl; i++)
-			kbd_inject_key(p->data[i]);
-	}
+	nic->transmit(p);
+
+	LINK_STATS_INC(link.xmit);
+
+	return ERR_OK;
 }
 
-void eth_poll()
+static err_t _init(struct netif *netif)
 {
-	int i;
-//	static int c;
-	static short pos = 0x0;
-	unsigned short base = vga_base();
-	unsigned char *p = (unsigned char *)0xB8000;
-	smram_state_t old_state;
+	struct nic *nic = netif->state;
 	
-	if (!_nic)
-		return;
-
-	if (_nic->poll(_nic, 0)) {
-		_nic->packet = packet;
-		_nic->poll(_nic, 1);
-
-		packet_t * p = (packet_t *) packet;
-
-		outputf("NIC: Packet: %d 0x%x", _nic->packetlen, htons(p->ethertype));
-		if (htons(p->ethertype) == 0x1338) {
-			if (htons(p->datalen) + sizeof(packet_t) > _nic->packetlen) {
-				outputf("NIC: Malformed packet");
-			} else {
-				handle_command(p);
-			}
-		}
-	}
-	smram_tseg_set_state(SMRAM_TSEG_OPEN);
-	old_state = smram_save_state();
+	LWIP_ASSERT("netif != NULL", (netif != NULL));
+		
+#if LWIP_NETIF_HOSTNAME
+	netif->hostname = "netwatch";
+#endif
 	
-//	if ((c++) % 2)
-//		return;
+	NETIF_INIT_SNMP(netif, snmp_ifType_ethernet_csmacd, 100000000);
 
-	if (((base + 80*25*2)%0x8000) < base)
-	{
-		if ((pos > ((base + 80*25*2)%0x8000)) && (pos < base))
-			pos = base;
-	} else if ((pos > base + 80*25*2) || (pos < base))
-		pos = base;
+	netif->name[0] = 'e';
+	netif->name[1] = 'n';
+	netif->output = etharp_output;
+	netif->linkoutput = _transmit;
 	
-	test[0] = pos >> 8;
-	test[1] = pos & 0xFF;
-	test[2] = base >> 8;
-	test[3] = base & 0xFF;
-
-	smram_aseg_set_state(SMRAM_ASEG_SMMCODE);
+	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;
 	
-	for (i = 4; i < 1024; i++)
-	{
-		test[i] = p[pos++];
-		pos %= 0x8000;
-	}
-	smram_restore_state(old_state);
-	_nic->transmit("\x00\x03\x93\x87\x84\x8C", 0x1337, 1024, test);
+	return ERR_OK;
 }
 
 int eth_register(struct nic *nic)
 {
+	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);
-	pci_probe_driver(a3c90x_driver);
+	lwip_init();
+	httpd_init();
+
+	rfb_init();
+
 }