Current WIP code.

src/network/net_3c503.c

@@ -48,13 +48,13 @@
 #include <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../io.h"
-#include "../dma.h"
-#include "../pic.h"
-#include "../mem.h"
-#include "../random.h"
-#include "../device.h"
+#include "86box.h"
+#include "86box_io.h"
+#include "dma.h"
+#include "pic.h"
+#include "mem.h"
+#include "random.h"
+#include "device.h"
 #include "network.h"
 #include "net_dp8390.h"
 #include "net_3c503.h"
@@ -617,7 +617,7 @@ threec503_nic_init(const device_t *info)
     dev->regs.gacfr = 0x09;	/* Start with RAM mapping enabled. */
 
     /* Attach ourselves to the network module. */
-    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx);
+    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx, NULL);
 
     return(dev);
 }

src/network/net_dp8390.c

@@ -23,8 +23,8 @@
 #include <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
+#include "86box.h"
+#include "device.h"
 #include "network.h"
 #include "net_dp8390.h"
 

src/network/net_ne2000.c

@@ -52,15 +52,15 @@
 #include <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../io.h"
-#include "../mem.h"
-#include "../rom.h"
-#include "../mca.h"
-#include "../pci.h"
-#include "../pic.h"
-#include "../random.h"
-#include "../device.h"
+#include "86box.h"
+#include "86box_io.h"
+#include "mem.h"
+#include "rom.h"
+#include "mca.h"
+#include "pci.h"
+#include "pic.h"
+#include "random.h"
+#include "device.h"
 #include "network.h"
 #include "net_dp8390.h"
 #include "net_ne2000.h"
@@ -1465,7 +1465,7 @@ nic_init(const device_t *info)
 	nic_reset(dev);
 
     /* Attach ourselves to the network module. */
-    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx);
+    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx, NULL);
 
     nelog(1, "%s: %s attached IO=0x%X IRQ=%d\n", dev->name,
 	dev->is_pci?"PCI":"ISA", dev->base_address, dev->base_irq);

src/network/net_pcap.c

@@ -51,11 +51,10 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../plat_dynld.h"
-// #include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "plat_dynld.h"
 #include "network.h"
 
 
@@ -185,7 +184,7 @@ poll_thread(void *arg)
 	if (pcap == NULL) break;
 
 	/* Wait for the next packet to arrive. */
-	if (network_get_wait())
+	if (network_get_wait() || (poll_card->wait && poll_card->wait(poll_card->priv)))
 		data = NULL;
 	else
 		data = (uint8_t *)f_pcap_next((void *)pcap, &h);

src/network/net_pcnet.c

@@ -31,16 +31,16 @@
 #include <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../io.h"
-#include "../timer.h"
-#include "../dma.h"
-#include "../mem.h"
-#include "../rom.h"
-#include "../pci.h"
-#include "../pic.h"
-#include "../random.h"
-#include "../device.h"
+#include "86box.h"
+#include "86box_io.h"
+#include "timer.h"
+#include "dma.h"
+#include "mem.h"
+#include "rom.h"
+#include "pci.h"
+#include "pic.h"
+#include "random.h"
+#include "device.h"
 #include "network.h"
 #include "net_pcnet.h"
 #include "bswap.h"
@@ -222,14 +222,16 @@ typedef struct {
     int  iLog2DescSize;
     /** Bits 16..23 in 16-bit mode */
     uint32_t GCUpperPhys;
+    /** We are waitign/about to start waiting for more receive buffers. */
+    int fMaybeOutOfSpace;
     /** True if we signal the guest that RX packets are missing. */
     int fSignalRxMiss;
     /** Link speed to be reported through CSR68. */
     uint32_t u32LinkSpeed;
     /** Error counter for bad receive descriptors. */
     uint32_t uCntBadRMD;
-	uint8_t maclocal[6]; /* configured MAC (local) address */
-	pc_timer_t poll_timer;
+    uint8_t maclocal[6]; /* configured MAC (local) address */
+    pc_timer_t poll_timer;
 } nic_t;
 
 /** @todo All structs: big endian? */
@@ -359,10 +361,10 @@ static void     pcnetAsyncTransmit(nic_t *dev);
 static void     pcnetPollRxTx(nic_t *dev);
 static void     pcnetPollTimer(nic_t *dev);
 static void     pcnetUpdateIrq(nic_t *dev);
-static uint16_t pcnet_bcr_readw(nic_t *dev, uint16_t rap);
-static void pcnet_bcr_writew(nic_t *dev, uint16_t rap, uint16_t val);
-static void pcnet_csr_writew(nic_t *dev, uint16_t rap, uint16_t val);
-static void pcnetCanReceive(nic_t *dev);
+static uint16_t	pcnet_bcr_readw(nic_t *dev, uint16_t rap);
+static void	pcnet_bcr_writew(nic_t *dev, uint16_t rap, uint16_t val);
+static void	pcnet_csr_writew(nic_t *dev, uint16_t rap, uint16_t val);
+static int	pcnetCanReceive(nic_t *dev);
 
 
 #ifdef ENABLE_PCNET_LOG
@@ -1028,6 +1030,13 @@ pcnetStop(nic_t *dev)
 }
 
 
+static void
+pcnetWakeupReceive(nic_t *dev)
+{
+    /* TODO: Wake up the thread here. */
+}
+
+
 /**
  * Poll Receive Descriptor Table Entry and cache the results in the appropriate registers.
  * Note: Once a descriptor belongs to the network card (this driver), it cannot be changed
@@ -1062,7 +1071,8 @@ pcnetRdtePoll(nic_t *dev)
 			CSR_CRBA(dev) = rmd.rmd0.rbadr;              /* Receive Buffer Address */
 			CSR_CRBC(dev) = rmd.rmd1.bcnt;               /* Receive Byte Count */
 			CSR_CRST(dev) = ((uint32_t *)&rmd)[1] >> 16; /* Receive Status */
-			pcnetCanReceive(dev);
+			if (dev->fMaybeOutOfSpace)
+				pcnetWakeupReceive(dev);
 		} else {
 			/* This is not problematic since we don't own the descriptor
 			 * We actually do own it, otherwise pcnetRmdLoad would have returned false.
@@ -1613,7 +1623,7 @@ pcnetPollRxTx(nic_t *dev)
          * true but pcnetCanReceive() returned false for some other reason we need to check
          * _now_ if we have to wakeup pcnetWaitReceiveAvail().
          */
-        if (HOST_IS_OWNER(CSR_CRST(dev)))
+        if (HOST_IS_OWNER(CSR_CRST(dev)) || dev->fMaybeOutOfSpace)
             pcnetRdtePoll(dev);
     }
 
@@ -1630,8 +1640,8 @@ pcnetPollTimer(nic_t *dev)
 
     pcnetUpdateIrq(dev);
 
-    if (!CSR_STOP(dev) && !CSR_SPND(dev) && !CSR_DPOLL(dev))
-		pcnetPollRxTx(dev);
+    if (!CSR_STOP(dev) && !CSR_SPND(dev) && (!CSR_DPOLL(dev) || dev->fMaybeOutOfSpace))
+	pcnetPollRxTx(dev);
 }
 
 
@@ -2449,9 +2459,11 @@ pcnet_pci_read(int func, int addr, void *p)
  * @returns VBox status code.
  * @param   pThis           The PCnet instance data.
  */
-static void 
+static int
 pcnetCanReceive(nic_t *dev)
 {
+    int rc = 0;
+
     if (!CSR_DRX(dev) && !CSR_STOP(dev) && !CSR_SPND(dev)) {
         if (HOST_IS_OWNER(CSR_CRST(dev)) && dev->GCRDRA)
             pcnetRdtePoll(dev);
@@ -2460,8 +2472,22 @@ pcnetCanReceive(nic_t *dev)
             /** @todo Notify the guest _now_. Will potentially increase the interrupt load */
             if (dev->fSignalRxMiss)
                 dev->aCSR[0] |= 0x1000; /* Set MISS flag */
-        }
+        } else
+		rc = 1;
     }
+
+    return rc;
+}
+
+
+static int
+pcnetWaitReceiveAvail(void *priv)
+{
+    nic_t *dev = (nic_t *) priv;
+
+    dev->fMaybeOutOfSpace = !pcnetCanReceive(dev);
+
+    return dev->fMaybeOutOfSpace;
 }
 
 
@@ -2591,7 +2617,7 @@ pcnet_init(const device_t *info)
     pcnetHardReset(dev);
 
     /* Attach ourselves to the network module. */
-    network_attach(dev, dev->aPROM, pcnetReceiveNoSync);
+    network_attach(dev, dev->aPROM, pcnetReceiveNoSync, pcnetWaitReceiveAvail);
 
     return(dev);
 }

src/network/net_slirp.c

@@ -53,10 +53,9 @@
 #define HAVE_STDARG_H
 #include "slirp/slirp.h"
 #include "slirp/queue.h"
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-// #include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
 #include "network.h"
 
 
@@ -148,7 +147,7 @@ poll_thread(void *arg)
 	/* Wait for the next packet to arrive. */
 	data_valid = 0;
 
-	if (!network_get_wait() && (QueuePeek(slirpq) != 0)) {
+	if ((!network_get_wait() && !(poll_card->wait && poll_card->wait(poll_card->priv))) && (QueuePeek(slirpq) != 0)) {
 		/* Grab a packet from the queue. */
 		// ui_sb_update_icon(SB_NETWORK, 1);
 

src/network/net_wd8003.c

@@ -48,16 +48,16 @@
 #include <wchar.h>
 #include <time.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../io.h"
-#include "../mem.h"
-#include "../rom.h"
-#include "../machine/machine.h"
-#include "../mca.h"
-#include "../pci.h"
-#include "../pic.h"
-#include "../random.h"
-#include "../device.h"
+#include "86box.h"
+#include "86box_io.h"
+#include "mem.h"
+#include "rom.h"
+#include "machine.h"
+#include "mca.h"
+#include "pci.h"
+#include "pic.h"
+#include "random.h"
+#include "device.h"
 #include "network.h"
 #include "net_dp8390.h"
 #include "net_wd8003.h"
@@ -771,7 +771,7 @@ wd_init(const device_t *info)
     mem_mapping_disable(&dev->ram_mapping);		
 
     /* Attach ourselves to the network module. */
-    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx);
+    network_attach(dev->dp8390, dev->dp8390->physaddr, dp8390_rx, NULL);
 
     if (!(dev->board_chip & WE_ID_BUS_MCA)) {
 	wdlog("%s: attached IO=0x%X IRQ=%d, RAM addr=0x%06x\n", dev->name,

src/network/network.c

@@ -55,10 +55,10 @@
 #include <stdlib.h>
 #include <wchar.h>
 #define HAVE_STDARG_H
-#include "../86box.h"
-#include "../device.h"
-#include "../plat.h"
-#include "../ui.h"
+#include "86box.h"
+#include "device.h"
+#include "plat.h"
+#include "ui.h"
 #include "network.h"
 #include "net_3c503.h"
 #include "net_ne2000.h"
@@ -219,13 +219,14 @@ network_init(void)
  * modules.
  */
 void
-network_attach(void *dev, uint8_t *mac, NETRXCB rx)
+network_attach(void *dev, uint8_t *mac, NETRXCB rx, NETWAITCB wait)
 {
     if (network_card == 0) return;
 
     /* Save the card's info. */
     net_cards[network_card].priv = dev;
     net_cards[network_card].rx = rx;
+    net_cards[network_card].wait = wait;
     network_mac = mac;
 
     network_set_wait(0);

src/network/network.h

@@ -65,6 +65,7 @@ enum {
 
 
 typedef void (*NETRXCB)(void *, uint8_t *, int);
+typedef int (*NETWAITCB)(void *);
 
 
 typedef struct {
@@ -74,6 +75,7 @@ typedef struct {
     void		*priv;
     int			(*poll)(void *);
     NETRXCB		rx;
+    NETWAITCB		wait;
 } netcard_t;
 
 typedef struct {
@@ -99,7 +101,7 @@ extern void	network_busy(uint8_t set);
 extern void	network_end(void);
 
 extern void	network_init(void);
-extern void	network_attach(void *, uint8_t *, NETRXCB);
+extern void	network_attach(void *, uint8_t *, NETRXCB, NETWAITCB);
 extern void	network_close(void);
 extern void	network_reset(void);
 extern int	network_available(void);

src/network/pcap_if.c

@@ -54,9 +54,9 @@
 #include <ctype.h>
 #include <pcap/pcap.h>
 #include <time.h>
-#include "../86box.h"
-#include "../plat.h"
-#include "../plat_dynld.h"
+#include "86box.h"
+#include "plat.h"
+#include "plat_dynld.h"
 
 
 static void	*pcap_handle;		/* handle to WinPcap DLL */