diff --git a/hash/msx2_flop.xml b/hash/msx2_flop.xml
index 81cb81b066a..e8f8a804b6f 100644
--- a/hash/msx2_flop.xml
+++ b/hash/msx2_flop.xml
@@ -599,7 +599,7 @@ The following floppies came with the machines.
- L'Affaire (Japan)
+ L'Affaire: Ushinawareta Toki wo Motomete (Japan)
1987
Pack-In-Video
@@ -8411,7 +8411,7 @@ The following floppies came with the machines.
- Kan Satoru Hyakka (Japan)
+ Kandoku Hyakka (Japan)
1987
Sony
@@ -8525,7 +8525,7 @@ The following floppies came with the machines.
- Konai Shasei Vol. 1 (Japan)
+ Kounai Shasei Vol. 1 (Japan)
1991
Fairytale
@@ -8558,7 +8558,7 @@ The following floppies came with the machines.
- Konai Shasei Vol. 2 (Japan)
+ Kounai Shasei Vol. 2 (Japan)
1991
Fairytale
@@ -8591,7 +8591,7 @@ The following floppies came with the machines.
- Konai Shasei Vol. 3 (Japan)
+ Kounai Shasei Vol. 3 (Japan)
1991
Fairytale
diff --git a/hash/spectrum_betadisc_flop.xml b/hash/spectrum_betadisc_flop.xml
index f157a006620..e404b705bb4 100644
--- a/hash/spectrum_betadisc_flop.xml
+++ b/hash/spectrum_betadisc_flop.xml
@@ -44,12 +44,13 @@ license:CC0-1.0
- Aliens: Neoplasma (v1.2, English, AY sound)
+
+ Aliens: Neoplasma (v1.3, English, AY sound)
2019
Sanchez crew
-
+
@@ -58,12 +59,13 @@ license:CC0-1.0
- Aliens: Neoplasma (v1.2, English, Turbo Sound)
+
+ Aliens: Neoplasma (v1.3, English, Turbo Sound)
2019
Sanchez crew
-
+
@@ -72,12 +74,13 @@ license:CC0-1.0
- Aliens: Neoplasma (v1.2, Russian, AY sound)
+
+ Aliens: Neoplasma (v1.3, Russian, AY sound)
2019
Sanchez crew
-
+
@@ -86,12 +89,13 @@ license:CC0-1.0
- Aliens: Neoplasma (v1.2, Russian, Turbo Sound)
+
+ Aliens: Neoplasma (v1.3, Russian, Turbo Sound)
2019
Sanchez crew
-
+
@@ -100,12 +104,13 @@ license:CC0-1.0
- Aliens: Neoplasma (v1.2, Spanish, AY sound)
+
+ Aliens: Neoplasma (v1.3, Spanish, AY sound)
2019
Sanchez crew
-
+
@@ -113,13 +118,14 @@ license:CC0-1.0
-
- Aliens: Neoplasma (v1.2, Spanish, Turbo Sound)
+
+
+ Aliens: Neoplasma (v1.3, Spanish, Turbo Sound)
2019
Sanchez crew
-
+
diff --git a/hash/spectrum_cass.xml b/hash/spectrum_cass.xml
index 6ff73158a74..0df777bc64e 100644
--- a/hash/spectrum_cass.xml
+++ b/hash/spectrum_cass.xml
@@ -1117,6 +1117,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, English, AY sound)
2019
Sanchez crew
@@ -1131,6 +1132,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, English, Turbo Sound)
2019
Sanchez crew
@@ -1145,6 +1147,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, Russian, AY sound)
2019
Sanchez crew
@@ -1159,6 +1162,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, Russian, Turbo Sound)
2019
Sanchez crew
@@ -1173,6 +1177,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, Spanish, AY sound)
2019
Sanchez crew
@@ -1188,6 +1193,7 @@ license:CC0-1.0
+
Aliens: Neoplasma (v1.3, Spanish, Turbo Sound)
2019
Sanchez crew
@@ -1202,96 +1208,6 @@ license:CC0-1.0
-
- Aliens: Neoplasma (v1.2, English, AY sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
-
- Aliens: Neoplasma (v1.2, English, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
-
- Aliens: Neoplasma (v1.2, Russian, AY sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
-
- Aliens: Neoplasma (v1.2, Russian, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
-
- Aliens: Neoplasma (v1.2, Spanish, AY sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
-
- Aliens: Neoplasma (v1.2, Spanish, Turbo Sound)
- 2019
- Sanchez crew
-
-
-
-
-
-
-
-
-
-
-
Afterburner
1988
diff --git a/src/devices/bus/a2bus/vistaa800.cpp b/src/devices/bus/a2bus/vistaa800.cpp
index a711f0b1b00..7f18f48560c 100644
--- a/src/devices/bus/a2bus/vistaa800.cpp
+++ b/src/devices/bus/a2bus/vistaa800.cpp
@@ -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")