X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdos%2Ftimer.c;h=5492f0b654242fd454dc4ed9ffd9680548bb0350;hb=HEAD;hp=d6c3b520cf600c2cd0caf795ae50b9ecbbacdb46;hpb=7cffbf057545fb303ad8f53e432ef42f7708e16d;p=dosdemo

diff --git a/src/dos/timer.c b/src/dos/timer.c
index d6c3b52..5492f0b 100644
--- a/src/dos/timer.c
+++ b/src/dos/timer.c
@@ -1,3 +1,8 @@
+/* for sound we use MIDAS, which takes over the PIT and we can't use it
+ * therefore only compile this file for NO_SOUND builds.
+ */
+#ifdef NO_SOUND
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -17,6 +22,7 @@
 #include "pit8254.h"
 #include "inttypes.h"
 #include "util.h"
+#include "dosutil.h"
 
 #define PIT_TIMER_INTR	8
 #define DOS_TIMER_INTR	0x1c
@@ -40,8 +46,6 @@ static void (INTERRUPT *prev_timer_intr)();
 #define INTERRUPT
 
 static _go32_dpmi_seginfo intr, prev_intr;
-
-#define outp(p, v)	outportb(p, v)
 #endif
 
 static void INTERRUPT timer_irq();
@@ -174,3 +178,5 @@ static void INTERRUPT timer_irq()
 	/* send EOI to the PIC */
 	outp(PIC1_CMD, OCW2_EOI);
 }
+
+#endif	/* NO_SOUND */