diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/bus/msx_cart/ascii.cpp | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/bus/msx_cart/ascii.cpp')
-rw-r--r-- | src/devices/bus/msx_cart/ascii.cpp | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/src/devices/bus/msx_cart/ascii.cpp b/src/devices/bus/msx_cart/ascii.cpp index c7598a8ccc0..7d1b354b404 100644 --- a/src/devices/bus/msx_cart/ascii.cpp +++ b/src/devices/bus/msx_cart/ascii.cpp @@ -27,8 +27,12 @@ msx_cart_ascii8_device::msx_cart_ascii8_device(const machine_config &mconfig, co void msx_cart_ascii8_device::device_start() { save_item(NAME(m_selected_bank)); +} + - machine().save().register_postload(save_prepost_delegate(FUNC(msx_cart_ascii8_device::restore_banks), this)); +void msx_cart_ascii8_device::device_post_load() +{ + restore_banks(); } @@ -72,7 +76,7 @@ void msx_cart_ascii8_device::initialize_cartridge() } -READ8_MEMBER(msx_cart_ascii8_device::read_cart) +uint8_t msx_cart_ascii8_device::read_cart(offs_t offset) { if ( offset >= 0x4000 && offset < 0xC000 ) { @@ -82,7 +86,7 @@ READ8_MEMBER(msx_cart_ascii8_device::read_cart) } -WRITE8_MEMBER(msx_cart_ascii8_device::write_cart) +void msx_cart_ascii8_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x6000 && offset < 0x8000) { @@ -111,8 +115,12 @@ msx_cart_ascii16_device::msx_cart_ascii16_device(const machine_config &mconfig, void msx_cart_ascii16_device::device_start() { save_item(NAME(m_selected_bank)); +} - machine().save().register_postload(save_prepost_delegate(FUNC(msx_cart_ascii16_device::restore_banks), this)); + +void msx_cart_ascii16_device::device_post_load() +{ + restore_banks(); } @@ -156,7 +164,7 @@ void msx_cart_ascii16_device::initialize_cartridge() } -READ8_MEMBER(msx_cart_ascii16_device::read_cart) +uint8_t msx_cart_ascii16_device::read_cart(offs_t offset) { if ( offset >= 0x4000 && offset < 0xC000 ) { @@ -166,7 +174,7 @@ READ8_MEMBER(msx_cart_ascii16_device::read_cart) } -WRITE8_MEMBER(msx_cart_ascii16_device::write_cart) +void msx_cart_ascii16_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x6000 && offset < 0x6800) { @@ -202,8 +210,12 @@ msx_cart_ascii8_sram_device::msx_cart_ascii8_sram_device(const machine_config &m void msx_cart_ascii8_sram_device::device_start() { save_item(NAME(m_selected_bank)); +} + - machine().save().register_postload(save_prepost_delegate(FUNC(msx_cart_ascii8_sram_device::restore_banks), this)); +void msx_cart_ascii8_sram_device::device_post_load() +{ + restore_banks(); } @@ -272,7 +284,7 @@ void msx_cart_ascii8_sram_device::initialize_cartridge() } -READ8_MEMBER(msx_cart_ascii8_sram_device::read_cart) +uint8_t msx_cart_ascii8_sram_device::read_cart(offs_t offset) { if ( offset >= 0x4000 && offset < 0xC000 ) { @@ -287,7 +299,7 @@ READ8_MEMBER(msx_cart_ascii8_sram_device::read_cart) } -WRITE8_MEMBER(msx_cart_ascii8_sram_device::write_cart) +void msx_cart_ascii8_sram_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x6000 && offset < 0x8000) { @@ -327,8 +339,12 @@ msx_cart_ascii16_sram_device::msx_cart_ascii16_sram_device(const machine_config void msx_cart_ascii16_sram_device::device_start() { save_item(NAME(m_selected_bank)); +} - machine().save().register_postload(save_prepost_delegate(FUNC(msx_cart_ascii16_sram_device::restore_banks), this)); + +void msx_cart_ascii16_sram_device::device_post_load() +{ + restore_banks(); } @@ -397,7 +413,7 @@ void msx_cart_ascii16_sram_device::initialize_cartridge() } -READ8_MEMBER(msx_cart_ascii16_sram_device::read_cart) +uint8_t msx_cart_ascii16_sram_device::read_cart(offs_t offset) { if ( offset >= 0x4000 && offset < 0xC000 ) { @@ -419,7 +435,7 @@ READ8_MEMBER(msx_cart_ascii16_sram_device::read_cart) } -WRITE8_MEMBER(msx_cart_ascii16_sram_device::write_cart) +void msx_cart_ascii16_sram_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x6000 && offset < 0x6800) { @@ -461,8 +477,12 @@ msx_cart_msxwrite_device::msx_cart_msxwrite_device(const machine_config &mconfig void msx_cart_msxwrite_device::device_start() { save_item(NAME(m_selected_bank)); +} + - machine().save().register_postload(save_prepost_delegate(FUNC(msx_cart_msxwrite_device::restore_banks), this)); +void msx_cart_msxwrite_device::device_post_load() +{ + restore_banks(); } @@ -506,7 +526,7 @@ void msx_cart_msxwrite_device::initialize_cartridge() } -READ8_MEMBER(msx_cart_msxwrite_device::read_cart) +uint8_t msx_cart_msxwrite_device::read_cart(offs_t offset) { if ( offset >= 0x4000 && offset < 0xC000 ) { @@ -516,7 +536,7 @@ READ8_MEMBER(msx_cart_msxwrite_device::read_cart) } -WRITE8_MEMBER(msx_cart_msxwrite_device::write_cart) +void msx_cart_msxwrite_device::write_cart(offs_t offset, uint8_t data) { // The rom writes to 6fff and 7fff for banking, unknown whether // other locations also trigger banking. |