Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mainline/release0213' into mainline-master

Browse Source
This commit is contained in:
Vas Crabb 2019-09-02 21:53:01 +10:00
commit 17e43dada2
5 changed files with 42 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
hash/spectrum_betadisc_flop.xml
View File

@ -155,72 +155,6 @@
</part> </part>
</software> </software>
<software name="neoplasm">
<description>Aliens Neoplasma (set 1, v1.2, English)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="neoplasma" cloneof="neoplasm" supported="partial">
<description>Aliens Neoplasma (set 2, v1.2, English, Turbo Sound)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="neoplasms" cloneof="neoplasm">
<description>Aliens Neoplasma (set 3, v1.2, Spanish)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="neoplasmsa" cloneof="neoplasm" supported="partial">
<description>Aliens Neoplasma (set 4, v1.2, Spanish, Turbo Sound)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="neoplasmr" cloneof="neoplasm">
<description>Aliens Neoplasma (set 5, v1.2, Russian)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="neoplasmra" cloneof="neoplasm" supported="partial">
<description>Aliens Neoplasma (set 6, v1.2, Russian, Turbo Sound)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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"/>
</dataarea>
</part>
</software>
<software name="redshftt"> <software name="redshftt">
<description>Redshift</description> <description>Redshift</description>
<year>19??</year> <year>19??</year>

68
hash/spectrum_cass.xml
View File

@ -18319,72 +18319,6 @@
</part> </part>
</software> </software>
<software name="neoplasm">
<description>>Aliens Neoplasma (set 1, v1.2, English)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="neoplasma" cloneof="neoplasm" supported="partial">
<description>>Aliens Neoplasma (set 2, v1.2, English, Turbo Sound)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="neoplasms" cloneof="neoplasm">
<description>>Aliens Neoplasma (set 3, v1.2, Spanish)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="neoplasmsa" cloneof="neoplasm" supported="partial">
<description>>Aliens Neoplasma (set 4, v1.2, Spanish, Turbo Soudn)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="neoplasmr" cloneof="neoplasm">
<description>>Aliens Neoplasma (set 5, v1.2, Russian)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="neoplasmra" cloneof="neoplasm" supported="partial">
<description>>Aliens Neoplasma (set 6, v1.2, Russian, Turbo Sound)</description>
<year>2019</year>
<publisher>Sanchez crew</publisher>
<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="nominasi"> <software name="nominasi">
<description>Nominas (Investronica)</description> <description>Nominas (Investronica)</description>
<year>1984</year> <year>1984</year>
@ -90476,7 +90410,7 @@
</software> </software>
<software name="lostspec10b" cloneof="lostspec"> <software name="lostspec10b" cloneof="lostspec">
<description>Lost In My Spectrum - (set 25, v1.0, Italian, 128k)</description> <description>Lost In My Spectrum (set 25, v1.0, Italian, 128k)</description>
<year>2012</year> <year>2012</year>
<publisher>Alessandro Grussu</publisher> <publisher>Alessandro Grussu</publisher>
<part name="cass" interface="spectrum_cass"> <part name="cass" interface="spectrum_cass">

80
src/devices/bus/gio64/newport.cpp
View File

@ -913,34 +913,34 @@ void rb2_device::deserialize(FILE *file)
uint32_t rb2_device::expand_to_all_lanes(uint32_t src) uint32_t rb2_device::expand_to_all_lanes(uint32_t src)
{ {
switch (m_draw_depth) { switch (m_draw_depth) {
case 0: case 0:
src |= src << 4; src |= src << 4;
src |= src << 8; src |= src << 8;
src |= src << 16; src |= src << 16;
break; break;
case 1: case 1:
src |= src << 8; src |= src << 8;
src |= src << 16; src |= src << 16;
break; break;
case 2: case 2:
src |= src << 12; src |= src << 12;
break; break;
case 3: case 3:
break; break;
} }
switch (m_plane_enable) switch (m_plane_enable)
{ {
case 1: // RGB/CI case 1: // RGB/CI
case 2: // RGBA case 2: // RGBA
case 6: // CID case 6: // CID
return src; return src;
case 4: // OLAY case 4: // OLAY
return src << 8; return src << 8;
case 5: // PUP case 5: // PUP
return src << 2; return src << 2;
} }
return src; return src;
} }
void rb2_device::set_write_mask(uint32_t data) void rb2_device::set_write_mask(uint32_t data)
@ -2372,10 +2372,10 @@ void newport_base_device::output_pixel(int16_t x, int16_t y, uint32_t color)
const uint32_t address = (uint32_t)(y * (1280 + 64) + x); const uint32_t address = (uint32_t)(y * (1280 + 64) + x);
m_set_address(address); m_set_address(address);
if (BIT(m_rex3.m_draw_mode1, 18)) if (BIT(m_rex3.m_draw_mode1, 18))
blend_pixel(color); blend_pixel(color);
else else
m_write_pixel(color); m_write_pixel(color);
} }
void newport_base_device::blend_pixel(uint32_t src) void newport_base_device::blend_pixel(uint32_t src)
@ -3268,27 +3268,27 @@ uint32_t newport_base_device::get_default_color(uint32_t src)
case 0: // 4bpp case 0: // 4bpp
color &= 0xf; color &= 0xf;
color |= color << 4; color |= color << 4;
color |= color << 8; color |= color << 8;
color |= color << 16; color |= color << 16;
break; break;
case 1: // 8bpp case 1: // 8bpp
color &= 0xff; color &= 0xff;
color |= color << 8; color |= color << 8;
color |= color << 16; color |= color << 16;
break; break;
case 2: // 12bpp case 2: // 12bpp
if (BIT(m_rex3.m_draw_mode1, 15)) if (BIT(m_rex3.m_draw_mode1, 15))
color = ((m_rex3.m_color_vram & 0xf00000) >> 12) | ((m_rex3.m_color_vram & 0xf000) >> 8) | ((m_rex3.m_color_vram & 0xf0) >> 4); color = ((m_rex3.m_color_vram & 0xf00000) >> 12) | ((m_rex3.m_color_vram & 0xf000) >> 8) | ((m_rex3.m_color_vram & 0xf0) >> 4);
else else
color &= 0x00000fff; color &= 0x00000fff;
color |= color << 12; color |= color << 12;
break; break;
case 3: // 24bpp case 3: // 24bpp
color = m_rex3.m_color_vram & 0xffffff; color = m_rex3.m_color_vram & 0xffffff;
break; break;
} }
return color; return color;
} }
void newport_base_device::do_rex3_command() void newport_base_device::do_rex3_command()

2
src/devices/bus/gio64/newport.h
View File

@ -458,7 +458,7 @@ protected:
void iterate_shade(); void iterate_shade();
uint32_t get_default_color(uint32_t src); uint32_t get_default_color(uint32_t src);
uint32_t get_host_color(); uint32_t get_host_color();
uint32_t get_rgb_color(int16_t x, int16_t y); uint32_t get_rgb_color(int16_t x, int16_t y);

12
src/mame/drivers/sdk85.cpp
View File

@ -35,15 +35,6 @@ On the right you'll get a "clue", slightly different than on the standard game (
Once you find the number, you'll see it flashing. Press the 2 key and you'll get your score (number of attempts before guessing). Once you find the number, you'll see it flashing. Press the 2 key and you'll get your score (number of attempts before guessing).
Press 0 to restart. Press 0 to restart.
Notes on expansion rom with default content Mastermind.
Original authors: see above (Paolo Forlani and Stefano Bodrato)
Ported to option rom: NASZVADI Peter
The game can be started from monitor by defining SP as 20FFh and PC as 0800h and starting execution.
When setting register values in monitor, SPH, SPL, PCH and PCL values must be set to 20, FF, 08, 00 respectively before start!
Stefano's bios had been altered in order to use lower ram bank and the option rom slot.
When selecting "Empty" a14, which is basically 2kbytes of zeros, the default option rom will be launched directly.
*************************************************************************************************************************************/ *************************************************************************************************************************************/
#include "emu.h" #include "emu.h"
@ -193,11 +184,8 @@ ROM_START( sdk85 )
ROMX_LOAD( "sdk85.a14", 0x0000, 0x0800, CRC(9d5a983f) SHA1(54e218560fbec009ac3de5cfb64b920241ef2eeb), ROM_BIOS(0) ) ROMX_LOAD( "sdk85.a14", 0x0000, 0x0800, CRC(9d5a983f) SHA1(54e218560fbec009ac3de5cfb64b920241ef2eeb), ROM_BIOS(0) )
ROM_SYSTEM_BIOS(1, "mastermind", "Mastermind") ROM_SYSTEM_BIOS(1, "mastermind", "Mastermind")
ROMX_LOAD( "mastermind.a14", 0x0000, 0x0800, CRC(36b694ae) SHA1(4d8a5ae5d10e8f72a6e349c7eeaf1aa00c4e45e1), ROM_BIOS(1) ) ROMX_LOAD( "mastermind.a14", 0x0000, 0x0800, CRC(36b694ae) SHA1(4d8a5ae5d10e8f72a6e349c7eeaf1aa00c4e45e1), ROM_BIOS(1) )
ROM_SYSTEM_BIOS(2, "empty", "Empty")
ROMX_LOAD( "empty.a14", 0x0000, 0x0800, CRC(f1e8ba9e) SHA1(605db3fdbaff4ba13729371ad0c4fbab3889378e), ROM_BIOS(2) )
ROM_REGION( 0x800, "expromio", ROMREGION_ERASEFF ) ROM_REGION( 0x800, "expromio", ROMREGION_ERASEFF )
ROM_LOAD_OPTIONAL( "mastermind.a15", 0x0000, 0x0800, CRC(0538e162) SHA1(c351975e2cf515cee29fcaeb04ef47189afe5250) )
ROM_END ROM_END
/* Driver */ /* Driver */