diff options
87 files changed, 15 insertions, 164 deletions
diff --git a/docs/release/docs/hbnew.txt b/docs/release/docs/hbnew.txt index 326ce1fa9b6..b187ad71656 100644 --- a/docs/release/docs/hbnew.txt +++ b/docs/release/docs/hbnew.txt @@ -3,7 +3,7 @@ 2022-05-25 0.244 - +Added artwork for Man-Pac. New Games --------------------------------- diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp index a288e713c5a..3839b338ae1 100644 --- a/src/devices/bus/a2bus/a2cffa.cpp +++ b/src/devices/bus/a2bus/a2cffa.cpp @@ -17,10 +17,6 @@ #include "imagedev/harddriv.h" #include "bus/ata/ataintf.h" -#include "fileio.h" - -#include "softlist.h" - #include "softlist_dev.h" diff --git a/src/devices/bus/abcbus/ssa.h b/src/devices/bus/abcbus/ssa.h index 5b3dc70127a..f8f94bd2f93 100644 --- a/src/devices/bus/abcbus/ssa.h +++ b/src/devices/bus/abcbus/ssa.h @@ -13,10 +13,6 @@ #include "abcbus.h" -#include "machine/nvram.h" - -#include "fileio.h" - //************************************************************************** diff --git a/src/devices/bus/ata/cr589.cpp b/src/devices/bus/ata/cr589.cpp index 2b511ab93d8..5905a54bd54 100644 --- a/src/devices/bus/ata/cr589.cpp +++ b/src/devices/bus/ata/cr589.cpp @@ -3,8 +3,6 @@ #include "emu.h" #include "cr589.h" -#include "fileio.h" - static constexpr int identity_offset = 0x3ab; static constexpr char download_identity[] = "MATSHITA CD98Q4 DOWNLOADGS0N"; diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h index 5567a14e60e..9770793bdd0 100644 --- a/src/devices/bus/c64/dqbb.h +++ b/src/devices/bus/c64/dqbb.h @@ -14,10 +14,6 @@ #include "exp.h" -#include "machine/nvram.h" - -#include "fileio.h" - //************************************************************************** diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h index 00e5e31c37c..33baea0707c 100644 --- a/src/devices/bus/c64/fcc.h +++ b/src/devices/bus/c64/fcc.h @@ -14,7 +14,6 @@ #include "exp.h" #include "cpu/m6502/m65sc02.h" #include "machine/gen_latch.h" -#include "fileio.h" diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h index d3580750310..d54e8e18cc4 100644 --- a/src/devices/bus/c64/neoram.h +++ b/src/devices/bus/c64/neoram.h @@ -13,7 +13,6 @@ #include "exp.h" -#include "fileio.h" diff --git a/src/devices/bus/pasopia/rampac2.cpp b/src/devices/bus/pasopia/rampac2.cpp index c2a6d8b5b2d..3c128a10266 100644 --- a/src/devices/bus/pasopia/rampac2.cpp +++ b/src/devices/bus/pasopia/rampac2.cpp @@ -12,8 +12,6 @@ #include "emu.h" #include "rampac2.h" -#include "fileio.h" - //************************************************************************** // GLOBAL VARIABLES //************************************************************************** diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index 049da6db366..fea0d9f7dcc 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -12,8 +12,6 @@ #include "emu.h" #include "pce_rom.h" -#include "fileio.h" - //------------------------------------------------- diff --git a/src/devices/bus/pofo/hpc104.h b/src/devices/bus/pofo/hpc104.h index 951c0dcb38f..d5d1c36c3d3 100644 --- a/src/devices/bus/pofo/hpc104.h +++ b/src/devices/bus/pofo/hpc104.h @@ -13,8 +13,6 @@ #include "exp.h" #include "bus/pofo/ccm.h" -#include "machine/nvram.h" -#include "fileio.h" diff --git a/src/devices/bus/pofo/ram.h b/src/devices/bus/pofo/ram.h index 0c7ac0f30e5..7217299a989 100644 --- a/src/devices/bus/pofo/ram.h +++ b/src/devices/bus/pofo/ram.h @@ -12,8 +12,6 @@ #pragma once #include "ccm.h" -#include "machine/nvram.h" -#include "fileio.h" diff --git a/src/devices/bus/s100/seals8k.cpp b/src/devices/bus/s100/seals8k.cpp index eec2c936e1d..58a040efad4 100644 --- a/src/devices/bus/s100/seals8k.cpp +++ b/src/devices/bus/s100/seals8k.cpp @@ -29,8 +29,6 @@ #include "emu.h" #include "seals8k.h" -#include "fileio.h" - //************************************************************************** // TYPE DEFINITIONS diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index f01a8b8fd6f..2cee3467dea 100644 --- a/src/devices/bus/saturn/bram.h +++ b/src/devices/bus/saturn/bram.h @@ -5,8 +5,6 @@ #include "sat_slot.h" -#include "fileio.h" - // ======================> saturn_bram_device diff --git a/src/devices/bus/ti99/gromport/gkracker.cpp b/src/devices/bus/ti99/gromport/gkracker.cpp index 22c667f3d39..212207665e2 100644 --- a/src/devices/bus/ti99/gromport/gkracker.cpp +++ b/src/devices/bus/ti99/gromport/gkracker.cpp @@ -97,8 +97,6 @@ #include "emu.h" #include "gkracker.h" -#include "fileio.h" - #define LOG_WARN (1U<<1) // Warnings #define LOG_CHANGE (1U<<2) // Cartridge change #define LOG_GKRACKER (1U<<3) // Gram Kracker operation diff --git a/src/devices/bus/ti99/internal/buffram.cpp b/src/devices/bus/ti99/internal/buffram.cpp index 5e075ac30bf..bc07ad4b4ed 100644 --- a/src/devices/bus/ti99/internal/buffram.cpp +++ b/src/devices/bus/ti99/internal/buffram.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "buffram.h" -#include "fileio.h" - #define VERBOSE ( LOG_GENERAL ) #include "logmacro.h" diff --git a/src/devices/bus/ti99/peb/evpc.cpp b/src/devices/bus/ti99/peb/evpc.cpp index ce8670e906b..974d786d8ee 100644 --- a/src/devices/bus/ti99/peb/evpc.cpp +++ b/src/devices/bus/ti99/peb/evpc.cpp @@ -41,7 +41,6 @@ #include "emu.h" #include "evpc.h" -#include "fileio.h" #include "speaker.h" #define LOG_WARN (1U<<1) // Warnings diff --git a/src/devices/bus/ti99/peb/horizon.cpp b/src/devices/bus/ti99/peb/horizon.cpp index d234d9c93a1..52827ac324f 100644 --- a/src/devices/bus/ti99/peb/horizon.cpp +++ b/src/devices/bus/ti99/peb/horizon.cpp @@ -126,8 +126,6 @@ #include "emu.h" #include "horizon.h" -#include "fileio.h" - #define LOG_WARN (1U<<1) // Warnings #define LOG_CONFIG (1U<<2) // Configuration #define LOG_32K (1U<<3) // 32K optional RAM r/w diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h index ef2116b5697..e1c691a9a4b 100644 --- a/src/devices/bus/vic20/megacart.h +++ b/src/devices/bus/vic20/megacart.h @@ -12,7 +12,6 @@ #pragma once #include "exp.h" -#include "fileio.h" diff --git a/src/devices/cpu/m6805/m68705.cpp b/src/devices/cpu/m6805/m68705.cpp index 0c6cec94765..845d46bb31f 100644 --- a/src/devices/cpu/m6805/m68705.cpp +++ b/src/devices/cpu/m6805/m68705.cpp @@ -16,8 +16,6 @@ #include "m6805defs.h" #include "6805dasm.h" -#include "fileio.h" - /**************************************************************************** * Configurable logging ****************************************************************************/ diff --git a/src/devices/machine/28fxxx.cpp b/src/devices/machine/28fxxx.cpp index 8609839225a..60351ee7565 100644 --- a/src/devices/machine/28fxxx.cpp +++ b/src/devices/machine/28fxxx.cpp @@ -32,8 +32,6 @@ #include "emu.h" #include "28fxxx.h" -#include "fileio.h" - #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/machine/at28c16.cpp b/src/devices/machine/at28c16.cpp index 4590887286b..575b7e71308 100644 --- a/src/devices/machine/at28c16.cpp +++ b/src/devices/machine/at28c16.cpp @@ -10,8 +10,6 @@ #include "emu.h" #include "machine/at28c16.h" -#include "fileio.h" - #define AT28C16_DATA_BYTES ( 0x800 ) #define AT28C16_ID_BYTES ( 0x20 ) #define AT28C16_TOTAL_BYTES ( AT28C16_DATA_BYTES + AT28C16_ID_BYTES ) diff --git a/src/devices/machine/at28c64b.cpp b/src/devices/machine/at28c64b.cpp index ccd44ef0aed..098454a771e 100644 --- a/src/devices/machine/at28c64b.cpp +++ b/src/devices/machine/at28c64b.cpp @@ -10,8 +10,6 @@ #include "emu.h" #include "machine/at28c64b.h" -#include "fileio.h" - static constexpr int AT28C64B_DATA_BYTES = 0x10000; static constexpr int AT28C64B_ID_BYTES = 0x40; static constexpr int AT28C64B_TOTAL_BYTES = AT28C64B_DATA_BYTES + AT28C64B_ID_BYTES; diff --git a/src/devices/machine/at29x.cpp b/src/devices/machine/at29x.cpp index 2d287f43b3f..c701c13c557 100644 --- a/src/devices/machine/at29x.cpp +++ b/src/devices/machine/at29x.cpp @@ -40,8 +40,6 @@ #include "emu.h" #include "at29x.h" -#include "fileio.h" - #define LOG_DETAIL (1U<<1) // More detail #define LOG_WARN (1U<<2) // Warning #define LOG_PRG (1U<<3) // Programming diff --git a/src/devices/machine/at45dbxx.cpp b/src/devices/machine/at45dbxx.cpp index 4b16fb96da8..890cd78ac59 100644 --- a/src/devices/machine/at45dbxx.cpp +++ b/src/devices/machine/at45dbxx.cpp @@ -15,8 +15,6 @@ #include "emu.h" #include "at45dbxx.h" -#include "fileio.h" - #define LOG_LEVEL 1 #define _logerror(level,x) do { if (LOG_LEVEL > level) logerror x; } while (0) diff --git a/src/devices/machine/bq4847.cpp b/src/devices/machine/bq4847.cpp index 192a99d8712..7c8b2060869 100644 --- a/src/devices/machine/bq4847.cpp +++ b/src/devices/machine/bq4847.cpp @@ -21,8 +21,6 @@ #include "emu.h" #include "bq4847.h" -#include "fileio.h" - #define LOG_WARN (1U<<1) // Warnings #define LOG_CLOCK (1U<<2) // Clock operation #define LOG_REG (1U<<3) // Register write diff --git a/src/devices/machine/bq48x2.cpp b/src/devices/machine/bq48x2.cpp index e141e687fde..55434819a10 100644 --- a/src/devices/machine/bq48x2.cpp +++ b/src/devices/machine/bq48x2.cpp @@ -8,8 +8,6 @@ #include "emu.h" #include "bq48x2.h" -#include "fileio.h" - #define LOG_WARN (1U<<1) // Warnings #define LOG_CLOCK (1U<<2) // Clock operation #define LOG_REGW (1U<<3) // Register write diff --git a/src/devices/machine/dp8573.cpp b/src/devices/machine/dp8573.cpp index eb75dd74e39..86682d1c7a3 100644 --- a/src/devices/machine/dp8573.cpp +++ b/src/devices/machine/dp8573.cpp @@ -10,8 +10,6 @@ #include "machine/dp8573.h" #include "machine/timehelp.h" -#include "fileio.h" - #define LOG_GENERAL (1 << 0) #define LOG_TICKS (1 << 1) #define LOG_ALL (LOG_GENERAL | LOG_TICKS) diff --git a/src/devices/machine/ds1204.cpp b/src/devices/machine/ds1204.cpp index ff03134c931..e1070113277 100644 --- a/src/devices/machine/ds1204.cpp +++ b/src/devices/machine/ds1204.cpp @@ -10,8 +10,6 @@ #include "emu.h" #include "ds1204.h" -#include "fileio.h" - #include <cstdio> diff --git a/src/devices/machine/ds1205.cpp b/src/devices/machine/ds1205.cpp index 1f8099bdce7..5a723d5f259 100644 --- a/src/devices/machine/ds1205.cpp +++ b/src/devices/machine/ds1205.cpp @@ -10,8 +10,6 @@ #include "emu.h" #include "ds1205.h" -#include "fileio.h" - #include <cstdio> diff --git a/src/devices/machine/ds1302.cpp b/src/devices/machine/ds1302.cpp index bfb5f4dd179..7bc8689f3a2 100644 --- a/src/devices/machine/ds1302.cpp +++ b/src/devices/machine/ds1302.cpp @@ -18,8 +18,6 @@ #include "emu.h" #include "ds1302.h" -#include "fileio.h" - //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/ds1386.cpp b/src/devices/machine/ds1386.cpp index e88f96a2950..e9455585242 100644 --- a/src/devices/machine/ds1386.cpp +++ b/src/devices/machine/ds1386.cpp @@ -12,8 +12,6 @@ #include "ds1386.h" #include "machine/timehelp.h" -#include "fileio.h" - #define DISABLE_OSC (0x80) #define DISABLE_SQW (0x40) diff --git a/src/devices/machine/ds1994.cpp b/src/devices/machine/ds1994.cpp index 12a6bd4520f..d6dacf90815 100644 --- a/src/devices/machine/ds1994.cpp +++ b/src/devices/machine/ds1994.cpp @@ -15,8 +15,6 @@ #include "emu.h" #include "machine/ds1994.h" -#include "fileio.h" - #include <ctime> #define VERBOSE_LEVEL 0 diff --git a/src/devices/machine/ds2404.cpp b/src/devices/machine/ds2404.cpp index 3000e31865b..6a279d80986 100644 --- a/src/devices/machine/ds2404.cpp +++ b/src/devices/machine/ds2404.cpp @@ -16,8 +16,6 @@ #include "emu.h" #include "ds2404.h" -#include "fileio.h" - #include <algorithm> #include <ctime> // FIXME: re-write in terms of device_rtc_interface and remove this diff --git a/src/devices/machine/eeprom.cpp b/src/devices/machine/eeprom.cpp index e9f72fb76c3..2ee3b1697c1 100644 --- a/src/devices/machine/eeprom.cpp +++ b/src/devices/machine/eeprom.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "machine/eeprom.h" -#include "fileio.h" - //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/er1400.cpp b/src/devices/machine/er1400.cpp index 35faa205720..79ec1bc7d6e 100644 --- a/src/devices/machine/er1400.cpp +++ b/src/devices/machine/er1400.cpp @@ -24,8 +24,6 @@ #include "emu.h" #include "machine/er1400.h" -#include "fileio.h" - #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/machine/er2055.cpp b/src/devices/machine/er2055.cpp index d23bec2833b..678c044122a 100644 --- a/src/devices/machine/er2055.cpp +++ b/src/devices/machine/er2055.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "machine/er2055.h" -#include "fileio.h" - #include "logmacro.h" diff --git a/src/devices/machine/hd64610.cpp b/src/devices/machine/hd64610.cpp index 1f1a4272903..5090e162b41 100644 --- a/src/devices/machine/hd64610.cpp +++ b/src/devices/machine/hd64610.cpp @@ -18,7 +18,6 @@ #include "hd64610.h" #include "coreutil.h" -#include "fileio.h" #define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/i2cmem.cpp b/src/devices/machine/i2cmem.cpp index 8dca75307b5..8c64c372358 100644 --- a/src/devices/machine/i2cmem.cpp +++ b/src/devices/machine/i2cmem.cpp @@ -25,8 +25,6 @@ there are two standard values. #include "emu.h" #include "machine/i2cmem.h" -#include "fileio.h" - constexpr int STATE_IDLE(0); constexpr int STATE_DEVSEL(1); constexpr int STATE_ADDRESSHIGH(2); diff --git a/src/devices/machine/icm7170.cpp b/src/devices/machine/icm7170.cpp index f4559a72b3f..3960545ee94 100644 --- a/src/devices/machine/icm7170.cpp +++ b/src/devices/machine/icm7170.cpp @@ -10,7 +10,6 @@ #include "icm7170.h" #include "coreutil.h" -#include "fileio.h" #define VERBOSE (0) #include "logmacro.h" diff --git a/src/devices/machine/intelfsh.cpp b/src/devices/machine/intelfsh.cpp index fb867189524..abbee1b0a39 100644 --- a/src/devices/machine/intelfsh.cpp +++ b/src/devices/machine/intelfsh.cpp @@ -16,8 +16,6 @@ #include "emu.h" #include "intelfsh.h" -#include "fileio.h" - //************************************************************************** // CONSTANTS diff --git a/src/devices/machine/m3002.cpp b/src/devices/machine/m3002.cpp index 67797df8b98..a6a674c19e3 100644 --- a/src/devices/machine/m3002.cpp +++ b/src/devices/machine/m3002.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "m3002.h" -#include "fileio.h" - #define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/machine/m6m80011ap.cpp b/src/devices/machine/m6m80011ap.cpp index 5b5d68f9d17..937f9e815e1 100644 --- a/src/devices/machine/m6m80011ap.cpp +++ b/src/devices/machine/m6m80011ap.cpp @@ -4,8 +4,6 @@ #include "emu.h" #include "machine/m6m80011ap.h" -#include "fileio.h" - //************************************************************************** diff --git a/src/devices/machine/mc146818.cpp b/src/devices/machine/mc146818.cpp index c2928ec7ba7..ead6f1de5a7 100644 --- a/src/devices/machine/mc146818.cpp +++ b/src/devices/machine/mc146818.cpp @@ -12,11 +12,9 @@ *********************************************************************/ #include "emu.h" -#include "coreutil.h" #include "machine/mc146818.h" #include "coreutil.h" -#include "fileio.h" //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/mccs1850.cpp b/src/devices/machine/mccs1850.cpp index 4e29f02dd08..abbddf5b9be 100644 --- a/src/devices/machine/mccs1850.cpp +++ b/src/devices/machine/mccs1850.cpp @@ -18,8 +18,6 @@ #include "emu.h" #include "mccs1850.h" -#include "fileio.h" - //#define VERBOSE 0 #include "logmacro.h" diff --git a/src/devices/machine/msm58321.cpp b/src/devices/machine/msm58321.cpp index 08a063bb168..9dc1f8df642 100644 --- a/src/devices/machine/msm58321.cpp +++ b/src/devices/machine/msm58321.cpp @@ -17,8 +17,6 @@ #include "emu.h" #include "msm58321.h" -#include "fileio.h" - //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/nmc9306.cpp b/src/devices/machine/nmc9306.cpp index f71e6aad54c..b2fd50626f9 100644 --- a/src/devices/machine/nmc9306.cpp +++ b/src/devices/machine/nmc9306.cpp @@ -9,8 +9,6 @@ #include "emu.h" #include "nmc9306.h" -#include "fileio.h" - //#define VERBOSE 1 #include "logmacro.h" diff --git a/src/devices/machine/nvram.cpp b/src/devices/machine/nvram.cpp index fd87803a424..84c07477e9a 100644 --- a/src/devices/machine/nvram.cpp +++ b/src/devices/machine/nvram.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "machine/nvram.h" -#include "fileio.h" - //************************************************************************** // LIVE DEVICE //************************************************************************** diff --git a/src/devices/machine/pcf8583.cpp b/src/devices/machine/pcf8583.cpp index 45c248700e2..63a755d1077 100644 --- a/src/devices/machine/pcf8583.cpp +++ b/src/devices/machine/pcf8583.cpp @@ -12,8 +12,6 @@ #include "emu.h" #include "pcf8583.h" -#include "fileio.h" - #define LOG_DATA (1 << 1) #define LOG_LINE (1 << 2) diff --git a/src/devices/machine/pcf8593.cpp b/src/devices/machine/pcf8593.cpp index 6587ea4a6cc..cc2e372d4b8 100644 --- a/src/devices/machine/pcf8593.cpp +++ b/src/devices/machine/pcf8593.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "pcf8593.h" -#include "fileio.h" - /*************************************************************************** PARAMETERS/CONSTANTS/MACROS diff --git a/src/devices/machine/rp5c01.cpp b/src/devices/machine/rp5c01.cpp index b164b2c4e38..50443421ba5 100644 --- a/src/devices/machine/rp5c01.cpp +++ b/src/devices/machine/rp5c01.cpp @@ -19,8 +19,6 @@ #include "emu.h" #include "rp5c01.h" -#include "fileio.h" - // device type definitions DEFINE_DEVICE_TYPE(RP5C01, rp5c01_device, "rp5c01", "Ricoh RP5C01 RTC") diff --git a/src/devices/machine/rtc65271.cpp b/src/devices/machine/rtc65271.cpp index 2d45881968b..5ddc59ddb5f 100644 --- a/src/devices/machine/rtc65271.cpp +++ b/src/devices/machine/rtc65271.cpp @@ -21,8 +21,6 @@ #include "emu.h" #include "rtc65271.h" -#include "fileio.h" - /* Delay between the beginning (UIP asserted) and the end (UIP cleared and update interrupt asserted) of the update cycle */ #define UPDATE_CYCLE_TIME attotime::from_usec(1984) diff --git a/src/devices/machine/rtc9701.cpp b/src/devices/machine/rtc9701.cpp index 83831a0194b..a16ce296dde 100644 --- a/src/devices/machine/rtc9701.cpp +++ b/src/devices/machine/rtc9701.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "machine/rtc9701.h" -#include "fileio.h" - ALLOW_SAVE_TYPE(rtc9701_device::state_t); diff --git a/src/devices/machine/s3520cf.cpp b/src/devices/machine/s3520cf.cpp index 065c3e6913b..6bc9bbf64eb 100644 --- a/src/devices/machine/s3520cf.cpp +++ b/src/devices/machine/s3520cf.cpp @@ -17,8 +17,6 @@ TODO: #include "emu.h" #include "machine/s3520cf.h" -#include "fileio.h" - //************************************************************************** diff --git a/src/devices/machine/sda2006.cpp b/src/devices/machine/sda2006.cpp index e1345076994..815cb829d85 100644 --- a/src/devices/machine/sda2006.cpp +++ b/src/devices/machine/sda2006.cpp @@ -4,8 +4,6 @@ #include "emu.h" #include "machine/sda2006.h" -#include "fileio.h" - //------------------------------------------------- // // Siemens SDA2006 512-bit (32x16) NV EEPROM diff --git a/src/devices/machine/sensorboard.cpp b/src/devices/machine/sensorboard.cpp index 83a5c5ef08b..e9edf3a892a 100644 --- a/src/devices/machine/sensorboard.cpp +++ b/src/devices/machine/sensorboard.cpp @@ -59,8 +59,6 @@ sensor state instead. #include "emu.h" #include "machine/sensorboard.h" -#include "fileio.h" - DEFINE_DEVICE_TYPE(SENSORBOARD, sensorboard_device, "sensorboard", "Sensorboard") diff --git a/src/devices/machine/serflash.cpp b/src/devices/machine/serflash.cpp index 2d645f8e5c6..c7589e6f58e 100644 --- a/src/devices/machine/serflash.cpp +++ b/src/devices/machine/serflash.cpp @@ -8,8 +8,6 @@ #include "emu.h" #include "machine/serflash.h" -#include "fileio.h" - #include <algorithm> ALLOW_SAVE_TYPE(serflash_device::flash_state_t); diff --git a/src/devices/machine/strata.cpp b/src/devices/machine/strata.cpp index ceb4044053e..15841fe4597 100644 --- a/src/devices/machine/strata.cpp +++ b/src/devices/machine/strata.cpp @@ -23,8 +23,6 @@ #include "emu.h" #include "strata.h" -#include "fileio.h" - #define FEEPROM_SIZE 0x800000 // 64Mbit #define BLOCK_SIZE 0x020000 diff --git a/src/devices/machine/timekpr.cpp b/src/devices/machine/timekpr.cpp index 2bf22ac47b7..645a4604c8a 100644 --- a/src/devices/machine/timekpr.cpp +++ b/src/devices/machine/timekpr.cpp @@ -18,8 +18,6 @@ #include "machine/timekpr.h" #include "machine/timehelp.h" -#include "fileio.h" - #define LOG_GENERAL (1U << 0) #define LOG_TICKS (1U << 1) diff --git a/src/devices/machine/x2201.cpp b/src/devices/machine/x2201.cpp index 395dd4fd8dd..30ee78a8cfd 100644 --- a/src/devices/machine/x2201.cpp +++ b/src/devices/machine/x2201.cpp @@ -25,8 +25,6 @@ #include "emu.h" #include "machine/x2201.h" -#include "fileio.h" - #include <algorithm> diff --git a/src/devices/machine/x2212.cpp b/src/devices/machine/x2212.cpp index 6facb9f5797..f8c7fb906e3 100644 --- a/src/devices/machine/x2212.cpp +++ b/src/devices/machine/x2212.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "machine/x2212.h" -#include "fileio.h" - #include <algorithm> diff --git a/src/devices/machine/x76f041.cpp b/src/devices/machine/x76f041.cpp index 68cf9786024..74b15449f3b 100644 --- a/src/devices/machine/x76f041.cpp +++ b/src/devices/machine/x76f041.cpp @@ -16,8 +16,6 @@ #include "emu.h" #include "machine/x76f041.h" -#include "fileio.h" - #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) x76f041_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/devices/machine/x76f100.cpp b/src/devices/machine/x76f100.cpp index d8cfa23f39d..320ab833549 100644 --- a/src/devices/machine/x76f100.cpp +++ b/src/devices/machine/x76f100.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "machine/x76f100.h" -#include "fileio.h" - #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) x76f100_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/emu/digfx.h b/src/emu/digfx.h index 0e5e2eb16e1..57dc81ba212 100644 --- a/src/emu/digfx.h +++ b/src/emu/digfx.h @@ -25,7 +25,7 @@ constexpr u8 MAX_GFX_ELEMENTS = 32; constexpr u16 MAX_GFX_PLANES = 8; -// HBMAME - needed by monaco +// MESSUI - needed by monaco constexpr u16 MAX_GFX_SIZE = 64; diff --git a/src/emu/emuopts.cpp b/src/emu/emuopts.cpp index cb09afb134f..70bae253e57 100644 --- a/src/emu/emuopts.cpp +++ b/src/emu/emuopts.cpp @@ -42,7 +42,7 @@ const options_entry emu_options::s_option_entries[] = { OPTION_SAMPLEPATH ";sp", "samples", OPTION_STRING, "path to audio sample sets" }, { OPTION_ARTPATH, "artwork", OPTION_STRING, "path to artwork files" }, { OPTION_CTRLRPATH, "ctrlr", OPTION_STRING, "path to controller definitions" }, - { OPTION_INIPATH, ".", OPTION_STRING, "path to ini files" }, // MESSUI + { OPTION_INIPATH, "ini", OPTION_STRING, "path to ini files" }, // MESSUI { OPTION_FONTPATH, ".", OPTION_STRING, "path to font files" }, { OPTION_CHEATPATH, "cheat", OPTION_STRING, "path to cheat files" }, { OPTION_CROSSHAIRPATH, "crosshair", OPTION_STRING, "path to crosshair files" }, diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp index 28870ac67d7..668cc8a248c 100644 --- a/src/emu/validity.cpp +++ b/src/emu/validity.cpp @@ -2172,7 +2172,7 @@ void validity_checker::validate_roms(device_t &root) } // for any non-region ending entries, make sure they don't extend past the end - if (!ROMENTRY_ISREGIONEND(romp) && current_length > 0 && !ROMENTRY_ISIGNORE(romp)) // HBMAME + if (!ROMENTRY_ISREGIONEND(romp) && current_length > 0 && !ROMENTRY_ISIGNORE(romp)) // MESSUI { items_since_region++; if (!ROMENTRY_ISIGNORE(romp) && (ROM_GETOFFSET(romp) + ROM_GETLENGTH(romp) > current_length)) diff --git a/src/emu/video.h b/src/emu/video.h index eb77d0d4ddb..da57d6b8a98 100644 --- a/src/emu/video.h +++ b/src/emu/video.h @@ -55,7 +55,6 @@ public: bool fastforward() const { return m_fastforward; } // setters - void set_speed_factor(int speed) { m_speed = speed; } // MESSUI void set_frameskip(int frameskip); void set_throttled(bool throttled) { m_throttled = throttled; } void set_throttle_rate(float throttle_rate) { m_throttle_rate = throttle_rate; } diff --git a/src/frontend/mame/audit.h b/src/frontend/mame/audit.h index e1857de5cdf..39e9b362262 100644 --- a/src/frontend/mame/audit.h +++ b/src/frontend/mame/audit.h @@ -159,7 +159,7 @@ public: summary audit_software(software_list_device &swlist, const software_info &swinfo, const char *validation = AUDIT_VALIDATE_FULL); summary audit_samples(); summary summarize(const char *name, std::ostream *output = nullptr) const; - summary winui_summarize(const char *name, std::string *output = nullptr); //WINUI - only report problems that the user can fix + summary winui_summarize(const char *name, std::string *output = nullptr); //MESSUI - only report problems that the user can fix private: // internal helpers diff --git a/src/frontend/mame/clifront.cpp b/src/frontend/mame/clifront.cpp index a7779183894..31e1ae63246 100644 --- a/src/frontend/mame/clifront.cpp +++ b/src/frontend/mame/clifront.cpp @@ -1764,7 +1764,7 @@ void cli_frontend::execute_commands(std::string_view exename) // output //------------------------------------------------- -// HBMAME - remove reference to software and media. +// MESSUI - remove reference to software and media. void cli_frontend::display_help(std::string_view exename) { osd_printf_info( diff --git a/src/frontend/mame/mame.cpp b/src/frontend/mame/mame.cpp index ba4b0c65dcc..f57bac1103a 100644 --- a/src/frontend/mame/mame.cpp +++ b/src/frontend/mame/mame.cpp @@ -171,7 +171,7 @@ void mame_machine_manager::start_luaengine() { plugin_options::plugin *p = m_plugins->find(incl); if (!p) - osd_printf_warning("Could not load plugin: %s\n", incl); // HBMAME - removed fatalerror + osd_printf_warning("Could not load plugin: %s\n", incl); // MESSUI - removed fatalerror else p->m_start = true; } @@ -181,7 +181,7 @@ void mame_machine_manager::start_luaengine() { plugin_options::plugin *p = m_plugins->find(excl); if (!p) - osd_printf_warning("Unknown plugin: %s\n", excl); // HBMAME - removed fatalerror + osd_printf_warning("Unknown plugin: %s\n", excl); // MESSUI - removed fatalerror else p->m_start = false; } @@ -192,7 +192,7 @@ void mame_machine_manager::start_luaengine() { plugin_options::plugin *p = m_plugins->find(OPTION_CONSOLE); if (!p) - osd_printf_warning("Fatal error: Console plugin not found.\n"); // HBMAME - removed fatalerror + osd_printf_warning("Fatal error: Console plugin not found.\n"); // MESSUI - removed fatalerror else p->m_start = true; } diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp index 9edfe2fbda4..62d6003cb51 100644 --- a/src/frontend/mame/ui/ui.cpp +++ b/src/frontend/mame/ui/ui.cpp @@ -1485,7 +1485,7 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine } // add CPU overclocking (cheat only) -// if (machine.options().cheat()) // HBMAME +// if (machine.options().cheat()) // MESSUI { for (device_execute_interface &exec : execute_interface_enumerator(machine.root_device())) { @@ -1514,7 +1514,7 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine std::string screen_desc = machine_info().get_screen_desc(screen); // add refresh rate tweaker -// if (machine.options().cheat()) // HBMAME +// if (machine.options().cheat()) // MESSUI { std::string str = string_format(_("%1$s Refresh Rate"), screen_desc); slider_alloc(std::move(str), -10000, 0, 10000, 1000, std::bind(&mame_ui_manager::slider_refresh, this, std::ref(screen), _1, _2)); diff --git a/src/frontend/mame/ui/ui.h b/src/frontend/mame/ui/ui.h index 28bb1b6ce03..e773e669cd6 100644 --- a/src/frontend/mame/ui/ui.h +++ b/src/frontend/mame/ui/ui.h @@ -190,11 +190,6 @@ public: void start_save_state(); void start_load_state(); - // config callbacks - void config_load_s(config_type cfg_type, util::xml::data_node const *parentnode); - void config_save_s(config_type cfg_type, util::xml::data_node *parentnode); - void config_apply(void); - // slider controls std::vector<ui::menu_item>& get_slider_list(void); @@ -310,7 +305,6 @@ private: #endif std::vector<std::unique_ptr<slider_state>> m_sliders; - std::vector<std::unique_ptr<slider_state>> m_sliders_saved; }; diff --git a/src/hbmame/drivers/mslug5.cpp b/src/hbmame/drivers/mslug5.cpp index d48ca867c06..1e42b865567 100644 --- a/src/hbmame/drivers/mslug5.cpp +++ b/src/hbmame/drivers/mslug5.cpp @@ -7975,7 +7975,7 @@ ROM_START( mslug5ast ) ROM_LOAD32_WORD_SWAP( "5555.p1", 0x000000, 0x400000, CRC(1e0506cf) SHA1(f1a20f1f0fc3fd74dd5d258eaf75965eb2b4cd91) ) ROM_LOAD32_WORD_SWAP( "5555.p2", 0x000002, 0x400000, CRC(894cd3dd) SHA1(553f90fce8c04940892bd797dc4f1dddf7276c81) ) - NEO_SFIX_MT_512K + NEO_SFIX_MT_128K NEO_BIOS_AUDIO_ENCRYPTED_128K( "5555.m1", CRC(876df5e1) SHA1(a54bd3eb76d9768fec26fbf4153c0a6055df159f) ) diff --git a/src/mame/drivers/cinemat.cpp b/src/mame/drivers/cinemat.cpp index a4e294a0bed..7b472fa36ee 100644 --- a/src/mame/drivers/cinemat.cpp +++ b/src/mame/drivers/cinemat.cpp @@ -1185,6 +1185,7 @@ void cinemat_64level_state::solarq(machine_config &config) void cinemat_color_state::boxingb(machine_config &config) { cinemat_jmi_32k(config); + SPEAKER(config, "mono").front_center(); // BOXING_BUGS_AUDIO(config, "soundboard", 0) // .configure_latch_inputs(*m_outlatch) diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index a40bca50fa9..1a6b5901d7d 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -2807,7 +2807,7 @@ void galaxian_state::frogger_sound_portmap(address_map &map) void galaxian_state::konami_sound_map(address_map &map) { - map(0x0000, 0x3fff).rom().region("audiocpu", 0); // HBMAME - fix monstrz speed + map(0x0000, 0x1fff).rom().region("audiocpu", 0); map(0x8000, 0x83ff).mirror(0x6c00).ram(); map(0x9000, 0x9fff).mirror(0x6000).w(FUNC(galaxian_state::konami_sound_filter_w)); } diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index 7e91ed1c733..6739569a331 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -105,7 +105,6 @@ the Neogeo Pocket. #include "sound/t6w28.h" #include "sound/dac.h" #include "video/k1ge.h" -#include "fileio.h" #include "screen.h" #include "softlist_dev.h" #include "speaker.h" diff --git a/src/mame/machine/cuda.cpp b/src/mame/machine/cuda.cpp index fc17bc8c9bc..39cad3032c0 100644 --- a/src/mame/machine/cuda.cpp +++ b/src/mame/machine/cuda.cpp @@ -43,8 +43,6 @@ #include "cpu/m6805/m6805.h" #include "sound/asc.h" -#include "fileio.h" - //************************************************************************** // MACROS / CONSTANTS //************************************************************************** diff --git a/src/mame/machine/docg3.cpp b/src/mame/machine/docg3.cpp index 1c69eff9649..0b53b52f64b 100644 --- a/src/mame/machine/docg3.cpp +++ b/src/mame/machine/docg3.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "machine/docg3.h" -#include "fileio.h" - #define VERBOSE_LEVEL ( 0 ) static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, const char *s_fmt, ... ) diff --git a/src/mame/machine/egret.cpp b/src/mame/machine/egret.cpp index bb1f298e4d2..9af4be4d36e 100644 --- a/src/mame/machine/egret.cpp +++ b/src/mame/machine/egret.cpp @@ -42,8 +42,6 @@ #include "cpu/m6805/m6805.h" #include "sound/asc.h" -#include "fileio.h" - //************************************************************************** // MACROS / CONSTANTS //************************************************************************** diff --git a/src/mame/machine/kr1601rr1.cpp b/src/mame/machine/kr1601rr1.cpp index 0a5aabbb8ea..561d3f212db 100644 --- a/src/mame/machine/kr1601rr1.cpp +++ b/src/mame/machine/kr1601rr1.cpp @@ -13,11 +13,8 @@ ***************************************************************************/ #include "emu.h" - #include "kr1601rr1.h" -#include "fileio.h" - #include <algorithm> diff --git a/src/mame/machine/macrtc.cpp b/src/mame/machine/macrtc.cpp index 1a1e81c0f9b..0d31c3585fd 100644 --- a/src/mame/machine/macrtc.cpp +++ b/src/mame/machine/macrtc.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "macrtc.h" -#include "fileio.h" - #ifdef MAME_DEBUG #define LOG_RTC 0 #else diff --git a/src/mame/machine/msx_matsushita.cpp b/src/mame/machine/msx_matsushita.cpp index 5c41e146ea8..1153b3c21b3 100644 --- a/src/mame/machine/msx_matsushita.cpp +++ b/src/mame/machine/msx_matsushita.cpp @@ -3,8 +3,6 @@ #include "emu.h" #include "msx_matsushita.h" -#include "fileio.h" - const uint8_t manufacturer_id = 0x08; DEFINE_DEVICE_TYPE(MSX_MATSUSHITA, msx_matsushita_device, "msx_matsushita", "Matsushita switched device") diff --git a/src/mame/machine/msx_s1985.cpp b/src/mame/machine/msx_s1985.cpp index 2ee9f73668d..fddbd56315e 100644 --- a/src/mame/machine/msx_s1985.cpp +++ b/src/mame/machine/msx_s1985.cpp @@ -3,8 +3,6 @@ #include "emu.h" #include "msx_s1985.h" -#include "fileio.h" - const uint8_t manufacturer_id = 0xfe; DEFINE_DEVICE_TYPE(MSX_S1985, msx_s1985_device, "msx_s1985", "MSX-Engine S1985") diff --git a/src/mame/machine/pc9801_memsw.cpp b/src/mame/machine/pc9801_memsw.cpp index 5a056b6e1fb..5efcd07b9d9 100644 --- a/src/mame/machine/pc9801_memsw.cpp +++ b/src/mame/machine/pc9801_memsw.cpp @@ -80,7 +80,6 @@ #include "pc9801_memsw.h" #include "coreutil.h" -#include "fileio.h" //************************************************************************** // GLOBAL VARIABLES diff --git a/src/mame/machine/tosh1000_bram.cpp b/src/mame/machine/tosh1000_bram.cpp index b136d8e3c8d..6dce3a8ad78 100644 --- a/src/mame/machine/tosh1000_bram.cpp +++ b/src/mame/machine/tosh1000_bram.cpp @@ -11,8 +11,6 @@ #include "emu.h" #include "tosh1000_bram.h" -#include "fileio.h" - #include <algorithm> diff --git a/src/mame/machine/zs01.cpp b/src/mame/machine/zs01.cpp index bd4d0888c76..d3b07ea9312 100644 --- a/src/mame/machine/zs01.cpp +++ b/src/mame/machine/zs01.cpp @@ -14,8 +14,6 @@ #include "emu.h" #include "machine/zs01.h" -#include "fileio.h" - #define VERBOSE_LEVEL ( 0 ) inline void ATTR_PRINTF( 3, 4 ) zs01_device::verboselog( int n_level, const char *s_fmt, ... ) diff --git a/src/mame/video/avgdvg.cpp b/src/mame/video/avgdvg.cpp index 00746047f97..b3983305ba2 100644 --- a/src/mame/video/avgdvg.cpp +++ b/src/mame/video/avgdvg.cpp @@ -760,6 +760,7 @@ int avg_mhavoc_device::handler_6() // mhavoc_strobe2 else { m_color = m_dvy & 0xf; + m_intensity = (m_dvy >> 4) & 0xf; m_map = (m_dvy >> 8) & 0x3; diff --git a/src/osd/modules/sound/direct_sound.cpp b/src/osd/modules/sound/direct_sound.cpp index 9beab6380f8..fcdc13e07df 100644 --- a/src/osd/modules/sound/direct_sound.cpp +++ b/src/osd/modules/sound/direct_sound.cpp @@ -23,7 +23,6 @@ // MAME headers #include "emu.h" #include "osdepend.h" -//#include "modules/lib/osdobj_common.h" #include "emuopts.h" #ifdef SDLMAME_WIN32 |