bfsoundlib: Removed some sound-related ASM code

Author: mefistotelis

bfsoundlib/src/bfaudio.c

@@ -200,10 +200,6 @@ void InitAudio(AudioInitOptions *audOpts)
 
 void FreeAudio(void)
 {
-#if 0
-    asm volatile ("call ASM_FreeAudio\n"
-        :  :  : "eax" );
-#endif
     if (GetCDAble()) {
         FreeCD();
         if (!SoundAble && !MusicAble)
@@ -219,10 +215,6 @@ void FreeAudio(void)
 
 void SetSoundMasterVolume(long vol)
 {
-#if 0
-    asm volatile ("call ASM_SetSoundMasterVolume\n"
-        :  : "a" (vol));
-#endif
     if (!SoundAble || !SoundInstalled)
         return;
     if (vol == CurrentSoundMasterVolume || vol > 127 || vol < 0)
@@ -233,10 +225,6 @@ void SetSoundMasterVolume(long vol)
 
 void SetMusicMasterVolume(long vol)
 {
-#if 0
-    asm volatile ("call ASM_SetMusicMasterVolume\n"
-        :  : "a" (vol));
-#endif
     if (!MusicAble || !MusicInstalled)
         return;
     if (vol == CurrentMusicMasterVolume || vol > 127 || vol < 0)

bfsoundlib/src/init_mus.c

@@ -71,12 +71,6 @@ TbBool fm_instrument_file_exists(const char *fname)
 
 sbyte AllocateMusicBankMemory(void)
 {
-#if 0
-    TbBool ret;
-    asm volatile ("call ASM_AllocateMusicBankMemory\n"
-        : "=r" (ret) : );
-    return ret;
-#endif
     ulong musLen, musDataLen;
 
     {

bfsoundlib/src/init_snd.c

@@ -217,10 +217,6 @@ int AllocateSoundBankMemory(ushort snd_type)
 
 void DetermineSoundType(void)
 {
-#if 0
-    asm volatile ("call ASM_DetermineSoundType\n"
-        :  :  : "eax" );
-#else
     int ret;
     ubyte tpno;
 
@@ -260,7 +256,6 @@ void DetermineSoundType(void)
             break;
     }
     SoundType = 0;
-#endif
 }
 
 static void DoFreeSound(void)

bfsoundlib/src/mseqnlst.c

@@ -91,12 +91,6 @@ void init_music_bank_songs(void)
 
 ubyte load_music_bank(TbFileHandle fh, ubyte bankId)
 {
-#if 0
-    ubyte ret;
-    asm volatile ("call ASM_load_music_bank\n"
-        : "=r" (ret) : "a" (fh),  "d" (bankId));
-    return ret;
-#endif
     ubyte *m;
     ubyte *dt;
     struct MusicBankHead mbhead[4];
@@ -155,12 +149,6 @@ ubyte load_music_bank(TbFileHandle fh, ubyte bankId)
 
 int LoadMusic(ushort bankNo)
 {
-#if 0
-    int ret;
-    asm volatile ("call ASM_LoadMusic\n"
-        : "=r" (ret) : "a" (a1));
-    return ret;
-#endif
     TbFileHandle fh;
     long fsize;
     ulong nbanks_offs;

bfsoundlib/src/ssamplst.c

@@ -95,10 +95,6 @@ void StopSampleQueueList(void)
 
 void format_sounds(void)
 {
-#if 0
-    asm volatile ("call ASM_format_sounds\n"
-        :  : );
-#else
     short n;
     struct BfSfxInfo *sfiend;
     ubyte *dt;
@@ -122,17 +118,10 @@ void format_sounds(void)
     SfxData = dt;
     EndSfxs = sfiend;
     NumberOfSamples = n;
-#endif
 }
 
 ubyte load_sound_bank(TbFileHandle fh, ubyte bank_tpno)
 {
-#if 0
-    ubyte ret;
-    asm volatile ("call ASM_load_sound_bank\n"
-        : "=r" (ret) : "a" (fh),  "d" (bank_tpno));
-    return ret;
-#else
     struct BfSoundBankHead head[9];
 
     LbFileRead(fh, head, 9 * sizeof(struct BfSoundBankHead));
@@ -175,7 +164,6 @@ ubyte load_sound_bank(TbFileHandle fh, ubyte bank_tpno)
 
     SoundAble = 1;
     return 1;
-#endif
 }
 
 int LoadSounds(ubyte bank_no)

conf/wrappers_game.conf

@@ -288,6 +288,7 @@ allocate_buffers		W	i
 free_buffers			W	v
 StartMusic				W	v	ii
 StopMusic				W	v
+close_adpcm_file		W	v
 load_music_bank			W	i	ii
 setup_heap_manager		W	i	pipi
 process_sound_heap		W	v