diff options
-rw-r--r-- | scripts/target/mame/mess.lua | 1 | ||||
-rw-r--r-- | src/devices/cpu/mips/mips1.cpp | 2 | ||||
-rw-r--r-- | src/devices/machine/dp8573.cpp | 6 | ||||
-rw-r--r-- | src/devices/sound/okim6376.cpp | 86 | ||||
-rw-r--r-- | src/devices/sound/okim6376.h | 28 | ||||
-rw-r--r-- | src/frontend/mame/ui/ui.cpp | 6 | ||||
-rw-r--r-- | src/mame/drivers/fidel_cc7.cpp | 3 | ||||
-rw-r--r-- | src/mame/drivers/maygaysw.cpp | 20 | ||||
-rw-r--r-- | src/mame/drivers/nmkmedal.cpp | 82 | ||||
-rw-r--r-- | src/mame/drivers/saitek_stratos.cpp | 16 | ||||
-rw-r--r-- | src/mame/drivers/saitek_superstar.cpp | 207 | ||||
-rw-r--r-- | src/mame/layout/coco3.lay | 6 | ||||
-rw-r--r-- | src/mame/layout/mephisto_1.lay | 53 | ||||
-rw-r--r-- | src/mame/layout/mephisto_3.lay | 55 | ||||
-rw-r--r-- | src/mame/layout/saitek_sstar28k.lay | 514 | ||||
-rw-r--r-- | src/mame/layout/sms1.lay | 8 | ||||
-rw-r--r-- | src/mame/mame.lst | 3 | ||||
-rw-r--r-- | src/mame/mess.flt | 1 |
18 files changed, 1031 insertions, 66 deletions
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 8110c60f3d2..09e5bff47b9 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -3073,6 +3073,7 @@ files { MAME_DIR .. "src/mame/includes/saitek_stratos.h", MAME_DIR .. "src/mame/drivers/saitek_stratos.cpp", MAME_DIR .. "src/mame/drivers/saitek_corona.cpp", -- subdriver of saitek_stratos + MAME_DIR .. "src/mame/drivers/saitek_superstar.cpp", } createMESSProjects(_target, _subtarget, "samcoupe") diff --git a/src/devices/cpu/mips/mips1.cpp b/src/devices/cpu/mips/mips1.cpp index 21f49301e26..ec8aa88a59b 100644 --- a/src/devices/cpu/mips/mips1.cpp +++ b/src/devices/cpu/mips/mips1.cpp @@ -1335,6 +1335,8 @@ void mips1_device_base::handle_cop1(u32 const op) if (!m_fcr0) return; + softfloat_exceptionFlags = 0; + switch (op >> 26) { case 0x11: // COP1 diff --git a/src/devices/machine/dp8573.cpp b/src/devices/machine/dp8573.cpp index a9f30016ed2..0fe7e2ba1d4 100644 --- a/src/devices/machine/dp8573.cpp +++ b/src/devices/machine/dp8573.cpp @@ -40,10 +40,7 @@ void dp8573_device::device_start() m_irq.resolve_safe(); m_pfail.resolve_safe(); -} -void dp8573_device::device_reset() -{ memset(m_ram, 0, 32); m_tscr = 0; @@ -61,7 +58,10 @@ void dp8573_device::device_reset() m_ram[REG_YEAR] = time_helper::make_bcd(systime.local_time.year % 100); m_ram[REG_DAYOFWEEK] = time_helper::make_bcd(systime.local_time.weekday + 1); m_ram[REG_RTMR] = RTMR_CSS; +} +void dp8573_device::device_reset() +{ m_timer->adjust(attotime::from_msec(1), 0, attotime::from_msec(1)); } diff --git a/src/devices/sound/okim6376.cpp b/src/devices/sound/okim6376.cpp index e04f051b0f5..2170bd5e898 100644 --- a/src/devices/sound/okim6376.cpp +++ b/src/devices/sound/okim6376.cpp @@ -19,8 +19,8 @@ #define MAX_SAMPLE_CHUNK 10000 //#define MAX_WORDS 111 -#define OKIVERBOSE 0 -#define MSM6376LOG(...) do { if (OKIVERBOSE) logerror(__VA_ARGS__); } while (0) +//#define VERBOSE 1 +#include "logmacro.h" /* step size index shift table */ static const int index_shift[8] = { -1, -1, -1, -1, 2, 4, 6, 8 }; @@ -111,11 +111,12 @@ void okim6376_device::ADPCMVoice::reset() DEFINE_DEVICE_TYPE(OKIM6376, okim6376_device, "okim6376", "OKI MSM6376 ADPCM") +DEFINE_DEVICE_TYPE(OKIM6650, okim6650_device, "okim6650", "OKI MSM6650 ADPCM") -okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) - : device_t(mconfig, OKIM6376, tag, owner, clock), +okim6376_device::okim6376_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int addrbits) + : device_t(mconfig, type, tag, owner, clock), device_sound_interface(mconfig, *this), - m_region_base(*this, DEVICE_SELF), + device_rom_interface(mconfig, *this, addrbits, ENDIANNESS_BIG, 8), //m_command[OKIM6376_VOICES], m_latch(0), //m_stage[OKIM6376_VOICES], @@ -133,6 +134,16 @@ okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, { } +okim6376_device::okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : okim6376_device(mconfig, OKIM6376, tag, owner, clock, 21) +{ +} + +okim6650_device::okim6650_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : okim6376_device(mconfig, OKIM6650, tag, owner, clock, 23) +{ +} + //------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -184,6 +195,11 @@ void okim6376_device::device_reset() } +void okim6376_device::rom_bank_updated() +{ +} + + /********************************************************************************************** clock_adpcm -- clock the next ADPCM byte @@ -212,13 +228,34 @@ int16_t okim6376_device::ADPCMVoice::clock(uint8_t nibble) } +offs_t okim6376_device::get_start_position(int channel) +{ + offs_t base = m_command[channel] * 4; + + // max address space is 16Mbit + return (read_byte(base+0) << 16 | read_byte(base+1) << 8 | read_byte(base+2)) & 0x1fffff; +} + + +offs_t okim6650_device::get_start_position(int channel) +{ + offs_t base = 0x000800 + m_command[channel] * 4; + + // determine sampling frequency for phrase + uint8_t data = read_byte(base); + m_divisor = ((data & 3) == 2 ? 5 : 8 - (data & 3) * 2) * (BIT(data, 2) ? 2 : 1); + notify_clock_changed(); + + // max address space is 64Mbit + return (read_byte(base+1) << 16 | read_byte(base+2) << 8 | read_byte(base+3)) & 0x7fffff; +} + + void okim6376_device::oki_process(int channel, int command) { /* if a command is pending, process the second half */ if ((command != -1) && (command != 0)) //process silence separately { - int start; - unsigned char *base/*, *base_end*/; /* update the stream */ m_stream->update(); @@ -226,10 +263,8 @@ void okim6376_device::oki_process(int channel, int command) { struct ADPCMVoice *voice = &m_voice[channel]; - /* determine the start position, max address space is 16Mbit */ - base = &m_region_base[m_command[channel] * 4]; - //base_end = &m_region_base[(MAX_WORDS+1) * 4]; - start = ((base[0] << 16) + (base[1] << 8) + base[2]) & 0x1fffff; + // determine the start position + offs_t start = get_start_position(channel); if (start == 0) { @@ -293,7 +328,7 @@ void okim6376_device::generate_adpcm(struct ADPCMVoice *voice, int16_t *buffer, /* if this voice is active */ if (voice->playing) { - uint8_t *base = m_region_base + voice->base_offset; + offs_t base = voice->base_offset; int sample = voice->sample; int count = voice->count; @@ -305,7 +340,7 @@ void okim6376_device::generate_adpcm(struct ADPCMVoice *voice, int16_t *buffer, if (count == 0) { /* get the number of samples to play */ - count = (base[sample / 2] & 0x7f) << 1; + count = (read_byte(base + sample / 2) & 0x7f) << 1; /* end of voice marker */ if (count == 0) @@ -321,7 +356,7 @@ void okim6376_device::generate_adpcm(struct ADPCMVoice *voice, int16_t *buffer, } /* compute the new amplitude and update the current step */ - nibble = base[sample / 2] >> (((sample & 1) << 2) ^ 4); + nibble = read_byte(base + sample / 2) >> (((sample & 1) << 2) ^ 4); /* output to the buffer, scaling by the volume */ /* signal in range -4096..4095, volume in range 2..16 => signal * volume / 2 in range -32768..32767 */ @@ -400,6 +435,11 @@ void okim6376_device::device_clock_changed() m_stream->set_sample_rate(clock() / m_divisor); } +void okim6650_device::device_clock_changed() +{ + m_stream->set_sample_rate(clock() / 64 / m_divisor); +} + /********************************************************************************************** @@ -425,14 +465,14 @@ READ_LINE_MEMBER( okim6376_device::busy_r ) READ_LINE_MEMBER( okim6376_device::nar_r ) { - MSM6376LOG("OKIM6376: NAR %x\n",m_nar); + LOG("OKIM6376: NAR %x\n",m_nar); return m_nar; } WRITE_LINE_MEMBER( okim6376_device::ch2_w ) { m_ch2_update = 0;//Clear flag - MSM6376LOG("OKIM6376: CH2 %x\n",state); + LOG("OKIM6376: CH2 %x\n",state); if (m_ch2 != state) { @@ -445,7 +485,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w ) struct ADPCMVoice *voice0 = &m_voice[0]; struct ADPCMVoice *voice1 = &m_voice[1]; // We set to channel 2 - MSM6376LOG("OKIM6376: Channel 1\n"); + LOG("OKIM6376: Channel 1\n"); m_channel = 1; if ((voice0->playing)&&(m_st)) @@ -460,7 +500,7 @@ WRITE_LINE_MEMBER( okim6376_device::ch2_w ) { m_stage[1]=0; oki_process(1, m_command[1]); - MSM6376LOG("OKIM6376: Channel 0\n"); + LOG("OKIM6376: Channel 0\n"); m_channel = 0; } } @@ -471,7 +511,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w ) //As in STart, presumably, this triggers everything m_st_update = 0;//Clear flag - MSM6376LOG("OKIM6376: ST %x\n",state); + LOG("OKIM6376: ST %x\n",state); if (m_st != state) { @@ -483,7 +523,7 @@ WRITE_LINE_MEMBER( okim6376_device::st_w ) struct ADPCMVoice *voice = &m_voice[m_channel]; { m_st_pulses ++; - MSM6376LOG("OKIM6376: ST pulses %x\n",m_st_pulses); + LOG("OKIM6376: ST pulses %x\n",m_st_pulses); if (m_st_pulses > 3) { m_st_pulses = 3; //undocumented behaviour beyond 3 pulses @@ -507,6 +547,12 @@ WRITE_LINE_MEMBER( okim6376_device::st_w ) } } + +WRITE_LINE_MEMBER( okim6650_device::cmd_w ) +{ + // TODO +} + /********************************************************************************************** okim6376_data_w -- write to the data port of an OKIM6376-compatible chip diff --git a/src/devices/sound/okim6376.h b/src/devices/sound/okim6376.h index 91cb3acf7e6..361a9d2ccb0 100644 --- a/src/devices/sound/okim6376.h +++ b/src/devices/sound/okim6376.h @@ -7,8 +7,7 @@ /* an interface for the OKIM6376 and similar chips (CPU interface only) */ -class okim6376_device : public device_t, - public device_sound_interface +class okim6376_device : public device_t, public device_sound_interface, public device_rom_interface { public: okim6376_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); @@ -22,6 +21,8 @@ public: DECLARE_READ_LINE_MEMBER( nar_r ); protected: + okim6376_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int addrbits); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -31,7 +32,11 @@ protected: // sound stream update overrides virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; -private: + // device_rom_interface overrides + virtual void rom_bank_updated() override; + + virtual offs_t get_start_position(int channel); + /* struct describing a single playing ADPCM voice */ struct ADPCMVoice { @@ -50,8 +55,6 @@ private: }; // internal state - required_region_ptr<uint8_t> m_region_base; /* pointer to the base of the region */ - static constexpr unsigned OKIM6376_VOICES = 2; struct ADPCMVoice m_voice[OKIM6376_VOICES]; int32_t m_command[OKIM6376_VOICES]; @@ -75,6 +78,21 @@ private: void adpcm_state_save_register(struct ADPCMVoice *voice, int index); }; +class okim6650_device : public okim6376_device +{ +public: + okim6650_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + + DECLARE_WRITE_LINE_MEMBER( cmd_w ); + +protected: + // device-level overrides + virtual void device_clock_changed() override; + + virtual offs_t get_start_position(int channel) override; +}; + DECLARE_DEVICE_TYPE(OKIM6376, okim6376_device) +DECLARE_DEVICE_TYPE(OKIM6650, okim6650_device) #endif // MAME_SOUND_OKIM6376_H diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp index ce1ea2855c1..3a9151f1f2e 100644 --- a/src/frontend/mame/ui/ui.cpp +++ b/src/frontend/mame/ui/ui.cpp @@ -303,13 +303,13 @@ void mame_ui_manager::display_startup_screens(bool first_time) const int maxstate = 3; int str = machine().options().seconds_to_run(); bool show_gameinfo = !machine().options().skip_gameinfo(); - bool show_warnings = true; + bool show_warnings = true, show_mandatory_fileman = true; bool video_none = strcmp(downcast<osd_options &>(machine().options()).video(), "none") == 0; // disable everything if we are using -str for 300 or fewer seconds, or if we're the empty driver, // or if we are debugging, or if there's no mame window to send inputs to if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0 || video_none) - show_gameinfo = show_warnings = false; + show_gameinfo = show_warnings = show_mandatory_fileman = false; #if defined(EMSCRIPTEN) // also disable for the JavaScript port since the startup screens do not run asynchronously @@ -347,7 +347,7 @@ void mame_ui_manager::display_startup_screens(bool first_time) case 2: std::vector<std::reference_wrapper<const std::string>> mandatory_images = mame_machine_manager::instance()->missing_mandatory_images(); - if (!mandatory_images.empty()) + if (!mandatory_images.empty() && show_mandatory_fileman) { std::ostringstream warning; warning << _("This driver requires images to be loaded in the following device(s): "); diff --git a/src/mame/drivers/fidel_cc7.cpp b/src/mame/drivers/fidel_cc7.cpp index f872eba2333..2c802e9df52 100644 --- a/src/mame/drivers/fidel_cc7.cpp +++ b/src/mame/drivers/fidel_cc7.cpp @@ -15,6 +15,9 @@ This is a cost-reduced design from CC10, no special I/O chips. Backgammon Challenger (BKC) is the same PCB, with the speaker connection going to the display panel instead. +CC7 (BCC) was also bootlegged around 1981 by Splice Industria Brasileira, +as "Byte XD-300". Mostek MK3880N-4 @ 4MHz, ROM contents is same as BCC REVB. + RE information from netlist by Berger (a BCC model) Memory map: diff --git a/src/mame/drivers/maygaysw.cpp b/src/mame/drivers/maygaysw.cpp index 4fb1f75042d..59fe3ad52ed 100644 --- a/src/mame/drivers/maygaysw.cpp +++ b/src/mame/drivers/maygaysw.cpp @@ -101,6 +101,8 @@ #include "emu.h" #include "cpu/m68000/m68000.h" +#include "sound/okim6376.h" +#include "speaker.h" class maygayew_state : public driver_device { @@ -136,6 +138,9 @@ void maygayew_state::maygayew(machine_config &config) /* basic machine hardware */ M68000(config, m_maincpu, 8000000); // MC68306FC16 - standard 68000 core + peripherals m_maincpu->set_addrmap(AS_PROGRAM, &maygayew_state::maygayew_map); + + SPEAKER(config, "mono").front_center(); + OKIM6650(config, "snd", 4_MHz_XTAL).add_route(ALL_OUTPUTS, "mono", 1.0); } ROM_START( mg_gbr ) @@ -383,6 +388,9 @@ ROM_START( mg_ewg ) ROM_LOAD16_BYTE( "sa6-283.u2", 0x00000, 0x020000, CRC(49b59728) SHA1(b9728e63a5453b66469af2457e258761dbc21927) ) ROM_LOAD16_BYTE( "sa6-284.u1", 0x00001, 0x020000, CRC(bd16cd1e) SHA1(fcb9314f83d60d84ed4ff17d2c02c29f20e15fdf) ) ROM_LOAD16_BYTE( "sa6-284.u2", 0x00000, 0x020000, CRC(fc40c076) SHA1(825fec1f768fd2442a5de89d627609f3b133dc5b) ) + + ROM_REGION( 0x100000, "snd", 0 ) + ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END ROM_START( mg_jv ) @@ -397,6 +405,9 @@ ROM_START( mg_jv ) ROM_LOAD16_BYTE( "sa6-610.u2", 0x0000, 0x020000, CRC(bb3cbd6f) SHA1(1642712bc3afbf9675639280667d27a74833863d) ) ROM_LOAD16_BYTE( "sa6-611.u1", 0x0000, 0x020000, CRC(c65af93d) SHA1(bd4a83d3405be39fb61d8d5b59e19c40b81a841f) ) ROM_LOAD16_BYTE( "sa6-611.u2", 0x0000, 0x020000, CRC(c75a0135) SHA1(bb4aba84894d95458720f26703622622efbffb7d) ) + + ROM_REGION( 0x100000, "snd", 0 ) + ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END ROM_START( mg_kf ) @@ -407,6 +418,9 @@ ROM_START( mg_kf ) ROM_REGION( 0x1000000, "altrevs", 0 ) ROM_LOAD16_BYTE( "sw6-100.u27", 0x0000, 0x020000, CRC(ea5b6583) SHA1(70f1fd73d6e422cf0e9d39c8fcd9650085801953) ) ROM_LOAD16_BYTE( "sw6-100.u28", 0x0000, 0x020000, CRC(a90f949b) SHA1(4d8d92e78da69628b12e418e61a073f17d97ed8a) ) + + ROM_REGION( 0x100000, "snd", 0 ) + ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END @@ -420,6 +434,9 @@ ROM_START( mg_pbw ) ROM_LOAD16_BYTE( "sw8-149.u28", 0x00001, 0x020000, CRC(0a9f0fd6) SHA1(7841cbb4997e0f244164072790b8936d49910879) ) ROM_LOAD16_BYTE( "pwizu27", 0x00000, 0x080000, CRC(84af9df8) SHA1(f31fd5721cac97f17476fb71bb0071ad6c44091b) ) ROM_LOAD16_BYTE( "pwizu28", 0x00001, 0x080000, CRC(ba00fecd) SHA1(9e78626b2f611ecd3b62fa5035041b231d53c26f) ) + + ROM_REGION( 0x100000, "snd", 0 ) + ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END @@ -433,6 +450,9 @@ ROM_START( mg_scl ) ROM_LOAD16_BYTE( "sw8-153.u28", 0x00001, 0x020000, CRC(8afd96f1) SHA1(db3b4ef58c293cddddefeed9e3ba8b936d682dc4) ) ROM_LOAD16_BYTE( "sclue.u27", 0x00000, 0x080000, CRC(1296124a) SHA1(502de898fee639fa7917a607ce451bc3a3374c5b) ) ROM_LOAD16_BYTE( "sclue.u28", 0x00001, 0x080000, CRC(1330b949) SHA1(11736865f7524a1de7da235d85c4aafd7199ed62) ) + + ROM_REGION( 0x100000, "snd", 0 ) + ROM_LOAD( "snd.u3", 0x000000, 0x080000, NO_DUMP ) ROM_END // complete(?) dump diff --git a/src/mame/drivers/nmkmedal.cpp b/src/mame/drivers/nmkmedal.cpp index 91fea27838e..49576b29096 100644 --- a/src/mame/drivers/nmkmedal.cpp +++ b/src/mame/drivers/nmkmedal.cpp @@ -36,23 +36,97 @@ class nmkmedal_state : public driver_device { public: nmkmedal_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), - m_maincpu(*this, "maincpu") + : driver_device(mconfig, type, tag) + , m_maincpu(*this, "maincpu") + , m_oki(*this, "oki") { } void trocana(machine_config &config); - void mem_map(address_map &map); + private: + void adpcm_control_w(u8 data); + + void mem_map(address_map &map); + required_device<cpu_device> m_maincpu; + required_device<okim6650_device> m_oki; }; +void nmkmedal_state::adpcm_control_w(u8 data) +{ + m_oki->ch2_w(BIT(data, 0)); + m_oki->cmd_w(BIT(data, 1)); + m_oki->st_w(BIT(data, 2) || !BIT(data, 1)); +} + void nmkmedal_state::mem_map(address_map &map) { map(0x0000, 0x7fff).rom().region("maincpu", 0); + map(0x8000, 0x8000).portr("IN0"); + map(0x8001, 0x8001).portr("IN1"); + map(0x8002, 0x8002).portr("IN2"); + map(0x8003, 0x8003).portr("IN3"); + map(0x8004, 0x8004).portr("IN4"); + map(0x8005, 0x8005).portr("IN5"); + map(0xa003, 0xa003).w(m_oki, FUNC(okim6376_device::write)); + map(0xa004, 0xa004).w(FUNC(nmkmedal_state::adpcm_control_w)); map(0xc000, 0xc7ff).ram(); } static INPUT_PORTS_START( trocana ) + PORT_START("IN0") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.0") PORT_CODE(KEYCODE_1) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.1") PORT_CODE(KEYCODE_2) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.2") PORT_CODE(KEYCODE_3) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.3") PORT_CODE(KEYCODE_4) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.4") PORT_CODE(KEYCODE_5) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.5") PORT_CODE(KEYCODE_6) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.6") PORT_CODE(KEYCODE_7) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("0.7") PORT_CODE(KEYCODE_8) + + PORT_START("IN1") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.0") PORT_CODE(KEYCODE_Q) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.1") PORT_CODE(KEYCODE_W) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.2") PORT_CODE(KEYCODE_E) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.3") PORT_CODE(KEYCODE_R) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.4") PORT_CODE(KEYCODE_T) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.5") PORT_CODE(KEYCODE_Y) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.6") PORT_CODE(KEYCODE_U) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("1.7") PORT_CODE(KEYCODE_I) + + PORT_START("IN2") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.0") PORT_CODE(KEYCODE_A) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.1") PORT_CODE(KEYCODE_S) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.2") PORT_CODE(KEYCODE_D) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.3") PORT_CODE(KEYCODE_F) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.4") PORT_CODE(KEYCODE_G) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.5") PORT_CODE(KEYCODE_H) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.6") PORT_CODE(KEYCODE_J) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("2.7") PORT_CODE(KEYCODE_K) + + PORT_START("IN3") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.0") PORT_CODE(KEYCODE_LSHIFT) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.1") PORT_CODE(KEYCODE_Z) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.2") PORT_CODE(KEYCODE_X) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.3") PORT_CODE(KEYCODE_C) + PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.4") PORT_CODE(KEYCODE_V) + PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.5") PORT_CODE(KEYCODE_B) + PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.6") PORT_CODE(KEYCODE_N) + PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("3.7") PORT_CODE(KEYCODE_M) + + PORT_START("IN4") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("4.0") PORT_CODE(KEYCODE_9) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("4.1") PORT_CODE(KEYCODE_0) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("4.2") PORT_CODE(KEYCODE_MINUS) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("4.3") PORT_CODE(KEYCODE_EQUALS) + PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED) + + PORT_START("IN5") + PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("5.0") PORT_CODE(KEYCODE_COMMA) + PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("5.1") PORT_CODE(KEYCODE_STOP) + PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("5.2") PORT_CODE(KEYCODE_SLASH) + PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("5.3") PORT_CODE(KEYCODE_RSHIFT) + PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED) INPUT_PORTS_END void nmkmedal_state::trocana(machine_config &config) @@ -61,7 +135,7 @@ void nmkmedal_state::trocana(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &nmkmedal_state::mem_map); SPEAKER(config, "mono").front_center(); - OKIM6376(config, "oki", 16500000 / 16).add_route(ALL_OUTPUTS, "mono", 1.0); // actually MSM6650 + OKIM6650(config, m_oki, 16500000 / 4).add_route(ALL_OUTPUTS, "mono", 1.0); } ROM_START( trocana) diff --git a/src/mame/drivers/saitek_stratos.cpp b/src/mame/drivers/saitek_stratos.cpp index 3c7912a30f7..36ca484c49d 100644 --- a/src/mame/drivers/saitek_stratos.cpp +++ b/src/mame/drivers/saitek_stratos.cpp @@ -541,33 +541,33 @@ void stratos_state::tking2(machine_config &config) ROM_START( stratos ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("w1y01f_728m_u3.u3", 0x0000, 0x8000, CRC(b58a7256) SHA1(75b3a3a65f4ca8d52aa5b17a06319bff59d9014f) ) + ROM_LOAD("w1yo1f_728m_u3.u3", 0x0000, 0x8000, CRC(b58a7256) SHA1(75b3a3a65f4ca8d52aa5b17a06319bff59d9014f) ) ROM_LOAD("bw1_819n_u4.u4", 0x8000, 0x8000, CRC(cb0de631) SHA1(f78d40213be21775966cbc832d64acd9b73de632) ) ROM_END ROM_START( stratosa ) ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("w1y01f_728l_u3.u3", 0x0000, 0x8000, CRC(19a22058) SHA1(a5ca54d870c70b7ce9c7be2951800bf49cc57527) ) + ROM_LOAD("w1yo1f_728l_u3.u3", 0x0000, 0x8000, CRC(19a22058) SHA1(a5ca54d870c70b7ce9c7be2951800bf49cc57527) ) ROM_LOAD("bw1_819n_u4.u4", 0x8000, 0x8000, CRC(cb0de631) SHA1(f78d40213be21775966cbc832d64acd9b73de632) ) ROM_END ROM_START( tking ) // PCB rev. 10 ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("y01f_713d_u3.u3", 0x0000, 0x8000, CRC(b8c6d853) SHA1(98923f44bbbd2ea17c269850971d3df229e6057e) ) - ROM_LOAD("y01f_712a_u4.u4", 0x8000, 0x8000, CRC(7d3f8f7b) SHA1(8be5d8d988ff0577ccfec0a773bfd94599f2534f) ) + ROM_LOAD("yo1f_713d_u3.u3", 0x0000, 0x8000, CRC(b8c6d853) SHA1(98923f44bbbd2ea17c269850971d3df229e6057e) ) + ROM_LOAD("yo1f_712a_u4.u4", 0x8000, 0x8000, CRC(7d3f8f7b) SHA1(8be5d8d988ff0577ccfec0a773bfd94599f2534f) ) ROM_END ROM_START( tkinga ) // PCB rev. 3, also PCB rev. 5 ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("w1y01f_728l_u3.u3", 0x0000, 0x8000, CRC(19a22058) SHA1(a5ca54d870c70b7ce9c7be2951800bf49cc57527) ) - ROM_LOAD("y01f-b_819o_u4.u4", 0x8000, 0x8000, CRC(336040d4) SHA1(aca662b8cc4d6bafd61ca158c768ba8896117169) ) + ROM_LOAD("w1yo1f_728l_u3.u3", 0x0000, 0x8000, CRC(19a22058) SHA1(a5ca54d870c70b7ce9c7be2951800bf49cc57527) ) + ROM_LOAD("yo1f-b_819o_u4.u4", 0x8000, 0x8000, CRC(336040d4) SHA1(aca662b8cc4d6bafd61ca158c768ba8896117169) ) ROM_END ROM_START( tkingb ) // PCB rev. 7 ROM_REGION( 0x10000, "maincpu", 0 ) - ROM_LOAD("w1y01f_728p_u3.u3", 0x0000, 0x8000, CRC(ad77f83e) SHA1(598fdb1e40267d9d43a3d8f287723070b9afa349) ) - ROM_LOAD("y01f-b_819o_u4.u4", 0x8000, 0x8000, CRC(336040d4) SHA1(aca662b8cc4d6bafd61ca158c768ba8896117169) ) + ROM_LOAD("w1yo1f_728p_u3.u3", 0x0000, 0x8000, CRC(ad77f83e) SHA1(598fdb1e40267d9d43a3d8f287723070b9afa349) ) + ROM_LOAD("yo1f-b_819o_u4.u4", 0x8000, 0x8000, CRC(336040d4) SHA1(aca662b8cc4d6bafd61ca158c768ba8896117169) ) ROM_END diff --git a/src/mame/drivers/saitek_superstar.cpp b/src/mame/drivers/saitek_superstar.cpp new file mode 100644 index 00000000000..3f61540178f --- /dev/null +++ b/src/mame/drivers/saitek_superstar.cpp @@ -0,0 +1,207 @@ +// license:BSD-3-Clause +// copyright-holders:hap +// thanks-to:Berger +/****************************************************************************** + +SciSys Superstar / Turbostar +Starting from Turbostar 432, SciSys started adding the "Kasparov" prefix. + +Hardware notes (Superstar 28K): +- PCB label: YO1C-PE-017 REV2 +- R6502AP @ ~2MHz (no XTAL, clock from RC circuit?) +- 4KB RAM (2*HM6116P-4) +- 24KB ROM (3*M5L2764K) +- TTL, buzzer, 28 LEDs, 8*8 chessboard buttons + +TODO: +- verify CPU speed +- add sstar36k, and Turbostar versions (assuming it's similar hardware) +- add KSO module, sstar28k doesn't support it? + +******************************************************************************/ + +#include "emu.h" +#include "cpu/m6502/m6502.h" +#include "machine/sensorboard.h" +#include "sound/dac.h" +#include "sound/volt_reg.h" +#include "video/pwm.h" +#include "speaker.h" + +// internal artwork +#include "saitek_sstar28k.lh" // clickable + + +namespace { + +class star_state : public driver_device +{ +public: + star_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), + m_maincpu(*this, "maincpu"), + m_board(*this, "board"), + m_display(*this, "display"), + m_dac(*this, "dac"), + m_inputs(*this, "IN.%u", 0) + { } + + // machine drivers + void sstar28k(machine_config &config); + +protected: + virtual void machine_start() override; + +private: + // devices/pointers + required_device<cpu_device> m_maincpu; + required_device<sensorboard_device> m_board; + required_device<pwm_display_device> m_display; + required_device<dac_bit_interface> m_dac; + required_ioport_array<2> m_inputs; + + // address maps + void main_map(address_map &map); + + // I/O handlers + DECLARE_WRITE8_MEMBER(control_w); + DECLARE_READ8_MEMBER(input_r); + + u8 m_inp_mux; +}; + +void star_state::machine_start() +{ + m_inp_mux = 0; + save_item(NAME(m_inp_mux)); +} + + + +/****************************************************************************** + I/O +******************************************************************************/ + +WRITE8_MEMBER(star_state::control_w) +{ + // d0-d3: input mux, led select + m_inp_mux = data & 0xf; + + // d4-d6: led data + m_display->matrix(1 << m_inp_mux, ~data >> 4 & 7); + + // d7: speaker out + m_dac->write(BIT(data, 7)); +} + +READ8_MEMBER(star_state::input_r) +{ + u8 data = 0; + + // d0-d7: multiplexed inputs + // read chessboard sensors + if (m_inp_mux < 8) + data = m_board->read_file(m_inp_mux); + + // read other buttons + else if (m_inp_mux < 10) + data = m_inputs[m_inp_mux - 8]->read(); + + return data; +} + + + +/****************************************************************************** + Address Maps +******************************************************************************/ + +void star_state::main_map(address_map &map) +{ + map(0x0000, 0x07ff).mirror(0x1800).ram(); + map(0x2000, 0x27ff).mirror(0x1800).ram(); + map(0x4000, 0x4000).w(FUNC(star_state::control_w)); + map(0x6000, 0x6000).r(FUNC(star_state::input_r)); + map(0xa000, 0xffff).rom(); +} + + + +/****************************************************************************** + Input Ports +******************************************************************************/ + +static INPUT_PORTS_START( sstar28k ) + PORT_START("IN.0") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("Queen") + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("Bishop") + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("Pawn") + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("Level") + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_O) PORT_NAME("Sound") + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("New Game") + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_D) PORT_NAME("Display Move") + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Take Back") + + PORT_START("IN.1") + PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("King") + PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("Rook") + PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("Knight") + PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("Set Up") + PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_U) PORT_NAME("Multi Move") + PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_C) PORT_NAME("Color") + PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_NAME("Replay") + PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("Move") +INPUT_PORTS_END + + + +/****************************************************************************** + Machine Drivers +******************************************************************************/ + +void star_state::sstar28k(machine_config &config) +{ + /* basic machine hardware */ + M6502(config, m_maincpu, 2000000); // no XTAL + m_maincpu->set_addrmap(AS_PROGRAM, &star_state::main_map); + + const attotime irq_period = attotime::from_hz(2000000 / 0x2000); // 4020 Q13 + m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), irq_period); + + SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS); + m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess)); + m_board->set_delay(attotime::from_msec(150)); + + /* video hardware */ + PWM_DISPLAY(config, m_display).set_size(10, 3); + config.set_default_layout(layout_saitek_sstar28k); + + /* sound hardware */ + SPEAKER(config, "speaker").front_center(); + DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.25); + VOLTAGE_REGULATOR(config, "vref").add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); +} + + + +/****************************************************************************** + ROM Definitions +******************************************************************************/ + +ROM_START( sstar28k ) + ROM_REGION( 0x10000, "maincpu", 0 ) + ROM_LOAD("yo1c-v25_a0.u6", 0xa000, 0x2000, CRC(3c4bef09) SHA1(50349820d131db0138bd5dc4b62f38cc3aa1d7db) ) // M5L2764K + ROM_LOAD("yo1c-v21_c0.u4", 0xc000, 0x2000, CRC(aae43b1b) SHA1(9acef9593f19ec3a6e9a671e82196d7bd054960e) ) // " + ROM_LOAD("yo1c-v25_e0.u5", 0xe000, 0x2000, CRC(371b81fe) SHA1(c08dd0de8eebd7c1ed2d2281bf0241a83ee0f391) ) // " +ROM_END + +} // anonymous namespace + + + +/****************************************************************************** + Drivers +******************************************************************************/ + +// YEAR NAME PARENT CMP MACHINE INPUT STATE INIT COMPANY, FULLNAME, FLAGS +CONS( 1983, sstar28k, 0, 0, sstar28k, sstar28k, star_state, empty_init, "SciSys", "Superstar 28K", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) diff --git a/src/mame/layout/coco3.lay b/src/mame/layout/coco3.lay index 0a4205d8cdd..46a6bd2137a 100644 --- a/src/mame/layout/coco3.lay +++ b/src/mame/layout/coco3.lay @@ -1,12 +1,12 @@ <?xml version="1.0"?> <mamelayout version="2"> <view name="Composite"> + <!-- workaround for MAME selecting a 2-screen view by default --> + <screen index="1"><bounds left="0" top="0" right="4" bottom="3" /><color alpha="0" /></screen> + <screen index="0"> <bounds left="0" top="0" right="4" bottom="3" /> </screen> - - <!-- workaround for MAME selecting a 2-screen view by default --> - <screen index="1"><bounds left="0" top="0" right="4" bottom="3" /><color alpha="0" /></screen> </view> <view name="RGB"> diff --git a/src/mame/layout/mephisto_1.lay b/src/mame/layout/mephisto_1.lay index d4c5ef7feaf..04c45e078c1 100644 --- a/src/mame/layout/mephisto_1.lay +++ b/src/mame/layout/mephisto_1.lay @@ -3,7 +3,43 @@ <!-- NOTE: no chesspieces simulation here, H+G Mephisto/Mephisto II didn't have a built-in chessboard --> -<!-- define elements --> +<!-- schach labels --> + + <element name="text_schach"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + <element name="text_matt"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + <element name="text_patt"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + + <group name="labels"> + <bounds x="0" y="0" width="22.5" height="6" /> + + <bezel element="gray2"><bounds x="0" y="0" width="22.5" height="6" /></bezel> + <bezel element="gray3"><bounds x="2.0" y="0.7" width="19" height="5" /></bezel> + + <bezel element="gray2"><bounds x="5.45" y="0.5" width="0.2" height="5.4" /></bezel> + <bezel element="gray2"><bounds x="10.95" y="0.5" width="0.2" height="5.4" /></bezel> + <bezel element="gray2"><bounds x="0.25" y="4.9" width="5" height="1" /></bezel> + <bezel element="gray2"><bounds x="5.85" y="4.9" width="4.9" height="1" /></bezel> + <bezel element="gray2"><bounds x="11.35" y="4.9" width="11" height="1" /></bezel> + <bezel element="gray2"><bounds x="0.25" y="0.2" width="22" height="3.7" /></bezel> + <bezel element="gray2"><bounds x="2.2" y="3.7" width="18.6" height="1" /></bezel> + + <bezel element="gray3"><bounds x="8.6" y="3.9" width="0.6" height="0.9" /></bezel> + <bezel element="gray2"><bounds x="8.8" y="1" width="0.2" height="4.5" /></bezel> + + <bezel element="text_schach"><bounds x="0.1" y="2.7" width="4.2" height="1.2" /></bezel> + <bezel element="text_matt"><bounds x="7.0" y="2.7" width="3.5" height="1.2" /></bezel> + <bezel element="text_patt"><bounds x="19.2" y="2.7" width="3.2" height="1.2" /></bezel> + </group> + <!-- display --> @@ -134,12 +170,12 @@ <bezel element="text_b9"><bounds x="11.9" y="21.8" width="1.3" height="1.8" /></bezel> <bezel element="text_b0"><bounds x="16.9" y="21.8" width="1.3" height="1.8" /></bezel> - <bezel element="text_p6"><bounds x="6.8" y="10.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p5"><bounds x="11.8" y="10.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p4"><bounds x="1.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p3"><bounds x="6.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p2"><bounds x="11.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p1"><bounds x="1.8" y="20.05" width="1.8" height="1.8" /></bezel> + <bezel element="text_p6"><bounds x="6.85" y="10.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p5"><bounds x="11.85" y="10.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p4"><bounds x="1.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p3"><bounds x="6.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p2"><bounds x="11.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p1"><bounds x="1.85" y="20.1" width="1.7" height="1.7" /></bezel> <bezel element="hlb" inputtag="IN.0" inputmask="0x01"><bounds x="0" y="5" width="3.7" height="3.7" /><color alpha="0.08" /></bezel> <bezel element="hlb" inputtag="IN.2" inputmask="0x01"><bounds x="5" y="5" width="3.7" height="3.7" /><color alpha="0.08" /></bezel> @@ -170,7 +206,7 @@ <element name="gray1"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element> <element name="gray2"><rect><color red="0.11" green="0.105" blue="0.10" /></rect></element> <element name="gray2d"><disk><color red="0.11" green="0.105" blue="0.10" /></disk></element> - <element name="gray3"><rect><color red="0.08" green="0.075" blue="0.075" /></rect></element> + <element name="gray3"><rect><color red="0.21" green="0.2" blue="0.2" /></rect></element> <group name="brikett"> <bounds x="16.5" y="6" width="58.5" height="32" /> @@ -186,6 +222,7 @@ <bezel element="blackb"><bounds x="69" y="32" width="6" height="6" /></bezel> <bezel element="gray2d"><bounds x="64" y="27" width="10" height="10" /></bezel> + <group ref="labels"><bounds x="22.5" y="9.7" width="20" height="5.333" /></group> <group ref="display"><bounds x="22.5" y="15" width="20" height="6.85" /></group> <group ref="buttons"><bounds x="50" y="10" width="19" height="24" /></group> </group> diff --git a/src/mame/layout/mephisto_3.lay b/src/mame/layout/mephisto_3.lay index 4f99ea3da73..33c7d35b48d 100644 --- a/src/mame/layout/mephisto_3.lay +++ b/src/mame/layout/mephisto_3.lay @@ -379,6 +379,44 @@ </group> +<!-- schach labels --> + + <element name="text_schach"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="SCHACH"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + <element name="text_matt"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="MATT"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + <element name="text_patt"> + <rect><color red="0.11" green="0.105" blue="0.10" /></rect> + <text string="PATT"><color red="0.3" green="0.3" blue="0.31" /></text> + </element> + + <group name="labels"> + <bounds x="0" y="0" width="22.5" height="6" /> + + <bezel element="gray2"><bounds x="0" y="0" width="22.5" height="6" /></bezel> + <bezel element="gray3"><bounds x="2.0" y="0.7" width="19" height="5" /></bezel> + + <bezel element="gray2"><bounds x="5.45" y="0.5" width="0.2" height="5.4" /></bezel> + <bezel element="gray2"><bounds x="10.95" y="0.5" width="0.2" height="5.4" /></bezel> + <bezel element="gray2"><bounds x="0.25" y="4.9" width="5" height="1" /></bezel> + <bezel element="gray2"><bounds x="5.85" y="4.9" width="4.9" height="1" /></bezel> + <bezel element="gray2"><bounds x="11.35" y="4.9" width="11" height="1" /></bezel> + <bezel element="gray2"><bounds x="0.25" y="0.2" width="22" height="3.7" /></bezel> + <bezel element="gray2"><bounds x="2.2" y="3.7" width="18.6" height="1" /></bezel> + + <bezel element="gray3"><bounds x="8.6" y="3.9" width="0.6" height="0.9" /></bezel> + <bezel element="gray2"><bounds x="8.8" y="1" width="0.2" height="4.5" /></bezel> + + <bezel element="text_schach"><bounds x="0.1" y="2.7" width="4.2" height="1.2" /></bezel> + <bezel element="text_matt"><bounds x="7.0" y="2.7" width="3.5" height="1.2" /></bezel> + <bezel element="text_patt"><bounds x="19.2" y="2.7" width="3.2" height="1.2" /></bezel> + </group> + + <!-- display --> <element name="lcd_bg"><rect><color red="0.54" green="0.57" blue="0.58" /></rect></element> @@ -511,12 +549,12 @@ <bezel element="text_b9"><bounds x="11.9" y="21.8" width="1.3" height="1.8" /></bezel> <bezel element="text_b0"><bounds x="16.9" y="21.8" width="1.3" height="1.8" /></bezel> - <bezel element="text_p6"><bounds x="6.8" y="10.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p5"><bounds x="11.8" y="10.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p4"><bounds x="1.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p3"><bounds x="6.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p2"><bounds x="11.8" y="15.05" width="1.8" height="1.8" /></bezel> - <bezel element="text_p1"><bounds x="1.8" y="20.05" width="1.8" height="1.8" /></bezel> + <bezel element="text_p6"><bounds x="6.85" y="10.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p5"><bounds x="11.85" y="10.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p4"><bounds x="1.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p3"><bounds x="6.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p2"><bounds x="11.85" y="15.1" width="1.7" height="1.7" /></bezel> + <bezel element="text_p1"><bounds x="1.85" y="20.1" width="1.7" height="1.7" /></bezel> <bezel element="hlb" inputtag="IN.0" inputmask="0x01"><bounds x="0" y="5" width="3.7" height="3.7" /><color alpha="0.08" /></bezel> <bezel element="hlb" inputtag="IN.2" inputmask="0x01"><bounds x="5" y="5" width="3.7" height="3.7" /><color alpha="0.08" /></bezel> @@ -547,7 +585,7 @@ <element name="gray1"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element> <element name="gray2"><rect><color red="0.11" green="0.105" blue="0.10" /></rect></element> <element name="gray2d"><disk><color red="0.11" green="0.105" blue="0.10" /></disk></element> - <element name="gray3"><rect><color red="0.08" green="0.075" blue="0.075" /></rect></element> + <element name="gray3"><rect><color red="0.21" green="0.2" blue="0.2" /></rect></element> <group name="brikett"> <bounds x="16.5" y="6" width="58.5" height="32" /> @@ -563,6 +601,7 @@ <bezel element="blackb"><bounds x="69" y="32" width="6" height="6" /></bezel> <bezel element="gray2d"><bounds x="64" y="27" width="10" height="10" /></bezel> + <group ref="labels"><bounds x="22.5" y="9.7" width="20" height="5.333" /></group> <group ref="display"><bounds x="22.5" y="15" width="20" height="6.85" /></group> <group ref="buttons"><bounds x="50" y="10" width="19" height="24" /></group> </group> @@ -573,7 +612,7 @@ <view name="Internal Layout (Full)"> <bounds left="-13" right="150.5" top="-1.5" bottom="87.5" /> - <element ref="gray3"><bounds x="80" y="61" width="60" height="14" /></element> + <element ref="gray3"><bounds x="80" y="61" width="60" height="6.85" /></element> <group ref="brikett"><bounds x="90" y="52" width="58.5" height="32" /></group> <bezel element="cblack"><bounds x="-1" y="-1.5" width="89" height="89" /></bezel> diff --git a/src/mame/layout/saitek_sstar28k.lay b/src/mame/layout/saitek_sstar28k.lay new file mode 100644 index 00000000000..78299828c30 --- /dev/null +++ b/src/mame/layout/saitek_sstar28k.lay @@ -0,0 +1,514 @@ +<?xml version="1.0"?> +<mamelayout version="2"> + +<!-- define elements --> + + <element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element> + <element name="black"><rect><color red="0.21" green="0.2" blue="0.2" /></rect></element> + <element name="white2"><rect><color red="0.75" green="0.74" blue="0.74" /></rect></element> + <element name="blue"><rect><color red="0.05" green="0.35" blue="0.85" /></rect></element> + + <element name="hl" defstate="0"> + <rect state="0"><color red="0" green="0" blue="0" /></rect> + <rect state="1"><color red="0.11" green="0.11" blue="0.11" /></rect> + </element> + + <element name="ledr" defstate="0"> + <rect state="1"><color red="1.0" green="0.1" blue="0.15" /></rect> + <rect state="0"><color red="0.2" green="0.02" blue="0.03" /></rect> + </element> + + <element name="text_1"><text string="1"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_2"><text string="2"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_3"><text string="3"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_4"><text string="4"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_5"><text string="5"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_6"><text string="6"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_7"><text string="7"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_8"><text string="8"><color red="0.9" green="0.9" blue="0.9" /></text></element> + + <element name="text_a"><text string="A"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_b"><text string="B"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_c"><text string="C"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_d"><text string="D"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_e"><text string="E"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_f"><text string="F"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_g"><text string="G"><color red="0.9" green="0.9" blue="0.9" /></text></element> + <element name="text_h"><text string="H"><color red="0.9" green="0.9" blue="0.9" /></text></element> + + <element name="text_l1"><text string="WHITE" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_l2"><text string="BLACK" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_l3"><text string="SET UP" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_l4"><text string="CHECK" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_l5"><text string="DRAW" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_l6"><text string="MATE" align="1"><color red="0.81" green="0.8" blue="0.79" /></text></element> + + <element name="text_b1"><text string="COLOR"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b2"><text string="SET UP"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b3a"><text string="MULTI"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b3b"><text string="MOVE"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b4"><text string="REPLAY"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b5"><text string="MOVE"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b6a"><text string="NEW"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b6b"><text string="GAME"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b7"><text string="LEVEL"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b8"><text string="SOUND"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b9a"><text string="DISPLAY"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b9b"><text string="MOVE"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b10a"><text string="TAKE"><color red="0.6" green="0.6" blue="0.59" /></text></element> + <element name="text_b10b"><text string="BACK"><color red="0.6" green="0.6" blue="0.59" /></text></element> + + <element name="text_p1"><image file="chess/wk.png"/></element> + <element name="text_p2"><image file="chess/wq.png"/></element> + <element name="text_p3"><image file="chess/wr.png"/></element> + <element name="text_p4"><image file="chess/wb.png"/></element> + <element name="text_p5"><image file="chess/wn.png"/></element> + <element name="text_p6"><image file="chess/wp.png"/></element> + + +<!-- sb board --> + + <element name="cblack"><rect><color red="0.41" green="0.4" blue="0.39" /></rect></element> + <element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element> + + <element name="text_sqa"> + <rect><color red="0.41" green="0.4" blue="0.39" /></rect> + <text string="CASUAL"><color red="0.81" green="0.8" blue="0.79" /></text> + </element> + <element name="text_sqb"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string="TOURNAMENT"><color red="0.41" green="0.4" blue="0.39" /></text> + </element> + <element name="text_sqh"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string="PROBLEM"><color red="0.41" green="0.4" blue="0.39" /></text> + </element> + + <element name="hlbb" defstate="0"> + <text string=" "><bounds x="0" y="0" width="1" height="1" /></text> + <disk state="1"> + <bounds x="0.12" y="0.12" width="0.76" height="0.76" /> + <color red="0" green="0" blue="0" /> + </disk> + </element> + + <element name="piece" defstate="0"> + <image file="chess/wp.png" state="1"/> + <image file="chess/wn.png" state="2"/> + <image file="chess/wb.png" state="3"/> + <image file="chess/wr.png" state="4"/> + <image file="chess/wq.png" state="5"/> + <image file="chess/wk.png" state="6"/> + + <image file="chess/bp.png" state="7"/> + <image file="chess/bn.png" state="8"/> + <image file="chess/bb.png" state="9"/> + <image file="chess/br.png" state="10"/> + <image file="chess/bq.png" state="11"/> + <image file="chess/bk.png" state="12"/> + + <!-- selected pieces --> + <image file="chess/wp.png" state="13"><color alpha="0.5" /></image> + <image file="chess/wn.png" state="14"><color alpha="0.5" /></image> + <image file="chess/wb.png" state="15"><color alpha="0.5" /></image> + <image file="chess/wr.png" state="16"><color alpha="0.5" /></image> + <image file="chess/wq.png" state="17"><color alpha="0.5" /></image> + <image file="chess/wk.png" state="18"><color alpha="0.5" /></image> + + <image file="chess/bp.png" state="19"><color alpha="0.5" /></image> + <image file="chess/bn.png" state="20"><color alpha="0.5" /></image> + <image file="chess/bb.png" state="21"><color alpha="0.5" /></image> + <image file="chess/br.png" state="22"><color alpha="0.5" /></image> + <image file="chess/bq.png" state="23"><color alpha="0.5" /></image> + <image file="chess/bk.png" state="24"><color alpha="0.5" /></image> + </element> + + <group name="sb_board"> + <bounds x="0" y="0" width="80" height="80" /> + + <!-- squares (avoid seams) --> + <bezel element="cwhite"><bounds x="0" y="0" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="10" y="0" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="20" y="0" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="30" y="0" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="40" y="0" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="50" y="0" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="60" y="0" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="70" y="0" width="10" height="11" /></bezel> + + <bezel element="cblack"><bounds x="0" y="10" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="10" y="10" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="20" y="10" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="30" y="10" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="40" y="10" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="50" y="10" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="60" y="10" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="70" y="10" width="10" height="11" /></bezel> + + <bezel element="cwhite"><bounds x="0" y="20" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="10" y="20" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="20" y="20" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="30" y="20" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="40" y="20" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="50" y="20" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="60" y="20" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="70" y="20" width="10" height="11" /></bezel> + + <bezel element="cblack"><bounds x="0" y="30" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="10" y="30" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="20" y="30" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="30" y="30" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="40" y="30" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="50" y="30" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="60" y="30" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="70" y="30" width="10" height="11" /></bezel> + + <bezel element="cwhite"><bounds x="0" y="40" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="10" y="40" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="20" y="40" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="30" y="40" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="40" y="40" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="50" y="40" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="60" y="40" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="70" y="40" width="10" height="11" /></bezel> + + <bezel element="cblack"><bounds x="0" y="50" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="10" y="50" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="20" y="50" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="30" y="50" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="40" y="50" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="50" y="50" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="60" y="50" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="70" y="50" width="10" height="11" /></bezel> + + <bezel element="cwhite"><bounds x="0" y="60" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="10" y="60" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="20" y="60" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="30" y="60" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="40" y="60" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="50" y="60" width="11" height="11" /></bezel> + <bezel element="cwhite"><bounds x="60" y="60" width="11" height="11" /></bezel> + <bezel element="cblack"><bounds x="70" y="60" width="10" height="11" /></bezel> + + <bezel element="cblack"><bounds x="0" y="70" width="11" height="10" /></bezel> + <bezel element="cwhite"><bounds x="10" y="70" width="11" height="10" /></bezel> + <bezel element="cblack"><bounds x="20" y="70" width="11" height="10" /></bezel> + <bezel element="cwhite"><bounds x="30" y="70" width="11" height="10" /></bezel> + <bezel element="cblack"><bounds x="40" y="70" width="11" height="10" /></bezel> + <bezel element="cwhite"><bounds x="50" y="70" width="11" height="10" /></bezel> + <bezel element="cblack"><bounds x="60" y="70" width="11" height="10" /></bezel> + <bezel element="cwhite"><bounds x="70" y="70" width="10" height="10" /></bezel> + + <bezel element="text_sqa"><bounds x="1" y="78.7" width="8" height="1.25" /></bezel> + <bezel element="text_sqb"><bounds x="11" y="78.7" width="8" height="1.25" /></bezel> + <bezel element="text_sqh"><bounds x="71" y="78.7" width="8" height="1.25" /></bezel> + + <!-- sensors, pieces --> + <repeat count="8"> + <param name="y" start="0" increment="10" /> + <param name="i" start="8" increment="-1" /> + + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + <bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel> + + <bezel name="piece_a~i~" element="piece"><bounds x="0" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_b~i~" element="piece"><bounds x="10" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_c~i~" element="piece"><bounds x="20" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_d~i~" element="piece"><bounds x="30" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_e~i~" element="piece"><bounds x="40" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_f~i~" element="piece"><bounds x="50" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_g~i~" element="piece"><bounds x="60" y="~y~" width="10" height="10" /></bezel> + <bezel name="piece_h~i~" element="piece"><bounds x="70" y="~y~" width="10" height="10" /></bezel> + </repeat> + </group> + + +<!-- sb ui --> + + <element name="hlub" defstate="0"> + <rect state="1"><color red="0" green="0" blue="0" /></rect> + </element> + + <element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uib2"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uib3"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uih2"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uiu2a"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string=" <<"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uiu2b"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string=" < "><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uiu2c"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string=" >"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uiu2d"> + <rect><color red="0.81" green="0.8" blue="0.79" /></rect> + <text string=" >>"><color red="0.01" green="0.01" blue="0.01" /></text> + </element> + <element name="text_uiu3a" defstate="0"> + <simplecounter maxstate="999" digits="1" align="2"> + <color red="0.81" green="0.8" blue="0.79" /> + </simplecounter> + </element> + <element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element> + <element name="text_uiu3c" defstate="0"> + <simplecounter maxstate="999" digits="1" align="1"> + <color red="0.81" green="0.8" blue="0.79" /> + </simplecounter> + </element> + + <group name="sb_ui"> + <bounds x="0" y="0" width="10" height="80" /> + <bezel element="cblack"><bounds x="0" y="0" width="10" height="1" /></bezel> + <bezel element="cblack"><bounds x="0" y="7" width="10" height="1" /></bezel> + <bezel element="cblack"><bounds x="0" y="79" width="10" height="1" /></bezel> + <bezel element="text_uit1"><bounds x="0" y="2" width="10" height="2" /></bezel> + <bezel element="text_uit2"><bounds x="0" y="4" width="10" height="2" /></bezel> + + <!-- board --> + <bezel element="text_uib1"><bounds x="0" y="9" width="10" height="2" /></bezel> + <bezel element="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></bezel> + <bezel element="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></bezel> + + <bezel element="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></bezel> + <bezel element="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></bezel> + + <bezel element="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></bezel> + + <!-- spawn --> + <bezel element="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></bezel> + <bezel element="cwhite"><bounds x="1" y="23" width="8" height="12" /></bezel> + <bezel element="cwhite"><bounds x="1" y="36" width="8" height="12" /></bezel> + + <bezel name="piece_ui1" element="piece"><bounds x="1" y="23" width="4" height="4" /></bezel> + <bezel name="piece_ui2" element="piece"><bounds x="1" y="27" width="4" height="4" /></bezel> + <bezel name="piece_ui3" element="piece"><bounds x="1" y="31" width="4" height="4" /></bezel> + <bezel name="piece_ui4" element="piece"><bounds x="5" y="23" width="4" height="4" /></bezel> + <bezel name="piece_ui5" element="piece"><bounds x="5" y="27" width="4" height="4" /></bezel> + <bezel name="piece_ui6" element="piece"><bounds x="5" y="31" width="4" height="4" /></bezel> + <bezel name="piece_ui7" element="piece"><bounds x="1" y="36" width="4" height="4" /></bezel> + <bezel name="piece_ui8" element="piece"><bounds x="1" y="40" width="4" height="4" /></bezel> + <bezel name="piece_ui9" element="piece"><bounds x="1" y="44" width="4" height="4" /></bezel> + <bezel name="piece_ui10" element="piece"><bounds x="5" y="36" width="4" height="4" /></bezel> + <bezel name="piece_ui11" element="piece"><bounds x="5" y="40" width="4" height="4" /></bezel> + <bezel name="piece_ui12" element="piece"><bounds x="5" y="44" width="4" height="4" /></bezel> + + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></bezel> + + <!-- hand --> + <bezel element="text_uih1"><bounds x="0" y="51" width="10" height="2" /></bezel> + <bezel element="cblack"><bounds x="1" y="53.5" width="8" height="6" /></bezel> + <bezel name="piece_ui0" element="piece"><bounds x="2" y="53.5" width="6" height="6" /></bezel> + + <bezel element="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></bezel> + <bezel element="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></bezel> + <bezel element="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></bezel> + + <!-- undo --> + <bezel element="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></bezel> + <bezel element="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></bezel> + <bezel element="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></bezel> + <bezel element="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></bezel> + <bezel element="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></bezel> + <bezel element="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></bezel> + <bezel element="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></bezel> + <bezel element="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></bezel> + <bezel element="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></bezel> + + <bezel element="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel> + <bezel element="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel> + + <bezel name="count_ui0" element="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></bezel> + <bezel name="count_ui1" element="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></bezel> + <bezel element="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></bezel> + </group> + + +<!-- build screen --> + + <view name="Internal Layout"> + <bounds left="-12.5" right="116" top="-1" bottom="88" /> + + <group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group> + <group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group> + + <!-- chessboard coords (actually, real board does not have this, but I like having them around) --> + + <bezel element="text_8"><bounds x="0.3" y="7" width="2" height="2" /></bezel> + <bezel element="text_7"><bounds x="0.3" y="17" width="2" height="2" /></bezel> + <bezel element="text_6"><bounds x="0.3" y="27" width="2" height="2" /></bezel> + <bezel element="text_5"><bounds x="0.3" y="37" width="2" height="2" /></bezel> + <bezel element="text_4"><bounds x="0.3" y="47" width="2" height="2" /></bezel> + <bezel element="text_3"><bounds x="0.3" y="57" width="2" height="2" /></bezel> + <bezel element="text_2"><bounds x="0.3" y="67" width="2" height="2" /></bezel> + <bezel element="text_1"><bounds x="0.3" y="77" width="2" height="2" /></bezel> + + <bezel element="text_a"><bounds x="8" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_b"><bounds x="18" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_c"><bounds x="28" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_d"><bounds x="38" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_e"><bounds x="48" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_f"><bounds x="58" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_g"><bounds x="68" y="85.0" width="2" height="2" /></bezel> + <bezel element="text_h"><bounds x="78" y="85.0" width="2" height="2" /></bezel> + + <!-- chessboard leds --> + + <bezel name="7.1" element="ledr"><bounds x="2.4" y="7" width="0.8" height="2" /></bezel> + <bezel name="6.1" element="ledr"><bounds x="2.4" y="17" width="0.8" height="2" /></bezel> + <bezel name="5.1" element="ledr"><bounds x="2.4" y="27" width="0.8" height="2" /></bezel> + <bezel name="4.1" element="ledr"><bounds x="2.4" y="37" width="0.8" height="2" /></bezel> + <bezel name="3.1" element="ledr"><bounds x="2.4" y="47" width="0.8" height="2" /></bezel> + <bezel name="2.1" element="ledr"><bounds x="2.4" y="57" width="0.8" height="2" /></bezel> + <bezel name="1.1" element="ledr"><bounds x="2.4" y="67" width="0.8" height="2" /></bezel> + <bezel name="0.1" element="ledr"><bounds x="2.4" y="77" width="0.8" height="2" /></bezel> + + <bezel name="0.0" element="ledr"><bounds x="8" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="1.0" element="ledr"><bounds x="18" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="2.0" element="ledr"><bounds x="28" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="3.0" element="ledr"><bounds x="38" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="4.0" element="ledr"><bounds x="48" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="5.0" element="ledr"><bounds x="58" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="6.0" element="ledr"><bounds x="68" y="83.8" width="2" height="0.8" /></bezel> + <bezel name="7.0" element="ledr"><bounds x="78" y="83.8" width="2" height="0.8" /></bezel> + + <!-- right side leds --> + + <bezel name="9.0" element="ledr"><bounds x="88" y="37" width="0.8" height="2" /></bezel> + <bezel name="9.1" element="ledr"><bounds x="88" y="41" width="0.8" height="2" /></bezel> + <bezel name="9.2" element="ledr"><bounds x="88" y="45" width="0.8" height="2" /></bezel> + <bezel name="8.0" element="ledr"><bounds x="88" y="49" width="0.8" height="2" /></bezel> + <bezel name="8.1" element="ledr"><bounds x="88" y="53" width="0.8" height="2" /></bezel> + <bezel name="8.2" element="ledr"><bounds x="88" y="57" width="0.8" height="2" /></bezel> + <bezel name="7.2" element="ledr"><bounds x="88" y="61" width="0.8" height="2" /></bezel> + <bezel name="6.2" element="ledr"><bounds x="88" y="65" width="0.8" height="2" /></bezel> + <bezel name="5.2" element="ledr"><bounds x="88" y="69" width="0.8" height="2" /></bezel> + <bezel name="2.2" element="ledr"><bounds x="88" y="73" width="0.8" height="2" /></bezel> + <bezel name="1.2" element="ledr"><bounds x="88" y="77" width="0.8" height="2" /></bezel> + <bezel name="0.2" element="ledr"><bounds x="88" y="81" width="0.8" height="2" /></bezel> + + <bezel element="white2"><bounds x="89.5" y="37" width="9.5" height="2" /></bezel> + <bezel element="white2"><bounds x="89.5" y="41" width="9.5" height="2" /></bezel> + <bezel element="white2"><bounds x="89.5" y="45" width="9.5" height="2" /></bezel> + <bezel element="white2"><bounds x="89.5" y="49" width="9.5" height="2" /></bezel> + <bezel element="white2"><bounds x="89.5" y="53" width="9.5" height="2" /></bezel> + <bezel element="white2"><bounds x="89.5" y="57" width="9.5" height="2" /></bezel> + + <bezel element="blackb"><bounds x="90.0" y="36.8" width="9.2" height="2" /></bezel> + <bezel element="blackb"><bounds x="90.0" y="40.8" width="9.2" height="2" /></bezel> + <bezel element="blackb"><bounds x="90.0" y="44.8" width="9.2" height="2" /></bezel> + <bezel element="blackb"><bounds x="90.0" y="48.8" width="9.2" height="2" /></bezel> + <bezel element="blackb"><bounds x="90.0" y="52.8" width="9.2" height="2" /></bezel> + <bezel element="blackb"><bounds x="90.0" y="56.8" width="9.2" height="2" /></bezel> + + <bezel element="text_l1"><bounds x="89.5" y="61.2" width="6" height="1.5" /></bezel> + <bezel element="text_l2"><bounds x="89.5" y="65.2" width="6" height="1.5" /></bezel> + <bezel element="text_l3"><bounds x="89.5" y="69.2" width="6" height="1.5" /></bezel> + <bezel element="text_l4"><bounds x="89.5" y="73.2" width="6" height="1.5" /></bezel> + <bezel element="text_l5"><bounds x="89.5" y="77.2" width="6" height="1.5" /></bezel> + <bezel element="text_l6"><bounds x="89.5" y="81.2" width="6" height="1.5" /></bezel> + + <!-- right side buttons --> + + <element ref="text_p1"><bounds x="99.5" y="36.3" width="3" height="3" /></element> + <element ref="text_p2"><bounds x="99.5" y="40.3" width="3" height="3" /></element> + <element ref="text_p3"><bounds x="99.5" y="44.3" width="3" height="3" /></element> + <element ref="text_p4"><bounds x="99.5" y="48.3" width="3" height="3" /></element> + <element ref="text_p5"><bounds x="99.5" y="52.3" width="3" height="3" /></element> + <element ref="text_p6"><bounds x="99.5" y="56.3" width="3" height="3" /></element> + <bezel element="blue" blend="multiply"><bounds x="99.5" y="36" width="3" height="25" /></bezel> + + <element ref="text_b1"><bounds x="97.1" y="65.2" width="5.2" height="1.5" /></element> + <element ref="text_b2"><bounds x="97.1" y="69.2" width="5.2" height="1.5" /></element> + <element ref="text_b3a"><bounds x="97.1" y="72.55" width="5.2" height="1.5" /></element> + <element ref="text_b3b"><bounds x="97.1" y="73.95" width="5.2" height="1.5" /></element> + <element ref="text_b4"><bounds x="97.1" y="77.2" width="5.2" height="1.5" /></element> + <element ref="text_b5"><bounds x="97.1" y="81.2" width="5.2" height="1.5" /></element> + + <element ref="text_b6a"><bounds x="107.1" y="64.55" width="5.2" height="1.5" /></element> + <element ref="text_b6b"><bounds x="107.1" y="65.95" width="5.2" height="1.5" /></element> + <element ref="text_b7"><bounds x="107.1" y="69.2" width="5.2" height="1.5" /></element> + <element ref="text_b8"><bounds x="107.1" y="73.2" width="5.2" height="1.5" /></element> + <element ref="text_b9a"><bounds x="107.1" y="76.55" width="5.2" height="1.5" /></element> + <element ref="text_b9b"><bounds x="107.1" y="77.95" width="5.2" height="1.5" /></element> + <element ref="text_b10a"><bounds x="107.1" y="80.55" width="5.2" height="1.5" /></element> + <element ref="text_b10b"><bounds x="107.1" y="81.95" width="5.2" height="1.5" /></element> + + <element ref="black" blend="add"><bounds x="97" y="64.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="97" y="68.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="97" y="72.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="97" y="76.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="97" y="80.5" width="5.2" height="3" /></element> + + <element ref="black" blend="add"><bounds x="107" y="36.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="40.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="44.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="48.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="52.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="56.5" width="5.2" height="3" /></element> + + <element ref="black" blend="add"><bounds x="107" y="64.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="68.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="72.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="76.5" width="5.2" height="3" /></element> + <element ref="black" blend="add"><bounds x="107" y="80.5" width="5.2" height="3" /></element> + + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x20"><bounds x="97" y="64.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x08"><bounds x="97" y="68.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x10"><bounds x="97" y="72.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x40"><bounds x="97" y="76.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x80"><bounds x="97" y="80.5" width="5.2" height="3" /></element> + + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x01"><bounds x="107" y="36.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x01"><bounds x="107" y="40.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x02"><bounds x="107" y="44.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x02"><bounds x="107" y="48.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.1" inputmask="0x04"><bounds x="107" y="52.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x04"><bounds x="107" y="56.5" width="5.2" height="3" /></element> + + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x20"><bounds x="107" y="64.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x08"><bounds x="107" y="68.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x10"><bounds x="107" y="72.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x40"><bounds x="107" y="76.5" width="5.2" height="3" /></element> + <element ref="hl" blend="add" inputtag="IN.0" inputmask="0x80"><bounds x="107" y="80.5" width="5.2" height="3" /></element> + + </view> +</mamelayout> diff --git a/src/mame/layout/sms1.lay b/src/mame/layout/sms1.lay index b390da57e59..f7524f52640 100644 --- a/src/mame/layout/sms1.lay +++ b/src/mame/layout/sms1.lay @@ -1,13 +1,13 @@ <?xml version="1.0"?> <mamelayout version="2"> <view name="Main Screen Standard (4:3)"> - <screen index="0"> - <bounds left="0" top="0" right="4" bottom="3" /> - </screen> - <!-- workaround for MAME selecting a 3-screen view by default --> <screen index="1"><bounds left="0" top="0" right="4" bottom="3" /><color alpha="0" /></screen> <screen index="2"><bounds left="0" top="0" right="4" bottom="3" /><color alpha="0" /></screen> + + <screen index="0"> + <bounds left="0" top="0" right="4" bottom="3" /> + </screen> </view> <view name="SegaScope Left LCD Standard (4:3)"> diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 9e4852a07e6..5cdb6911a2c 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -34174,6 +34174,9 @@ tking tkinga tkingb +@source:saitek_superstar.cpp +sstar28k + @source:sam.cpp 24_130 // 24_140 // diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 34412a81660..fd34f4a7f33 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -703,6 +703,7 @@ saitek_cp2000.cpp saitek_delta1.cpp saitek_risc2500.cpp saitek_stratos.cpp +saitek_superstar.cpp samcoupe.cpp sansa_fuze.cpp sapi1.cpp |