worked on SD abit so the irq0 is not needed in imfplay anymore. I will need to merge...

[16.git] / src / lib / 16_sd.c

diff --git a/src/lib/16_sd.c b/src/lib/16_sd.c
index b3349bc25e7bb3e8415129327f0f4062ea168007..1cdd5627811a092c41566bcc9d5fc4e5c8e85f0e 100755 (executable)
--- a/src/lib/16_sd.c
+++ b/src/lib/16_sd.c
@@ -22,8 +22,7 @@
 \r
 #include "src/lib/16_sd.h"\r
 \r
-static void (interrupt *SD_old_irq0)();\r
-//void interrupt       (*old_irq0)(void);\r
+static void interrupt  (*t0OldService)(void);\r
 \r
 void opl2out(word reg, word data)\r
 {\r
@@ -196,6 +195,24 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
        opl2out(opCellNum, ins->Feedback);\r
 } /* End of FMSetVoice */\r
 \r
+\r
+//newer sd\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 SDL_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
+               ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;\r
+               t0OldService();\r
+       }\r
+       else {\r
+               p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r
+       }\r
+}\r
+\r
 void SD_Initimf(global_game_variables_t *gvar)\r
 {\r
        if (!init_adlib()) {\r
@@ -207,17 +224,10 @@ void SD_Initimf(global_game_variables_t *gvar)
                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.imf_delay_countdown=\r
-       gvar->ca.sd.irq0_max=0;\r
+       gvar->ca.sd.imf_delay_countdown=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
@@ -229,6 +239,28 @@ void SD_imf_reset_music(global_game_variables_t *gvar)
        gvar->ca.sd.imf_delay_countdown = 0;\r
 }\r
 \r
+void SD_StartupTimer(global_game_variables_t *gvar)\r
+{\r
+       gvar->ca.sd.irq0_ticks=\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
+       gvar->ca.sd.tickrate = 700;\r
+\r
+       write_8254_system_timer(T8254_REF_CLOCK_HZ / gvar->ca.sd.tickrate);\r
+       t0OldService = _dos_getvect(8); /*IRQ0*/\r
+       _dos_setvect(8,SDL_irq0);\r
+\r
+       _cli();\r
+       gvar->ca.sd.irq0_ticks = gvar->ca.sd.ptick = 0;\r
+       _sti();\r
+}\r
+\r
+void SD_ShutdownTimer()\r
+{\r
+       _dos_setvect(8,t0OldService);\r
+}\r
+\r
 void SD_imf_free_music(global_game_variables_t *gvar)\r
 {\r
 #ifndef SD_USESCAMMPM\r
@@ -286,20 +318,6 @@ int SD_imf_load_music(const char *path, global_game_variables_t *gvar)
        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 SD_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
-               ggvv->ca.sd.irq0_cnt -= ggvv->ca.sd.irq0_max;\r
-               SD_old_irq0();\r
-       }\r
-       else {\r
-               p8259_OCW2(0,P8259_OCW2_NON_SPECIFIC_EOI);\r
-       }\r
-}\r
-\r
 void SD_imf_tick(global_game_variables_t *gvar)\r
 {\r
        if (gvar->ca.sd.imf_delay_countdown == 0) {\r