mirror of
https://github.com/mamedev/mame.git
synced 2024-11-16 07:48:32 +01:00
Miscellaneous fixes:
* bus/a2bus/vistaa800.cpp: Guard against debugger accesses on reads with side effects. * spectrum_betadisc_flop.xml, spectrum_cass.xml: Aliens: Neoplasma 1.2 and 1.3 have identical disc/tape images. * msx2_flop.xml: Fixed a few descriptions.
This commit is contained in:
Vas Crabb
parent
8193b3f652
commit
15c1f7f5e9
4 changed files with 48 additions and 122 deletions
|
|
@ -599,7 +599,7 @@ The following floppies came with the machines.
|
|||
</software>
|
||||
|
||||
<software name="affairej" cloneof="affaire">
|
||||
<description>L'Affaire (Japan)</description>
|
||||
<description>L'Affaire: Ushinawareta Toki wo Motomete (Japan)</description>
|
||||
<year>1987</year>
|
||||
<publisher>Pack-In-Video</publisher>
|
||||
<info name="alt_title" value="ラ・フェール～失われた時を求めて～"/>
|
||||
|
|
@ -8411,7 +8411,7 @@ The following floppies came with the machines.
|
|||
</software>
|
||||
|
||||
<software name="kansator">
|
||||
<description>Kan Satoru Hyakka (Japan)</description>
|
||||
<description>Kandoku Hyakka (Japan)</description>
|
||||
<year>1987</year>
|
||||
<publisher>Sony</publisher>
|
||||
<info name="alt_title" value="漢読百科"/>
|
||||
|
|
@ -8525,7 +8525,7 @@ The following floppies came with the machines.
|
|||
</software>
|
||||
|
||||
<software name="konaish1">
|
||||
<description>Konai Shasei Vol. 1 (Japan)</description>
|
||||
<description>Kounai Shasei Vol. 1 (Japan)</description>
|
||||
<year>1991</year>
|
||||
<publisher>Fairytale</publisher>
|
||||
<info name="alt_title" value="校内写生１巻"/>
|
||||
|
|
@ -8558,7 +8558,7 @@ The following floppies came with the machines.
|
|||
</software>
|
||||
|
||||
<software name="konaish2">
|
||||
<description>Konai Shasei Vol. 2 (Japan)</description>
|
||||
<description>Kounai Shasei Vol. 2 (Japan)</description>
|
||||
<year>1991</year>
|
||||
<publisher>Fairytale</publisher>
|
||||
<info name="alt_title" value="校内写生２巻"/>
|
||||
|
|
@ -8591,7 +8591,7 @@ The following floppies came with the machines.
|
|||
</software>
|
||||
|
||||
<software name="konaish3">
|
||||
<description>Konai Shasei Vol. 3 (Japan)</description>
|
||||
<description>Kounai Shasei Vol. 3 (Japan)</description>
|
||||
<year>1991</year>
|
||||
<publisher>Fairytale</publisher>
|
||||
<info name="alt_title" value="校内写生３巻"/>
|
||||
|
|
|
|||
|
|
@ -44,12 +44,13 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, English, AY sound)</description>
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, English, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="English" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_en_trd_v1_2.trd" size="655360" crc="c054ca8b" sha1="d82efc709fc42f39fe92e77c9cdd7575855cae74"/>
|
||||
|
|
@ -58,12 +59,13 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_a" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, English, Turbo Sound)</description>
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, English, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="English" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_en_trd_ts_v1_2.trd" size="655360" crc="5649ab8d" sha1="48403112fb70228b52baf19a8991da60d8b7bd20"/>
|
||||
|
|
@ -72,12 +74,13 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_ru" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Russian, AY sound)</description>
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Russian, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Russian" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_ru_trd_v1_2.trd" size="655360" crc="5975dcd9" sha1="c0820e5735afb2423642bee69458c0d3ff395b69"/>
|
||||
|
|
@ -86,12 +89,13 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_a_ru" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Russian, Turbo Sound)</description>
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Russian, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Russian" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_ru_trd_ts_v1_2.trd" size="655360" crc="8316b07d" sha1="0ba959d936d501d457d5ac36b593aced7b8f8a07"/>
|
||||
|
|
@ -100,12 +104,13 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_es" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Spanish, AY sound)</description>
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Spanish, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Spanish" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_es_trd_v1_2.trd" size="655360" crc="7d91d859" sha1="ec43f48951268862a8fb0a1287d5f647af9b643b"/>
|
||||
|
|
@ -113,13 +118,14 @@ license:CC0-1.0
|
|||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasms_a_es" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Spanish, Turbo Sound)</description>
|
||||
<software name="neoplasm_a_es" cloneof="neoplasm">
|
||||
<!-- disk images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Spanish, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Spanish" />
|
||||
<info name="version" value="1.2" />
|
||||
<info name="version" value="1.3" />
|
||||
<part name="flop" interface="floppy_5_25">
|
||||
<dataarea name="flop" size="655360">
|
||||
<rom name="aliens_neoplasma_1_2_es_trd_ts_v1_2.trd" size="655360" crc="eb8cb95f" sha1="8c2456dd1b36d51c1fe30c8028b97dbc19df5464"/>
|
||||
|
|
|
|||
|
|
@ -1117,6 +1117,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, English, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1131,6 +1132,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_a" cloneof="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, English, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1145,6 +1147,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_ru" cloneof="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Russian, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1159,6 +1162,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_a_ru" cloneof="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Russian, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1173,6 +1177,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_es" cloneof="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Spanish, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1188,6 +1193,7 @@ license:CC0-1.0
|
|||
</software>
|
||||
|
||||
<software name="neoplasm_a_es" cloneof="neoplasm">
|
||||
<!-- tape images for versions 1.2 and 1.3 are apparently identical -->
|
||||
<description>Aliens: Neoplasma (v1.3, Spanish, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
|
|
@ -1202,96 +1208,6 @@ license:CC0-1.0
|
|||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, English, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="English" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64233">
|
||||
<rom name="aliens_neoplasma_1_2_en_tap_v1_2.tap" size="64233" crc="6cf1a406" sha1="59d719af6bd4ae46b8f22db76119260f515057c7"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12_a" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, English, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="English" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64377">
|
||||
<rom name="aliens_neoplasma_1_2_en_tap_ts_v1_2.tap" size="64377" crc="747043bb" sha1="99aef48031e67f2bd6ec45d3815b66e381cb7b9e"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12_ru" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Russian, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Russian" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64460">
|
||||
<rom name="aliens_neoplasma_1_2_ru_tap_v1_2.tap" size="64460" crc="84175b8b" sha1="d0f5bacf34e078e679b605fb88a897646fe177ef"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12_a_ru" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Russian, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Russian" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64604">
|
||||
<rom name="aliens_neoplasma_1_2_ru_tap_ts_v1_2.tap" size="64604" crc="f072219c" sha1="d464cab16989f99701db08e394e2efbddc66101f"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12_es" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Spanish, AY sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Spanish" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64212">
|
||||
<rom name="aliens_neoplasma_1_2_es_tap_v1_2.tap" size="64212" crc="58a0d65f" sha1="db929ae446e9b977dc79fe2f5b2991fa12c24818"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="neoplasmv12_a_es" cloneof="neoplasm">
|
||||
<description>Aliens: Neoplasma (v1.2, Spanish, Turbo Sound)</description>
|
||||
<year>2019</year>
|
||||
<publisher>Sanchez crew</publisher>
|
||||
<info name="developer" value="Aleksander Udotov / Oleg Nikitin / Eugene Rogulin" />
|
||||
<info name="language" value="Spanish" />
|
||||
<info name="usage" value="128K" />
|
||||
<info name="version" value="1.2" />
|
||||
<part name="cass" interface="spectrum_cass">
|
||||
<dataarea name="cass" size="64356">
|
||||
<rom name="aliens_neoplasma_1_2_es_tap_ts_v1_2.tap" size="64356" crc="1f032905" sha1="5b59b45b934f1fe6ab9c37b01d01c314aafae8ff"/>
|
||||
</dataarea>
|
||||
</part>
|
||||
</software>
|
||||
|
||||
<software name="aburner">
|
||||
<description>Afterburner</description>
|
||||
<year>1988</year>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ private:
|
|||
uint8_t m_density;
|
||||
uint8_t m_side;
|
||||
uint8_t m_sso;
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -131,11 +130,11 @@ const tiny_rom_entry *a2bus_vistaa800_device::device_rom_region() const
|
|||
|
||||
void a2bus_vistaa800_device::device_add_mconfig(machine_config &config)
|
||||
{
|
||||
FD1797(config, m_fdc, 2000000);
|
||||
FLOPPY_CONNECTOR(config, "fdc:0", vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, "fdc:1", vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, "fdc:2", vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, "fdc:3", vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FD1797(config, m_fdc, 2'000'000);
|
||||
FLOPPY_CONNECTOR(config, m_floppy0, vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, m_floppy1, vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, m_floppy2, vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
FLOPPY_CONNECTOR(config, m_floppy3, vistaa800_floppies, "8dsdd", floppy_image_device::default_mfm_floppy_formats).enable_sound(true);
|
||||
|
||||
m_fdc->intrq_wr_callback().set(FUNC(a2bus_vistaa800_device::fdc_intrq_w));
|
||||
m_fdc->drq_wr_callback().set(FUNC(a2bus_vistaa800_device::fdc_drq_w));
|
||||
|
|
@ -184,16 +183,21 @@ uint8_t a2bus_vistaa800_device::read_c0nx(uint8_t offset)
|
|||
break;
|
||||
|
||||
case 0xa:
|
||||
m_dmaenable_read = true;
|
||||
if (!machine().side_effecs_disabled())
|
||||
m_dmaenable_read = true;
|
||||
break;
|
||||
|
||||
case 0xb:
|
||||
m_dmaenable_write = true;
|
||||
if (!machine().side_effecs_disabled())
|
||||
m_dmaenable_write = true;
|
||||
break;
|
||||
|
||||
case 0xc:
|
||||
m_dmaenable_read = false;
|
||||
m_dmaenable_write = false;
|
||||
if (!machine().side_effecs_disabled())
|
||||
{
|
||||
m_dmaenable_read = false;
|
||||
m_dmaenable_write = false;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0xf:
|
||||
|
|
@ -202,7 +206,7 @@ uint8_t a2bus_vistaa800_device::read_c0nx(uint8_t offset)
|
|||
result = result | 0x80;
|
||||
}
|
||||
|
||||
result = result | (m_side << 5); // Todo: check this
|
||||
result = result | (m_side << 5); // TODO: check this
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
@ -300,7 +304,7 @@ void a2bus_vistaa800_device::fdc_drq_w(uint8_t state)
|
|||
{
|
||||
if (state)
|
||||
{
|
||||
if (m_dmaenable_read) //Todo: verify if both can be turned on at the same time, and which has priority
|
||||
if (m_dmaenable_read) // TODO: verify if both can be turned on at the same time, and which has priority
|
||||
{
|
||||
uint8_t data = m_fdc->data_r();
|
||||
slot_dma_write(m_dmaaddr, data);
|
||||
|
|
@ -318,10 +322,10 @@ void a2bus_vistaa800_device::fdc_drq_w(uint8_t state)
|
|||
|
||||
void a2bus_vistaa800_device::fdc_sso_w(uint8_t state)
|
||||
{
|
||||
m_sso = state; // Todo: needs to be verified on real h/w. This is meant to be from the drive
|
||||
m_sso = state; // TODO: needs to be verified on real h/w. This is meant to be from the drive
|
||||
}
|
||||
|
||||
} // anonymous namespace
|
||||
|
||||
|
||||
DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_VISTAA800, device_a2bus_card_interface, a2bus_vistaa800_device, "vistaa800", "Vista A800 8inch disk Controller Card")
|
||||
DEFINE_DEVICE_TYPE_PRIVATE(A2BUS_VISTAA800, device_a2bus_card_interface, a2bus_vistaa800_device, "a2vistaa800", "Vista A800 8inch disk Controller Card")
|
||||
|
|
|
|||
Loading…
Reference in a new issue