Don't worry about me, I'm kind of a noob

[netwatch.git] / net / 3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index ae8a7716327c2c34396d6a51c777d4bff4bec1ed..b9f708c81bf7cbb4d03ef42ed4c30182916888cf 100644 (file)
--- 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
@@ -492,8 +493,6 @@ 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);
@@ -503,29 +502,22 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
                /** 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.FrameStartHeader = (size + sizeof(hdr)) | 0x8000;
+               INF_3C90X.TransmitDPD.HdrAddr = memory_v2p(&hdr);
                INF_3C90X.TransmitDPD.HdrLength = sizeof(hdr);
-               INF_3C90X.TransmitDPD.DataAddr = virt_to_bus(pkt);
+               INF_3C90X.TransmitDPD.DataAddr = memory_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, memory_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())
                        ;
@@ -602,11 +594,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 = memory_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(memory_v2p(&(INF_3C90X.ReceiveUPD)),
          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/