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

[proj16/16.git] / src / lib / 16_sd.h

diff --git a/src/lib/16_sd.h b/src/lib/16_sd.h
index 3690fe3..73600a1 100755 (executable)
--- a/src/lib/16_sd.h
+++ b/src/lib/16_sd.h
@@ -24,17 +24,19 @@
 #define __16_SD_H_\r
 \r
 #include "src/lib/16_head.h"\r
+#include "src/lib/16_tail.h"\r
 #include <hw/8254/8254.h>              /* 8254 timer */\r
 #include <hw/adlib/adlib.h>\r
 #include <hw/vga/vga.h>\r
 #include <hw/dos/dos.h>\r
 #include <hw/8259/8259.h>\r
 \r
+#define SD_USESCAMMPM\r
+\r
 #define MIN_REGISTER                   0x01\r
 #define MAX_REGISTER                   0xF5\r
 #define ADLIB_FM_ADDRESS       0x388   /* adlib address/status register */\r
 #define ADLIB_FM_DATA          0x389   /* adlib data register           */\r
-#define LIBIRQ0\r
 \r
 /*\r
 * FM Instrument definition for .SBI files - SoundBlaster instrument\r
@@ -52,7 +54,7 @@ typedef struct{
        byte Feedback;                  /* feedback algorithm and strength  */\r
 } FMInstrument;\r
 \r
-extern void interrupt  (*old_irq0)(void);\r
+//extern void interrupt        (*old_irq0)(void);\r
 \r
 void opl2out(word reg, word data);\r
 void opl3out(word reg, word data);\r
@@ -64,9 +66,12 @@ void FMKeyOn(int voice, int freq, int octave);
 void FMSetVoice(int voiceNum, FMInstrument *ins);\r
 \r
 void SD_Initimf(global_game_variables_t *gvar);\r
+void SD_imf_reset_music(global_game_variables_t *gvar);\r
+void   SD_StartupTimer(global_game_variables_t *gvar),\r
+               SD_ShutdownTimer();\r
 void SD_imf_free_music(global_game_variables_t *gvar);\r
 int SD_imf_load_music(const char *path, global_game_variables_t *gvar);\r
-void interrupt irq0(void);\r
+void interrupt SD_irq0(void);\r
 void SD_imf_tick(global_game_variables_t *gvar);\r
 void SD_adlib_shut_up();\r
 \r