diff options
author | 2008-02-27 15:01:08 +0000 | |
---|---|---|
committer | 2008-02-27 15:01:08 +0000 | |
commit | 27024536604352008f1531c5c34ab6bb4b9ab866 (patch) | |
tree | ccde34d8323cfcb9dec158fa2d87b836564e5bc4 /src/emu/mconfig.c | |
parent | f78611cfd3aaa8b34be2e1801345da91419f8707 (diff) |
Couple more address map merges, plus an MSVC compile fix.
Diffstat (limited to 'src/emu/mconfig.c')
-rw-r--r-- | src/emu/mconfig.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index b7f1301da79..3461f714837 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -349,20 +349,20 @@ static void machine_config_detokenize(machine_config *config, const machine_conf case MCONFIG_TOKEN_CPU_PROGRAM_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_PROGRAM][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_PROGRAM][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_PROGRAM][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_PROGRAM][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_DATA_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_DATA][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_DATA][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_DATA][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_DATA][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_IO_MAP: assert(cpu != NULL); - cpu->construct_map[ADDRESS_SPACE_IO][0] = TOKEN_GET_PTR(tokens, voidptr); - cpu->construct_map[ADDRESS_SPACE_IO][1] = TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_IO][0] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); + cpu->construct_map[ADDRESS_SPACE_IO][1] = (construct_map_t)TOKEN_GET_PTR(tokens, voidptr); break; case MCONFIG_TOKEN_CPU_VBLANK_INT: |