summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--hash/msx2_flop.xml24
-rw-r--r--scripts/src/bus.lua2
-rw-r--r--src/devices/bus/msx/cart/cartridge.cpp16
-rw-r--r--src/devices/bus/msx/cart/ide.cpp213
-rw-r--r--src/devices/bus/msx/cart/ide.h12
-rw-r--r--src/devices/bus/msx/cart/slotoptions.cpp1
-rw-r--r--src/devices/bus/msx/cart/slotoptions.h1
-rw-r--r--src/devices/machine/atahle.cpp37
-rw-r--r--src/devices/machine/atahle.h1
9 files changed, 290 insertions, 17 deletions
diff --git a/hash/msx2_flop.xml b/hash/msx2_flop.xml
index 4efd5ef4599..89001477b67 100644
--- a/hash/msx2_flop.xml
+++ b/hash/msx2_flop.xml
@@ -607,6 +607,30 @@ The following floppies came with the machines.
</part>
</software>
+ <software name="sunride">
+ <description>Sunrise IDE firmware (v2.50)</description>
+ <year>2013</year>
+ <publisher>Jon de Schrijder</publisher>
+ <notes>Handcrafted image containing firmware and tools.</notes>
+ <part name="flop1" interface="floppy_3_5">
+ <dataarea name="flop" size="737280">
+ <rom name="sunrise ide v2.50.dsk" size="737280" crc="7a7a505f" sha1="83d4aca1115e6a0a42f7bf481d472e4c4e5eb87d"/>
+ </dataarea>
+ </part>
+ </software>
+
+ <software name="sunride240" cloneof="sunride">
+ <description>Sunrise IDE firmware (v2.40)</description>
+ <year>2005</year>
+ <publisher>Jon de Schrijder</publisher>
+ <notes>Handcrafted image containing firmware and tools.</notes>
+ <part name="flop1" interface="floppy_3_5">
+ <dataarea name="flop" size="737280">
+ <rom name="sunrise ide v2.40.dsk" size="737280" crc="c2fca42b" sha1="ff8e67d3d5b16ea27d3bd5a6922f1d8af1d3e31a"/>
+ </dataarea>
+ </part>
+ </software>
+
<!-- Disks only -->
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 6220b51d820..04c56bb019e 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -2035,6 +2035,8 @@ if (BUSES["MSX_SLOT"]~=null) then
MAME_DIR .. "src/devices/bus/msx/cart/hfox.h",
MAME_DIR .. "src/devices/bus/msx/cart/holy_quran.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/holy_quran.h",
+ MAME_DIR .. "src/devices/bus/msx/cart/ide.cpp",
+ MAME_DIR .. "src/devices/bus/msx/cart/ide.h",
MAME_DIR .. "src/devices/bus/msx/cart/ink.cpp",
MAME_DIR .. "src/devices/bus/msx/cart/ink.h",
MAME_DIR .. "src/devices/bus/msx/cart/kanji.cpp",
diff --git a/src/devices/bus/msx/cart/cartridge.cpp b/src/devices/bus/msx/cart/cartridge.cpp
index 9f499e48a29..030e0a96475 100644
--- a/src/devices/bus/msx/cart/cartridge.cpp
+++ b/src/devices/bus/msx/cart/cartridge.cpp
@@ -20,6 +20,7 @@
#include "hbi55.h"
#include "hfox.h"
#include "holy_quran.h"
+#include "ide.h"
#include "ink.h"
#include "kanji.h"
#include "konami.h"
@@ -99,13 +100,14 @@ void msx_cart(device_slot_interface &device, bool is_in_subslot)
device.option_add_internal(slotoptions::SUPERLODERUNNER, MSX_CART_SUPERLODERUNNER);
device.option_add_internal(slotoptions::SYNTHESIZER, MSX_CART_SYNTHESIZER);
device.option_add_internal(slotoptions::EC701, MSX_CART_EC701);
- device.option_add(slotoptions::BEEPACK, MSX_CART_BEEPACK);
- device.option_add(slotoptions::BM_012, MSX_CART_BM_012);
- device.option_add(slotoptions::FRANKY, MSX_CART_FRANKY);
- device.option_add(slotoptions::HBI55, MSX_CART_HBI55);
- device.option_add(slotoptions::MOONSOUND, MSX_CART_MOONSOUND);
- device.option_add(slotoptions::SOFTCARD, MSX_CART_SOFTCARD);
- device.option_add(slotoptions::UCN01, MSX_CART_UCN01);
+ device.option_add(slotoptions::BEEPACK, MSX_CART_BEEPACK);
+ device.option_add(slotoptions::BM_012, MSX_CART_BM_012);
+ device.option_add(slotoptions::FRANKY, MSX_CART_FRANKY);
+ device.option_add(slotoptions::HBI55, MSX_CART_HBI55);
+ device.option_add(slotoptions::MOONSOUND, MSX_CART_MOONSOUND);
+ device.option_add(slotoptions::SOFTCARD, MSX_CART_SOFTCARD);
+ device.option_add(slotoptions::SUNRISE_ATAIDE, MSX_CART_SUNRISE_ATAIDE);
+ device.option_add(slotoptions::UCN01, MSX_CART_UCN01);
if (!is_in_subslot)
{
device.option_add(slotoptions::SLOTEXP, MSX_CART_SLOTEXPANDER);
diff --git a/src/devices/bus/msx/cart/ide.cpp b/src/devices/bus/msx/cart/ide.cpp
new file mode 100644
index 00000000000..29fb64008cc
--- /dev/null
+++ b/src/devices/bus/msx/cart/ide.cpp
@@ -0,0 +1,213 @@
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
+/******************************************************************************
+
+Sunrise ATA-IDE and CF ATA-IDE cartridges.
+
+The difference between these two interface cartridges is in the connectors. The
+ATA-IDE cartridge has a connector for an IDE cable. The CF ATA-IDE cartridge
+has 2 slots for CF cards. The rest of the hardware and firmware on these
+cartridges is the same.
+
+******************************************************************************/
+#include "emu.h"
+#include "ide.h"
+
+#include "bus/ata/ataintf.h"
+#include "bus/ata/hdd.h"
+#include "machine/intelfsh.h"
+
+
+namespace
+{
+
+class msx_cart_sunrise_ataide_device : public device_t, public msx_cart_interface
+{
+public:
+ msx_cart_sunrise_ataide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ : device_t(mconfig, MSX_CART_SUNRISE_ATAIDE, tag, owner, clock)
+ , msx_cart_interface(mconfig, *this)
+ , m_flash(*this, "flash")
+ , m_ata(*this, "ata")
+ , m_rombank(*this, "rombank")
+ , m_view(*this, "view")
+ , m_activity_led(*this, "activity_led")
+ , m_control(0)
+ , m_data(0)
+ { }
+
+protected:
+ virtual void device_start() override;
+ virtual void device_reset() override;
+ virtual void device_add_mconfig(machine_config &config) override;
+ virtual const tiny_rom_entry *device_rom_region() const override;
+ virtual void interface_pre_start() override;
+
+private:
+ required_device<amd_29f010_device> m_flash;
+ required_device<ata_interface_device> m_ata;
+ memory_bank_creator m_rombank;
+ memory_view m_view;
+ output_finder<> m_activity_led;
+ u8 m_control;
+ u32 m_bank_base;
+ u16 m_data;
+};
+
+
+void msx_cart_sunrise_ataide_device::device_add_mconfig(machine_config &config)
+{
+ AMD_29F010(config, m_flash);
+
+ ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, false);
+ m_ata->dasp_handler().set_output("activity_led");
+}
+
+
+ROM_START(sunrise_ataide)
+ ROM_REGION(0x20000, "flash", ROMREGION_ERASEFF)
+ // These are not dumped from a real unit but the result of flashing the firmware.
+ // Since the full flash contents are written, the contents are expected to be the same.
+ ROM_DEFAULT_BIOS("v2.50")
+ ROM_SYSTEM_BIOS(0, "v2.50", "v2.50 - 29.01.2013")
+ ROMX_LOAD("v2.50.u3", 0, 0x20000, CRC(1944bca9) SHA1(b4bd26c0caee3bdb4e2e2dd1ca6e5ed1e9a7d57e), ROM_BIOS(0))
+
+ ROM_SYSTEM_BIOS(1, "v2.40", "v2.40 - 23.03.2005")
+ ROMX_LOAD("v2.40.u3", 0, 0x20000, CRC(c73f525b) SHA1(b43e709d62ce4c88072eec4369b4910e89b3fe7b), ROM_BIOS(1))
+
+ // Reverse-patched from a patched variant
+ ROM_SYSTEM_BIOS(2, "v2.21", "v2.21 - 26.03.2003")
+ ROMX_LOAD("v2.21.u3", 0, 0x20000, BAD_DUMP CRC(fb99f89b) SHA1(a650f51310c2a02c893993e683b54850c278d60b), ROM_BIOS(2))
+
+ ROM_SYSTEM_BIOS(3, "v2.10", "v2.10 - 14.06.2002")
+ ROMX_LOAD("v2.10.u3", 0, 0x20000, NO_DUMP, ROM_BIOS(3))
+
+ // Reverse-patched from a patched variant
+ ROM_SYSTEM_BIOS(4, "v2.01", "v2.01 - 18.09.2000")
+ ROMX_LOAD("v2.01.u3", 0, 0x20000, BAD_DUMP CRC(7fd06ee2) SHA1(bced64ee970e0d66be2634914e4aa58530202f7e), ROM_BIOS(4))
+
+ ROM_SYSTEM_BIOS(5, "v1.99", "v1.99 - 27.02.2000")
+ ROMX_LOAD("v1.99.u3", 0, 0x20000, NO_DUMP, ROM_BIOS(5))
+
+ ROM_SYSTEM_BIOS(6, "v1.97", "v1.97 - 20.10.1999")
+ ROMX_LOAD("v1.97.u3", 0, 0x20000, NO_DUMP, ROM_BIOS(6))
+
+ ROM_SYSTEM_BIOS(7, "v1.96", "v1.96 - 22.09.1999")
+ ROMX_LOAD("v1.96.u3", 0, 0x20000, NO_DUMP, ROM_BIOS(7))
+
+ ROM_REGION(0x1000, "gals", ROMREGION_ERASE00)
+ ROM_LOAD("gal16v8d.gal1.jed.u1", 0x0000, 1452, CRC(db625e66) SHA1(5e0718066eea14b89d3801e5464b9a3db41baa2e))
+ ROM_LOAD("gal16v8d.gal2.jed.u2", 0x0800, 1494, CRC(22e34ff1) SHA1(cbeb5830ee740747aa61ef5b896e2eb6d7acd7ab))
+ROM_END
+
+
+const tiny_rom_entry *msx_cart_sunrise_ataide_device::device_rom_region() const
+{
+ return ROM_NAME(sunrise_ataide);
+}
+
+
+void msx_cart_sunrise_ataide_device::interface_pre_start()
+{
+ if (!m_flash->started())
+ throw device_missing_dependencies();
+}
+
+
+void msx_cart_sunrise_ataide_device::device_start()
+{
+ m_activity_led.resolve();
+
+ save_item(NAME(m_control));
+ save_item(NAME(m_bank_base));
+ save_item(NAME(m_data));
+
+ m_rombank->configure_entries(0, 8, m_flash->base(), 0x4000);
+
+ page(1)->install_read_handler(0x4000, 0x7fff, read8sm_delegate(*this, [this] (offs_t offset)
+ {
+ u8 data = m_flash->read(m_bank_base | offset);
+ return bitswap(data, 0, 1, 2, 3, 4, 5, 6, 7);
+ }, "read")
+ );
+ page(1)->install_write_handler(0x4104, 0x4104, write8smo_delegate(*this, [this] (u8 data)
+ {
+ m_control = data;
+ m_bank_base = bitswap(m_control, 5, 6, 7) * 0x4000;
+ m_rombank->set_entry(bitswap(data, 5, 6, 7));
+ m_view.select(BIT(m_control, 0));
+ }, "control")
+ );
+ page(1)->install_view(0x7c00, 0x7e0f, m_view);
+ m_view[0];
+ m_view[1].install_read_handler(0x7c00, 0x7dff, read8sm_delegate(*this, [this] (offs_t offset)
+ {
+ if (!machine().side_effects_disabled())
+ {
+ if (!BIT(offset, 0))
+ {
+ m_ata->write_dmack(1);
+ m_data = m_ata->read_dma();
+ m_ata->write_dmack(0);
+ return m_data & 0xff;
+ }
+ }
+ return m_data >> 8;
+ }, "read_ide_data")
+ );
+ m_view[1].install_write_handler(0x7c00, 0x7dff, write8sm_delegate(*this, [this] (offs_t offset, u8 data)
+ {
+ if (BIT(offset, 0))
+ {
+ m_data = (m_data & 0x00ff) | (data << 8);
+ m_ata->write_dmack(1);
+ m_ata->write_dma(m_data);
+ m_ata->write_dmack(0);
+ }
+ else
+ {
+ m_data = (m_data & 0xff00) | data;
+ }
+ }, "write_ide_data")
+ );
+ m_view[1].install_write_handler(0x7e00, 0x7e0f, write8sm_delegate(*this, [this] (offs_t offset, u8 data)
+ {
+ if (BIT(offset, 3))
+ m_ata->cs1_w(offset & 0x07, data, 0xff);
+ else
+ m_ata->cs0_w(offset & 0x07, data, 0xff);
+ }, "write_ide")
+ );
+ m_view[1].install_read_handler(0x7e00, 0x7e0f, read8sm_delegate(*this, [this] (offs_t offset)
+ {
+ if (BIT(offset, 3))
+ return m_ata->cs1_r(offset & 0x07, 0xff);
+ else
+ return m_ata->cs0_r(offset & 0x07, 0xff);
+ }, "read_ide")
+ );
+
+ page(2)->install_write_handler(0x8000, 0xbfff, write8sm_delegate(*this, [this] (offs_t offset, u8 data)
+ {
+ data = bitswap(data, 0, 1, 2, 3, 4, 5, 6, 7);
+ m_flash->write(m_bank_base | (offset & 0x3fff), data);
+ }, "write_flash")
+ );
+}
+
+
+void msx_cart_sunrise_ataide_device::device_reset()
+{
+ m_rombank->set_entry(0);
+ m_control = 0;
+ m_bank_base = 0;
+ m_data = 0;
+ m_view.select(0);
+ m_activity_led = 0;
+ // Pulling high breaks status reads
+ //m_ata->write_dmack(1);
+}
+
+} // anonymous namespace
+
+DEFINE_DEVICE_TYPE_PRIVATE(MSX_CART_SUNRISE_ATAIDE, msx_cart_interface, msx_cart_sunrise_ataide_device, "msx_cart_sunrise_ataide", "Sunrise ATA-IDE/CF ATA-IDE Interface")
diff --git a/src/devices/bus/msx/cart/ide.h b/src/devices/bus/msx/cart/ide.h
new file mode 100644
index 00000000000..1b958ffda59
--- /dev/null
+++ b/src/devices/bus/msx/cart/ide.h
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol
+#ifndef MAME_BUS_MSX_CART_IDE_H
+#define MAME_BUS_MSX_CART_IDE_H
+
+#pragma once
+
+#include "bus/msx/slot/cartridge.h"
+
+DECLARE_DEVICE_TYPE(MSX_CART_SUNRISE_ATAIDE, msx_cart_interface)
+
+#endif // MAME_BUS_MSX_CART_IDE_H
diff --git a/src/devices/bus/msx/cart/slotoptions.cpp b/src/devices/bus/msx/cart/slotoptions.cpp
index a99a1750bf3..7dab963dc4c 100644
--- a/src/devices/bus/msx/cart/slotoptions.cpp
+++ b/src/devices/bus/msx/cart/slotoptions.cpp
@@ -83,6 +83,7 @@ char const *const SLOTEXP = "slotexp";
char const *const SOFTCARD = "softcard";
char const *const SOUND_SNATCHER = "sound_snatcher";
char const *const SOUND_SDSNATCH = "sound_sdsnatch";
+char const *const SUNRISE_ATAIDE = "sunrise_ataide";
char const *const SUNRISE_SCC = "sunrise_scc";
char const *const SUPER_SWANGI = "super_swangi";
char const *const SUPERLODERUNNER = "superloderunner";
diff --git a/src/devices/bus/msx/cart/slotoptions.h b/src/devices/bus/msx/cart/slotoptions.h
index 3333ca62165..c47a1006b86 100644
--- a/src/devices/bus/msx/cart/slotoptions.h
+++ b/src/devices/bus/msx/cart/slotoptions.h
@@ -86,6 +86,7 @@ extern char const *const SLOTEXP;
extern char const *const SOFTCARD;
extern char const *const SOUND_SNATCHER;
extern char const *const SOUND_SDSNATCH;
+extern char const *const SUNRISE_ATAIDE;
extern char const *const SUNRISE_SCC;
extern char const *const SUPER_SWANGI;
extern char const *const SUPERLODERUNNER;
diff --git a/src/devices/machine/atahle.cpp b/src/devices/machine/atahle.cpp
index 6decde4cb9f..30d2053c697 100644
--- a/src/devices/machine/atahle.cpp
+++ b/src/devices/machine/atahle.cpp
@@ -239,13 +239,18 @@ void ata_hle_device_base::finished_command()
}
}
+void ata_hle_device_base::clear_dma_modes()
+{
+ m_identify_buffer[62] &= 0xff;
+ m_identify_buffer[63] &= 0xff;
+ m_identify_buffer[88] &= 0xff;
+}
+
bool ata_hle_device_base::set_dma_mode(int word)
{
if ((m_identify_buffer[word] >> (m_sector_count & 7)) & 1)
{
- m_identify_buffer[62] &= 0xff;
- m_identify_buffer[63] &= 0xff;
- m_identify_buffer[88] &= 0xff;
+ clear_dma_modes();
m_identify_buffer[word] |= 0x100 << (m_sector_count & 7);
return true;
@@ -285,6 +290,7 @@ bool ata_hle_device_base::set_features()
default:
if ((m_identify_buffer[64] >> ((m_sector_count & 7) - 3)) & 1)
{
+ clear_dma_modes();
return true;
}
}
@@ -541,7 +547,8 @@ uint16_t ata_hle_device_base::command_r(offs_t offset)
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs0 %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset );
+ if (!machine().side_effects_disabled())
+ logerror( "%s: %s dev %d read_cs0 %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset );
}
else if ((m_status & IDE_STATUS_BSY) && offset != IDE_CS0_STATUS_R)
{
@@ -552,7 +559,8 @@ uint16_t ata_hle_device_base::command_r(offs_t offset)
switch (offset)
{
case IDE_CS0_DATA_RW:
- logerror( "%s: %s dev %d read_cs0 %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), offset );
+ if (!machine().side_effects_disabled())
+ logerror( "%s: %s dev %d read_cs0 %04x ignored (BSY)\n", machine().describe_context(), tag(), dev(), offset );
break;
default:
@@ -575,11 +583,15 @@ uint16_t ata_hle_device_base::command_r(offs_t offset)
{
if (!(m_status & IDE_STATUS_DRQ))
{
- logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
+ if (!machine().side_effects_disabled())
+ logerror( "%s: %s dev %d read_cs0 ignored (!DRQ)\n", machine().describe_context(), tag(), dev() );
}
else
{
- result = read_data();
+ if (!machine().side_effects_disabled())
+ result = read_data();
+ else
+ result = 0;
}
}
else
@@ -637,7 +649,8 @@ uint16_t ata_hle_device_base::command_r(offs_t offset)
/* log anything else */
default:
- logerror("%s:unknown IDE cs0 read at %03X\n", machine().describe_context(), offset);
+ if (!machine().side_effects_disabled())
+ logerror("%s:unknown IDE cs0 read at %03X\n", machine().describe_context(), offset);
break;
}
}
@@ -645,6 +658,7 @@ uint16_t ata_hle_device_base::command_r(offs_t offset)
/* logit */
// if (offset != IDE_CS0_DATA_RW && offset != IDE_CS0_STATUS_R)
+ if (!machine().side_effects_disabled())
LOG(("%s:IDE cs0 read %X at %X (err: %X)\n", machine().describe_context(), result, offset, m_error));
/* return the result */
@@ -656,6 +670,7 @@ uint16_t ata_hle_device_base::control_r(offs_t offset)
{
/* logit */
// if (offset != IDE_CS1_ALTERNATE_STATUS_R)
+ if (!machine().side_effects_disabled())
LOG(("%s:IDE cs1 read at %X\n", machine().describe_context(), offset));
uint16_t result = 0xffff;
@@ -664,7 +679,8 @@ uint16_t ata_hle_device_base::control_r(offs_t offset)
{
if (m_dmack)
{
- logerror( "%s: %s dev %d read_cs1 %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset );
+ if (!machine().side_effects_disabled())
+ logerror( "%s: %s dev %d read_cs1 %04x ignored (DMACK)\n", machine().describe_context(), tag(), dev(), offset );
}
else
{
@@ -708,7 +724,8 @@ uint16_t ata_hle_device_base::control_r(offs_t offset)
/* log anything else */
default:
- logerror("%s:unknown IDE cs1 read at %03X\n", machine().describe_context(), offset);
+ if (!machine().side_effects_disabled())
+ logerror("%s:unknown IDE cs1 read at %03X\n", machine().describe_context(), offset);
break;
}
}
diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h
index 63a176c51ed..60ef3e0586b 100644
--- a/src/devices/machine/atahle.h
+++ b/src/devices/machine/atahle.h
@@ -240,6 +240,7 @@ private:
void start_diagnostic();
void finished_diagnostic();
void finished_busy(int32_t param);
+ void clear_dma_modes();
bool set_dma_mode(int word);
int m_csel;