X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/31ddf9b375ddf1bd142750bc4762b3268e297619..e8f20fe7be6203b50e049bbaa057acc7f0b0d593:/net/3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index 64f1d01..40edafe 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -45,13 +45,14 @@
 #include <pci-bother.h>
 #include <minilib.h>
 #include <output.h>
+#include <paging.h>
 
 #define	XCVR_MAGIC	(0x5A00)
 /** any single transmission fails after 16 collisions or other errors
  ** this is the number of times to retry the transmission -- this should
  ** be plenty
  **/
-#define	XMIT_RETRIES	1
+#define	XMIT_RETRIES	5
 
 /*** Register definitions for the 3c905 ***/
 enum Registers
@@ -223,8 +224,6 @@ typedef struct
     {
     unsigned int	DnNextPtr;
     unsigned int	FrameStartHeader;
-    unsigned int	HdrAddr;
-    unsigned int	HdrLength;
     unsigned int	DataAddr;
     unsigned int	DataLength;
     }
@@ -474,16 +473,8 @@ static void a3c90x_reset(void)
  *** pkt - the pointer to the packet data itself.
  ***/
 static void
-a3c90x_transmit(const char *dest_addr, unsigned int proto,
-                unsigned int size, const char *pkt)
+a3c90x_transmit(unsigned int size, const char *pkt)
 {
-	struct eth_hdr
-	{
-		unsigned char dst_addr[ETH_ALEN];
-		unsigned char src_addr[ETH_ALEN];
-		unsigned short type;
-	} hdr;
-		
 	unsigned char status;
 	unsigned int i, retries;
 
@@ -492,61 +483,38 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
 		if (retries != 0)
 			outputf("3c90x: retrying packet send (%d)", retries);
 		
-		/** Stall the download engine **/
-		outputf("3c90x: stalling transmit engine");
 		_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
-		hdr.type = htons(proto);
-		memcpy(hdr.dst_addr, dest_addr, ETH_ALEN);
-		memcpy(hdr.src_addr, INF_3C90X.HWAddr, ETH_ALEN);
-
 		/** Setup the DPD (download descriptor) **/
 		INF_3C90X.TransmitDPD.DnNextPtr = 0;
 		/** set notification for transmission completion (bit 15) **/
-		INF_3C90X.TransmitDPD.FrameStartHeader = (size + sizeof(hdr)) | 0x8000;
-		INF_3C90X.TransmitDPD.HdrAddr = virt_to_bus(&hdr);
-		INF_3C90X.TransmitDPD.HdrLength = sizeof(hdr);
-		INF_3C90X.TransmitDPD.DataAddr = virt_to_bus(pkt);
+		INF_3C90X.TransmitDPD.FrameStartHeader = (size) | 0x8000;
+		INF_3C90X.TransmitDPD.DataAddr = v2p((void*)pkt);
 		INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
 		/** Send the packet **/
-		outputf("3c90x: pointing card at %08x", virt_to_bus(&(INF_3C90X.TransmitDPD)));
-		outl(INF_3C90X.IOAddr + regDnListPtr_l, virt_to_bus(&(INF_3C90X.TransmitDPD)));
-
-		outputf("3c90x: unstalling transmit engine");
+		outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD)));
 		_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
 		
-		outputf("3c90x: waiting for download pointer");
 		oneshot_start_ms(100);
 		while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
 			;
 		if (!oneshot_running())
-		{
 			outputf("3c90x: Download engine pointer timeout");
-		}
 
-		outputf("3c90x: waiting for TXCOMPLETE");
 		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? stat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
-			_issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
-    if (! INF_3C90X.isBrev)
-	_outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
-    _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
-    _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
-    _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);
-    _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
+			outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
+			outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
 			continue;
 		}
 		status = inb(INF_3C90X.IOAddr + regTxStatus_b);
 		outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
 		
-		_issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, INT_TXCOMPLETE);
-
 		/** successful completion (sans "interrupt Requested" bit) **/
 		if ((status & 0xbf) == 0x80)
 			return;
@@ -610,11 +578,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 = virt_to_bus(nic->packet);
+    INF_3C90X.ReceiveUPD.DataAddr = v2p(nic->packet);
     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/
-    _outl(virt_to_bus(&(INF_3C90X.ReceiveUPD)),
+    _outl(v2p(&(INF_3C90X.ReceiveUPD)),
          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/
@@ -700,7 +668,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     	pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3);
     
     outputf("3c90x: Picked I/O address %04x", ioaddr);
-//    pci_bother_add(pci);
+    pci_bother_add(pci);
     nic.ioaddr = ioaddr & ~3;
     nic.irqno = 0;
 
@@ -953,6 +921,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /* * Set our exported functions **/
     nic.poll     = a3c90x_poll;
     nic.transmit = a3c90x_transmit;
+    memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);
 
     return 1;