diff --git a/hash/msx2_cart.xml b/hash/msx2_cart.xml index e84f1d71a4f..bbb3b7fadad 100644 --- a/hash/msx2_cart.xml +++ b/hash/msx2_cart.xml @@ -2873,6 +2873,44 @@ LZ93A13 (32 pin) - 8KB banks + + FS-SR021 MSX2 Word Processor (Japan) + 1988 + Panasonic + Cartridge hardware is partially emulated. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Nekketsu Juudou (Japan) 1989 diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 15c89451829..cc2badf3dd4 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -1952,6 +1952,8 @@ if (BUSES["MSX_SLOT"]~=null) then MAME_DIR .. "src/devices/bus/msx/cart/easi_speech.h", MAME_DIR .. "src/devices/bus/msx/cart/fmpac.cpp", MAME_DIR .. "src/devices/bus/msx/cart/fmpac.h", + MAME_DIR .. "src/devices/bus/msx/cart/fs_sr021.cpp", + MAME_DIR .. "src/devices/bus/msx/cart/fs_sr021.h", MAME_DIR .. "src/devices/bus/msx/cart/fs_sr022.cpp", MAME_DIR .. "src/devices/bus/msx/cart/fs_sr022.h", MAME_DIR .. "src/devices/bus/msx/cart/halnote.cpp", diff --git a/src/devices/bus/msx/cart/cartridge.cpp b/src/devices/bus/msx/cart/cartridge.cpp index 8b303a30334..5e6143541d9 100644 --- a/src/devices/bus/msx/cart/cartridge.cpp +++ b/src/devices/bus/msx/cart/cartridge.cpp @@ -13,6 +13,7 @@ #include "dooly.h" #include "easi_speech.h" #include "fmpac.h" +#include "fs_sr021.h" #include "fs_sr022.h" #include "halnote.h" #include "hbi55.h" @@ -59,6 +60,7 @@ void msx_cart(device_slot_interface &device, bool is_in_subslot) device.option_add_internal(slotoptions::DOOLY, MSX_CART_DOOLY); device.option_add_internal(slotoptions::EASISPEECH, MSX_CART_EASISPEECH); device.option_add_internal(slotoptions::FMPAC, MSX_CART_FMPAC); + device.option_add_internal(slotoptions::FS_SR021, MSX_CART_FS_SR021); device.option_add_internal(slotoptions::FS_SR022, MSX_CART_FS_SR022); device.option_add_internal(slotoptions::GAMEMASTER2, MSX_CART_GAMEMASTER2); device.option_add_internal(slotoptions::HALNOTE, MSX_CART_HALNOTE); diff --git a/src/devices/bus/msx/cart/fs_sr021.cpp b/src/devices/bus/msx/cart/fs_sr021.cpp new file mode 100644 index 00000000000..712b7826a3f --- /dev/null +++ b/src/devices/bus/msx/cart/fs_sr021.cpp @@ -0,0 +1,222 @@ +// license:BSD-3-Clause +// copyright-holders:Wilbert Pol +/*********************************************************************************** + +Emulation of the FS-SR021 MSX2 Word Processor Cartridge. + +TODO: +- Display of JIS level 1 characters might not be fully correct, the tools do seem to display fine. +- Unknown how JIS level 2 characters are input/displayed. + +***********************************************************************************/ +#include "emu.h" +#include "fs_sr021.h" + +namespace { + +class msx_cart_fs_sr021_device : public device_t, public msx_cart_interface +{ +public: + msx_cart_fs_sr021_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, MSX_CART_FS_SR021, tag, owner, clock) + , msx_cart_interface(mconfig, *this) + , m_bank(*this, "bank%u", 0U) + , m_view_0000(*this, "view0000") + , m_view_2000(*this, "view2000") + , m_view_4000(*this, "view4000") + , m_view_6000(*this, "view6000") + , m_view_8000(*this, "view8000") + , m_view_a000(*this, "viewa000") + { } + + virtual std::error_condition initialize_cartridge(std::string &message) override; + +protected: + // device_t implementation + virtual void device_start() override; + virtual void device_reset() override; + +private: + static constexpr size_t BANK_SIZE = 0x2000; + + template void bank_w(u8 data); + template void set_view(); + void control_w(u8 data); + u8 bank_r(offs_t offset); + u8 kanji_r(offs_t offset); + void kanji_w(offs_t offset, u8 data); + + memory_bank_array_creator<6> m_bank; + memory_view m_view_0000; + memory_view m_view_2000; + memory_view m_view_4000; + memory_view m_view_6000; + memory_view m_view_8000; + memory_view m_view_a000; + u8 m_selected_bank[6]; + u8 m_control; + u32 m_kanji_latch; +}; + +void msx_cart_fs_sr021_device::device_start() +{ + save_item(NAME(m_selected_bank)); + save_item(NAME(m_control)); + save_item(NAME(m_kanji_latch)); +} + +void msx_cart_fs_sr021_device::device_reset() +{ + m_control = 0; + m_view_0000.select(0); + m_view_2000.select(0); + m_view_4000.select(0); + m_view_6000.select(0); + m_view_8000.select(0); + m_view_a000.select(0); + m_bank[2]->set_entry(0); +} + +std::error_condition msx_cart_fs_sr021_device::initialize_cartridge(std::string &message) +{ + if (!cart_rom_region()) + { + message = "msx_cart_fs_sr021_device: Required region 'rom' was not found."; + return image_error::INTERNAL; + } + + if (cart_rom_region()->bytes() != 0x200000) + { + message = "msx_cart_fs_sr021_device: Region 'rom' has unsupported size."; + return image_error::INVALIDLENGTH; + } + + if (!cart_sram_region()) + { + message = "msx_cart_fs_sr021_device: Required region 'sram' was not found."; + return image_error::INTERNAL; + } + + if (cart_sram_region()->bytes() != 0x4000) + { + message = "msx_cart_fs_sr021_device: Region 'sram' has unsupported size."; + return image_error::BADSOFTWARE; + } + + const u32 size = cart_rom_region()->bytes(); + const u16 banks = size / BANK_SIZE; + + for (int i = 0; i < 6; i++) + { + m_bank[i]->configure_entries(0, banks, cart_rom_region()->base(), BANK_SIZE); + m_bank[i]->configure_entry(0x80, cart_sram_region()->base()); + m_bank[i]->configure_entry(0x81, cart_sram_region()->base() + BANK_SIZE); + } + + page(0)->install_view(0x0000, 0x1fff, m_view_0000); + m_view_0000[0].install_read_bank(0x0000, 0x1fff, m_bank[0]); + m_view_0000[1].install_readwrite_bank(0x0000, 0x1fff, m_bank[0]); + page(0)->install_view(0x2000, 0x3fff, m_view_2000); + m_view_2000[0].install_read_bank(0x2000, 0x3fff, m_bank[1]); + m_view_2000[1].install_readwrite_bank(0x2000, 0x3fff, m_bank[1]); + + page(1)->install_view(0x4000, 0x5fff, m_view_4000); + m_view_4000[0].install_read_bank(0x4000, 0x5fff, m_bank[2]); + m_view_4000[1].install_readwrite_bank(0x4000, 0x5fff, m_bank[2]); + page(1)->install_view(0x6000, 0x7fff, m_view_6000); + m_view_6000[0].install_read_bank(0x6000, 0x7fff, m_bank[3]); + m_view_6000[1].install_readwrite_bank(0x6000, 0x7fff, m_bank[3]); + m_view_6000[2].install_read_bank(0x6000, 0x7fff, m_bank[3]); + m_view_6000[2].install_read_handler(0x7ff0, 0x7ff5, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_r))); + m_view_6000[3].install_readwrite_bank(0x6000, 0x7fff, m_bank[3]); + m_view_6000[3].install_read_handler(0x7ff0, 0x7ff5, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_r))); + + page(2)->install_view(0x8000, 0x9fff, m_view_8000); + m_view_8000[0].install_read_bank(0x8000, 0x9fff, m_bank[4]); + m_view_8000[1].install_readwrite_bank(0x8000, 0x9fff, m_bank[4]); + page(2)->install_view(0xa000, 0xbfff, m_view_a000); + m_view_a000[0].install_read_bank(0xa000, 0xbfff, m_bank[5]); + m_view_a000[1].install_readwrite_bank(0xa000, 0xbfff, m_bank[5]); + + page(1)->install_write_handler(0x6000, 0x6000, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<0>))); // 0000-1fff + page(1)->install_write_handler(0x6400, 0x6400, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<1>))); // 2000-3fff + page(1)->install_write_handler(0x6800, 0x6800, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<2>))); // 4000-5fff + page(1)->install_write_handler(0x6c00, 0x6c00, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<3>))); // 6000-7fff + page(1)->install_write_handler(0x7000, 0x7000, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<4>))); // 8000-9fff + page(1)->install_write_handler(0x7800, 0x7800, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::bank_w<5>))); // a000-bfff + page(1)->install_write_handler(0x7ff9, 0x7ff9, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::control_w))); + + // Takes over kanji from base system? + io_space().install_write_handler(0xd8, 0xd9, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::kanji_w))); + io_space().install_read_handler(0xd9, 0xd9, emu::rw_delegate(*this, FUNC(msx_cart_fs_sr021_device::kanji_r))); + + return std::error_condition(); +} + +template +void msx_cart_fs_sr021_device::set_view() +{ + bool ram_active = (m_selected_bank[Bank] >= 0x80 && m_selected_bank[Bank] < 0x82); + if (Bank == 0) + m_view_0000.select(ram_active ? 1 : 0); + if (Bank == 1) + m_view_2000.select(ram_active ? 1 : 0); + if (Bank == 2) + m_view_4000.select(ram_active ? 1 : 0); + if (Bank == 3) + m_view_6000.select((BIT(m_control, 2) ? 2 : 0) | (ram_active ? 1 : 0)); + if (Bank == 4) + m_view_8000.select(ram_active ? 1 : 0); + if (Bank == 5) + m_view_a000.select(ram_active ? 1 : 0); +} + +template +void msx_cart_fs_sr021_device::bank_w(u8 data) +{ + m_selected_bank[Bank] = data; + m_bank[Bank]->set_entry(data); + set_view(); +} + +void msx_cart_fs_sr021_device::control_w(u8 data) +{ + m_control = data; + set_view<3>(); +} + +u8 msx_cart_fs_sr021_device::bank_r(offs_t offset) +{ + return m_selected_bank[offset]; +} + +u8 msx_cart_fs_sr021_device::kanji_r(offs_t offset) +{ + u8 result = 0xff; + + u32 latch = bitswap<17>(m_kanji_latch, 4, 3, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 2, 1, 0); + // This might not be correct, fixes most characters on the menu screen. + if (!(latch & 0x18000)) + { + latch |= 0x40000; + } + result = cart_rom_region()->base()[0x100000 | latch]; + + if (!machine().side_effects_disabled()) + { + m_kanji_latch = (m_kanji_latch & ~0x1f) | ((m_kanji_latch + 1) & 0x1f); + } + return result; +} + +void msx_cart_fs_sr021_device::kanji_w(offs_t offset, u8 data) +{ + if (offset) + m_kanji_latch = (m_kanji_latch & 0x007e0) | ((data & 0x3f) << 11); + else + m_kanji_latch = (m_kanji_latch & 0x1f800) | ((data & 0x3f) << 5); +} + +} // anonymous namespace + +DEFINE_DEVICE_TYPE_PRIVATE(MSX_CART_FS_SR021, msx_cart_interface, msx_cart_fs_sr021_device, "msx_cart_fs_sr021", "MSX Cartridge - FS-SR021") diff --git a/src/devices/bus/msx/cart/fs_sr021.h b/src/devices/bus/msx/cart/fs_sr021.h new file mode 100644 index 00000000000..04737b99b3d --- /dev/null +++ b/src/devices/bus/msx/cart/fs_sr021.h @@ -0,0 +1,13 @@ +// license:BSD-3-Clause +// copyright-holders:Wilbert Pol +#ifndef MAME_BUS_MSX_CART_FS_SR021_H +#define MAME_BUS_MSX_CART_FS_SR021_H + +#pragma once + +#include "bus/msx/slot/cartridge.h" + + +DECLARE_DEVICE_TYPE(MSX_CART_FS_SR021, msx_cart_interface) + +#endif // MAME_BUS_MSX_CART_FS_SR021_H diff --git a/src/devices/bus/msx/cart/slotoptions.cpp b/src/devices/bus/msx/cart/slotoptions.cpp index eae2a586c7c..e7f709ccc0c 100644 --- a/src/devices/bus/msx/cart/slotoptions.cpp +++ b/src/devices/bus/msx/cart/slotoptions.cpp @@ -34,6 +34,7 @@ char const *const DOOLY = "dooly"; char const *const EC701 = "ec701"; char const *const EASISPEECH = "easispeech"; char const *const FMPAC = "fmpac"; +char const *const FS_SR021 = "fs_sr021"; char const *const FS_SR022 = "fs_sr022"; char const *const GAMEMASTER2 = "gamemaster2"; char const *const HALNOTE = "halnote"; diff --git a/src/devices/bus/msx/cart/slotoptions.h b/src/devices/bus/msx/cart/slotoptions.h index 6e21f01cb93..a4208acf188 100644 --- a/src/devices/bus/msx/cart/slotoptions.h +++ b/src/devices/bus/msx/cart/slotoptions.h @@ -37,6 +37,7 @@ extern char const *const DOOLY; extern char const *const EC701; extern char const *const EASISPEECH; extern char const *const FMPAC; +extern char const *const FS_SR021; extern char const *const FS_SR022; extern char const *const GAMEMASTER2; extern char const *const HALNOTE;