diff options
Diffstat (limited to 'src/mame/machine/kc.cpp')
-rw-r--r-- | src/mame/machine/kc.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/machine/kc.cpp b/src/mame/machine/kc.cpp index ec622162754..1a0487e224d 100644 --- a/src/mame/machine/kc.cpp +++ b/src/mame/machine/kc.cpp @@ -77,7 +77,7 @@ QUICKLOAD_LOAD_MEMBER(kc_state::quickload_cb) // The KC85/4 and KC85/3 are "modular systems". These computers can be expanded with modules. -READ8_MEMBER( kc_state::expansion_read ) +uint8_t kc_state::expansion_read(offs_t offset) { uint8_t result = 0xff; @@ -90,7 +90,7 @@ READ8_MEMBER( kc_state::expansion_read ) return result; } -WRITE8_MEMBER( kc_state::expansion_write ) +void kc_state::expansion_write(offs_t offset, uint8_t data) { // assert MEI line of first slot m_expansions[0]->mei_w(ASSERT_LINE); @@ -104,14 +104,14 @@ WRITE8_MEMBER( kc_state::expansion_write ) - xx is module id. - Only addressess divisible by 4 are checked. + Only addresses divisible by 4 are checked. If module does not exist, 0x0ff is returned. When xx80 is read, if a module exists a id will be returned. Id's for known modules are listed above. */ -READ8_MEMBER( kc_state::expansion_io_read ) +uint8_t kc_state::expansion_io_read(offs_t offset) { uint8_t result = 0xff; @@ -136,7 +136,7 @@ READ8_MEMBER( kc_state::expansion_io_read ) return result; } -WRITE8_MEMBER( kc_state::expansion_io_write ) +void kc_state::expansion_io_write(offs_t offset, uint8_t data) { // assert MEI line of first slot m_expansions[0]->mei_w(ASSERT_LINE); @@ -158,14 +158,14 @@ WRITE8_MEMBER( kc_state::expansion_io_write ) } // module read/write handlers -READ8_MEMBER ( kc_state::expansion_4000_r ){ return expansion_read(space, offset + 0x4000); } -WRITE8_MEMBER( kc_state::expansion_4000_w ){ expansion_write(space, offset + 0x4000, data); } -READ8_MEMBER ( kc_state::expansion_8000_r ){ return expansion_read(space, offset + 0x8000); } -WRITE8_MEMBER( kc_state::expansion_8000_w ){ expansion_write(space, offset + 0x8000, data); } -READ8_MEMBER ( kc_state::expansion_c000_r ){ return expansion_read(space, offset + 0xc000); } -WRITE8_MEMBER( kc_state::expansion_c000_w ){ expansion_write(space, offset + 0xc000, data); } -READ8_MEMBER ( kc_state::expansion_e000_r ){ return expansion_read(space, offset + 0xe000); } -WRITE8_MEMBER( kc_state::expansion_e000_w ){ expansion_write(space, offset + 0xe000, data); } +uint8_t kc_state::expansion_4000_r(offs_t offset){ return expansion_read(offset + 0x4000); } +void kc_state::expansion_4000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0x4000, data); } +uint8_t kc_state::expansion_8000_r(offs_t offset){ return expansion_read(offset + 0x8000); } +void kc_state::expansion_8000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0x8000, data); } +uint8_t kc_state::expansion_c000_r(offs_t offset){ return expansion_read(offset + 0xc000); } +void kc_state::expansion_c000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0xc000, data); } +uint8_t kc_state::expansion_e000_r(offs_t offset){ return expansion_read(offset + 0xe000); } +void kc_state::expansion_e000_w(offs_t offset, uint8_t data){ expansion_write(offset + 0xe000, data); } //************************************************************************** @@ -309,8 +309,8 @@ void kc_state::update_0x00000() { LOG(("Module at 0x0000\n")); - space.install_read_handler (0x0000, 0x3fff, read8_delegate(*this, FUNC(kc_state::expansion_read)), 0); - space.install_write_handler(0x0000, 0x3fff, write8_delegate(*this, FUNC(kc_state::expansion_write)), 0); + space.install_read_handler (0x0000, 0x3fff, read8sm_delegate(*this, FUNC(kc_state::expansion_read)), 0); + space.install_write_handler(0x0000, 0x3fff, write8sm_delegate(*this, FUNC(kc_state::expansion_write)), 0); } } @@ -321,8 +321,8 @@ void kc_state::update_0x04000() LOG(("Module at 0x4000\n")); - space.install_read_handler (0x4000, 0x7fff, read8_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0); - space.install_write_handler(0x4000, 0x7fff, write8_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0); + space.install_read_handler (0x4000, 0x7fff, read8sm_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0); + space.install_write_handler(0x4000, 0x7fff, write8sm_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0); } @@ -345,8 +345,8 @@ void kc_state::update_0x0c000() { LOG(("Module at 0x0c000\n")); - space.install_read_handler (0xc000, 0xdfff, read8_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0); - space.install_write_handler(0xc000, 0xdfff, write8_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0); + space.install_read_handler (0xc000, 0xdfff, read8sm_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0); + space.install_write_handler(0xc000, 0xdfff, write8sm_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0); } } @@ -368,8 +368,8 @@ void kc_state::update_0x0e000() { LOG(("Module at 0x0e000\n")); - space.install_read_handler (0xe000, 0xffff, read8_delegate(*this, FUNC(kc_state::expansion_e000_r)), 0); - space.install_write_handler(0xe000, 0xffff, write8_delegate(*this, FUNC(kc_state::expansion_e000_w)), 0); + space.install_read_handler (0xe000, 0xffff, read8sm_delegate(*this, FUNC(kc_state::expansion_e000_r)), 0); + space.install_write_handler(0xe000, 0xffff, write8sm_delegate(*this, FUNC(kc_state::expansion_e000_w)), 0); } } @@ -391,8 +391,8 @@ void kc_state::update_0x08000() { LOG(("Module at 0x8000!\n")); - space.install_read_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0); - space.install_write_handler(0x8000, 0xbfff, write8_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0); + space.install_read_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0); + space.install_write_handler(0x8000, 0xbfff, write8sm_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0); } } @@ -433,8 +433,8 @@ void kc85_4_state::update_0x04000() { LOG(("Module at 0x4000\n")); - space.install_read_handler (0x4000, 0x7fff, read8_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0); - space.install_write_handler(0x4000, 0x7fff, write8_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0); + space.install_read_handler (0x4000, 0x7fff, read8sm_delegate(*this, FUNC(kc_state::expansion_4000_r)), 0); + space.install_write_handler(0x4000, 0x7fff, write8sm_delegate(*this, FUNC(kc_state::expansion_4000_w)), 0); } } @@ -470,8 +470,8 @@ void kc85_4_state::update_0x0c000() { LOG(("Module at 0x0c000\n")); - space.install_read_handler (0xc000, 0xdfff, read8_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0); - space.install_write_handler(0xc000, 0xdfff, write8_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0); + space.install_read_handler (0xc000, 0xdfff, read8sm_delegate(*this, FUNC(kc_state::expansion_c000_r)), 0); + space.install_write_handler(0xc000, 0xdfff, write8sm_delegate(*this, FUNC(kc_state::expansion_c000_w)), 0); } } } @@ -542,8 +542,8 @@ void kc85_4_state::update_0x08000() { LOG(("Module at 0x8000\n")); - space.install_read_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0); - space.install_write_handler(0x8000, 0xbfff, write8_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0); + space.install_read_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(kc_state::expansion_8000_r)), 0); + space.install_write_handler(0x8000, 0xbfff, write8sm_delegate(*this, FUNC(kc_state::expansion_8000_w)), 0); } } @@ -624,7 +624,7 @@ bit 1: BLA0 .pixel/color bit 0: BILD .display screen 0 or 1 */ -WRITE8_MEMBER( kc85_4_state::kc85_4_84_w ) +void kc85_4_state::kc85_4_84_w(uint8_t data) { LOG(("0x84 W: %02x\n", data)); @@ -635,7 +635,7 @@ WRITE8_MEMBER( kc85_4_state::kc85_4_84_w ) update_0x08000(); } -READ8_MEMBER( kc85_4_state::kc85_4_84_r ) +uint8_t kc85_4_state::kc85_4_84_r() { return m_port_84_data; } @@ -651,7 +651,7 @@ bit 1: WRITE PROTECT RAM 4 bit 0: ACCESS RAM 4 */ -WRITE8_MEMBER( kc85_4_state::kc85_4_86_w ) +void kc85_4_state::kc85_4_86_w(uint8_t data) { LOG(("0x86 W: %02x\n", data)); @@ -661,7 +661,7 @@ WRITE8_MEMBER( kc85_4_state::kc85_4_86_w ) update_0x04000(); } -READ8_MEMBER( kc85_4_state::kc85_4_86_r ) +uint8_t kc85_4_state::kc85_4_86_r() { return m_port_86_data; } |