#include "src/lib/16_sd.h"\r
\r
//static void (interrupt *old_irq0)();\r
-extern struct glob_game_vars *ggvv;\r
+void interrupt (*old_irq0)(void);\r
\r
void opl2out(word reg, word data)\r
{\r
opl2out(opCellNum, ins->Feedback);\r
} /* End of FMSetVoice */\r
\r
-\r
void SD_Initimf(global_game_variables_t *gvar)\r
{\r
+ if (!init_adlib()) {\r
+ printf("Cannot init library\n");\r
+ return;\r
+ }\r
+ if (!probe_8254()) { /* we need the timer to keep time with the music */\r
+ printf("8254 timer not found\n");\r
+ return;\r
+ }\r
+\r
gvar->ca.sd.irq0_ticks=\r
- gvar->ca.sd.irq0_cnt=\r
- gvar->ca.sd.irq0_add=\r
+ //gvar->ca.sd.irq0_cnt=\r
+ //gvar->ca.sd.irq0_add=\r
gvar->ca.sd.imf_delay_countdown=\r
gvar->ca.sd.irq0_max=0;\r
gvar->ca.sd.imf_music=\r
gvar->ca.sd.imf_play_ptr=\r
gvar->ca.sd.imf_music_end=NULL;\r
+ gvar->ca.sd.irq0_cnt = 0;\r
+ gvar->ca.sd.irq0_add = 182;\r
+ gvar->ca.sd.irq0_max = 1000; /* about 18.2Hz */\r
+\r
+ SD_adlib_shut_up();\r
+ shutdown_adlib_opl3(); // NTS: Apparently the music won't play otherwise\r
}\r
\r
void SD_imf_free_music(global_game_variables_t *gvar)\r
{\r
- if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);\r
- MM_FreePtr(MEMPTR gvar->ca.audiosegs[0], gvar); //TODO make behave like id engine\r
+// if (gvar->ca.sd.imf_music) free(gvar->ca.sd.imf_music);\r
+ MM_FreePtr(MEMPTRCONV gvar->ca.audiosegs[0], gvar); //TODO make behave like id engine\r
gvar->ca.sd.imf_music = gvar->ca.sd.imf_play_ptr = gvar->ca.sd.imf_music_end = NULL;\r
gvar->ca.sd.imf_delay_countdown = 0;\r
}\r
}\r
len -= len & 3;\r
\r
- MM_GetPtr(MEMPTR gvar->ca.audiosegs[0],len, gvar);\r
+ MM_GetPtr(MEMPTRCONV gvar->ca.audiosegs[0],len, gvar);\r
gvar->ca.sd.imf_music = (struct imf_entry *)gvar->ca.audiosegs[0];\r
if (gvar->ca.sd.imf_music == NULL) {\r
close(fd);\r
return 1;\r
}\r
\r
+struct glob_game_vars *ggvv;\r
// WARNING: subroutine call in interrupt handler. make sure you compile with -zu flag for large/compact memory models\r
-/*void interrupt irq0()\r
+void interrupt irq0()\r
{\r
ggvv->ca.sd.irq0_ticks++;\r
if ((ggvv->ca.sd.irq0_cnt += ggvv->ca.sd.irq0_add) >= ggvv->ca.sd.irq0_max) {\r
else {\r
p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r
}\r
-}*/\r
+}\r
\r
void SD_imf_tick(global_game_variables_t *gvar)\r
{\r