Finally fixed problems with demo mode.

[stargem2] / src / timing.h

diff --git a/src/timing.h b/src/timing.h
old mode 100755 (executable)
new mode 100644 (file)
index 28f906e..a41c7c6
--- a/src/timing.h
+++ b/src/timing.h
@@ -1,42 +1,21 @@
 //
 // TIMING.H: System timing support functionality
 //
-// by James L. Hammons
+// by James Hammons
 // (C) 2005 Underground Software
 //
-
 #ifndef __TIMING_H__
 #define __TIMING_H__
 
-#include "types.h"
-
-// Note that these are NTSC timings:
-
-//#define RISC_CYCLE_IN_USEC     0.03760684198
-//#define M68K_CYCLE_IN_USEC     (RISC_CYCLE_IN_USEC * 2)
-//#define HORIZ_PERIOD_IN_USEC   63.5555
-//#define M6502_CYCLE_IN_USEC      0.9765625
-
-//#define MASTER_CLOCK         (12000000)
-//#define SOUND_CLOCK                  (3579000)
-//     MDRV_CPU_ADD("maincpu", M6809, MASTER_CLOCK/3/4)
-//     MDRV_CPU_PROGRAM_MAP(defender_map)
-//     MDRV_CPU_ADD("soundcpu", M6808, SOUND_CLOCK)
-//     MDRV_CPU_PROGRAM_MAP(defender_sound_map)
-
+// Even though it's driven at 4 MHz, internally it runs at 1/4 that speed
 #define M6808_CLOCK_SPEED_IN_HZ                (3579000.0 / 4.0)
 #define M6809_CLOCK_SPEED_IN_HZ                (1000000.0)
 
-// Actually, it's 1.1176306230790722 usec
-//#define M6808_CYCLE_IN_USEC      (0.9765625)
 #define M6808_CYCLE_IN_USEC            (1000000.0 / M6808_CLOCK_SPEEK_IN_HZ)
 #define M6809_CYCLE_IN_USEC            (1000000.0 / M6809_CLOCK_SPEED_IN_HZ)
 
-//#define USEC_TO_RISC_CYCLES(u) (uint32)(((u) / RISC_CYCLE_IN_USEC) + 0.5)
-//#define USEC_TO_M68K_CYCLES(u) (uint32)(((u) / M68K_CYCLE_IN_USEC) + 0.5)
-//#define USEC_TO_M6502_CYCLES(u)  (uint32)(((u) / M6502_CYCLE_IN_USEC) + 0.5)
-#define USEC_TO_M6808_CYCLES(u)  (uint32)(((u) / M6808_CYCLE_IN_USEC) + 0.5)
-#define USEC_TO_M6809_CYCLES(u)  (uint32)(((u) / M6809_CYCLE_IN_USEC) + 0.5)
+#define USEC_TO_M6808_CYCLES(u)  (uint32_t)(((u) / M6808_CYCLE_IN_USEC) + 0.5)
+#define USEC_TO_M6809_CYCLES(u)  (uint32_t)(((u) / M6809_CYCLE_IN_USEC) + 0.5)
 
 void InitializeEventList(void);
 void SetCallbackTime(void (* callback)(void), double time);