Merge from trunk.

Subversion-branch: /branches/raven-branch
Subversion-revision: 2347

1 files changed, 29 insertions, 2 deletions

diff --git a/opl/opl_win32.c b/opl/opl_win32.c
index 29df3643..277ce76c 100644
--- a/opl/opl_win32.c
+++ b/opl/opl_win32.c
@@ -72,8 +72,35 @@ static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
     );
 }
 
-// TODO: MSVC version
-// #elif defined(_MSC_VER) && defined(_M_IX6) ...
+// haleyjd 20110417: MSVC version
+#elif defined(_MSC_VER) && defined(_M_IX86)
+
+static unsigned int OPL_Win32_PortRead(opl_port_t port)
+{
+    unsigned char result;
+    opl_port_t dst_port = opl_port_base + port;
+    
+    __asm    
+    {
+        mov edx, dword ptr [dst_port]
+        in al, dx
+        mov byte ptr [result], al
+    }
+    
+    return result;
+}
+
+static void OPL_Win32_PortWrite(opl_port_t port, unsigned int value)
+{
+    opl_port_t dst_port = opl_port_base + port;
+    
+    __asm    
+    {
+        mov edx, dword ptr [dst_port]
+        mov al, byte ptr [value]
+        out dx, al
+    }
+}
 
 #else