diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 86b607d703c..83b8b4986dd 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -2821,9 +2821,6 @@ files { MAME_DIR .. "src/mame/drivers/novag_savant.cpp", MAME_DIR .. "src/mame/drivers/novag_scon.cpp", MAME_DIR .. "src/mame/drivers/novag_sexpert.cpp", - MAME_DIR .. "src/mame/drivers/ssystem3.cpp", - MAME_DIR .. "src/mame/includes/ssystem3.h", - MAME_DIR .. "src/mame/video/ssystem3.cpp", } createMESSProjects(_target, _subtarget, "olivetti") @@ -3068,11 +3065,11 @@ files { createMESSProjects(_target, _subtarget, "saitek") files { - MAME_DIR .. "src/mame/drivers/risc2500.cpp", + MAME_DIR .. "src/mame/drivers/saitek_chesstrv.cpp", + MAME_DIR .. "src/mame/drivers/saitek_cp2000.cpp", MAME_DIR .. "src/mame/drivers/saitek_delta1.cpp", - MAME_DIR .. "src/mame/drivers/scisys_chesstrv.cpp", - MAME_DIR .. "src/mame/drivers/scisys_cp2000.cpp", - MAME_DIR .. "src/mame/drivers/stratos.cpp", + MAME_DIR .. "src/mame/drivers/saitek_risc2500.cpp", + MAME_DIR .. "src/mame/drivers/saitek_stratos.cpp", } createMESSProjects(_target, _subtarget, "samcoupe") @@ -4059,6 +4056,9 @@ files { MAME_DIR .. "src/mame/includes/softbox.h", MAME_DIR .. "src/mame/drivers/squale.cpp", MAME_DIR .. "src/mame/drivers/solbourne.cpp", + MAME_DIR .. "src/mame/drivers/ssystem3.cpp", + MAME_DIR .. "src/mame/includes/ssystem3.h", + MAME_DIR .. "src/mame/video/ssystem3.cpp", MAME_DIR .. "src/mame/drivers/swyft.cpp", MAME_DIR .. "src/mame/drivers/symbolics.cpp", MAME_DIR .. "src/mame/drivers/sys2900.cpp", diff --git a/src/mame/drivers/scisys_chesstrv.cpp b/src/mame/drivers/saitek_chesstrv.cpp similarity index 98% rename from src/mame/drivers/scisys_chesstrv.cpp rename to src/mame/drivers/saitek_chesstrv.cpp index ddb2c6ac756..35520a18960 100644 --- a/src/mame/drivers/scisys_chesstrv.cpp +++ b/src/mame/drivers/saitek_chesstrv.cpp @@ -26,7 +26,7 @@ digit DP lights up). #include "machine/sensorboard.h" // internal artwork -#include "scisys_chesstrv.lh" // clickable +#include "saitek_chesstrv.lh" // clickable namespace { @@ -208,7 +208,7 @@ void chesstrv_state::chesstrv(machine_config &config) /* video hardware */ PWM_DISPLAY(config, m_display).set_size(4, 7); m_display->set_segmask(0xf, 0x7f); - config.set_default_layout(layout_scisys_chesstrv); + config.set_default_layout(layout_saitek_chesstrv); } diff --git a/src/mame/drivers/scisys_cp2000.cpp b/src/mame/drivers/saitek_cp2000.cpp similarity index 98% rename from src/mame/drivers/scisys_cp2000.cpp rename to src/mame/drivers/saitek_cp2000.cpp index dca0d81a4ff..9d4befeb69f 100644 --- a/src/mame/drivers/scisys_cp2000.cpp +++ b/src/mame/drivers/saitek_cp2000.cpp @@ -28,7 +28,7 @@ Capturing pieces is also unintuitive, having to press the destination square twi #include "speaker.h" // internal artwork -#include "scisys_cp2000.lh" // clickable +#include "saitek_cp2000.lh" // clickable namespace { @@ -228,7 +228,7 @@ void cp2000_state::cp2000(machine_config &config) /* video hardware */ PWM_DISPLAY(config, m_display).set_size(4, 7); m_display->set_segmask(0xf, 0x7f); - config.set_default_layout(layout_scisys_cp2000); + config.set_default_layout(layout_saitek_cp2000); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/saitek_risc2500.cpp similarity index 98% rename from src/mame/drivers/risc2500.cpp rename to src/mame/drivers/saitek_risc2500.cpp index bb22d416e34..7bef7e8a201 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/saitek_risc2500.cpp @@ -32,7 +32,7 @@ TODO: #include "screen.h" #include "speaker.h" -#include "risc2500.lh" +#include "saitek_risc2500.lh" class risc2500_state : public driver_device @@ -281,7 +281,7 @@ void risc2500_state::risc2500(machine_config &config) screen.set_screen_update(FUNC(risc2500_state::screen_update)); screen.set_palette("palette"); - config.set_default_layout(layout_risc2500); + config.set_default_layout(layout_saitek_risc2500); PALETTE(config, "palette", palette_device::MONOCHROME); @@ -305,7 +305,7 @@ void risc2500_state::risc2500(machine_config &config) /* ROM definitions */ -ROM_START( risc ) +ROM_START( risc2500 ) ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASE ) ROM_SYSTEM_BIOS( 0, "v104", "v1.04" ) ROMX_LOAD("s2500_v104.bin", 0x000000, 0x020000, CRC(84a06178) SHA1(66f4d9f53de6da865a3ebb4af1d6a3e245c59a3c), ROM_BIOS(0)) @@ -321,5 +321,5 @@ ROM_END /* YEAR NAME PARENT COMPAT MACHINE INPUT CLASS INIT COMPANY FULLNAME FLAGS */ -CONS( 1992, risc, 0, 0, risc2500, risc2500, risc2500_state, empty_init, "Saitek", "Kasparov RISC 2500", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND ) +CONS( 1992, risc2500, 0, 0, risc2500, risc2500, risc2500_state, empty_init, "Saitek", "Kasparov RISC 2500", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND ) CONS( 1995, montreux, 0, 0, risc2500, risc2500, risc2500_state, empty_init, "Saitek", "Mephisto Montreux", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_SOUND ) // after Saitek bought Hegener & Glaser diff --git a/src/mame/drivers/stratos.cpp b/src/mame/drivers/saitek_stratos.cpp similarity index 100% rename from src/mame/drivers/stratos.cpp rename to src/mame/drivers/saitek_stratos.cpp diff --git a/src/mame/layout/scisys_chesstrv.lay b/src/mame/layout/saitek_chesstrv.lay similarity index 100% rename from src/mame/layout/scisys_chesstrv.lay rename to src/mame/layout/saitek_chesstrv.lay diff --git a/src/mame/layout/scisys_cp2000.lay b/src/mame/layout/saitek_cp2000.lay similarity index 100% rename from src/mame/layout/scisys_cp2000.lay rename to src/mame/layout/saitek_cp2000.lay diff --git a/src/mame/layout/risc2500.lay b/src/mame/layout/saitek_risc2500.lay similarity index 100% rename from src/mame/layout/risc2500.lay rename to src/mame/layout/saitek_risc2500.lay diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 3e54364ef64..d85fafd6a9e 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -33658,10 +33658,6 @@ rex6000 // @source:rgum.cpp rgum // -@source:risc2500.cpp -risc // -montreux // - @source:riscpc.cpp a7000 // 1995 Acorn Archimedes 7000 a7000p // 1997 Acorn Archimedes 7000+ @@ -34088,9 +34084,22 @@ safarirj // (c) 1979 Shin Nihon Kikaku (SNK) @source:sage2.cpp sage2 // +@source:saitek_chesstrv.cpp +chesstrv // + +@source:saitek_cp2000.cpp +cp2000 // + @source:saitek_delta1.cpp ccdelta1 // +@source:saitek_risc2500.cpp +risc2500 // +montreux // + +@source:saitek_stratos.cpp +stratos // Kasparov Stratos Chess Computer + @source:sam.cpp 24_130 // 24_140 // @@ -34374,12 +34383,6 @@ sbuggera // (c) 1981 Game-A-Tron sc2 // sc2a // -@source:scisys_chesstrv.cpp -chesstrv // - -@source:scisys_cp2000.cpp -cp2000 // - @source:scm_500.cpp scm_500 // @@ -36512,9 +36515,6 @@ twinbrat // (c) 1995 twinbrata // (c) 1995 twinbratb // (c) 1995 -@source:stratos.cpp -stratos // Kasparov Stratos Chess Computer - @source:strkzn.cpp strkzn // (c) 1994 Purple Star diff --git a/src/mame/mess.flt b/src/mame/mess.flt index 6076cdaeff3..988c0c620aa 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -679,7 +679,6 @@ rd100.cpp rd110.cpp replicator.cpp rex6000.cpp -risc2500.cpp riscpc.cpp rm380z.cpp rmnimbus.cpp @@ -692,7 +691,11 @@ rz1.cpp rzone.cpp sacstate.cpp sage2.cpp +saitek_chesstrv.cpp +saitek_cp2000.cpp saitek_delta1.cpp +saitek_risc2500.cpp +saitek_stratos.cpp samcoupe.cpp sansa_fuze.cpp sapi1.cpp @@ -702,8 +705,6 @@ savia84.cpp sbc6510.cpp sbrain.cpp sc2.cpp -scisys_chesstrv.cpp -scisys_cp2000.cpp scopus.cpp scorpion.cpp scv.cpp @@ -748,7 +749,6 @@ ssem.cpp ssystem3.cpp st17xx.cpp storio.cpp -stratos.cpp studio2.cpp sun1.cpp sun2.cpp