summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-01-24 14:16:13 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-01-24 14:16:13 +0000
commitf446536f183701367b61fcb608e29bffd42d0584 (patch)
treefaa2b59f9b3621acbec99631716127bc01bcabe9
parent3815ec44e1cbc224e5bfdd534208d369198703cd (diff)
Minor spacing and clock cleanup.
-rw-r--r--src/emu/mame.c2
-rw-r--r--src/emu/memory.h4
-rw-r--r--src/mame/drivers/jackal.c12
3 files changed, 11 insertions, 7 deletions
diff --git a/src/emu/mame.c b/src/emu/mame.c
index a08ce341be2..0bb1b56b375 100644
--- a/src/emu/mame.c
+++ b/src/emu/mame.c
@@ -142,7 +142,7 @@ struct _mame_private
UINT8 exit_pending;
const game_driver *new_driver_pending;
astring * saveload_pending_file;
- emu_timer * soft_reset_timer;
+ emu_timer * soft_reset_timer;
mame_file * logfile;
/* callbacks */
diff --git a/src/emu/memory.h b/src/emu/memory.h
index 10b947f90f6..48112a0de5b 100644
--- a/src/emu/memory.h
+++ b/src/emu/memory.h
@@ -57,6 +57,7 @@ typedef void (*write64_handler)(ATTR_UNUSED offs_t offset, ATTR_UNUSED UINT64
typedef offs_t (*opbase_handler) (ATTR_UNUSED offs_t address);
/* ----- this struct contains pointers to the live read/write routines ----- */
+typedef struct _data_accessors data_accessors;
struct _data_accessors
{
UINT8 (*read_byte)(offs_t offset);
@@ -69,7 +70,6 @@ struct _data_accessors
void (*write_dword)(offs_t offset, UINT32 data);
void (*write_qword)(offs_t offset, UINT64 data);
};
-typedef struct _data_accessors data_accessors;
@@ -591,7 +591,7 @@ struct _address_space
UINT8 * writelookup; /* write table lookup */
handler_data * readhandlers; /* read handlers */
handler_data * writehandlers; /* write handlers */
- const data_accessors * accessors; /* pointers to the data access handlers */
+ const data_accessors *accessors; /* pointers to the data access handlers */
};
diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c
index 0bc87b03414..8a5c1d5812f 100644
--- a/src/mame/drivers/jackal.c
+++ b/src/mame/drivers/jackal.c
@@ -25,6 +25,10 @@ TODO:
#include "sound/2151intf.h"
+#define MASTER_CLOCK XTAL_18_432MHz
+#define SOUND_CLOCK XTAL_3_579545MHz
+
+
extern UINT8 *jackal_videoctrl;
extern MACHINE_RESET( jackal );
@@ -253,16 +257,16 @@ static INTERRUPT_GEN( jackal_interrupt )
static MACHINE_DRIVER_START( jackal )
// basic machine hardware
- MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) // verified on pcb
+ MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb
MDRV_CPU_PROGRAM_MAP(master_map, 0)
MDRV_CPU_VBLANK_INT(jackal_interrupt, 1)
- MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) // verified on pcb
+ MDRV_CPU_ADD(M6809, MASTER_CLOCK/12) // verified on pcb
MDRV_CPU_PROGRAM_MAP(slave_map, 0)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)
- MDRV_INTERLEAVE(10) // 10 CPU slices per frame - seems enough to keep the CPUs in sync
+ MDRV_INTERLEAVE(100)
MDRV_MACHINE_RESET(jackal)
@@ -282,7 +286,7 @@ static MACHINE_DRIVER_START( jackal )
// sound hardware
MDRV_SPEAKER_STANDARD_STEREO("left", "right")
- MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) // verified on pcb
+ MDRV_SOUND_ADD(YM2151, SOUND_CLOCK) // verified on pcb
MDRV_SOUND_ROUTE(0, "left", 0.50)
MDRV_SOUND_ROUTE(1, "right", 0.50)
MACHINE_DRIVER_END