X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/d401e73e740bcf5e7d1b66aeae9839493a8c1686..057f0bb976a93bfa290b20a2192837e324573d9b:/net/3c90x.c?ds=inline

diff --git a/net/3c90x.c b/net/3c90x.c
index ea7914c..a1b319c 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -478,8 +478,23 @@ static void
 a3c90x_transmit(struct pbuf *p)
 {
 	unsigned char status;
-	static unsigned int stillwaiting = 0;
+	static struct pbuf *oldpbuf = NULL;
 	unsigned int n, len;
+	
+	if (oldpbuf)
+	{
+		while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
+			;
+		if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
+		{
+			outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
+			outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
+		}
+		status = inb(INF_3C90X.IOAddr + regTxStatus_b);
+		outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
+		pbuf_free(oldpbuf);
+		oldpbuf = NULL;
+	}
 
 	_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
@@ -487,11 +502,13 @@ a3c90x_transmit(struct pbuf *p)
 	INF_3C90X.TransmitDPD.DnNextPtr = 0;
 	len = 0;
 	n = 0;
+	oldpbuf = p;
 	for (; p; p = p->next)
 	{
 		INF_3C90X.TransmitDPD.segments[n].addr = v2p(p->payload);
 		INF_3C90X.TransmitDPD.segments[n].len = p->len | (p->next ? 0 : (1 << 31));
 		len += p->len;
+		pbuf_ref(p);
 		n++;
 	}
 	/** set notification for transmission completion (bit 15) **/
@@ -512,22 +529,6 @@ a3c90x_transmit(struct pbuf *p)
 		return;
 	}
 
-	oneshot_start_ms(10);
-	stillwaiting = 1;
-	if (stillwaiting)
-	{
-		while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
-			;
-		if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
-		{
-			outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
-			outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
-		}
-		status = inb(INF_3C90X.IOAddr + regTxStatus_b);
-		outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
-		stillwaiting = 0;
-	}
-		
 #if 0		
 	/** successful completion (sans "interrupt Requested" bit) **/
 	if ((status & 0xbf) == 0x80)