From 2e6917c409717c43be131c084abb17fc42bf4bae Mon Sep 17 00:00:00 2001
From: "ramapcsx2.code" <ramapcsx2.code@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 19 Mar 2013 23:08:29 +0000
Subject: [PATCH] DEV9ghzdrk: Either be thread safe in the whole plugin or
 don't try to at all.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5597 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 .../Win32/DEV9ghzdrk.vcxproj.filters          | 10 ++---
 plugins/dev9ghzdrk/Win32/smap.cpp             | 44 +++++--------------
 plugins/dev9ghzdrk/Win32/tap-win32.cpp        |  4 --
 3 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj.filters b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj.filters
index 4225c129d9..3a59b7752d 100644
--- a/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj.filters
+++ b/plugins/dev9ghzdrk/Win32/DEV9ghzdrk.vcxproj.filters
@@ -61,11 +61,6 @@
       <Filter>Source Files\ethernet i/o\pcap</Filter>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="DEV9ghzdrk.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="mtfifo.h">
       <Filter>Source Files</Filter>
@@ -94,4 +89,9 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="DEV9ghzdrk.def">
+      <Filter>Resource Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/plugins/dev9ghzdrk/Win32/smap.cpp b/plugins/dev9ghzdrk/Win32/smap.cpp
index 942582b7c7..54d274f393 100644
--- a/plugins/dev9ghzdrk/Win32/smap.cpp
+++ b/plugins/dev9ghzdrk/Win32/smap.cpp
@@ -101,19 +101,7 @@ void rx_process(NetPacket* pk)
 	pbd->ctrl_stat&= ~SMAP_BD_RX_EMPTY;
 
 	//increase frame count
-	u8* cntptr=&dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT);
-
-#ifdef WIN_X64
-	*cntptr++; //no asm inline in x64
-#else
-	__asm 
-	{ 
-		//this is silly
-		mov eax,[cntptr];
-		lock inc byte ptr [eax] 
-	}
-#endif
-
+	dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT)++;
 	//spams// emu_printf("Got packet, %d bytes (%d fifo)\n", pk->size,bytes);
 	_DEV9irq(SMAP_INTR_RXEND,0);//now ? or when the fifo is full ? i guess now atm
 								//note that this _is_ wrong since the IOP interrupt system is not thread safe.. but nothing i can do about that
@@ -131,15 +119,15 @@ void tx_process()
 	//spams// printf("tx_process : %d cnt frames !\n",cnt);
 
 	//						this hack worsens OPL performance. Is it really needed? OPL works fine without. (rama)
-	if (!tx_p_first)
-	{
-		dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT)=0;
-		tx_p_first=true;
-		//THIS IS A HACK.without that the stack wont init, i guess its missing e3/emac emulation ..
-		emu_printf("WARN : First packet interrupt hack ..\n");
-		_DEV9irq(SMAP_INTR_RXEND|SMAP_INTR_TXEND|SMAP_INTR_TXDNV,100);
-		return;
-	}
+	//if (!tx_p_first)
+	//{
+	//	dev9Ru8(SMAP_R_TXFIFO_FRAME_CNT)=0;
+	//	tx_p_first=true;
+	//	//THIS IS A HACK.without that the stack wont init, i guess its missing e3/emac emulation ..
+	//	emu_printf("WARN : First packet interrupt hack ..\n");
+	//	_DEV9irq(SMAP_INTR_RXEND|SMAP_INTR_TXEND|SMAP_INTR_TXDNV,100);
+	//	return;
+	//}
 
 	NetPacket pk;
 	int fc=0;
@@ -554,17 +542,7 @@ void CALLBACK smap_write8(u32 addr, u8 value)
 		DEV9_LOG("SMAP_R_RXFIFO_FRAME_DEC 8bit write %x\n", value);
 		dev9Ru8(addr) = value;
 		{
-			u8* cntptr=&dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT);
-#ifdef WIN_X64
-			*cntptr--; //no asm inline in x64
-#else
-			__asm 
-			{ 
-				//this is silly
-				mov eax,[cntptr];
-				lock dec byte ptr [eax] 
-			}
-#endif
+			dev9Ru8(SMAP_R_RXFIFO_FRAME_CNT)--;
 		}
 		return;
 
diff --git a/plugins/dev9ghzdrk/Win32/tap-win32.cpp b/plugins/dev9ghzdrk/Win32/tap-win32.cpp
index 27afd45201..9c4ceb4353 100644
--- a/plugins/dev9ghzdrk/Win32/tap-win32.cpp
+++ b/plugins/dev9ghzdrk/Win32/tap-win32.cpp
@@ -64,11 +64,7 @@
 #define USERMODEDEVICEDIR "\\\\.\\Global\\"
 #define TAPSUFFIX         ".tap"
 
-#ifdef WIN_X64
-#define TAP_COMPONENT_ID "tap0901"
-#else
 #define TAP_COMPONENT_ID "tap0801"
-#endif
 
 vector<string>* get_tap_reg ()
 {