Mercurial > repos > blastem
diff genesis.h @ 1648:b7ecd0d6a77b mame_interp
Merge from default
| author | Michael Pavone <pavone@retrodev.com> |
|---|---|
| date | Tue, 25 Dec 2018 11:12:26 -0800 |
| parents | 2455662378ed 360d5bab199f |
| children | 956c1cce05e2 |
line wrap: on
line diff
--- a/genesis.h Sun Dec 31 10:11:16 2017 -0800 +++ b/genesis.h Tue Dec 25 11:12:26 2018 -0800 @@ -48,6 +48,7 @@ uint32_t max_cycles; uint32_t int_latency_prev1; uint32_t int_latency_prev2; + uint32_t reset_cycle; uint8_t bank_regs[8]; uint16_t mapper_start_index; uint8_t mapper_type; @@ -65,7 +66,7 @@ uint16_t read_dma_value(uint32_t address); m68k_context * sync_components(m68k_context *context, uint32_t address); -genesis_context *alloc_config_genesis(void *rom, uint32_t rom_size, void *lock_on, uint32_t lock_on_size, uint32_t system_opts, uint8_t force_region, rom_info *info_out); +genesis_context *alloc_config_genesis(void *rom, uint32_t rom_size, void *lock_on, uint32_t lock_on_size, uint32_t system_opts, uint8_t force_region); void genesis_serialize(genesis_context *gen, serialize_buffer *buf, uint32_t m68k_pc); void genesis_deserialize(deserialize_buffer *buf, genesis_context *gen);