diff options
author | 2021-05-27 13:08:37 +1000 | |
---|---|---|
committer | 2021-05-27 13:08:37 +1000 | |
commit | 71d6e6585fcb4ee5df9133c8884c93ca189e9011 (patch) | |
tree | fe00b7f39e0ea9499e2bf0eb16e8369d9dd0ea90 | |
parent | b118cedfc618237ff897ab8063798446b78faa01 (diff) |
**forgot to push all this earlier
27 files changed, 271 insertions, 173 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index b68ae191860..fcf46b64e43 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -1132,6 +1132,14 @@ end "-Wno-return-local-addr", -- sqlite3.c in GCC 10 } end + if (version >= 110000) then + buildoptions { + "-Wno-nonnull", -- luaengine.cpp lambdas do not need "this" captured but GCC 11.1 erroneously insists + "-Wno-stringop-overread", -- machine/bbc.cpp in GCC 11.1 + "-Wno-misleading-indentation", -- sqlite3.c in GCC 11.1 + "-Wno-maybe-uninitialized" -- expat in GCC 11.1 + } + end end end @@ -1437,6 +1445,7 @@ if _OPTIONS["vs"]=="clangcl" then "-Wno-unused-local-typedef", "-Wno-unused-private-field", "-Wno-unused-variable", + "-Wno-xor-used-as-pow", "-Wno-microsoft-cast", } end diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 2056e2e95a5..6da826ea0d5 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -2255,6 +2255,42 @@ project "wdlfft" -------------------------------------------------- +-- ymfm library objects +-------------------------------------------------- + +project "ymfm" + uuid "2403a536-cb0a-4b50-b41f-10c17917689b" + kind "StaticLib" + + configuration { } + defines { + "YMFM_MAME", + } + + files { + MAME_DIR .. "3rdparty/ymfm/src/ymfm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_adpcm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_adpcm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_fm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_fm.ipp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opl.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opl.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opn.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opn.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opq.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opq.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opz.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_opz.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_pcm.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_pcm.h", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_ssg.cpp", + MAME_DIR .. "3rdparty/ymfm/src/ymfm_ssg.h", + } + + +-------------------------------------------------- -- asmjit library -------------------------------------------------- diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index d98d0b90b48..4196c80050b 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -201,6 +201,10 @@ if (BUSES["ADB"]~=null) then MAME_DIR .. "src/devices/bus/adb/adb.h", MAME_DIR .. "src/devices/bus/adb/adbhle.cpp", MAME_DIR .. "src/devices/bus/adb/adbhle.h", + MAME_DIR .. "src/devices/bus/adb/a9m0330.cpp", + MAME_DIR .. "src/devices/bus/adb/a9m0330.h", + MAME_DIR .. "src/devices/bus/adb/a9m0331.cpp", + MAME_DIR .. "src/devices/bus/adb/a9m0331.h", } end @@ -618,6 +622,8 @@ if (BUSES["BBC_TUBE"]~=null) then MAME_DIR .. "src/devices/bus/bbc/tube/tube_a500.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm.h", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm7.cpp", + MAME_DIR .. "src/devices/bus/bbc/tube/tube_arm7.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_casper.cpp", MAME_DIR .. "src/devices/bus/bbc/tube/tube_casper.h", MAME_DIR .. "src/devices/bus/bbc/tube/tube_cms6809.cpp", @@ -2416,6 +2422,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/agat7ram.h", MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.cpp", MAME_DIR .. "src/devices/bus/a2bus/agat840k_hle.h", + MAME_DIR .. "src/devices/bus/a2bus/booti.cpp", + MAME_DIR .. "src/devices/bus/a2bus/booti.h", MAME_DIR .. "src/devices/bus/a2bus/byte8251.cpp", MAME_DIR .. "src/devices/bus/a2bus/byte8251.h", MAME_DIR .. "src/devices/bus/a2bus/ccs7710.cpp", @@ -2509,6 +2517,8 @@ if (BUSES["NSCSI"]~=null) then MAME_DIR .. "src/devices/bus/nscsi/cdu415.h", MAME_DIR .. "src/devices/bus/nscsi/cdu561.cpp", MAME_DIR .. "src/devices/bus/nscsi/cdu561.h", + MAME_DIR .. "src/devices/bus/nscsi/crd254sh.cpp", + MAME_DIR .. "src/devices/bus/nscsi/crd254sh.h", MAME_DIR .. "src/devices/bus/nscsi/cw7501.cpp", MAME_DIR .. "src/devices/bus/nscsi/cw7501.h", MAME_DIR .. "src/devices/bus/nscsi/devices.cpp", @@ -3827,6 +3837,8 @@ end if (BUSES["QBUS"]~=null) then files { + MAME_DIR .. "src/devices/bus/qbus/dsd4432.cpp", + MAME_DIR .. "src/devices/bus/qbus/dsd4432.h", MAME_DIR .. "src/devices/bus/qbus/pc11.cpp", MAME_DIR .. "src/devices/bus/qbus/pc11.h", MAME_DIR .. "src/devices/bus/qbus/qbus.cpp", @@ -3972,6 +3984,8 @@ if (BUSES["VSMILE"]~=null) then MAME_DIR .. "src/devices/bus/vsmile/pad.h", MAME_DIR .. "src/devices/bus/vsmile/mat.cpp", MAME_DIR .. "src/devices/bus/vsmile/mat.h", + MAME_DIR .. "src/devices/bus/vsmile/keyboard.cpp", + MAME_DIR .. "src/devices/bus/vsmile/keyboard.h", MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.cpp", MAME_DIR .. "src/devices/bus/vsmile/vsmile_slot.h", MAME_DIR .. "src/devices/bus/vsmile/rom.cpp", @@ -4438,6 +4452,26 @@ end --------------------------------------------------- -- +--@src/devices/bus/saitek_osa/expansion.h,BUSES["SAITEK_OSA"] = true +--------------------------------------------------- + +if (BUSES["SAITEK_OSA"]~=null) then + files { + MAME_DIR .. "src/devices/bus/saitek_osa/expansion.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/expansion.h", + MAME_DIR .. "src/devices/bus/saitek_osa/modules.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/modules.h", + MAME_DIR .. "src/devices/bus/saitek_osa/maestro.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/maestro.h", + MAME_DIR .. "src/devices/bus/saitek_osa/maestroa.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/maestroa.h", + MAME_DIR .. "src/devices/bus/saitek_osa/sparc.cpp", + MAME_DIR .. "src/devices/bus/saitek_osa/sparc.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/samcoupe/drive/drive.h,BUSES["SAMCOUPE_DRIVE_PORT"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index 8564d702a6d..fa655d8b60b 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -555,6 +555,8 @@ end if CPUS["PDP8"] then files { + MAME_DIR .. "src/devices/cpu/pdp8/hd6120.cpp", + MAME_DIR .. "src/devices/cpu/pdp8/hd6120.h", MAME_DIR .. "src/devices/cpu/pdp8/pdp8.cpp", MAME_DIR .. "src/devices/cpu/pdp8/pdp8.h", } @@ -668,6 +670,8 @@ if CPUS["H8"] then MAME_DIR .. "src/devices/cpu/h8/h83008.h", MAME_DIR .. "src/devices/cpu/h8/h83032.cpp", MAME_DIR .. "src/devices/cpu/h8/h83032.h", + MAME_DIR .. "src/devices/cpu/h8/h83042.cpp", + MAME_DIR .. "src/devices/cpu/h8/h83042.h", MAME_DIR .. "src/devices/cpu/h8/h83048.cpp", MAME_DIR .. "src/devices/cpu/h8/h83048.h", MAME_DIR .. "src/devices/cpu/h8/h8s2245.cpp", @@ -3519,3 +3523,13 @@ if opt_tool(CPUS, "MK1") then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.cpp") table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/mk1/mk1dasm.h") end + +-------------------------------------------------- +-- Motorola M68HC16 (CPU16) - Disassembler only +--@src/devices/cpu/m68hc16/m68hc16.h,CPUS["M68HC16"] = true +-------------------------------------------------- + +if opt_tool(CPUS, "M68HC16") then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68hc16/cpu16dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/m68hc16/cpu16dasm.h") +end diff --git a/docs/release/scripts/src/formats.lua b/docs/release/scripts/src/formats.lua index 52af636f2ef..3448962fe70 100644 --- a/docs/release/scripts/src/formats.lua +++ b/docs/release/scripts/src/formats.lua @@ -50,6 +50,8 @@ project "formats" MAME_DIR .. "src/lib/formats/cqm_dsk.h", MAME_DIR .. "src/lib/formats/dsk_dsk.cpp", MAME_DIR .. "src/lib/formats/dsk_dsk.h", + MAME_DIR .. "src/lib/formats/ipf_dsk.cpp", + MAME_DIR .. "src/lib/formats/ipf_dsk.h", MAME_DIR .. "src/lib/formats/td0_dsk.cpp", MAME_DIR .. "src/lib/formats/td0_dsk.h", MAME_DIR .. "src/lib/formats/hxchfe_dsk.cpp", @@ -72,6 +74,8 @@ project "formats" MAME_DIR .. "src/lib/formats/fsmgr.h", MAME_DIR .. "src/lib/formats/fsmgr.cpp", + MAME_DIR .. "src/lib/formats/fsblk_vec.h", + MAME_DIR .. "src/lib/formats/fsblk_vec.cpp", MAME_DIR .. "src/lib/formats/fs_unformatted.h", MAME_DIR .. "src/lib/formats/fs_unformatted.cpp", } @@ -1495,18 +1499,6 @@ end -------------------------------------------------- -- ---@src/lib/formats/ipf_dsk.h,FORMATS["IPF_DSK"] = true --------------------------------------------------- - -if opt_tool(FORMATS, "IPF_DSK") then - files { - MAME_DIR.. "src/lib/formats/ipf_dsk.cpp", - MAME_DIR.. "src/lib/formats/ipf_dsk.h", - } -end - --------------------------------------------------- --- --@src/lib/formats/phc25_cas.h,FORMATS["PHC25_CAS"] = true -------------------------------------------------- @@ -2069,4 +2061,16 @@ if opt_tool(FORMATS, "FS_PRODOS") then } end +-------------------------------------------------- +-- +--@src/lib/formats/fs_oric_jasmin.h,FORMATS["FS_ORIC_JASMIN"] = true +-------------------------------------------------- + +if opt_tool(FORMATS, "FS_ORIC_JASMIN") then + files { + MAME_DIR.. "src/lib/formats/fs_oric_jasmin.cpp", + MAME_DIR.. "src/lib/formats/fs_oric_jasmin.h", + } +end + end diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index 7d92ffc4219..d7e256ab203 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -634,18 +634,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/aakart.h,MACHINES["AAKARTDEV"] = true ---------------------------------------------------- - -if (MACHINES["AAKARTDEV"]~=null) then - files { - MAME_DIR .. "src/devices/machine/aakart.cpp", - MAME_DIR .. "src/devices/machine/aakart.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/adc0804.h,MACHINES["ADC0804"] = true --------------------------------------------------- @@ -850,6 +838,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/at28c64b.h,MACHINES["AT28C64B"] = true +--------------------------------------------------- + +if (MACHINES["AT28C64B"]~=null) then + files { + MAME_DIR .. "src/devices/machine/at28c64b.cpp", + MAME_DIR .. "src/devices/machine/at28c64b.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/at29x.h,MACHINES["AT29X"] = true --------------------------------------------------- @@ -993,6 +993,17 @@ if (MACHINES["CDP1879"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/machine/ch376.h,MACHINES["CH376"] = true +--------------------------------------------------- + +if (MACHINES["CH376"]~=null) then + files { + MAME_DIR .. "src/devices/machine/ch376.cpp", + MAME_DIR .. "src/devices/machine/ch376.h", + } +end --------------------------------------------------- -- @@ -3779,18 +3790,6 @@ end --------------------------------------------------- -- ---@src/devices/machine/ncr5380.h,MACHINES["NCR5380"] = true ---------------------------------------------------- - -if (MACHINES["NCR5380"]~=null) then - files { - MAME_DIR .. "src/devices/machine/ncr5380.cpp", - MAME_DIR .. "src/devices/machine/ncr5380.h", - } -end - ---------------------------------------------------- --- --@src/devices/machine/ncr5380n.h,MACHINES["NCR5380N"] = true --------------------------------------------------- diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index ddf4d9c9c8d..985afcf2cda 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -262,6 +262,7 @@ end "softfloat", "softfloat3", "wdlfft", + "ymfm", ext_lib("jpeg"), "7z", } diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index 1d643268548..6de550d5dde 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -1169,124 +1169,56 @@ end --------------------------------------------------- -- Yamaha FM synthesizers ---@src/devices/sound/ym2151.h,SOUNDS["YM2151"] = true ---@src/devices/sound/ym2203.h,SOUNDS["YM2203"] = true ---@src/devices/sound/ym2413.h,SOUNDS["YM2413"] = true ---@src/devices/sound/ym2608.h,SOUNDS["YM2608"] = true ---@src/devices/sound/ym2610.h,SOUNDS["YM2610"] = true ---@src/devices/sound/ym2612.h,SOUNDS["YM2612"] = true ---@src/devices/sound/ym3526.h,SOUNDS["YM3526"] = true ---@src/devices/sound/ym3812.h,SOUNDS["YM3812"] = true ---@src/devices/sound/ymf262.h,SOUNDS["YMF262"] = true +--@src/devices/sound/ymopm.h,SOUNDS["YM2151"] = true +--@src/devices/sound/ymopz.h,SOUNDS["YM2414"] = true +--@src/devices/sound/ymopq.h,SOUNDS["YM3806"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2203"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM2413"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2608"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2610"] = true +--@src/devices/sound/ymopn.h,SOUNDS["YM2612"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM3526"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YM3812"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YMF262"] = true +--@src/devices/sound/ymopl.h,SOUNDS["YMF278B"] = true --@src/devices/sound/ymf271.h,SOUNDS["YMF271"] = true ---@src/devices/sound/ymf278b.h,SOUNDS["YMF278B"] = true ---@src/devices/sound/y8950.h,SOUNDS["Y8950"] = true +--@src/devices/sound/ymopl.h,SOUNDS["Y8950"] = true --------------------------------------------------- -if (SOUNDS["YM2151"]~=null) then +if (SOUNDS["YM2151"]~=null or SOUNDS["YM2164"]~=null) then files { - MAME_DIR .. "src/devices/sound/ym2151.cpp", - MAME_DIR .. "src/devices/sound/ym2151.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopm.cpp", + MAME_DIR .. "src/devices/sound/ymopm.h", } end -if (SOUNDS["YM2413"]~=null or SOUNDS["YM2423"]~=null or SOUNDS["YMF281"]~=null or SOUNDS["DS1001"]~=null) then +if (SOUNDS["YM2414"]~=null) then files { - MAME_DIR .. "src/devices/sound/ym2413.cpp", - MAME_DIR .. "src/devices/sound/ym2413.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopz.cpp", + MAME_DIR .. "src/devices/sound/ymopz.h", } end -if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then ---if (SOUNDS["YM2203"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2203.cpp", - MAME_DIR .. "src/devices/sound/ym2203.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - - ---if (SOUNDS["YM2608"]~=null) then +if (SOUNDS["YM3806"]~=null) then files { - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2608.cpp", - MAME_DIR .. "src/devices/sound/ym2608.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopq.cpp", + MAME_DIR .. "src/devices/sound/ymopq.h", } ---end +end ---if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then +if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then files { MAME_DIR .. "src/devices/sound/ay8910.cpp", MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/ym2610.cpp", - MAME_DIR .. "src/devices/sound/ym2610.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - ---if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ym2612.cpp", - MAME_DIR .. "src/devices/sound/ym2612.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopn.cpp", + MAME_DIR .. "src/devices/sound/ymopn.h", } ---end end -if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then ---if (SOUNDS["YM3812"]~=null) then +if (SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null or SOUNDS["YM3812"]~=null or SOUNDS["YMF262"]~=null or SOUNDS["YMF278B"]~=null or SOUNDS["YM2413"]~=null or SOUNDS["YM2423"]~=null or SOUNDS["YMF281"]~=null or SOUNDS["DS1001"]~=null) then files { - MAME_DIR .. "src/devices/sound/ym3812.cpp", - MAME_DIR .. "src/devices/sound/ym3812.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - ---if (SOUNDS["YM3526"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ym3526.cpp", - MAME_DIR .. "src/devices/sound/ym3526.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } ---end - ---if (SOUNDS["Y8950"]~=null) then - files { - MAME_DIR .. "src/devices/sound/y8950.cpp", - MAME_DIR .. "src/devices/sound/y8950.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - MAME_DIR .. "src/devices/sound/ymadpcm.cpp", - MAME_DIR .. "src/devices/sound/ymadpcm.h", - } ---end -end - -if (SOUNDS["YMF262"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ymf262.cpp", - MAME_DIR .. "src/devices/sound/ymf262.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", + MAME_DIR .. "src/devices/sound/ymopl.cpp", + MAME_DIR .. "src/devices/sound/ymopl.h", } end @@ -1297,15 +1229,6 @@ if (SOUNDS["YMF271"]~=null) then } end -if (SOUNDS["YMF278B"]~=null) then - files { - MAME_DIR .. "src/devices/sound/ymf278b.cpp", - MAME_DIR .. "src/devices/sound/ymf278b.h", - MAME_DIR .. "src/devices/sound/ymfm.cpp", - MAME_DIR .. "src/devices/sound/ymfm.h", - } -end - --------------------------------------------------- diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index b3fb64c30c0..1f1e4215ce8 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -609,6 +609,8 @@ includedirs { } files { + MAME_DIR .. "src/tools/image_handler.cpp", + MAME_DIR .. "src/tools/image_handler.h", MAME_DIR .. "src/tools/floptool.cpp", } diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index 26da0650dea..ff079beb04e 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -441,7 +441,6 @@ MACHINES["TTL74259"] = true MACHINES["TTL7474"] = true MACHINES["KBDC8042"] = true MACHINES["I8257"] = true -MACHINES["AAKARTDEV"] = true --MACHINES["ACIA6850"] = true MACHINES["ADC0804"] = true MACHINES["ADC0808"] = true @@ -459,6 +458,7 @@ MACHINES["AM9517A"] = true MACHINES["AMIGAFDC"] = true MACHINES["AT_KEYBC"] = true MACHINES["AT28C16"] = true +--MACHINES["AT28C64B"] = true MACHINES["AT29X"] = true MACHINES["AT45DBXX"] = true MACHINES["ATAFLASH"] = true @@ -468,6 +468,7 @@ MACHINES["BANKDEV"] = true --MACHINES["BIM68153"] = true MACHINES["CDP1852"] = true MACHINES["CDP1871"] = true +--MACHINES["CH376"] = true MACHINES["CHESSMACHINE"] = true MACHINES["CMOS40105"] = true MACHINES["CDU76S"] = true @@ -588,7 +589,6 @@ MACHINES["MSM5832"] = true MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true MACHINES["MSM6253"] = true ---MACHINES["NCR5380"] = true MACHINES["NCR5380N"] = true MACHINES["NCR5390"] = true MACHINES["NCR539x"] = true @@ -1045,8 +1045,6 @@ files { MAME_DIR .. "src/mame/drivers/ertictac.cpp", MAME_DIR .. "src/mame/drivers/ssfindo.cpp", MAME_DIR .. "src/mame/drivers/aristmk5.cpp", - MAME_DIR .. "src/mame/machine/archimds.cpp", - MAME_DIR .. "src/mame/includes/archimds.h", } createMAMEProjects(_target, _subtarget, "adp") @@ -1570,6 +1568,7 @@ files { MAME_DIR .. "src/mame/drivers/mitchell.cpp", MAME_DIR .. "src/mame/includes/mitchell.h", MAME_DIR .. "src/mame/video/mitchell.cpp", + MAME_DIR .. "src/mame/drivers/psrockman.cpp", MAME_DIR .. "src/mame/drivers/sf.cpp", MAME_DIR .. "src/mame/drivers/sidearms.cpp", MAME_DIR .. "src/mame/includes/sidearms.h", @@ -2511,6 +2510,8 @@ files { MAME_DIR .. "src/mame/drivers/hornet.cpp", MAME_DIR .. "src/mame/machine/konppc.cpp", MAME_DIR .. "src/mame/machine/konppc.h", + MAME_DIR .. "src/mame/machine/konami_gn676_lan.cpp", + MAME_DIR .. "src/mame/machine/konami_gn676_lan.h", MAME_DIR .. "src/mame/drivers/hyperspt.cpp", MAME_DIR .. "src/mame/includes/hyperspt.h", MAME_DIR .. "src/mame/audio/hyprolyb.cpp", @@ -2553,6 +2554,8 @@ files { MAME_DIR .. "src/mame/machine/k573dio.h", MAME_DIR .. "src/mame/machine/k573fpga.cpp", MAME_DIR .. "src/mame/machine/k573fpga.h", + MAME_DIR .. "src/mame/machine/k573kara.cpp", + MAME_DIR .. "src/mame/machine/k573kara.h", MAME_DIR .. "src/mame/machine/k573mcr.cpp", MAME_DIR .. "src/mame/machine/k573mcr.h", MAME_DIR .. "src/mame/machine/k573msu.cpp", @@ -2922,6 +2925,7 @@ files { MAME_DIR .. "src/mame/drivers/cgang.cpp", MAME_DIR .. "src/mame/drivers/cswat.cpp", MAME_DIR .. "src/mame/drivers/dambustr.cpp", + MAME_DIR .. "src/mame/drivers/dangbar.cpp", MAME_DIR .. "src/mame/drivers/dkmb.cpp", MAME_DIR .. "src/mame/drivers/gal3.cpp", MAME_DIR .. "src/mame/drivers/galaga.cpp", @@ -3675,6 +3679,8 @@ files { MAME_DIR .. "src/mame/machine/315_5338a.h", MAME_DIR .. "src/mame/machine/315_5649.cpp", MAME_DIR .. "src/mame/machine/315_5649.h", + MAME_DIR .. "src/mame/machine/bingoct.cpp", + MAME_DIR .. "src/mame/machine/bingoct.h", MAME_DIR .. "src/mame/machine/model1io.cpp", MAME_DIR .. "src/mame/machine/model1io.h", MAME_DIR .. "src/mame/machine/model1io2.cpp", @@ -4679,6 +4685,7 @@ files { MAME_DIR .. "src/mame/drivers/ltd.cpp", MAME_DIR .. "src/mame/drivers/macp.cpp", MAME_DIR .. "src/mame/drivers/micropin.cpp", + MAME_DIR .. "src/mame/drivers/missamer.cpp", MAME_DIR .. "src/mame/drivers/mephistp.cpp", MAME_DIR .. "src/mame/drivers/mrgame.cpp", MAME_DIR .. "src/mame/drivers/nsm.cpp", @@ -5076,6 +5083,7 @@ files { MAME_DIR .. "src/mame/drivers/re900.cpp", MAME_DIR .. "src/mame/drivers/rf51w14cg.cpp", MAME_DIR .. "src/mame/drivers/rfslots8085.cpp", + MAME_DIR .. "src/mame/drivers/rfslotsmcs48.cpp", MAME_DIR .. "src/mame/drivers/rfslotspcpent.cpp", MAME_DIR .. "src/mame/drivers/rgum.cpp", MAME_DIR .. "src/mame/drivers/roul.cpp", diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 711f13834d7..312fac4b71e 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -99,6 +99,7 @@ CPUS["F8"] = true CPUS["LH5801"] = true CPUS["PATINHOFEIO"] = true CPUS["PDP1"] = true +CPUS["PDP8"] = true CPUS["TX0"] = true CPUS["SATURN"] = true CPUS["SC61860"] = true @@ -183,6 +184,8 @@ SOUNDS["BEEP"] = true SOUNDS["DISCRETE"] = true SOUNDS["AY8910"] = true SOUNDS["YM2151"] = true +SOUNDS["YM2414"] = true +SOUNDS["YM3806"] = true SOUNDS["YM2203"] = true SOUNDS["YM2413"] = true SOUNDS["YM2608"] = true @@ -455,7 +458,6 @@ MACHINES["MPCC68561"] = true MACHINES["68681"] = true MACHINES["7200FIFO"] = true MACHINES["8530SCC"] = true -MACHINES["AAKARTDEV"] = true MACHINES["ACIA6850"] = true MACHINES["ACORN_IOC"] = true MACHINES["ACORN_MEMC"] = true @@ -479,6 +481,7 @@ MACHINES["AMIGAFDC"] = true MACHINES["ARM_IOMD"] = true MACHINES["AT_KEYBC"] = true MACHINES["AT28C16"] = true +MACHINES["AT28C64B"] = true MACHINES["AT29X"] = true MACHINES["AT45DBXX"] = true MACHINES["ATAFLASH"] = true @@ -491,6 +494,7 @@ MACHINES["CDP1852"] = true MACHINES["CDP1871"] = true MACHINES["CDP1879"] = true --MACHINES["CDU76S"] = true +MACHINES["CH376"] = true MACHINES["CHESSMACHINE"] = true MACHINES["CMOS40105"] = true MACHINES["COM52C50"] = true @@ -619,7 +623,6 @@ MACHINES["MSM58321"] = true MACHINES["MSM6242"] = true --MACHINES["MSM6253"] = true MACHINES["MYB3K_KEYBOARD"] = true -MACHINES["NCR5380"] = true MACHINES["NCR5380N"] = true MACHINES["NCR5385"] = true MACHINES["NCR5390"] = true @@ -934,6 +937,7 @@ BUSES["QBUS"] = true BUSES["RS232"] = true BUSES["RTPC_KBD"] = true BUSES["S100"] = true +BUSES["SAITEK_OSA"] = true BUSES["SAMCOUPE_DRIVE_PORT"] = true BUSES["SAMCOUPE_EXPANSION"] = true BUSES["SAMCOUPE_MOUSE_PORT"] = true @@ -1156,6 +1160,7 @@ FORMATS["X1_TAP"] = true FORMATS["XDF_DSK"] = true FORMATS["ZX81_P"] = true FORMATS["FS_PRODOS"] = true +FORMATS["FS_ORIC_JASMIN"] = true -------------------------------------------------- -- this is the list of driver libraries that @@ -1283,6 +1288,7 @@ function linkProjects_mame_mess(_target, _subtarget) "kontron", "korg", "kurzweil", + "kyber", "kyocera", "leapfrog", "learsiegler", @@ -1296,6 +1302,7 @@ function linkProjects_mame_mess(_target, _subtarget) "mchester", "memotech", "mera", + "mg1", "mgu", "microkey", "microsoft", @@ -1483,7 +1490,6 @@ function createProjects_mame_mess(_target, _subtarget) if (_subtarget=="mess") then createMESSProjects(_target, _subtarget, "mameshared") files { - MAME_DIR .. "src/mame/machine/archimds.cpp", MAME_DIR .. "src/mame/machine/amiga.cpp", MAME_DIR .. "src/mame/video/amiga.cpp", MAME_DIR .. "src/mame/video/amigaaga.cpp", @@ -1817,6 +1823,8 @@ files { MAME_DIR .. "src/mame/machine/macpci.cpp", MAME_DIR .. "src/mame/machine/cuda.cpp", MAME_DIR .. "src/mame/machine/cuda.h", + MAME_DIR .. "src/mame/machine/macscsi.cpp", + MAME_DIR .. "src/mame/machine/macscsi.h", MAME_DIR .. "src/mame/drivers/iphone2g.cpp", MAME_DIR .. "src/mame/drivers/superga2.cpp", } @@ -2215,6 +2223,7 @@ files { createMESSProjects(_target, _subtarget, "dec") files { MAME_DIR .. "src/mame/drivers/dct11em.cpp", + MAME_DIR .. "src/mame/drivers/decmate2.cpp", MAME_DIR .. "src/mame/drivers/decstation.cpp", MAME_DIR .. "src/mame/machine/decioga.cpp", MAME_DIR .. "src/mame/machine/decioga.h", @@ -2515,9 +2524,7 @@ files { createMESSProjects(_target, _subtarget, "h01x") files { - MAME_DIR .. "src/mame/includes/h01x.h", MAME_DIR .. "src/mame/drivers/h01x.cpp", - MAME_DIR .. "src/mame/video/h01x.cpp", } createMESSProjects(_target, _subtarget, "hartung") @@ -2812,6 +2819,11 @@ files { MAME_DIR .. "src/mame/drivers/krz2000.cpp", } +createMESSProjects(_target, _subtarget, "kyber") +files { + MAME_DIR .. "src/mame/drivers/kminus.cpp", +} + createMESSProjects(_target, _subtarget, "kyocera") files { MAME_DIR .. "src/mame/drivers/kyocera.cpp", @@ -2916,6 +2928,11 @@ files { MAME_DIR .. "src/mame/drivers/vdm7932x.cpp", } +createMESSProjects(_target, _subtarget, "mg1") +files { + MAME_DIR .. "src/mame/drivers/mg1.cpp", +} + createMESSProjects(_target, _subtarget, "mgu") files { MAME_DIR .. "src/mame/drivers/irisha.cpp", @@ -3886,6 +3903,7 @@ files { MAME_DIR .. "src/mame/includes/tek405x.h", MAME_DIR .. "src/mame/drivers/tek410x.cpp", MAME_DIR .. "src/mame/drivers/tek440x.cpp", + MAME_DIR .. "src/mame/drivers/tekigw.cpp", MAME_DIR .. "src/mame/drivers/tekxp33x.cpp", } @@ -4023,6 +4041,7 @@ files { MAME_DIR .. "src/mame/drivers/amico2k.cpp", MAME_DIR .. "src/mame/drivers/babbage.cpp", MAME_DIR .. "src/mame/drivers/bob85.cpp", + MAME_DIR .. "src/mame/drivers/crei680.cpp", MAME_DIR .. "src/mame/drivers/cvicny.cpp", MAME_DIR .. "src/mame/drivers/datum.cpp", MAME_DIR .. "src/mame/drivers/dolphunk.cpp", @@ -4223,6 +4242,7 @@ files { createMESSProjects(_target, _subtarget, "veb") files { MAME_DIR .. "src/mame/drivers/chessmst.cpp", + MAME_DIR .. "src/mame/drivers/chessmstdm.cpp", MAME_DIR .. "src/mame/drivers/kc.cpp", MAME_DIR .. "src/mame/includes/kc.h", MAME_DIR .. "src/mame/machine/kc.cpp", @@ -4675,6 +4695,7 @@ files { MAME_DIR .. "src/mame/machine/nl_tp1985.cpp", MAME_DIR .. "src/mame/drivers/palestra.cpp", MAME_DIR .. "src/mame/machine/nl_palestra.cpp", + MAME_DIR .. "src/mame/drivers/philipsbo.cpp", MAME_DIR .. "src/mame/drivers/mindset.cpp", MAME_DIR .. "src/mame/drivers/gs6502.cpp", MAME_DIR .. "src/mame/drivers/gs6809.cpp", diff --git a/docs/release/scripts/target/mame/virtual.lua b/docs/release/scripts/target/mame/virtual.lua index 2d1c866d51a..e3d4da3a59d 100644 --- a/docs/release/scripts/target/mame/virtual.lua +++ b/docs/release/scripts/target/mame/virtual.lua @@ -57,6 +57,8 @@ SOUNDS["WAVE"] = true SOUNDS["X1_010"] = true SOUNDS["Y8950"] = true SOUNDS["YM2151"] = true +SOUNDS["YM2414"] = true +SOUNDS["YM3806"] = true SOUNDS["YM2203"] = true SOUNDS["YM2413"] = true SOUNDS["YM2608"] = true diff --git a/docs/release/src/emu/emuopts.cpp b/docs/release/src/emu/emuopts.cpp index 97d38acf73b..5ad0b1b0bce 100644 --- a/docs/release/src/emu/emuopts.cpp +++ b/docs/release/src/emu/emuopts.cpp @@ -59,6 +59,7 @@ const options_entry emu_options::s_option_entries[] = { OPTION_SNAPSHOT_DIRECTORY, "snap", OPTION_STRING, "directory to save/load screenshots" }, { OPTION_DIFF_DIRECTORY, "diff", OPTION_STRING, "directory to save hard drive image difference files" }, { OPTION_COMMENT_DIRECTORY, "comments", OPTION_STRING, "directory to save debugger comments" }, + { OPTION_SHARE_DIRECTORY, "share", OPTION_STRING, "directory to share with emulated machines" }, // state/playback options { nullptr, nullptr, OPTION_HEADER, "CORE STATE/PLAYBACK OPTIONS" }, diff --git a/docs/release/src/emu/emuopts.h b/docs/release/src/emu/emuopts.h index 6ad1d70bcf4..4d92ce5371c 100644 --- a/docs/release/src/emu/emuopts.h +++ b/docs/release/src/emu/emuopts.h @@ -47,6 +47,7 @@ #define OPTION_SNAPSHOT_DIRECTORY "snapshot_directory" #define OPTION_DIFF_DIRECTORY "diff_directory" #define OPTION_COMMENT_DIRECTORY "comment_directory" +#define OPTION_SHARE_DIRECTORY "share_directory" // core state/playback options #define OPTION_STATE "state" @@ -331,6 +332,7 @@ public: const char *snapshot_directory() const { return value(OPTION_SNAPSHOT_DIRECTORY); } const char *diff_directory() const { return value(OPTION_DIFF_DIRECTORY); } const char *comment_directory() const { return value(OPTION_COMMENT_DIRECTORY); } + const char *share_directory() const { return value(OPTION_SHARE_DIRECTORY); } // core state/playback options const char *state() const { return value(OPTION_STATE); } diff --git a/docs/release/src/emu/video.cpp b/docs/release/src/emu/video.cpp index db7406a8474..b6dada1c0b5 100644 --- a/docs/release/src/emu/video.cpp +++ b/docs/release/src/emu/video.cpp @@ -1169,6 +1169,18 @@ osd_file::error video_manager::open_next(emu_file &file, const char *extension, } } + // handle %t in the template (for timestamp) + std::string snaptime("%t"); + int pos_time = snapstr.find(snaptime); + + if (pos_time != -1) + { + char t_str[15]; + const std::time_t cur_time = std::time(nullptr); + strftime(t_str, sizeof(t_str), "%Y%m%d_%H%M%S", std::localtime(&cur_time)); + strreplace(snapstr, "%t", t_str); + } + // add our own extension snapstr.append(".").append(extension); diff --git a/docs/release/src/hbmame/drivers/cps1.cpp b/docs/release/src/hbmame/drivers/cps1.cpp index 2df8c43704f..1aafbb1a78c 100644 --- a/docs/release/src/hbmame/drivers/cps1.cpp +++ b/docs/release/src/hbmame/drivers/cps1.cpp @@ -245,7 +245,7 @@ Stephh's log (2006.09.20) : #include "cpu/m68000/m68000.h" #include "machine/eepromser.h" #include "machine/upd4701.h" -#include "sound/ym2151.h" +#include "sound/ymopm.h" #include "sound/okim6295.h" #include "sound/qsound.h" #include "machine/kabuki.h" diff --git a/docs/release/src/hbmame/drivers/exerion.cpp b/docs/release/src/hbmame/drivers/exerion.cpp index 51865891e61..428a7eea24d 100644 --- a/docs/release/src/hbmame/drivers/exerion.cpp +++ b/docs/release/src/hbmame/drivers/exerion.cpp @@ -11,25 +11,27 @@ ROM_START( exeriongr ) ROM_REGION( 0x10000, "sub", 0 ) ROM_LOAD( "exerion.05", 0x0000, 0x2000, CRC(32f6bff5) SHA1(a4d0289f9d1d9eea7ca9a32a0616af48da74b401) ) - ROM_REGION( 0x02000, "gfx1", 0 ) + ROM_REGION( 0x02000, "fgchars", 0 ) ROM_LOAD( "exriongr.06", 0x00000, 0x2000, CRC(e18dc7c6) SHA1(1ec9bb9aa1552e4d7dbe16435f98209813590211) ) - ROM_REGION( 0x04000, "gfx2", 0 ) + ROM_REGION( 0x04000, "sprites", 0 ) ROM_LOAD( "exerion.11", 0x00000, 0x2000, CRC(f0633a09) SHA1(8989bcb12abadde34777f7c189cfa6e2dfe92d62) ) ROM_LOAD( "exerion.10", 0x02000, 0x2000, CRC(80312de0) SHA1(4fa3bb9d5c62e41a54e8909f8d3b47637137e913) ) - ROM_REGION( 0x08000, "gfx3", 0 ) + ROM_REGION( 0x08000, "bgdata", 0 ) ROM_LOAD( "exerion.03", 0x00000, 0x2000, CRC(790595b8) SHA1(8016ac2394b25db38e962bcff4805380082f6683) ) ROM_LOAD( "exerion.04", 0x02000, 0x2000, CRC(d7abd0b9) SHA1(ca6413ecd324cf84e11b703a4eda2c1e6d28ff15) ) ROM_LOAD( "exriongr.01", 0x04000, 0x2000, CRC(b18009ea) SHA1(6a7abbe60e493a125b5d0e4d7f114b15758e4c6e) ) ROM_LOAD( "exerion.02", 0x06000, 0x2000, CRC(a7ecbb70) SHA1(3c359d5bb21290a45d3eb18fea2b1f9439b931be) ) - ROM_REGION( 0x0420, "proms", 0 ) + ROM_REGION( 0x0320, "proms", 0 ) ROM_LOAD( "exerion.e1", 0x0000, 0x0020, CRC(2befcc20) SHA1(a24d3f691413378fde545a6ddcef7e5118e74019) ) ROM_LOAD( "exerion.i8", 0x0020, 0x0100, CRC(31db0e08) SHA1(1041a778e86d3fe6f057cf40a0a08b30760f3887) ) ROM_LOAD( "exerion.h10", 0x0120, 0x0100, CRC(63b4c555) SHA1(30243041be4fa77ada71e8b29d721cad51640c29) ) ROM_LOAD( "exerion.i3", 0x0220, 0x0100, CRC(fe72ab79) SHA1(048a72e6db4768df687df927acaa70ef906b3dc0) ) - ROM_LOAD( "exerion.k4", 0x0320, 0x0100, CRC(ffc2ba43) SHA1(03be1c41d6ac3fc11439caef04ef5ffa60d6aec4) ) + + ROM_REGION( 0x0100, "bg_char_mixer_prom", 0 ) + ROM_LOAD( "exerion.k4", 0x0000, 0x0100, CRC(ffc2ba43) SHA1(03be1c41d6ac3fc11439caef04ef5ffa60d6aec4) ) ROM_END ROM_START( exerionj ) @@ -41,25 +43,27 @@ ROM_START( exerionj ) ROM_REGION( 0x10000, "sub", 0 ) ROM_LOAD( "exerion.05", 0x0000, 0x2000, CRC(32f6bff5) SHA1(a4d0289f9d1d9eea7ca9a32a0616af48da74b401) ) - ROM_REGION( 0x02000, "gfx1", 0 ) + ROM_REGION( 0x02000, "fgchars", 0 ) ROM_LOAD( "exerion.06", 0x00000, 0x2000, CRC(435a85a4) SHA1(f6846bfee11df754405d4d796e7d8ac0321b6eb6) ) - ROM_REGION( 0x04000, "gfx2", 0 ) + ROM_REGION( 0x04000, "sprites", 0 ) ROM_LOAD( "exerion.11", 0x00000, 0x2000, CRC(f0633a09) SHA1(8989bcb12abadde34777f7c189cfa6e2dfe92d62) ) ROM_LOAD( "exerion.10", 0x02000, 0x2000, CRC(80312de0) SHA1(4fa3bb9d5c62e41a54e8909f8d3b47637137e913) ) - ROM_REGION( 0x08000, "gfx3", 0 ) + ROM_REGION( 0x08000, "bgdata", 0 ) ROM_LOAD( "exerion.03", 0x00000, 0x2000, CRC(790595b8) SHA1(8016ac2394b25db38e962bcff4805380082f6683) ) ROM_LOAD( "exerion.04", 0x02000, 0x2000, CRC(d7abd0b9) SHA1(ca6413ecd324cf84e11b703a4eda2c1e6d28ff15) ) ROM_LOAD( "exerion.01", 0x04000, 0x2000, CRC(5bb755cb) SHA1(ec92c518c116a78dbb23381468cefb3f930212cc) ) ROM_LOAD( "exerion.02", 0x06000, 0x2000, CRC(a7ecbb70) SHA1(3c359d5bb21290a45d3eb18fea2b1f9439b931be) ) - ROM_REGION( 0x0420, "proms", 0 ) + ROM_REGION( 0x0320, "proms", 0 ) ROM_LOAD( "exerionj.e1", 0x0000, 0x0020, CRC(60cec362) SHA1(2422e894e2def2ab31f4b6c14fabbe443bd495e6) ) ROM_LOAD( "exerion.i8", 0x0020, 0x0100, CRC(31db0e08) SHA1(1041a778e86d3fe6f057cf40a0a08b30760f3887) ) ROM_LOAD( "exerion.h10", 0x0120, 0x0100, CRC(63b4c555) SHA1(30243041be4fa77ada71e8b29d721cad51640c29) ) ROM_LOAD( "exerion.i3", 0x0220, 0x0100, CRC(fe72ab79) SHA1(048a72e6db4768df687df927acaa70ef906b3dc0) ) - ROM_LOAD( "exerion.k4", 0x0320, 0x0100, CRC(ffc2ba43) SHA1(03be1c41d6ac3fc11439caef04ef5ffa60d6aec4) ) + + ROM_REGION( 0x0100, "bg_char_mixer_prom", 0 ) + ROM_LOAD( "exerion.k4", 0x0000, 0x0100, CRC(ffc2ba43) SHA1(03be1c41d6ac3fc11439caef04ef5ffa60d6aec4) ) ROM_END GAME( 2004, exeriongr, exerion, exerion, exerion, exerion_state, init_exerion, ROT90, "GreekRoms", "Exerion (Greek)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/fcrash.cpp b/docs/release/src/hbmame/drivers/fcrash.cpp index ceb31850d5f..785f4e2450a 100644 --- a/docs/release/src/hbmame/drivers/fcrash.cpp +++ b/docs/release/src/hbmame/drivers/fcrash.cpp @@ -91,9 +91,9 @@ slampic: no sound. A priority problem between sprites and crowd. #include "cpu/z80/z80.h" #include "cpu/m68000/m68000.h" #include "includes/cps1.h" -#include "sound/ym2203.h" +#include "sound/ymopm.h" +#include "sound/ymopn.h" #include "sound/msm5205.h" -#include "sound/ym2151.h" #include "sound/okim6295.h" #include "machine/eepromser.h" #include "speaker.h" diff --git a/docs/release/src/hbmame/drivers/neogeohb.cpp b/docs/release/src/hbmame/drivers/neogeohb.cpp index db0aa2d512d..6acecb81218 100644 --- a/docs/release/src/hbmame/drivers/neogeohb.cpp +++ b/docs/release/src/hbmame/drivers/neogeohb.cpp @@ -559,6 +559,26 @@ ROM_START( teotd2 ) // 2nd demo, 2021-02-20 ROM_LOAD16_BYTE( "323d2.c2", 0x000001, 0x800000, CRC(fb5116b6) SHA1(d70b13b24a3b85a0881bd0fe998fc98f6a99e99b) ) ROM_END +ROM_START( teotd3 ) // Alpha5 demo, 2021-05-16 + ROM_REGION( 0x900000, "maincpu", 0 ) + ROM_LOAD16_WORD_SWAP( "323d3.p1", 0x000000, 0x100000, CRC(9038ff78) SHA1(33f0ce3874e24c366177c89824c4b0cd1d30dfce) ) + ROM_LOAD16_WORD_SWAP( "323d3.p2", 0x100000, 0x800000, CRC(fe363160) SHA1(e503dd9cefa2b7d69ea2aaff60c63c00b83c158d) ) + + NEO_SFIX_128K( "419.s1", CRC(a545b593) SHA1(09077b63595eebb7dddd55e041e7786164df0ead) ) + + NEO_BIOS_AUDIO_64K( "323d3.m1", CRC(31b05f06) SHA1(da1f984af58bcc7d4d496382bcb938fa7aff5ab1) ) + + ROM_REGION( 0x1000000, "ymsnd:adpcma", 0 ) + ROM_LOAD( "323d3.v1", 0x000000, 0x800000, CRC(299d84cf) SHA1(da0bb20b8faeaf0d78f987afc775abaadcc59dfa) ) + ROM_LOAD( "323d3.v2", 0x800000, 0x800000, CRC(aced6c72) SHA1(8dc481445dbcc717c6dccb27dff446c5f05080f0) ) + + ROM_REGION( 0x4000000, "sprites", 0 ) + ROM_LOAD16_BYTE( "323d3.c1", 0x0000000, 0x1000000, CRC(28872e1f) SHA1(420d68ed2d417e1edfbd351619ff144fb7eacd9b) ) + ROM_LOAD16_BYTE( "323d3.c2", 0x0000001, 0x1000000, CRC(fe31d1fc) SHA1(947d4cc47905308d03423640d863e60007b2309a) ) + ROM_LOAD16_BYTE( "323d3.c3", 0x2000000, 0x1000000, CRC(28872e1f) SHA1(420d68ed2d417e1edfbd351619ff144fb7eacd9b) ) + ROM_LOAD16_BYTE( "323d3.c4", 0x2000001, 0x1000000, CRC(fe31d1fc) SHA1(947d4cc47905308d03423640d863e60007b2309a) ) +ROM_END + // 401 : Shadow of the Beast demo by Neobitz // No sound @@ -2793,6 +2813,7 @@ GAME( 2011, spriteex, neogeo, neogeo_noslot, neogeo, neogeo_state, init GAME( 2000, syscheck, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Blastar", "Neo System Check (ver 1.0b)", MACHINE_SUPPORTS_SAVE ) GAME( 2020, teotd, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "OzzyOuzo", "The Eye of Typhoon (Tsunami Edition, demo)", MACHINE_SUPPORTS_SAVE ) GAME( 2021, teotd2, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "OzzyOuzo", "The Eye of Typhoon (Tsunami Edition, demo 2)", MACHINE_SUPPORTS_SAVE ) +GAME( 2021, teotd3, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "OzzyOuzo", "The Eye of Typhoon (Tsunami Edition, alpha 5)", MACHINE_SUPPORTS_SAVE ) GAME( 2000, test01, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "Furrtek", "MVS Test 01", MACHINE_SUPPORTS_SAVE ) GAME( 2012, timesupd, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "NGF Dev. Inc", "Time's Up! (Demo)", MACHINE_SUPPORTS_SAVE ) GAME( 2009, tmnti, neogeo, neogeo_noslot, neogeo, neogeo_state, init_neogeo, ROT0, "[Raregame]", "Teenage Mutant Ninja Turtles (Intro demo v1)", MACHINE_SUPPORTS_SAVE ) diff --git a/docs/release/src/hbmame/drivers/taito_f3.cpp b/docs/release/src/hbmame/drivers/taito_f3.cpp index 2d5a517a2ec..bbf9acd10a4 100644 --- a/docs/release/src/hbmame/drivers/taito_f3.cpp +++ b/docs/release/src/hbmame/drivers/taito_f3.cpp @@ -553,6 +553,9 @@ ROM_START( gseekerjs01 ) ROM_REGION16_BE(0x800000, "taito_en:ensoniq" , ROMREGION_ERASE00 ) ROM_LOAD16_BYTE("d40_01.rom", 0x000000, 0x200000, CRC(ee312e95) SHA1(885553950c2b2195d664639bf7e0d1ffa3e8346a) ) ROM_LOAD16_BYTE("d40_02.rom", 0x600000, 0x100000, CRC(ed894fe1) SHA1(5bf2fb6abdcf25bc525a2c3b29dbf7aca0b18fea) ) + + ROM_REGION16_BE( 0x80, "eeprom", 0 ) + ROM_LOAD("gseeker.nv", 0x0000, 0x0080, CRC(3e24cc80) SHA1(42173cf6aa40bb5015d01f62312fc2ff8d81fb65) ) ROM_END /************** @@ -728,13 +731,13 @@ GAME( 2017, arabianmjs01, arabianm, f3_224a, f3, taito_f3_state, init_arabi GAME( 1994, bubsymphjs01, bublbob2, f3_224a, f3, taito_f3_state, init_bubsymph, ROT0, "hack", "Bubble Symphony (Translation Chinese)", 0 ) // Dan-Ku-Ga GAME( 1994, dankugas01, dankuga, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "hack", "Dan-Ku-Ga (Plus)", 0 ) -GAME( 1994, dankugas02, dankuga, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "yumeji", "Dan-Ku-Ga (Enable Hidden Characters)", 0 ) +GAME( 1994, dankugas02, dankuga, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "yumeji", "Dan-Ku-Ga (Enable Hidden Characters)", 0 ) // Elevator Action Returns GAME( 1994, elvactrjs01, elvactr, f3, f3, taito_f3_state, init_elvactr, ROT0, "hack", "Elevator Action Returns (Translation Chinese)", 0 ) // Grid Seeker: Project Storm Hammer -GAME( 1992, gseekerjs01, gseeker, f3_224b_eeprom, f3, taito_f3_state, init_gseeker, ROT90, "hack", "Grid Seeker: Project Storm Hammer (Translation Chinese)", 0 ) +GAME( 1992, gseekerjs01, gseeker, f3_224b, f3, taito_f3_state, init_gseeker, ROT90, "hack", "Grid Seeker: Project Storm Hammer (Translation Chinese)", 0 ) // Kaiser Knuckle -GAME( 1994, kaiserkns01, kaiserkn, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "yumeji", "Kaiser Knuckle (Enable Hidden Characters)", 0 ) +GAME( 1994, kaiserkns01, kaiserkn, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "yumeji", "Kaiser Knuckle (Enable Hidden Characters)", 0 ) GAME( 1994, kaiserkns02, kaiserkn, f3_224a, kn, taito_f3_state, init_kaiserkn, ROT0, "hack", "Kaiser Knuckle (Plus)", 0 ) // Land Maker GAME( 1998, landmakrs01, landmakr, f3, f3, taito_f3_state, init_landmakr, ROT0, "hack", "Land Maker (Translation Chinese)", 0 ) diff --git a/docs/release/src/hbmame/hbmame.lst b/docs/release/src/hbmame/hbmame.lst index c9b94af6294..0c52494785d 100644 --- a/docs/release/src/hbmame/hbmame.lst +++ b/docs/release/src/hbmame/hbmame.lst @@ -5942,6 +5942,7 @@ spriteex // furrtek Sprite Experimenter syscheck teotd teotd2 +teotd3 test01 // MVS Test 01 by Furrtek timesupd // CeL tmnti /* TMNT intro */ diff --git a/docs/release/src/hbmame/includes/neogeo.h b/docs/release/src/hbmame/includes/neogeo.h index aa541088b11..174a2edd080 100644 --- a/docs/release/src/hbmame/includes/neogeo.h +++ b/docs/release/src/hbmame/includes/neogeo.h @@ -12,7 +12,7 @@ #include "cpu/z80/z80.h" #include "machine/nvram.h" #include "machine/watchdog.h" -#include "sound/ym2610.h" +#include "sound/ymopn.h" #include "machine/upd1990a.h" #include "machine/ng_memcard.h" #include "machine/gen_latch.h" diff --git a/docs/release/src/mame/drivers/model2.cpp b/docs/release/src/mame/drivers/model2.cpp index 84fc4d2bc87..471ada147e8 100644 --- a/docs/release/src/mame/drivers/model2.cpp +++ b/docs/release/src/mame/drivers/model2.cpp @@ -101,7 +101,7 @@ #include "machine/315_5649.h" #include "machine/model1io.h" //#include "machine/model1io2.h" -#include "sound/ym2612.h" +#include "sound/ymopn.h" #include "video/segaic24.h" #include "speaker.h" diff --git a/docs/release/src/osd/windows/winmain.cpp b/docs/release/src/osd/windows/winmain.cpp index 2c1ee3fdf89..6dd486f692f 100644 --- a/docs/release/src/osd/windows/winmain.cpp +++ b/docs/release/src/osd/windows/winmain.cpp @@ -501,6 +501,7 @@ windows_options::windows_options() set_default_value(OPTION_SNAPSHOT_DIRECTORY, osd::text::from_wstring((LPCWSTR)path->Data()) + snapshot_directory()); set_default_value(OPTION_DIFF_DIRECTORY, osd::text::from_wstring((LPCWSTR)path->Data()) + diff_directory()); set_default_value(OPTION_COMMENT_DIRECTORY, osd::text::from_wstring((LPCWSTR)path->Data()) + comment_directory()); + set_default_value(OPTION_SHARE_DIRECTORY, osd::text::from_wstring((LPCWSTR)path->Data()) + share_directory()); set_default_value(OPTION_HOMEPATH, osd::text::from_wstring((LPCWSTR)path->Data())); set_default_value(OPTION_MEDIAPATH, osd::text::from_wstring((LPCWSTR)path->Data()) + media_path()); diff --git a/docs/release/src/version.cpp b/docs/release/src/version.cpp index d9e3dca322a..fba54ef41f2 100644 --- a/docs/release/src/version.cpp +++ b/docs/release/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.231" +#define BARE_BUILD_VERSION "0.232" extern const char bare_build_version[]; extern const char build_version[]; @@ -1760,14 +1760,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.231"' > $@ + @echo '#define BARE_BUILD_VERSION "0.232"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.231" > $@ + @echo #define BARE_BUILD_VERSION "0.232" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/version.cpp b/src/version.cpp index d9e3dca322a..fba54ef41f2 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -8,7 +8,7 @@ ***************************************************************************/ -#define BARE_BUILD_VERSION "0.231" +#define BARE_BUILD_VERSION "0.232" extern const char bare_build_version[]; extern const char build_version[]; |