From 111cc06bf113d48d1e9fbf345cc1c45a9d485d76 Mon Sep 17 00:00:00 2001
From: n-a-c-h <>
Date: Mon, 3 Jan 2005 16:22:16 +0000
Subject: [PATCH] Removed every last trace of OSPort.

---
 zsnes/src/cpu/dspproc.asm    |  4 ---
 zsnes/src/cpu/execute.asm    | 25 --------------
 zsnes/src/dos/dosintrf.asm   |  2 --
 zsnes/src/gui/gui.asm        | 14 --------
 zsnes/src/gui/guikeys.inc    |  7 ----
 zsnes/src/gui/guiload.inc    |  9 -----
 zsnes/src/gui/guimisc.inc    |  2 --
 zsnes/src/gui/guimouse.inc   | 26 --------------
 zsnes/src/gui/guinetpl.inc   |  4 ---
 zsnes/src/gui/guitools.inc   |  2 --
 zsnes/src/gui/guiwindp.inc   | 66 ------------------------------------
 zsnes/src/init.asm           |  1 -
 zsnes/src/linux/sdlintrf.asm |  3 --
 zsnes/src/ui.asm             |  8 -----
 zsnes/src/video/copyvid.inc  |  4 ---
 zsnes/src/video/procvid.asm  | 12 -------
 zsnes/src/win/winintrf.asm   |  3 --
 17 files changed, 192 deletions(-)

diff --git a/zsnes/src/cpu/dspproc.asm b/zsnes/src/cpu/dspproc.asm
index ec8be5fb..3cd61ce2 100644
--- a/zsnes/src/cpu/dspproc.asm
+++ b/zsnes/src/cpu/dspproc.asm
@@ -1563,10 +1563,6 @@ NEWSYM InitSPC
       mov dword [opcjmptab+03F4h],OpFD
       mov dword [opcjmptab+03F8h],OpFE
       mov dword [opcjmptab+03FCh],OpFF
-;    cmp byte[soundon],0
-;    je .nosound
-;    cmp byte[OSPort],2
-;    jae .nosound
 %ifdef __MSDOS__
      call SB_alloc_dma
 %endif
diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 82739ec1..8f845dbc 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -437,11 +437,6 @@ NEWSYM ProcessRewind
     ret
 
 NEWSYM UpdateRewind
-;    cmp byte[OSPort],3
-;    je .yeswin32
-;    ret
-
-;.yeswin32
 %ifndef __MSDOS__
     push eax
     cmp dword[KeyRewind],0
@@ -1024,8 +1019,6 @@ NEWSYM start65816
     ret
 .notrouble
 
-;    cmp byte[OSPort],2
-;    jae .nonewgfxcheck
     jmp .nonewgfxcheck
     cmp byte[cbitmode],1
     jne .nonewgfxcheck
@@ -1107,8 +1100,6 @@ reexecutenokeys
     jmp reexecuteb2
 
 NEWSYM reexecuteb
-    ;cmp byte[OSPort],1
-    ;ja reexecuteb2
 %ifdef __MSDOS__
     mov esi,pressed
     mov ecx,256+128+64
@@ -2839,8 +2830,6 @@ NEWSYM cpuover
     call RemoteSendChar
     ; ##################
     ; Send latency value
-    ;cmp byte[OSPort],3
-    ;jne .nolatencysend
 %ifndef __MSDOS__ 
     cmp byte[BackState],1
     jne .nolatencysend
@@ -2891,8 +2880,6 @@ NEWSYM cpuover
     push esi
     mov esi,chatstrR
 
-    ;cmp byte[OSPort],2
-    ;jae .notwin32b
 %ifdef __MSDOS__
     mov byte[esi],'L'
     mov byte[esi+1],'>'
@@ -2942,8 +2929,6 @@ NEWSYM cpuover
 %endif
 .skipsendnick
     mov ebx,chatstrL+1
-    ;cmp byte[OSPort],2
-    ;jb .noaction3
 %ifndef __MSDOS__
     cmp dword[chatstrL+1],'/ME '
     jne .noaction3
@@ -2997,8 +2982,6 @@ NEWSYM cpuover
 
     push ecx
     push ebx
-;    cmp byte[OSPort],3
-;    jne .nobackstate
 %ifndef __MSDOS__
     cmp byte[BackState],1
     jne .nobackstate
@@ -3069,8 +3052,6 @@ NEWSYM cpuover
 .notor
     cmp dh,0
     jne .foundchar
-    ;cmp byte[OSPort],3
-    ;jne .notwin32
 %ifndef __MSDOS__
     push ebx
     cmp byte[BackState],1
@@ -3128,8 +3109,6 @@ NEWSYM cpuover
     pushad
     ; Receive latency value
     ; #####################
-    ;cmp byte[OSPort],3
-    ;jne near .nolatencyrecv2
 %ifndef __MSDOS__
     cmp byte[BackState],1
     jne near .nolatencyrecv2
@@ -3206,8 +3185,6 @@ NEWSYM cpuover
     test dl,02h
     jz near .nocrupdate2
 
-;    cmp byte[OSPort],3
-;    jne .notwin32d
 %ifndef __MSDOS__
     cmp byte[BackState],1
     jne .notwin32d
@@ -3314,8 +3291,6 @@ NEWSYM cpuover
     jne .nextchatcr            ; *********
     pop edx
     pushad
-    ;cmp byte[OSPort],2
-    ;jae .notwin32e
 %ifdef __MSDOS__
     mov dl,'R'
     call NetAddChar
diff --git a/zsnes/src/dos/dosintrf.asm b/zsnes/src/dos/dosintrf.asm
index c29eb355..51027c44 100644
--- a/zsnes/src/dos/dosintrf.asm
+++ b/zsnes/src/dos/dosintrf.asm
@@ -1563,8 +1563,6 @@ NEWSYM StartSound
 
 
 NEWSYM SoundProcess     ; This function is called ~60 times/s at full speed
-    cmp byte[OSPort],1  ; Do not call in the dos port
-;    ja .notdos
 .nosound
     ret
 .notdos
diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index 4d3c988c..74c8b405 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -3334,11 +3334,6 @@ GUITryMenuItem:
     jne .noreset
     mov byte[GUICResetPos],1
 .noreset
-;    cmp byte[OSPort],3
-;    je .win32state
-;    cmp byte[CNetType],20
-;    je near .noromloaded
-;.win32state
     cmp byte[CNetType],21
     je near .noromloaded
     cmp byte[CNetType],22
@@ -3440,8 +3435,6 @@ GUITryMenuItem:
 .nocheat
     cmp byte[GUIcmenupos],5
     jne near .nonet
-;    cmp byte[GOSPort],3
-;    je near .win32
 %ifdef __MSDOS__
     cmp byte[CNetType],10
     jae .nomod
@@ -3894,8 +3887,6 @@ DisplayMenu:
     GUIBox 0,14,229,14,70
     GUIBox 0,15,229,15,71
 
-;    cmp byte[OSPort],3
-;    jne near .notwinpressa
     %ifdef __LINUX__
     GUIShadow 238,9,247,20
     GUIShadow 249,9,257,20
@@ -3907,9 +3898,6 @@ DisplayMenu:
     %endif
 .notwinpressa
 
-;    cmp byte[OSPort],3
-;    jne near .notwinpressb
-
     %ifdef __LINUX__
     mov byte[GUIMenuItem+36],247
     GUIDMHelpB 233,242,GUIMenuItem+36,1
@@ -3967,8 +3955,6 @@ DisplayMenu:
 .nomenu4
     cmp byte[GUIcmenupos],5
     jne near .nomenu5
-;    cmp byte[GOSPort],3
-;    je near .menu5b
 %ifdef __MSDOS__
     GUIDrawMenuM 140,16,10,2,GUINetPlayMenuData,142,145,22,39,48 ;19+2*10
     mov dword[GUICYLocPtr],MenuDat5
diff --git a/zsnes/src/gui/guikeys.inc b/zsnes/src/gui/guikeys.inc
index 3fc09b82..a2dfa3a2 100644
--- a/zsnes/src/gui/guikeys.inc
+++ b/zsnes/src/gui/guikeys.inc
@@ -187,8 +187,6 @@ GUIgetcurrentinput:
     GUIqcheckkeys 1
     GUIqcheckkeys 1Ch
 
-;    cmp byte[OSPort],3
-;    jne near .notwinport
 %ifndef __MSDOS__
     GUIqcheckkeys 0C8h
     GUIqcheckkeys 0D0h
@@ -257,9 +255,6 @@ GUIgetcurrentinput:
     mov al,cl
 .notextkb
 
-;    cmp byte[OSPort],3
-;    jne near .notwinport2
-
 %ifdef __LINUX__
     GUIgetprkeys 90,90 ; UP
     GUIgetprkeys 96,96 ; DOWN
@@ -358,8 +353,6 @@ GUIgetcurrentinput:
 .yesnet15
     mov byte[CNetType],0
 %ifdef __MSDOS__
-;    cmp byte[OSPort],1
-;    je .nodeinitipx
     call deinitipx
 .nodeinitipx
 %endif
diff --git a/zsnes/src/gui/guiload.inc b/zsnes/src/gui/guiload.inc
index a45ece7a..08aceaf3 100644
--- a/zsnes/src/gui/guiload.inc
+++ b/zsnes/src/gui/guiload.inc
@@ -529,11 +529,8 @@ GetNormalEntries2:
     GUIGetEntry2 GUIfindEUR
     GUIGetEntry2 GUIfindJAP
     GUIGetEntry2 GUIfindBIN
-;    cmp byte[OSPort],1
-;    je near .noasm
     GUIGetEntry2 GUIfindZIP
     GUIGetEntry2 GUIfindJMA
-;.noasm
     GUIGetEntry2 GUIfind1
     jmp .guiNext
 .guishowall
@@ -560,10 +557,7 @@ GetNormalEntries:
     GUIGetEntry GUIfindEUR
     GUIGetEntry GUIfindJAP
     GUIGetEntry GUIfindBIN
-;    cmp byte[OSPort],1
-;    je near .noasm
     GUIGetEntry GUIfindZIP
-;.noasm
     GUIGetEntry GUIfind1
     jmp .guiNext
 .guishowall
@@ -1093,8 +1087,6 @@ GetLoadData:
     mov dword[GUIcurrentdircursloc],0
     mov edi,spcRamcmp
     mov byte[Win95Failed],0
-;    cmp byte[OSPort],1
-;    ja .notdos
 %ifdef __MSDOS__
     cmp byte[GUIloadfntype],2
     jne .nowin95lfn
@@ -1103,7 +1095,6 @@ GetLoadData:
     int 21h
     jc .nowin95lfn
 %endif
-;.notdos
     mov byte[GUIloadfntype],0
 .nowin95lfn
     cmp byte[GUIloadfntype],2
diff --git a/zsnes/src/gui/guimisc.inc b/zsnes/src/gui/guimisc.inc
index 8ae6ed94..112a2bce 100644
--- a/zsnes/src/gui/guimisc.inc
+++ b/zsnes/src/gui/guimisc.inc
@@ -440,8 +440,6 @@ SetDevice:
     mov byte[GUICBHold],0
     xor eax,eax
     mov al,[cplayernum]
-;    cmp byte[OSPort],1
-;    ja .notdos
 %ifdef __MSDOS__
     cmp byte[pl1p209+eax],0
     jne .port209
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index 4d7c9128..ad50f8c6 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -305,8 +305,6 @@ ProcessMouseButtons:
     jmp .noclick
 .noclicked
 
-;    cmp byte[OSPort],3
-;    jne .noclick
 %ifdef __MSDOS__
     jmp .noclick
 %else
@@ -463,8 +461,6 @@ ProcessMouseButtons:
     mov byte[GUIpclicked],0
     mov byte[GUIHold],0
 
-;    cmp byte[OSPort],3
-;    jne .notwinpressa
 
 %ifdef __LINUX__
     cmp byte[GUIcwinpress],1
@@ -500,8 +496,6 @@ ProcessMouseButtons:
 
 .notwinpressa
 
-;    cmp byte[OSPort],3
-;    jne .notwinpressb
 %ifndef __MSDOS__
     cmp byte[GUIcwinpress],2
     jne .notwinpressb
@@ -518,8 +512,6 @@ ProcessMouseButtons:
     ret
 .notwinpressb
 
-    ;cmp byte[OSPort],3
-    ;jne .notwinpressc
     cmp byte[GUIcwinpress],3
     jne .notwinpressc
     mov byte[GUIcwinpress],0
@@ -793,8 +785,6 @@ ProcessMouseButtons:
 
 GUIProcVideo:
     mov al,[GUIcurrentvideocursloc]
-;    cmp byte[OSPort],2
-;    jae .yes16b
 %ifdef __MSDOS__
     cmp al,3
     je .yes16b
@@ -1281,8 +1271,6 @@ GUIWinClicked:
 %ifdef __MSDOS__
     cmp byte[En2xSaI],0
     jne %%nomodeq
-;    cmp byte[OSPort],2
-;    jae %%nomodeq
     cmp byte[cvidmode],2
     jne %%nomodeq
     jmp %%refresh
@@ -2054,8 +2042,6 @@ DisplayGUIMovieClick:
     cmp ebx,3Bh
     je %%cancelkey
     mov %3,ebx
-;    cmp byte[OSPort],3
-;    jne %%notwin32
 %ifndef __MSDOS__
     cmp dword[keycontrolval],0
     je %%notwin32
@@ -2159,12 +2145,9 @@ DisplayGUIInputClick:
     ;x,y,x2,y2,currentwin,vpos,#entries,starty,y/entry,cpos,winval,win#,dclicktick#
     GUIWinControl 5,36,107,34+5*8,GUIBlankVar,GUIcurrentinputviewloc,GUINumValue,35,8,GUIcurrentinputcursloc,4,3,0
     GUIPHoldbutton 125,34,155,45,14
-;    cmp byte[OSPort],3
-;    je near .win32
 %ifdef __MSDOS__
     GUIPHoldbutton 125,50,185,61,15
 %endif
-;.win32
     GUIPHoldbutton 125,66,185,77,40
     mov edi,pl1selk
     mov dword[keycontrolval],pl1contrl
@@ -2459,10 +2442,7 @@ DisplayGUISoundClick:
 %endif
 ;    GUIClickCButton 11,101,byte[SoundNoiseDis]
     GUIClickCButton 11,111,byte[RevStereo]
-;    cmp byte[OSPort],3
-;    je near .win32sound
     GUIClickCButton 11,121,byte[Surround]
-;.win32sound
     GUIClickCButton 11,131,byte[SoundBufEn]
     GUIClickCButton 11,141,byte[SPCDisable]
     GUIClickCButton5 11,163,byte[SoundInterpType],1
@@ -2840,12 +2820,9 @@ DisplayGameOptnsClick:
     DGOptnsProcBox 178,76,[KeyFRateUp]
     DGOptnsProcBox 178,84,[KeyFRateDown]
     DGOptnsProcBox 178,92,[KeyDisplayFPS]
-;    cmp byte[OSPort],3
-;    jne near .notwin32
 %ifndef __MSDOS__
     DGOptnsProcBox 178,44,[KeyRewind]
 %endif
-;.notwin32
     DGOptnsProcBox 178,52,[KeyFastFrwrd]
     DGOptnsProcBox 27,112,[KeyDisableSC0]
     DGOptnsProcBox 27+45,112,[KeyDisableSC1]
@@ -3037,12 +3014,9 @@ DisplayGUIOptnsClick:
     ret
 
 DisplayGUIAboutClick:
-;    cmp byte[OSPort],3
-;    jne near .nowin32
 %ifndef __MSDOS__
     GUIPHoldbutton 90,50,175,60,65
 %endif
-;.nowin32
     ret
 
 %macro ComboBoxProc 5
diff --git a/zsnes/src/gui/guinetpl.inc b/zsnes/src/gui/guinetpl.inc
index 972b0650..879e641a 100644
--- a/zsnes/src/gui/guinetpl.inc
+++ b/zsnes/src/gui/guinetpl.inc
@@ -259,8 +259,6 @@ SECTION .text
     pop es
     call .writehex
     ; ipx
-;    cmp byte[OSPort],1
-;    je .noinitipx
     call initipx
 .noinitipx
     cmp ax,0
@@ -282,8 +280,6 @@ SECTION .text
     cmp dword[ModemPTimer],0
     jne .nolookforconnect
     mov dword[ModemPTimer],36
-;    cmp byte[OSPort],1
-;    je .noipxlook
     call ipxlookforconnect
 .noipxlook
     cmp byte[IPXSearchval],0
diff --git a/zsnes/src/gui/guitools.inc b/zsnes/src/gui/guitools.inc
index 61b641ef..4277aede 100644
--- a/zsnes/src/gui/guitools.inc
+++ b/zsnes/src/gui/guitools.inc
@@ -430,8 +430,6 @@ GUIOutputStringwinl:
     mov ecx,[cloadmaxlen]
 .more
     mov al,[edi]
-;    cmp byte[OSPort],1
-;    jbe .noperc
 %ifndef __MSDOS__
     cmp al,'%'
     jne .noperc
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 8cb72108..898bc629 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -434,14 +434,11 @@ DisplayGUILoad:
     mov byte[GUItextcolor],211
 .zero
     sub byte[GUItextcolor],15
-;    cmp byte[OSPort],2
-;    jae near .noloadtypeb
 %ifdef __MSDOS__
     GUIOuttextwin2 1,21,166,GUILoadText3
     GUIOuttextwin2 1,21,174,GUILoadText4
     GUIOuttextwin2 1,21,182,GUILoadText5
 %endif
-.noloadtypeb
     GUIOuttextwin2 1,21,192,GUILoadText6
     GUIOuttextwin2 1,6,16,GUILoadText7
     GUIOuttextwin2 1,161,16,GUILoadText8
@@ -456,8 +453,6 @@ DisplayGUILoad:
     mov dword[cloadmaxlen],39
     cmp dword[GUIcurrentfilewin],0
     jne .nofiles
-;    cmp byte[OSPort],2
-;    jb .nofiles
 %ifndef __MSDOS__
     mov eax,[GUIcurrentcursloc]
     mov eax,[spcRamcmp+eax*4]
@@ -466,16 +461,12 @@ DisplayGUILoad:
     GUIOuttextwin2l 1,6,158,[cloadnpos]
 %endif
 .nofiles
-
     add byte[GUItextcolor],15
-;    cmp byte[OSPort],2
-;    jae near .noloadtypec
 %ifdef __MSDOS__
     GUIOuttextwin2 1,20,165,GUILoadText3
     GUIOuttextwin2 1,20,173,GUILoadText4
     GUIOuttextwin2 1,20,181,GUILoadText5
 %endif
-.noloadtypec
     GUIOuttextwin2 1,20,191,GUILoadText6
     GUIOuttextwin2 1,5,15,GUILoadText7
     GUIOuttextwin2 1,160,15,GUILoadText8
@@ -490,8 +481,6 @@ DisplayGUILoad:
     mov dword[cloadmaxlen],39
     cmp dword[GUIcurrentfilewin],0
     jne .nofilesb
-;    cmp byte[OSPort],2
-;    jb .nofilesb
 %ifndef __MSDOS__
     mov eax,[GUIcurrentcursloc]
     mov eax,[spcRamcmp+eax*4]
@@ -500,29 +489,20 @@ DisplayGUILoad:
     GUIOuttextwin2l 1,5,157,[cloadnpos]
 %endif
 .nofilesb
-
     DrawGUIButton 1,186,165,228,176,GUILoadText9,1,0,0
     mov al,[GUIWincol]
     mov byte[GUItextcolor],al
-;    GUIOuttextwin2 1,6,16,GUILoadText1
-;    cmp byte[OSPort],2
-;    jae near .noloadtypee
 %ifdef __MSDOS__
     GUIOuttextwin2 1,6,157,GUILoadText2
 %endif
-.noloadtypee
     mov byte[GUItextcolor],163
     cmp byte[GUIWincoladd],0
     je .zero3
     mov byte[GUItextcolor],164
 .zero3
-;    GUIOuttextwin2 1,5,15,GUILoadText1
-;    cmp byte[OSPort],2
-;    jae near .noloadtyped
 %ifdef __MSDOS__
     GUIOuttextwin2 1,5,156,GUILoadText2
 %endif
-.noloadtyped
     DrawGUIWinBox 1,5,25,144,134,167    ; 126 = 6 * 21, 112 = 7 * 16
     DrawGUIWinBox 1,160,25,228,134,167  ; 78 =  6 * 13
     DrawGUIWinBox 1,5,145,228,152,167    ; 126 = 6 * 21, 112 = 7 * 16
@@ -684,14 +664,11 @@ DisplayGUILoad:
     mov bl,[GUILoadPos]
     mov byte[GUILoadTextA+ebx],0
 
-;    cmp byte[OSPort],2
-;    jae near .noloadtype
 %ifdef __MSDOS__
     GUIDisplayButtonHole 1,9,163,byte[GUIloadfntype],0
     GUIDisplayButtonHole 1,9,171,byte[GUIloadfntype],1
     GUIDisplayButtonHole 1,9,179,byte[GUIloadfntype],2
 %endif
-.noloadtype
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[showallext],1
     jne .noshowallext
@@ -1126,12 +1103,9 @@ DisplayGUIInput:
     GUIDisplayIconWin 3,5,162,[GUITemp]
 %endif
     DrawGUIButton 3,125,34,155,45,GUIInputTextV,14,0,0
-;    cmp byte[OSPort],3
-;    je near .win32
 %ifdef __MSDOS__
     DrawGUIButton 3,125,50,185,61,GUIInputTexta,15,0,0
 %endif
-.win32
     DrawGUIButton 3,125,66,179,77,GUIInputTexta2,15,0,0
     mov al,[GUIWincol]
     mov byte[GUItextcolor],al
@@ -1670,15 +1644,12 @@ DisplayGUIVideo:
 .zero
     sub byte[GUItextcolor],15
 
-;    cmp byte[OSPort],3
-;    jne near .nowin32pt2
 %ifndef __MSDOS__
     GUIOuttextwin2 5,12,76,GUIVideoTextw0
     GUIOuttextwin2 5,12,83,GUIVideoTextw1
     GUIOuttextwin2 5,12,90,GUIVideoTextw2
     GUIOuttextwin2 5,12,97,GUIVideoTextw3
 %endif
-;.nowin32pt2
 
     xor eax,eax
     mov al,[cvidmode]
@@ -1796,15 +1767,12 @@ DisplayGUIVideo:
 %endif
     add byte[GUItextcolor],15
 
-;    cmp byte[OSPort],3
-;    jne near .nowin32pt
 %ifndef __MSDOS__
     GUIOuttextwin2 5,11,75,GUIVideoTextw0
     GUIOuttextwin2 5,11,82,GUIVideoTextw1
     GUIOuttextwin2 5,11,89,GUIVideoTextw2
     GUIOuttextwin2 5,11,96,GUIVideoTextw3
 %endif
-;.nowin32pt
     xor eax,eax
     mov al,[cvidmode]
     cmp byte[GUISLVID+eax],0
@@ -2274,19 +2242,12 @@ DisplayGUISound:
     ; R = Sample Rate
     GUIOuttextwin2u 6,26,26,GUISoundText1,0
     GUIOuttextwin2u 6,26,35,GUISoundText3,0
-;    cmp byte[OSPort],3
-;    je near .win32b
 %ifdef __MSDOS__
     GUIOuttextwin2u 6,116,26,GUISoundText1b,0
     GUIOuttextwin2u 6,26,44,GUISoundText2b,1
 %endif
-;.win32b
-;    GUIOuttextwin2u 6,26,106,GUISoundText4,8
     GUIOuttextwin2u 6,26,116,GUISoundTextH,2
-;    cmp byte[OSPort],3
-;    je near .win32s2
     GUIOuttextwin2u 6,26,126,GUISoundTextI,1
-;.win32s2
     GUIOuttextwin2u 6,26,136,GUISoundTextJ,6
     GUIOuttextwin2u 6,26,146,GUISoundTextK,0
     GUIOuttextwin2u 6,26,168,GUISoundTextQ,0
@@ -2302,19 +2263,12 @@ DisplayGUISound:
     add byte[GUItextcolor],15
     GUIOuttextwin2 6,25,25,GUISoundText1
     GUIOuttextwin2 6,25,34,GUISoundText3
-;    cmp byte[OSPort],3
-;    je near .win32c
 %ifdef __MSDOS__
     GUIOuttextwin2 6,115,25,GUISoundText1b
     GUIOuttextwin2 6,25,43,GUISoundText2b
 %endif
-;.win32c
-;    GUIOuttextwin2 6,25,105,GUISoundText4
     GUIOuttextwin2 6,25,115,GUISoundTextH
-;    cmp byte[OSPort],3
-;    je near .win32s
     GUIOuttextwin2 6,25,125,GUISoundTextI
-;.win32s
     GUIOuttextwin2 6,25,135,GUISoundTextJ
     GUIOuttextwin2 6,25,145,GUISoundTextK
     GUIOuttextwin2 6,25,167,GUISoundTextQ
@@ -2370,25 +2324,14 @@ DisplayGUISound:
     je .nocheckbox1b
     mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox1b
-;    cmp byte[OSPort],3
-;    je near .win32
     GUIDisplayIconWin 6,11,39,[GUITemp]
 %endif
-;.win32
-;    mov dword[GUITemp],GUIIconDataCheckBoxUC
-;    cmp byte[SoundNoiseDis],0
-;    je .nocheckbox2
-;    mov dword[GUITemp],GUIIconDataCheckBoxC
-;.nocheckbox2
-;    GUIDisplayIconWin 6,11,101,[GUITemp]
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[RevStereo],0
     je .nocheckbox3
     mov dword[GUITemp],GUIIconDataCheckBoxC
 .nocheckbox3
     GUIDisplayIconWin 6,11,111,[GUITemp]
-;    cmp byte[OSPort],3
-;    je near .nocheckbox42
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     cmp byte[Surround],0
     je .nocheckbox4
@@ -4609,12 +4552,9 @@ DisplayGameOptns:
     GUIOuttextwin2 9,9,78,GUIGameOptnsTextF
     GUIOuttextwin2 9,9,86,GUIGameOptnsTextG
     GUIOuttextwin2 9,9,94,GUIGameOptnsTextT
-;    cmp byte[OSPort],3
-;    jne near .notwin32
 %ifndef __MSDOS__
     GUIOuttextwin2 9,109,46,GUIGameOptnsTextS
 %endif
-;.notwin32
     GUIOuttextwin2 9,109,54,GUIGameOptnsTextH
     GUIOuttextwin2 9,109,62,GUIGameOptnsTextM
     GUIOuttextwin2 9,109,70,GUIGameOptnsTextN
@@ -4718,12 +4658,9 @@ DisplayGameOptns:
     GUIOuttextwin2 9,8,77,GUIGameOptnsTextF
     GUIOuttextwin2 9,8,85,GUIGameOptnsTextG
     GUIOuttextwin2 9,8,93,GUIGameOptnsTextT
-;    cmp byte[OSPort],3
-;    jne near .notwin32b
 %ifndef __MSDOS__
     GUIOuttextwin2 9,108,45,GUIGameOptnsTextS
 %endif
-;.notwin32b
     GUIOuttextwin2 9,108,53,GUIGameOptnsTextH
     GUIOuttextwin2 9,108,61,GUIGameOptnsTextM
     GUIOuttextwin2 9,108,69,GUIGameOptnsTextN
@@ -4807,12 +4744,9 @@ DisplayGameOptns:
     DGOptnsDrawBox 78,76,[KeyWinDisble]
     DGOptnsDrawBox 78,84,[KeyOffsetMSw]
     DGOptnsDrawBox 78,92,[KeySlowDown]
-;    cmp byte[OSPort],3
-;    jne near .notwin32c
 %ifndef __MSDOS__
     DGOptnsDrawBox 178,44,[KeyRewind]
 %endif
-;.notwin32c
     DGOptnsDrawBox 178,52,[KeyFastFrwrd]
     DGOptnsDrawBox 178,60,[KeyVolUp]
     DGOptnsDrawBox 178,68,[KeyVolDown]
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index a6d03481..060d681d 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -26,7 +26,6 @@ EXTSYM inittableb,inittablec,newgfx16b,cfgreinittime,EndMessage
 EXTSYM Open_File,Read_File,Write_File,Close_File,Output_Text,Get_Key,CNetType
 EXTSYM Delete_File,Get_First_Entry,Get_Next_Entry,Change_Dir,Get_Dir,InitDSP
 EXTSYM Remove_Dir,Change_Single_Dir,Create_Dir,Get_Memfree,Create_File
-;EXTSYM OSPort
 EXTSYM SPCDisable,osm2dis,CurRecv,BackupSystemVars
 EXTSYM SnowData,SnowVelDist
 EXTSYM cvidmode, newengen, cfgnewgfx, GUI16VID
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index aa688213..3d820b3c 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -1224,9 +1224,6 @@ NEWSYM StartSound
 
 NEWSYM SoundProcess     ; This function is called ~60 times/s at full speed
    pushad
-;    cmp byte[OSPort],1  ; Do not call in the dos port
-;    ja .notdos
-;.notdos
     cmp byte[soundon],0
     je .nosound
     cmp byte[DSPDisable],1
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 176ef7a4..89ee6824 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -26,7 +26,6 @@ EXTSYM xa
 EXTSYM ram7fa,wramdataa
 EXTSYM malloc,free
 EXTSYM StateBackup
-;EXTSYM OSPort
 EXTSYM ADSRGAINSwitch,MMXSupport,ScreenScale,SoundQuality
 EXTSYM debugger,pl1contrl,pl2contrl,romtype,smallscreence
 EXTSYM smallscreenon,spcon
@@ -248,7 +247,6 @@ NEWSYM Palette0,      db 0
 NEWSYM DisplayS,      db 0
 NEWSYM SPC700sh,      db 0
 NEWSYM OffBy1Line,    db 0
-NEWSYM DosPort,       db 3
 NEWSYM spc7110romptr, dd 0
 
 NEWSYM MusicRelVol,   db 75
@@ -642,28 +640,22 @@ SECTION .text
 ;    ret
 
 outofmemoryb
-;    cmp byte[OSPort],1
-;    ja .notdos
 %ifdef __MSDOS__
     mov ax,3
     int 10h
 %endif
-;.notdos
     jmp outofmemory
 
 NEWSYM allocptr
     mov dword[cmemallocptr],memfreearray
 
 
-;    cmp byte[OSPort],3
-;    jne near .nostate
 %ifndef __MSDOS__
     AllocmemFail 4096*128*16+4096+65536*16,StateBackup,outofmemory
     mov eax,[StateBackup]
     add eax,4096*128*16
     mov [BitConv32Ptr],eax
 %endif
-;.nostate
 
     ; Memory Allocation
     AllocmemFail 65536*4+4096,spcBuffera,outofmemory
diff --git a/zsnes/src/video/copyvid.inc b/zsnes/src/video/copyvid.inc
index f21eba09..43901aa0 100644
--- a/zsnes/src/video/copyvid.inc
+++ b/zsnes/src/video/copyvid.inc
@@ -6475,10 +6475,6 @@ NEWSYM cscopyvesa2512x384x16b
 
 NEWSYM GetScreen
 %ifdef __MSDOS__
-;    cmp byte[OSPort],1
-;    jbe .getscreen
-;    ret
-;.getscreen
     cmp byte[cvidmode],9
     je near getcopyvesa2320x240x16b
     cmp byte[cvidmode],14
diff --git a/zsnes/src/video/procvid.asm b/zsnes/src/video/procvid.asm
index f0fa0c96..5bea4d9c 100644
--- a/zsnes/src/video/procvid.asm
+++ b/zsnes/src/video/procvid.asm
@@ -34,7 +34,6 @@ EXTSYM GUIEnableTransp
 EXTSYM GUIFontData
 EXTSYM StopSound,StartSound
 EXTSYM PrevPicture,File_Seek,File_Seek_End,nggposng
-;EXTSYM OSPort
 EXTSYM Palette0
 EXTSYM GetTimeInSeconds
 EXTSYM scaddset,scrnon,spcRam,nmiprevline,bgmode,ofsmcptr
@@ -1622,8 +1621,6 @@ NEWSYM saveselect
     cmp byte[soundon],0
     je .nosound
     mov byte[csounddisable],1
-    ;cmp byte[OSPort],1
-    ;ja .nosound
 %ifdef __MSDOS__
     call SB_blank
 %endif
@@ -2204,8 +2201,6 @@ NEWSYM testpressed8b
     inc bl
     mov byte[pressed+77],2
 .noright
-    ;cmp byte[OSPort],3
-    ;jne near .nowin32
 %ifndef __MSDOS__
 %ifdef __LINUX__
     test byte[pressed+92],1
@@ -3384,9 +3379,6 @@ NEWSYM ChatType
     mov byte[chatstrL+ebx+1],0
     pushad
     mov dl,'L'
-;    call NetAddChar
-    ;cmp byte[OSPort],2
-    ;jb .dos
 %ifndef __MSDOS__
     cmp dword[chatstrL+1],'/ME '
     je .action
@@ -3633,8 +3625,6 @@ NEWSYM vidpaste
     jne .novsync
     cmp byte[curblank],0h
     jne .novsync
-;    cmp byte[OSPort],1
-;    ja .novsync
 %ifdef __MSDOS__
     call waitvsync
 %endif
@@ -3657,8 +3647,6 @@ NEWSYM vidpaste
     je .noclock
     cmp byte[ShowTimer],0
     je .noclock
-;    cmp byte[OSPort],2
-;    jae .noclock
     call ClockOutput
 .noclock
     cmp byte[snesmouse],3
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index 77ecad80..3eee7bc7 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -140,9 +140,6 @@ EXTSYM FrameSemaphore
 ;   made.  GUI36hzcall should be called at 36hz after a call GUIInit and
 ;   before GUIDeInit.
 
-
-SECTION .data
-;NEWSYM OSPort, db 3      ; 0 = DOS (C), 1 = DOS (ASM), 2 = Linux, 3 = Win95
 SECTION .text
 
 NEWSYM StartUp