Mercurial > repos > blastem
diff romdb.c @ 1534:c59adc305e46 nuklear_ui
Merge
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 24 Mar 2018 22:18:23 -0700 |
parents | 1f745318f10a |
children | 94ba407a5ec1 |
line wrap: on
line diff
--- a/romdb.c Tue Mar 13 22:18:20 2018 -0700 +++ b/romdb.c Sat Mar 24 22:18:23 2018 -0700 @@ -11,6 +11,7 @@ #include "nor.h" #include "sega_mapper.h" #include "multi_game.h" +#include "megawifi.h" #define DOM_TITLE_START 0x120 #define DOM_TITLE_END 0x150 @@ -56,6 +57,7 @@ free(info->port2_override); free(info->ext_override); free(info->mouse_mode); + free(info->nor); } void cart_serialize(system_header *sys, serialize_buffer *buf) @@ -499,15 +501,15 @@ if (!page_size) { fatal_error("ROM DB map entry %d with address %s has device type NOR, but the NOR page size is not defined\n", state->index, key); } - state->info->save_page_size = atoi(size); - if (!state->info->save_page_size) { - fatal_error("NOR page size %s is invalid\n", size); + uint32_t save_page_size = atoi(page_size); + if (!save_page_size) { + fatal_error("NOR page size %s is invalid\n", page_size); } char *product_id = tern_find_path(state->root, "NOR\0product_id\0", TVAL_PTR).ptrval; if (!product_id) { fatal_error("ROM DB map entry %d with address %s has device type NOR, but the NOR product ID is not defined\n", state->index, key); } - state->info->save_product_id = strtol(product_id, NULL, 16); + uint16_t save_product_id = strtol(product_id, NULL, 16); char *bus = tern_find_path(state->root, "NOR\0bus\0", TVAL_PTR).ptrval; if (!strcmp(bus, "odd")) { state->info->save_bus = RAM_FLAG_ODD; @@ -518,7 +520,26 @@ } state->info->save_type = SAVE_NOR; state->info->save_buffer = malloc(state->info->save_size); - memset(state->info->save_buffer, 0xFF, state->info->save_size); + char *init = tern_find_path_default(state->root, "NOR\0init\0", (tern_val){.ptrval="FF"}, TVAL_PTR).ptrval; + if (!strcmp(init, "ROM")) { + uint32_t init_size = state->rom_size > state->info->save_size ? state->info->save_size : state->rom_size; + memcpy(state->info->save_buffer, state->rom, init_size); + if (state->info->save_bus == RAM_FLAG_BOTH) { + byteswap_rom(state->info->save_size, (uint16_t *)state->info->save_buffer); + } + } else { + memset(state->info->save_buffer, strtol(init, NULL, 16), state->info->save_size); + } + state->info->nor = calloc(1, sizeof(nor_state)); + nor_flash_init(state->info->nor, state->info->save_buffer, state->info->save_size, save_page_size, save_product_id, state->info->save_bus); + char *cmd1 = tern_find_path(state->root, "NOR\0cmd_address1\0", TVAL_PTR).ptrval; + if (cmd1) { + state->info->nor->cmd_address1 = strtol(cmd1, NULL, 16); + } + char *cmd2 = tern_find_path(state->root, "NOR\0cmd_address2\0", TVAL_PTR).ptrval; + if (cmd2) { + state->info->nor->cmd_address2 = strtol(cmd2, NULL, 16); + } } } @@ -615,8 +636,7 @@ state->info->save_buffer = lock_info.save_buffer; state->info->save_size = lock_info.save_size; state->info->save_mask = lock_info.save_mask; - state->info->save_page_size = lock_info.save_page_size; - state->info->save_product_id = lock_info.save_product_id; + state->info->nor = lock_info.nor; state->info->save_type = lock_info.save_type; state->info->save_bus = lock_info.save_bus; lock_info.save_buffer = NULL; @@ -666,6 +686,10 @@ map->write_8 = nor_flash_write_b; map->read_16 = nor_flash_read_w; map->read_8 = nor_flash_read_b; + if (state->info->save_bus == RAM_FLAG_BOTH) { + map->flags |= MMAP_READ_CODE | MMAP_CODE; + map->buffer = state->info->save_buffer; + } map->mask = 0xFFFFFF; } else if (!strcmp(dtype, "Sega mapper")) { state->info->mapper_type = MAPPER_SEGA; @@ -778,6 +802,12 @@ map->mask = 0xFF; map->write_16 = write_multi_game_w; map->write_8 = write_multi_game_b; + } else if (!strcmp(dtype, "megawifi")) { + map->write_16 = megawifi_write_w; + map->write_8 = megawifi_write_b; + map->read_16 = megawifi_read_w; + map->read_8 = megawifi_read_b; + map->mask = 0xFFFFFF; } else { fatal_error("Invalid device type %s for ROM DB map entry %d with address %s\n", dtype, state->index, key); }