shithub: choc

Info  •  Files  •  Log  •  Branches

Don't use snd_mport to control OPL base I/O port; Vanilla doesn't do
this.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1691

--- a/src/i_oplmusic.c

+++ b/src/i_oplmusic.c

@@ -336,7 +336,7 @@

 // Configuration file variable, containing the port number for the

 // adlib chip.

-int snd_mport = 0x388;

+int opl_io_port = 0x388;

 static unsigned int GetStatus(void)

 {

@@ -729,7 +729,7 @@

 static boolean I_OPL_InitMusic(void)

 {

-    if (!OPL_Init(snd_mport))

+    if (!OPL_Init(opl_io_port))

     {

         return false;

     }

--- a/src/m_config.c

+++ b/src/m_config.c

@@ -184,7 +184,6 @@

 extern int snd_musicdevice;

 extern int snd_sfxdevice;

 extern int snd_samplerate;

-extern int snd_mport;

 // controls whether to use libsamplerate for sample rate conversions

@@ -197,6 +196,7 @@

 static int snd_sbport = 0;

 static int snd_sbirq = 0;

 static int snd_sbdma = 0;

+static int snd_mport = 0;

 typedef enum 

 {