From: Joshua Wise <joshua@rebirth.joshuawise.com>
Date: Mon, 10 Nov 2008 19:18:04 +0000 (-0500)
Subject: Don't worry about me, I'm kind of a noob
X-Git-Url: http://git.joshuawise.com/netwatch.git/commitdiff_plain/247ffdeea41720d829b9e0acc7887c5869924f56?ds=inline;hp=--cc

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

247ffdeea41720d829b9e0acc7887c5869924f56
diff --git a/lib/paging.c b/lib/paging.c
index 8fe80a9..fc54983 100644
--- a/lib/paging.c
+++ b/lib/paging.c
@@ -8,7 +8,7 @@ unsigned long memory_v2p(void *virt)
 	if (_virt >= 0xA0000 && _virt < 0xC0000)
 		return _virt;
 	if (_virt >= 0x200000 && _virt < 0x300000)
-		return _virt - 0x200000 + /* XXX */ 0x1FF80000;
+		return _virt - 0x200000 + /* XXX */ 0x1FF82000;
 	outputf("WARNING: v2p(%08x)", _virt);
 	return 0xFFFFFFFF;
 }
@@ -18,7 +18,7 @@ void *memory_p2v(unsigned long phys)
 	if (phys >= 0xA0000 && phys < 0xC0000)
 		return (void*)phys;
 	if (phys >= 0x1FF80000 && phys < 0x20000000)
-		return (void*)(phys - 0x1FF80000 + 0x200000);
+		return (void*)(phys - 0x1FF82000 + 0x200000);
 	outputf("WARNING: p2v(%08x)", phys);
 	return (void *)0xFFFFFFFF;
 }
diff --git a/net/3c90x.c b/net/3c90x.c
index 83a30ef..b9f708c 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -503,13 +503,13 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
 		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.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 **/
-		outl(INF_3C90X.IOAddr + regDnListPtr_l, virt_to_bus(&(INF_3C90X.TransmitDPD)));
+		outl(INF_3C90X.IOAddr + regDnListPtr_l, memory_v2p(&(INF_3C90X.TransmitDPD)));
 		_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
 		
 		oneshot_start_ms(100);
@@ -594,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)) **/