diff options
| author | Michael Pavone <pavone@retrodev.com> | 2016-04-11 20:56:54 -0700 |
|---|---|---|
| committer | Michael Pavone <pavone@retrodev.com> | 2016-04-11 20:56:54 -0700 |
| commit | d62ce280764beb725bf03b6e4508c73f3c23d224 (patch) | |
| tree | ef5b3af1c08e07a88198acaf5a495d4aa20b3fad /blastem.c | |
| parent | 2ca987e9d2ff6c012bda54ba47b3f7a57d576284 (diff) | |
| parent | 31f5791bd9d205a0f28e3e734c5328e743939ad7 (diff) | |
Merge
Diffstat (limited to 'blastem.c')
| -rw-r--r-- | blastem.c | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -27,8 +27,8 @@ #define MCLKS_NTSC 53693175 #define MCLKS_PAL 53203395 -#define MCLKS_PER_68K 7 -#define MCLKS_PER_YM MCLKS_PER_68K +uint32_t MCLKS_PER_68K; +#define MCLKS_PER_YM 7 #define MCLKS_PER_Z80 15 #define MCLKS_PER_PSG (MCLKS_PER_Z80*16) #define DEFAULT_SYNC_INTERVAL MCLKS_LINE @@ -1086,7 +1086,7 @@ int main(int argc, char ** argv) uint8_t menu = !loaded; if (!loaded) { //load menu - romfname = tern_find_path(config, "ui\rom\0").ptrval; + romfname = tern_find_path(config, "ui\0rom\0").ptrval; if (!romfname) { romfname = "menu.bin"; } @@ -1109,6 +1109,14 @@ int main(int argc, char ** argv) loaded = 1; } + char *m68k_divider = tern_find_path(config, "clocks\0m68k_divider\0").ptrval; + if (!m68k_divider) { + m68k_divider = "7"; + } + MCLKS_PER_68K = atoi(m68k_divider); + if (!MCLKS_PER_68K) { + MCLKS_PER_68K = 7; + } ram = malloc(RAM_WORDS * sizeof(uint16_t)); memmap_chunk base_map[] = { {0xE00000, 0x1000000, 0xFFFF, 0, MMAP_READ | MMAP_WRITE | MMAP_CODE, ram, |