Mercurial > repos > blastem
diff genesis.h @ 1692:5dacaef602a7 segacd
Merge from default
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 05 Jan 2019 00:58:08 -0800 |
parents | a763523dadf4 b500e971da75 |
children | 3414a4423de1 |
line wrap: on
line diff
--- a/genesis.h Tue Dec 19 00:49:13 2017 -0800 +++ b/genesis.h Sat Jan 05 00:58:08 2019 -0800 @@ -45,6 +45,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; @@ -60,10 +61,9 @@ #define RAM_WORDS 32 * 1024 #define Z80_RAM_BYTES 8 * 1024 -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_cdboot(system_media *media, uint32_t 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); +genesis_context *alloc_config_genesis_cdboot(system_media *media, 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);