summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/drivers/ql.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2012-09-19 19:48:09 +0000
committer Aaron Giles <aaron@aarongiles.com>2012-09-19 19:48:09 +0000
commit621ac620ae1ca743a66bb52aaf5478da01c3bac6 (patch)
tree2743a87e9077417af7546970d1ea1cc3b8781a63 /src/mess/drivers/ql.c
parent33c77e65bbd4513957f2ece623cee476cf439248 (diff)
Since nobody checks for NULLs anyway, make
device_memory_interface::space() assert against NULL and return a reference, and pushed references throughout all address space usage in the system. Added a has_space() method to check for those rare case when it is ambiguous. [Aaron Giles] Also reinstated the generic space and added fatal error handlers if anyone tries to actually read/write from it.
Diffstat (limited to 'src/mess/drivers/ql.c')
-rw-r--r--src/mess/drivers/ql.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/mess/drivers/ql.c b/src/mess/drivers/ql.c
index 94ec839cb1d..211542b7d44 100644
--- a/src/mess/drivers/ql.c
+++ b/src/mess/drivers/ql.c
@@ -907,7 +907,7 @@ void ql_state::machine_start()
void ql_state::machine_reset()
{
- address_space *program = m_maincpu->space(AS_PROGRAM);
+ address_space &program = m_maincpu->space(AS_PROGRAM);
m_disk_type=ioport(QL_CONFIG_PORT)->read() & DISK_TYPE_MASK;
logerror("disktype=%d\n",m_disk_type);
@@ -920,23 +920,23 @@ void ql_state::machine_reset()
switch (m_ram->size())
{
case 128*1024:
- program->unmap_readwrite(0x040000, 0x0fffff);
+ program.unmap_readwrite(0x040000, 0x0fffff);
break;
case 192*1024:
- program->unmap_readwrite(0x050000, 0x0fffff);
+ program.unmap_readwrite(0x050000, 0x0fffff);
break;
case 256*1024:
- program->unmap_readwrite(0x060000, 0x0fffff);
+ program.unmap_readwrite(0x060000, 0x0fffff);
break;
case 384*1024:
- program->unmap_readwrite(0x080000, 0x0fffff);
+ program.unmap_readwrite(0x080000, 0x0fffff);
break;
case 640*1024:
- program->unmap_readwrite(0x0c0000, 0x0fffff);
+ program.unmap_readwrite(0x0c0000, 0x0fffff);
break;
}
@@ -944,17 +944,17 @@ void ql_state::machine_reset()
{
case DISK_TYPE_SANDY :
logerror("Configuring SandySuperDisk\n");
- program->install_rom(0x0c0000, 0x0c3fff, &machine().root_device().memregion(M68008_TAG)->base()[SANDY_ROM_BASE]);
- program->install_read_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
- program->install_write_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
+ program.install_rom(0x0c0000, 0x0c3fff, &machine().root_device().memregion(M68008_TAG)->base()[SANDY_ROM_BASE]);
+ program.install_read_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
+ program.install_write_handler(SANDY_IO_BASE, SANDY_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
m_disk_io_base=SANDY_IO_BASE;
break;
case DISK_TYPE_TRUMP :
logerror("Configuring TrumpCard\n");
- program->install_read_handler(CART_ROM_BASE, CART_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::cart_rom_r), this));
- program->install_read_handler(TRUMP_ROM_BASE, TRUMP_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::trump_card_rom_r), this));
- program->install_read_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
- program->install_write_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
+ program.install_read_handler(CART_ROM_BASE, CART_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::cart_rom_r), this));
+ program.install_read_handler(TRUMP_ROM_BASE, TRUMP_ROM_END, 0, 0, read8_delegate(FUNC(ql_state::trump_card_rom_r), this));
+ program.install_read_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, read8_delegate(FUNC(ql_state::disk_io_r), this));
+ program.install_write_handler(TRUMP_IO_BASE, TRUMP_IO_END, 0, 0, write8_delegate(FUNC(ql_state::disk_io_w), this));
m_disk_io_base=TRUMP_IO_BASE;
break;
}