Get packets in and out of lwIP. PING works.

[netwatch.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index b89abe2d2b0f56206aa4446121de9099a28d8a0c..9d99342a48a6c9f3dd46aa7f340c17c88e0976c1 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -1,36 +1,149 @@
 #include <pci.h>
+#include <smram.h>
+#include <pci-bother.h>
 #include <output.h>
-#include "3c905.h"
+#include <minilib.h>
+#include <lwip/init.h>
+#include "net.h"
 
-static int found = 0, _bus, _dev, _fn;
+#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 int bother_3c905(pci_dev_t *dev, void *nutrinus)
+static struct nic *_nic = 0x0;
+static struct netif _netif;
+
+extern struct pci_driver a3c90x_driver;
+
+void eth_poll()
 {
-       if (dev->vid == 0x10B7 || dev->did == 0x9200)
-       {
-               outputf("Found a 3c905 to bother");
-               
-               _bus = dev->bus;
-               _dev = dev->dev;
-               _fn = dev->fn;
-               found = 1;
+       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);
                
-               return 1;
+       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;
        }
-       return 0;
 }
 
-void eth_poll()
+static err_t _transmit(struct netif *netif, struct pbuf *p)
 {
-       if (!found)
-               return;
+       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));
                
-       pci_write16(_bus, _dev, _fn, 0x04, 0xFF);
+#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;
        
-       pci_write16(_bus, _dev, _fn, 0x04, 0x00);
+       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()
 {
-       pci_probe(bother_3c905, 0x0);
+       /* Required for DMA to work. :( */
+       smram_tseg_set_state(SMRAM_TSEG_OPEN);
+       lwip_init();
+       pci_probe_driver(a3c90x_driver);
 }