X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/6f9272bdabcda81425ec1aaecf26a160535d4749..aa9bc58fc6be92126c89fda9b5e9c0b102d0fcca:/net/net.c diff --git a/net/net.c b/net/net.c index 8390f04..0c83b9b 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; @@ -45,68 +47,59 @@ 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) - { - 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) + if (_nic->poll(_nic, 0)) { - memcpy(q->payload, pkt+pos, q->len); - pos += q->len; - } - - LINK_STATS_INC(link.recv); + _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; + } - ethhdr = p->payload; - - switch (htons(ethhdr->type)) { - case ETHTYPE_IP: - case ETHTYPE_ARP: - if (_netif.input(p, &_netif) != ERR_OK) + for(q = p; q != NULL; q = q->next) { - LWIP_DEBUGF(NETIF_DEBUG, ("netdev_input: IP input error\n")); + 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; } - 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"); - outputf("NIC: Transmit packet: %d bytes", len); - - nic->transmit(len, pkt); + nic->transmit(p); LINK_STATS_INC(link.xmit); @@ -159,6 +152,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(); + }