mirror of
https://github.com/holub/mame
synced 2025-04-29 03:20:50 +03:00
don't abuse object finders for things that can't be found at object resolution time (nw)
This commit is contained in:
parent
0a7bff1417
commit
8aee042443
@ -255,9 +255,6 @@ public:
|
|||||||
m_pia(*this, "pia"),
|
m_pia(*this, "pia"),
|
||||||
m_dac(*this, "dac"),
|
m_dac(*this, "dac"),
|
||||||
m_region_maincpu(*this, "maincpu"),
|
m_region_maincpu(*this, "maincpu"),
|
||||||
m_0000(*this, "0000"),
|
|
||||||
m_8000(*this, "8000"),
|
|
||||||
m_a000(*this, "a000"),
|
|
||||||
m_cart(*this, "cartleft"),
|
m_cart(*this, "cartleft"),
|
||||||
m_cart2(*this, "cartright")
|
m_cart2(*this, "cartright")
|
||||||
{ }
|
{ }
|
||||||
@ -329,9 +326,9 @@ private:
|
|||||||
required_device<pia6821_device> m_pia;
|
required_device<pia6821_device> m_pia;
|
||||||
optional_device<dac_bit_interface> m_dac;
|
optional_device<dac_bit_interface> m_dac;
|
||||||
required_memory_region m_region_maincpu;
|
required_memory_region m_region_maincpu;
|
||||||
optional_memory_bank m_0000;
|
memory_bank *m_0000 = nullptr;
|
||||||
optional_memory_bank m_8000;
|
memory_bank *m_8000 = nullptr;
|
||||||
optional_memory_bank m_a000;
|
memory_bank *m_a000 = nullptr;
|
||||||
optional_device<a800_cart_slot_device> m_cart;
|
optional_device<a800_cart_slot_device> m_cart;
|
||||||
optional_device<a800_cart_slot_device> m_cart2;
|
optional_device<a800_cart_slot_device> m_cart2;
|
||||||
|
|
||||||
@ -1743,8 +1740,7 @@ void a400_state::setup_ram(int bank, uint32_t size)
|
|||||||
case 0: // 0x0000-0x7fff
|
case 0: // 0x0000-0x7fff
|
||||||
ram_top = std::min(size, uint32_t(0x8000)) - 1;
|
ram_top = std::min(size, uint32_t(0x8000)) - 1;
|
||||||
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x0000, ram_top, "0000");
|
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x0000, ram_top, "0000");
|
||||||
if (m_0000 == nullptr)
|
m_0000 = membank("0000");
|
||||||
m_0000.findit(false);
|
|
||||||
m_0000->set_base(m_ram->pointer());
|
m_0000->set_base(m_ram->pointer());
|
||||||
break;
|
break;
|
||||||
case 1: // 0x8000-0x9fff
|
case 1: // 0x8000-0x9fff
|
||||||
@ -1752,20 +1748,26 @@ void a400_state::setup_ram(int bank, uint32_t size)
|
|||||||
if (ram_top > 0x8000)
|
if (ram_top > 0x8000)
|
||||||
{
|
{
|
||||||
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x8000, ram_top, "8000");
|
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x8000, ram_top, "8000");
|
||||||
if (m_8000 == nullptr)
|
m_8000 = membank("8000");
|
||||||
m_8000.findit(false);
|
|
||||||
m_8000->set_base(m_ram->pointer() + 0x8000);
|
m_8000->set_base(m_ram->pointer() + 0x8000);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_8000 = nullptr;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 2: // 0xa000-0xbfff
|
case 2: // 0xa000-0xbfff
|
||||||
ram_top = std::min(size, uint32_t(0xc000)) - 1;
|
ram_top = std::min(size, uint32_t(0xc000)) - 1;
|
||||||
if (ram_top > 0xa000)
|
if (ram_top > 0xa000)
|
||||||
{
|
{
|
||||||
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0xa000, ram_top, "a000");
|
m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0xa000, ram_top, "a000");
|
||||||
if (m_a000 == nullptr)
|
m_a000 = membank("a000");
|
||||||
m_a000.findit(false);
|
|
||||||
m_a000->set_base(m_ram->pointer() + 0xa000);
|
m_a000->set_base(m_ram->pointer() + 0xa000);
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_a000 = nullptr;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -152,7 +152,7 @@ MACHINE_CONFIG_START(ondra_state::ondra)
|
|||||||
MCFG_SOFTWARE_LIST_ADD("cass_list","ondra")
|
MCFG_SOFTWARE_LIST_ADD("cass_list","ondra")
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0x00);
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
/* ROM definition */
|
/* ROM definition */
|
||||||
|
@ -193,7 +193,7 @@ void pecom_state::pecom64(machine_config &config)
|
|||||||
SOFTWARE_LIST(config, "cass_list").set_original("pecom_cass");
|
SOFTWARE_LIST(config, "cass_list").set_original("pecom_cass");
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, RAM_TAG).set_default_size("32K").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("32K").set_default_value(0x00);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ROM definition */
|
/* ROM definition */
|
||||||
|
@ -264,7 +264,7 @@ MACHINE_CONFIG_START(pk8020_state::pk8020)
|
|||||||
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
|
MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_PLAY)
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, RAM_TAG).set_default_size("258K").set_default_value(0); // 64 + 4*48 + 2 = 258
|
RAM(config, RAM_TAG).set_default_size("258K").set_default_value(0x00); // 64 + 4*48 + 2 = 258
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
/* ROM definition */
|
/* ROM definition */
|
||||||
|
@ -244,7 +244,7 @@ MACHINE_CONFIG_START(pp01_state::pp01)
|
|||||||
MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pp01_state, pp01_8255_portc_w))
|
MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, pp01_state, pp01_8255_portc_w))
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0x00);
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
/* ROM definition */
|
/* ROM definition */
|
||||||
|
@ -320,7 +320,7 @@ MACHINE_CONFIG_START(rt1715_state::rt1715)
|
|||||||
Z80PIO(config, "a72", 9.832_MHz_XTAL / 4);
|
Z80PIO(config, "a72", 9.832_MHz_XTAL / 4);
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("64K").set_default_value(0x00);
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
MACHINE_CONFIG_START(rt1715_state::rt1715w)
|
MACHINE_CONFIG_START(rt1715_state::rt1715w)
|
||||||
|
@ -477,7 +477,7 @@ MACHINE_CONFIG_START(special_state::specimx)
|
|||||||
MCFG_SOFTWARE_LIST_ADD("flop_list","special_flop")
|
MCFG_SOFTWARE_LIST_ADD("flop_list","special_flop")
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, m_ram).set_default_size("128K").set_default_value(0);
|
RAM(config, m_ram).set_default_size("128K").set_default_value(0x00);
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
MACHINE_CONFIG_START(special_state::erik)
|
MACHINE_CONFIG_START(special_state::erik)
|
||||||
@ -528,7 +528,7 @@ MACHINE_CONFIG_START(special_state::erik)
|
|||||||
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
|
MCFG_FLOPPY_DRIVE_ADD("fd1", specimx_floppies, "525qd", special_state::specimx_floppy_formats)
|
||||||
|
|
||||||
/* internal ram */
|
/* internal ram */
|
||||||
RAM(config, m_ram).set_default_size("192K").set_default_value(0);
|
RAM(config, m_ram).set_default_size("192K").set_default_value(0x00);
|
||||||
MACHINE_CONFIG_END
|
MACHINE_CONFIG_END
|
||||||
|
|
||||||
/* ROM definition */
|
/* ROM definition */
|
||||||
|
@ -616,7 +616,7 @@ MACHINE_CONFIG_START(sun2_state::sun2vme)
|
|||||||
MCFG_DEVICE_ADD("maincpu", M68010, 19.6608_MHz_XTAL / 2) // or 24_MHz_XTAL / 2 by jumper setting
|
MCFG_DEVICE_ADD("maincpu", M68010, 19.6608_MHz_XTAL / 2) // or 24_MHz_XTAL / 2 by jumper setting
|
||||||
MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
|
MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
|
||||||
|
|
||||||
RAM(config, RAM_TAG).set_default_size("2M").set_extra_options("4M,6M,8M").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("2M").set_extra_options("4M,6M,8M").set_default_value(0x00);
|
||||||
|
|
||||||
// MMU Type 0 device space
|
// MMU Type 0 device space
|
||||||
ADDRESS_MAP_BANK(config, "type0").set_map(&sun2_state::vmetype0space_map).set_options(ENDIANNESS_BIG, 16, 32, 0x1000000);
|
ADDRESS_MAP_BANK(config, "type0").set_map(&sun2_state::vmetype0space_map).set_options(ENDIANNESS_BIG, 16, 32, 0x1000000);
|
||||||
@ -669,7 +669,7 @@ MACHINE_CONFIG_START(sun2_state::sun2mbus)
|
|||||||
MCFG_DEVICE_ADD("maincpu", M68010, 39.3216_MHz_XTAL / 4)
|
MCFG_DEVICE_ADD("maincpu", M68010, 39.3216_MHz_XTAL / 4)
|
||||||
MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
|
MCFG_DEVICE_PROGRAM_MAP(sun2_mem)
|
||||||
|
|
||||||
RAM(config, RAM_TAG).set_default_size("2M").set_extra_options("4M").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("2M").set_extra_options("4M").set_default_value(0x00);
|
||||||
|
|
||||||
// MMU Type 0 device space
|
// MMU Type 0 device space
|
||||||
ADDRESS_MAP_BANK(config, "type0").set_map(&sun2_state::mbustype0space_map).set_options(ENDIANNESS_BIG, 16, 32, 0x1000000);
|
ADDRESS_MAP_BANK(config, "type0").set_map(&sun2_state::mbustype0space_map).set_options(ENDIANNESS_BIG, 16, 32, 0x1000000);
|
||||||
|
@ -981,7 +981,7 @@ MACHINE_CONFIG_START(sun3_state::sun3)
|
|||||||
MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 900-1)
|
MCFG_SCREEN_VISIBLE_AREA(0, 1152-1, 0, 900-1)
|
||||||
MCFG_SCREEN_REFRESH_RATE(72)
|
MCFG_SCREEN_REFRESH_RATE(72)
|
||||||
|
|
||||||
RAM(config, m_ram).set_default_size("4M").set_extra_options("6M,8M,12M,16M,20M,24M,28M,32M").set_default_value(0);
|
RAM(config, m_ram).set_default_size("4M").set_extra_options("6M,8M,12M,16M,20M,24M,28M,32M").set_default_value(0x00);
|
||||||
|
|
||||||
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
|
NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
|
||||||
|
|
||||||
@ -1069,7 +1069,7 @@ MACHINE_CONFIG_START(sun3_state::sun3_50)
|
|||||||
|
|
||||||
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", sun3_state, sun3_timer, attotime::from_hz(100))
|
MCFG_TIMER_DRIVER_ADD_PERIODIC("timer", sun3_state, sun3_timer, attotime::from_hz(100))
|
||||||
|
|
||||||
RAM(config, m_ram).set_default_size("4M").set_default_value(0);
|
RAM(config, m_ram).set_default_size("4M").set_default_value(0x00);
|
||||||
|
|
||||||
// MMU Type 0 device space
|
// MMU Type 0 device space
|
||||||
ADDRESS_MAP_BANK(config, "type0").set_map(&sun3_state::vmetype0space_novram_map).set_options(ENDIANNESS_BIG, 32, 32, 0x80000000);
|
ADDRESS_MAP_BANK(config, "type0").set_map(&sun3_state::vmetype0space_novram_map).set_options(ENDIANNESS_BIG, 32, 32, 0x80000000);
|
||||||
|
@ -1909,7 +1909,7 @@ MACHINE_CONFIG_START(sun4_state::sun4)
|
|||||||
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4_mem)
|
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4_mem)
|
||||||
MCFG_SPARC_ADD_ASI_DESC(sun4_asi_desc)
|
MCFG_SPARC_ADD_ASI_DESC(sun4_asi_desc)
|
||||||
|
|
||||||
RAM(config, RAM_TAG).set_default_size("16M").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("16M").set_default_value(0x00);
|
||||||
|
|
||||||
MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
|
MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
|
||||||
|
|
||||||
@ -1964,7 +1964,7 @@ MACHINE_CONFIG_START(sun4_state::sun4c)
|
|||||||
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4c_mem)
|
MCFG_DEVICE_ADDRESS_MAP(AS_PROGRAM, sun4c_mem)
|
||||||
MCFG_SPARC_ADD_ASI_DESC(sun4c_asi_desc)
|
MCFG_SPARC_ADD_ASI_DESC(sun4c_asi_desc)
|
||||||
|
|
||||||
RAM(config, RAM_TAG).set_default_size("16M").set_default_value(0);
|
RAM(config, RAM_TAG).set_default_size("16M").set_default_value(0x00);
|
||||||
|
|
||||||
MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
|
MCFG_DEVICE_ADD(TIMEKEEPER_TAG, MK48T12, 0)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user