X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/47c41031c5ec29bb8d8047cd287aa8b0b7af1fd3..d0dc32550bab5d545b91dd76003f04b827968f41:/net/3c90x.c?ds=inline

diff --git a/net/3c90x.c b/net/3c90x.c
index a9d15df..46fe6f1 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -477,6 +477,21 @@ a3c90x_transmit(unsigned int size, const char *pkt)
 {
 	unsigned char status;
 	unsigned int i, retries;
+	static unsigned int stillwaiting = 0;
+
+	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;
+	}
 
 	for (retries=0; retries < XMIT_RETRIES; retries++)
 	{
@@ -489,32 +504,27 @@ a3c90x_transmit(unsigned int size, const char *pkt)
 		INF_3C90X.TransmitDPD.DnNextPtr = 0;
 		/** set notification for transmission completion (bit 15) **/
 		INF_3C90X.TransmitDPD.FrameStartHeader = (size) | 0x8000;
-		INF_3C90X.TransmitDPD.DataAddr = memory_v2p((void*)pkt);
+		INF_3C90X.TransmitDPD.DataAddr = v2p((void*)pkt);
 		INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
 		/** Send the packet **/
-		outl(INF_3C90X.IOAddr + regDnListPtr_l, memory_v2p(&(INF_3C90X.TransmitDPD)));
+		outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD)));
 		_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
 		
-		oneshot_start_ms(100);
+		oneshot_start_ms(10);
 		while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
 			;
 		if (!oneshot_running())
-			outputf("3c90x: Download engine pointer timeout");
-
-		oneshot_start_ms(10);	/* Give it 10 ms */
-		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));
+			outputf("3c90x: Download engine pointer timeout");
 			continue;
 		}
-		status = inb(INF_3C90X.IOAddr + regTxStatus_b);
-		outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
+
+		oneshot_start_ms(10);
+		stillwaiting = 1;
+		break;
 		
+#if 0		
 		/** successful completion (sans "interrupt Requested" bit) **/
 		if ((status & 0xbf) == 0x80)
 			return;
@@ -545,6 +555,7 @@ a3c90x_transmit(unsigned int size, const char *pkt)
 			outputf("3c90x: Internal Error - Incomplete Transmission (%hhX)", status);
 			a3c90x_reset();
 		}
+#endif
 	}
 
 	/** failed after RETRY attempts **/
@@ -578,11 +589,11 @@ a3c90x_poll(struct nic *nic, int retrieve)
     /** Build the up-load descriptor **/
     INF_3C90X.ReceiveUPD.UpNextPtr = 0;
     INF_3C90X.ReceiveUPD.UpPktStatus = 0;
-    INF_3C90X.ReceiveUPD.DataAddr = memory_v2p(nic->packet);
+    INF_3C90X.ReceiveUPD.DataAddr = v2p(nic->packet);
     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/
-    _outl(memory_v2p(&(INF_3C90X.ReceiveUPD)),
+    _outl(v2p(&(INF_3C90X.ReceiveUPD)),
          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/