diff options
Diffstat (limited to 'src/emu')
30 files changed, 152 insertions, 152 deletions
diff --git a/src/emu/clifront.c b/src/emu/clifront.c index bbc20218b37..e730b136c96 100644 --- a/src/emu/clifront.c +++ b/src/emu/clifront.c @@ -185,7 +185,7 @@ int cli_execute(cli_options &options, osd_interface &osd, int argc, char **argv) // if we failed, check for no command and a system name first; in that case error on the name if (strlen(options.command()) == 0 && options.system() == NULL && strlen(options.system_name()) > 0) throw emu_fatalerror(MAMERR_NO_SUCH_GAME, "Unknown system '%s'", options.system_name()); - + // otherwise, error on the options throw emu_fatalerror(MAMERR_INVALID_CONFIG, "%s", option_errors.trimspace().cstr()); } @@ -846,9 +846,9 @@ static void info_listsoftware(emu_options &options, const char *gamename) "\t\t\t\t<!ATTLIST info name CDATA #REQUIRED>\n" "\t\t\t\t<!ATTLIST info value CDATA #IMPLIED>\n" // shared features get stored in the part->feature below and are output there - // this means that we don't output any <sharedfeat> and that -lsoft output will - // be different from the list in hash/ when the list uses sharedfeat. But this - // is by design: sharedfeat is only available to simplify the life to list creators, + // this means that we don't output any <sharedfeat> and that -lsoft output will + // be different from the list in hash/ when the list uses sharedfeat. But this + // is by design: sharedfeat is only available to simplify the life to list creators, // to e.g. avoid manually adding the same feature to each disk of a 9 floppies game! "\t\t\t<!ELEMENT sharedfeat EMPTY>\n" "\t\t\t\t<!ATTLIST sharedfeat name CDATA #REQUIRED>\n" diff --git a/src/emu/cpu/i4004/i4004.c b/src/emu/cpu/i4004/i4004.c index d9a2d2ee0bd..b529ba1ba9e 100644 --- a/src/emu/cpu/i4004/i4004.c +++ b/src/emu/cpu/i4004/i4004.c @@ -586,8 +586,8 @@ CPU_GET_INFO( i4004 ) case CPUINFO_INT_MAX_CYCLES: info->i = 16; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 12; break; diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c index 5fd91efc137..bcc6b1672b6 100644 --- a/src/emu/cpu/i8008/i8008.c +++ b/src/emu/cpu/i8008/i8008.c @@ -689,8 +689,8 @@ CPU_GET_INFO( i8008 ) case CPUINFO_INT_MAX_CYCLES: info->i = 16; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 14; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 14; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; diff --git a/src/emu/cpu/i8085/i8085.c b/src/emu/cpu/i8085/i8085.c index 524a819d367..3908166fdf5 100644 --- a/src/emu/cpu/i8085/i8085.c +++ b/src/emu/cpu/i8085/i8085.c @@ -1216,8 +1216,8 @@ CPU_GET_INFO( i8085 ) case CPUINFO_INT_MAX_CYCLES: info->i = 16; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 8; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; diff --git a/src/emu/cpu/i860/i860.c b/src/emu/cpu/i860/i860.c index 86bfd4f24ce..85e9c85250b 100644 --- a/src/emu/cpu/i860/i860.c +++ b/src/emu/cpu/i860/i860.c @@ -193,8 +193,8 @@ CPU_GET_INFO( i860 ) case CPUINFO_INT_MAX_CYCLES: info->i = 8; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c index 1b900f5d7e8..e09796556ba 100644 --- a/src/emu/cpu/m68000/m68kcpu.c +++ b/src/emu/cpu/m68000/m68kcpu.c @@ -1016,8 +1016,8 @@ static CPU_GET_INFO( m68k ) case CPUINFO_INT_MAX_CYCLES: info->i = 158; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case CPUINFO_INT_INPUT_STATE + 0: info->i = 0; /* there is no level 0 */ break; case CPUINFO_INT_INPUT_STATE + 1: info->i = (m68k->virq_state >> 1) & 1; break; @@ -1667,7 +1667,7 @@ CPU_GET_INFO( m68008 ) { /* --- the following bits of info are returned as 64-bit signed integers --- */ case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 22; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 22; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68008); break; @@ -1773,7 +1773,7 @@ CPU_GET_INFO( m68020 ) case CPUINFO_INT_MAX_CYCLES: info->i = 158; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68020); break; @@ -1886,7 +1886,7 @@ CPU_GET_INFO( m68ec020 ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 24; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68ec020); break; @@ -1943,7 +1943,7 @@ CPU_GET_INFO( m68030 ) case CPUINFO_INT_MAX_CYCLES: info->i = 158; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68030); break; @@ -2050,7 +2050,7 @@ CPU_GET_INFO( m68040 ) case CPUINFO_INT_MAX_CYCLES: info->i = 158; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(m68040); break; @@ -2178,7 +2178,7 @@ CPU_GET_INFO( scc68070 ) switch (state) { /* --- the following bits of info are returned as 64-bit signed integers --- */ - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; /* --- the following bits of info are returned as pointers to data or functions --- */ case CPUINFO_FCT_INIT: info->init = CPU_INIT_NAME(scc68070); break; diff --git a/src/emu/cpu/mc68hc11/mc68hc11.c b/src/emu/cpu/mc68hc11/mc68hc11.c index 4806a287fd3..dfa0054d495 100644 --- a/src/emu/cpu/mc68hc11/mc68hc11.c +++ b/src/emu/cpu/mc68hc11/mc68hc11.c @@ -551,8 +551,8 @@ CPU_GET_INFO( mc68hc11 ) case CPUINFO_INT_MAX_CYCLES: info->i = 41; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index 4575a04fd9c..388cffa0d86 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -1376,7 +1376,7 @@ static CPU_GET_INFO( mcs48 ) case CPUINFO_INT_MAX_CYCLES: info->i = 3; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: /*info->i = 6 or 7 or 8;*/ break; diff --git a/src/emu/cpu/pps4/pps4.c b/src/emu/cpu/pps4/pps4.c index cf19dfc64c1..fc7bf665470 100644 --- a/src/emu/cpu/pps4/pps4.c +++ b/src/emu/cpu/pps4/pps4.c @@ -412,8 +412,8 @@ CPU_GET_INFO( pps4 ) case CPUINFO_INT_MAX_CYCLES: info->i = 2; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 12; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 8; break; // 4 bit for RAM case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 12; break; diff --git a/src/emu/cpu/scmp/scmp.c b/src/emu/cpu/scmp/scmp.c index d2066248309..c20ad19d53d 100644 --- a/src/emu/cpu/scmp/scmp.c +++ b/src/emu/cpu/scmp/scmp.c @@ -616,8 +616,8 @@ CPU_GET_INFO( scmp ) case CPUINFO_INT_MAX_CYCLES: info->i = 131593; break; // DLY instruction max time case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 16; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index 6d508d9b996..1503db55665 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3658,8 +3658,8 @@ CPU_GET_INFO( sh4 ) case CPUINFO_INT_MAX_CYCLES: info->i = 4; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 64; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; diff --git a/src/emu/cpu/superfx/superfx.c b/src/emu/cpu/superfx/superfx.c index 1e22facd51a..1ffe408e0c2 100644 --- a/src/emu/cpu/superfx/superfx.c +++ b/src/emu/cpu/superfx/superfx.c @@ -1567,15 +1567,15 @@ CPU_GET_INFO( superfx ) case CPUINFO_INT_MIN_CYCLES: info->i = 1; break; case CPUINFO_INT_MAX_CYCLES: info->i = 1; break; - case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; - case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; - case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + AS_DATA: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_DATA: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_DATA: info->i = 0; break; + case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; case CPUINFO_INT_PC: /* intentional fallthrough */ case CPUINFO_INT_REGISTER + SUPERFX_PC: info->i = ((cpustate->pbr << 16) | cpustate->r[15]) - 1; break; diff --git a/src/emu/cpu/tms34010/tms34010.c b/src/emu/cpu/tms34010/tms34010.c index 5b0945ee3e5..04bcc9dc392 100644 --- a/src/emu/cpu/tms34010/tms34010.c +++ b/src/emu/cpu/tms34010/tms34010.c @@ -1737,8 +1737,8 @@ CPU_GET_INFO( tms34010 ) case CPUINFO_INT_MAX_CYCLES: info->i = 10000; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 16; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 3; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 32; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 3; break; case CPUINFO_INT_INPUT_STATE + 0: info->i = (IOREG(tms, REG_INTPEND) & TMS34010_INT1) ? ASSERT_LINE : CLEAR_LINE; break; case CPUINFO_INT_INPUT_STATE + 1: info->i = (IOREG(tms, REG_INTPEND) & TMS34010_INT2) ? ASSERT_LINE : CLEAR_LINE; break; diff --git a/src/emu/cpu/z180/z180.c b/src/emu/cpu/z180/z180.c index 546cef949c0..c1703fa69a0 100644 --- a/src/emu/cpu/z180/z180.c +++ b/src/emu/cpu/z180/z180.c @@ -2692,8 +2692,8 @@ CPU_GET_INFO( z180 ) case CPUINFO_INT_MAX_CYCLES: info->i = 16; break; case DEVINFO_INT_DATABUS_WIDTH + AS_PROGRAM: info->i = 8; break; - case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break; - case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; + case DEVINFO_INT_ADDRBUS_WIDTH + AS_PROGRAM: info->i = 20; break; + case DEVINFO_INT_ADDRBUS_SHIFT + AS_PROGRAM: info->i = 0; break; case DEVINFO_INT_DATABUS_WIDTH + AS_IO: info->i = 8; break; case DEVINFO_INT_ADDRBUS_WIDTH + AS_IO: info->i = 16; break; case DEVINFO_INT_ADDRBUS_SHIFT + AS_IO: info->i = 0; break; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 1916879c79d..3e594e87b51 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -1212,7 +1212,7 @@ static UINT64 expression_read_memory(void *param, const char *name, expression_s break; result = expression_read_memory_region(machine, name, address, size); break; - + default: break; } @@ -1383,7 +1383,7 @@ static void expression_write_memory(void *param, const char *name, expression_sp break; expression_write_memory_region(machine, name, address, size, data); break; - + default: break; } diff --git a/src/emu/machine.c b/src/emu/machine.c index 121360a0ace..a0ed6794f14 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -159,7 +159,7 @@ running_machine::running_machine(const machine_config &_config, osd_interface &o generic_machine_data(NULL), generic_video_data(NULL), generic_audio_data(NULL), - + m_config(_config), m_system(_config.gamedrv()), m_osd(osd), diff --git a/src/emu/machine.h b/src/emu/machine.h index 583e51f12e3..2b64c949f90 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -348,7 +348,7 @@ public: int sample_rate() const { return m_sample_rate; } bool save_or_load_pending() const { return m_saveload_pending_file; } screen_device *first_screen() const { return primary_screen; } - + // additional helpers emu_options &options() const { return m_config.options(); } memory_region *first_region() const { return m_regionlist.first(); } @@ -442,7 +442,7 @@ private: // internal callbacks static void logfile_callback(running_machine &machine, const char *buffer); - + // internal state const machine_config & m_config; // reference to the constructed machine_config const game_driver & m_system; // reference to the definition of the game machine @@ -501,7 +501,7 @@ private: // getters notifier_callback_item *next() const { return m_next; } - + // state notifier_callback_item * m_next; notify_callback m_func; @@ -514,10 +514,10 @@ private: public: // construction/destruction logerror_callback_item(logerror_callback func); - + // getters logerror_callback_item *next() const { return m_next; } - + // state logerror_callback_item * m_next; logerror_callback m_func; diff --git a/src/emu/machine/e0516.c b/src/emu/machine/e0516.c index 05b7df778cd..463814ffb91 100644 --- a/src/emu/machine/e0516.c +++ b/src/emu/machine/e0516.c @@ -89,7 +89,7 @@ void e0516_device::device_start() // allocate timers m_timer = timer_alloc(); m_timer->adjust(attotime::from_hz(clock() / 32768), 0, attotime::from_hz(clock() / 32768)); - + // state saving save_item(NAME(m_cs)); save_item(NAME(m_clk)); @@ -165,7 +165,7 @@ void e0516_device::device_timer(emu_timer &timer, device_timer_id id, int param, WRITE_LINE_MEMBER( e0516_device::cs_w ) { m_cs = state; - + if (m_cs) { m_data_latch = 0; @@ -183,7 +183,7 @@ WRITE_LINE_MEMBER( e0516_device::cs_w ) WRITE_LINE_MEMBER( e0516_device::clk_w ) { m_clk = state; - + if (m_cs || m_clk) return; m_bits++; @@ -215,7 +215,7 @@ WRITE_LINE_MEMBER( e0516_device::clk_w ) { // read if (LOG) logerror("E05-16 '%s' Data Bit OUT %u\n", tag(), m_dio); - + m_dio = BIT(m_data_latch, 0); m_data_latch >>= 1; } diff --git a/src/emu/machine/e0516.h b/src/emu/machine/e0516.h index 83c25db1582..223b317ebb7 100644 --- a/src/emu/machine/e0516.h +++ b/src/emu/machine/e0516.h @@ -76,10 +76,10 @@ class e0516_device : public device_t e0516_device(running_machine &_machine, const e0516_device_config &_config); public: - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( clk_w ); - DECLARE_WRITE_LINE_MEMBER( dio_w ); - DECLARE_READ_LINE_MEMBER( dio_r ); + DECLARE_WRITE_LINE_MEMBER( cs_w ); + DECLARE_WRITE_LINE_MEMBER( clk_w ); + DECLARE_WRITE_LINE_MEMBER( dio_w ); + DECLARE_READ_LINE_MEMBER( dio_r ); protected: // device-level overrides diff --git a/src/emu/machine/nmc9306.c b/src/emu/machine/nmc9306.c index 71ded4d32ad..7fef8bd7eaa 100644 --- a/src/emu/machine/nmc9306.c +++ b/src/emu/machine/nmc9306.c @@ -226,14 +226,14 @@ WRITE_LINE_MEMBER( nmc9306_device::cs_w ) WRITE_LINE_MEMBER( nmc9306_device::sk_w ) { m_sk = state; - + if (!m_cs || !m_sk) return; - + switch (m_state) { case STATE_IDLE: if (LOG) logerror("NMC9306 '%s' Idle %u\n", tag(), m_di); - + if (m_di) { // start bit received @@ -241,28 +241,28 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w ) m_bits = 0; } break; - + case STATE_COMMAND: if (LOG) logerror("NMC9306 '%s' Command Bit %u\n", tag(), m_di); - + m_command <<= 1; m_command |= m_di; m_bits++; - + if (m_bits == 4) { m_state = STATE_ADDRESS; m_bits = 0; } break; - + case STATE_ADDRESS: if (LOG) logerror("NMC9306 '%s' Address Bit %u\n", tag(), m_di); - + m_address <<= 1; m_address |= m_di; m_bits++; - + if (m_bits == 4) { switch ((m_command >> 2) & 0x03) @@ -275,11 +275,11 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w ) m_ewen = false; m_state = STATE_IDLE; break; - + case WRAL: if (LOG) logerror("NMC9306 '%s' WRAL\n", tag()); break; - + case ERAL: if (LOG) logerror("NMC9306 '%s' ERAL\n", tag()); break; @@ -296,46 +296,46 @@ WRITE_LINE_MEMBER( nmc9306_device::sk_w ) if (LOG) logerror("NMC9306 '%s' WRITE %u\n", tag(), m_address & 0x0f); m_state = STATE_DATA_IN; break; - + case READ: if (LOG) logerror("NMC9306 '%s' READ %u\n", tag(), m_address & 0x0f); m_data = read(m_address & 0x0f); m_state = STATE_DATA_OUT; break; - + case ERASE: if (LOG) logerror("NMC9306 '%s' ERASE %u\n", tag(), m_address & 0x0f); erase(m_address & 0x0f); m_state = STATE_ERASE; break; } - + m_bits = 0; } break; - + case STATE_DATA_IN: if (LOG) logerror("NMC9306 '%s' Data Bit IN %u\n", tag(), m_di); - + m_data <<= 1; m_data |= m_di; m_bits++; - + if (m_bits == 16) { write(m_address & 0x0f, m_data); - + m_state = STATE_IDLE; } break; - + case STATE_DATA_OUT: if (LOG) logerror("NMC9306 '%s' Data Bit OUT %u\n", tag(), m_di); - + m_do = BIT(m_data, 15); m_data <<= 1; m_bits++; - + if (m_bits == 16) { m_state = STATE_IDLE; diff --git a/src/emu/machine/nmc9306.h b/src/emu/machine/nmc9306.h index aa9dfb20593..366738b9a5e 100644 --- a/src/emu/machine/nmc9306.h +++ b/src/emu/machine/nmc9306.h @@ -74,10 +74,10 @@ class nmc9306_device : public device_t, nmc9306_device(running_machine &_machine, const nmc9306_device_config &_config); public: - DECLARE_WRITE_LINE_MEMBER( cs_w ); - DECLARE_WRITE_LINE_MEMBER( sk_w ); - DECLARE_WRITE_LINE_MEMBER( di_w ); - DECLARE_READ_LINE_MEMBER( do_r ); + DECLARE_WRITE_LINE_MEMBER( cs_w ); + DECLARE_WRITE_LINE_MEMBER( sk_w ); + DECLARE_WRITE_LINE_MEMBER( di_w ); + DECLARE_READ_LINE_MEMBER( do_r ); protected: // device-level overrides @@ -94,7 +94,7 @@ private: inline void erase(offs_t offset); UINT16 m_register[16]; - + int m_bits; int m_state; UINT8 m_command; diff --git a/src/emu/machine/upd1990a.c b/src/emu/machine/upd1990a.c index 36c82d8fbf1..b89d7820569 100644 --- a/src/emu/machine/upd1990a.c +++ b/src/emu/machine/upd1990a.c @@ -86,7 +86,7 @@ void upd1990a_device_config::device_config_complete() //************************************************************************** //------------------------------------------------- -// convert_to_bcd - +// convert_to_bcd - //------------------------------------------------- inline UINT8 upd1990a_device::convert_to_bcd(int val) @@ -96,7 +96,7 @@ inline UINT8 upd1990a_device::convert_to_bcd(int val) //------------------------------------------------- -// bcd_to_integer - +// bcd_to_integer - //------------------------------------------------- inline int upd1990a_device::bcd_to_integer(UINT8 val) @@ -106,7 +106,7 @@ inline int upd1990a_device::bcd_to_integer(UINT8 val) //------------------------------------------------- -// advance_seconds - +// advance_seconds - //------------------------------------------------- inline void upd1990a_device::advance_seconds() @@ -263,7 +263,7 @@ void upd1990a_device::device_timer(emu_timer &timer, device_timer_id id, int par //------------------------------------------------- -// oe_w - +// oe_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::oe_w ) @@ -275,7 +275,7 @@ WRITE_LINE_MEMBER( upd1990a_device::oe_w ) //------------------------------------------------- -// cs_w - +// cs_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::cs_w ) @@ -287,7 +287,7 @@ WRITE_LINE_MEMBER( upd1990a_device::cs_w ) //------------------------------------------------- -// stb_w - +// stb_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::stb_w ) @@ -425,7 +425,7 @@ WRITE_LINE_MEMBER( upd1990a_device::stb_w ) //------------------------------------------------- -// clk_w - +// clk_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::clk_w ) @@ -467,7 +467,7 @@ WRITE_LINE_MEMBER( upd1990a_device::clk_w ) //------------------------------------------------- -// c0_w - +// c0_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::c0_w ) @@ -479,7 +479,7 @@ WRITE_LINE_MEMBER( upd1990a_device::c0_w ) //------------------------------------------------- -// c1_w - +// c1_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::c1_w ) @@ -491,7 +491,7 @@ WRITE_LINE_MEMBER( upd1990a_device::c1_w ) //------------------------------------------------- -// c2_w - +// c2_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::c2_w ) @@ -503,7 +503,7 @@ WRITE_LINE_MEMBER( upd1990a_device::c2_w ) //------------------------------------------------- -// data_in_w - +// data_in_w - //------------------------------------------------- WRITE_LINE_MEMBER( upd1990a_device::data_in_w ) @@ -515,7 +515,7 @@ WRITE_LINE_MEMBER( upd1990a_device::data_in_w ) //------------------------------------------------- -// data_out_r - +// data_out_r - //------------------------------------------------- READ_LINE_MEMBER( upd1990a_device::data_out_r ) @@ -525,7 +525,7 @@ READ_LINE_MEMBER( upd1990a_device::data_out_r ) //------------------------------------------------- -// tp_r - +// tp_r - //------------------------------------------------- READ_LINE_MEMBER( upd1990a_device::tp_r ) diff --git a/src/emu/machine/z8536.c b/src/emu/machine/z8536.c index e9d2d277b83..322d764ada2 100644 --- a/src/emu/machine/z8536.c +++ b/src/emu/machine/z8536.c @@ -166,13 +166,13 @@ enum // master interrupt control register #define MICR_RESET 0x01 // reset -#define MICR_RJA 0x02 // right justified address +#define MICR_RJA 0x02 // right justified address #define MICR_CT_VIS 0x04 // counter/timer vector includes status #define MICR_PB_VIS 0x08 // port B vector includes status #define MICR_PA_VIS 0x10 // port A vector includes status #define MICR_NV 0x20 // no vector -#define MICR_DLC 0x40 // disable lower chain -#define MICR_MIE 0x80 // master interrupt enable +#define MICR_DLC 0x40 // disable lower chain +#define MICR_MIE 0x80 // master interrupt enable // master configuration control register @@ -287,7 +287,7 @@ void z8536_device_config::device_config_complete() inline UINT8 z8536_device::read_register(offs_t offset) { UINT8 data = 0; - + data = m_register[offset]; // HACK switch (offset) @@ -295,19 +295,19 @@ inline UINT8 z8536_device::read_register(offs_t offset) case PORT_A_DATA: data = devcb_call_read8(&m_in_pa_func, 0); break; - + case PORT_B_DATA: data = devcb_call_read8(&m_in_pb_func, 0); break; - + case PORT_C_DATA: data = 0xf0 | (devcb_call_read8(&m_in_pc_func, 0) & 0x0f); break; - + default: logerror("Z8536 '%s' Unimplemented read from register %u\n", tag(), offset); } - + return data; } @@ -340,29 +340,29 @@ inline void z8536_device::write_register(offs_t offset, UINT8 data) m_state = STATE_0; } break; - + case PORT_A_DATA: devcb_call_write8(&m_out_pa_func, 0, data); break; - + case PORT_B_DATA: devcb_call_write8(&m_out_pb_func, 0, data); break; - + case PORT_C_DATA: { UINT8 mask = (data & 0xf0) | (data >> 4); m_output[PORT_C] = (m_output[PORT_C] & mask) | ((data & 0x0f) & (mask ^ 0xff)); - + devcb_call_write8(&m_out_pc_func, 0, m_output[PORT_C]); } break; - + default: logerror("Z8536 '%s' Unimplemented write %02x to register %u\n", tag(), data, offset); } - + m_register[offset] = data; // HACK } @@ -374,13 +374,13 @@ inline void z8536_device::write_register(offs_t offset, UINT8 data) inline void z8536_device::write_register(offs_t offset, UINT8 data, UINT8 mask) { UINT8 combined_data = (data & mask) | (m_register[offset] & (mask ^ 0xff)); - + write_register(offset, combined_data); } //------------------------------------------------- -// count - +// count - //------------------------------------------------- inline void z8536_device::count(device_timer_id id) @@ -389,7 +389,7 @@ inline void z8536_device::count(device_timer_id id) //------------------------------------------------- -// trigger - +// trigger - //------------------------------------------------- inline void z8536_device::trigger(device_timer_id id) @@ -398,7 +398,7 @@ inline void z8536_device::trigger(device_timer_id id) //------------------------------------------------- -// gate - +// gate - //------------------------------------------------- inline void z8536_device::gate(device_timer_id id) @@ -432,7 +432,7 @@ void z8536_device::device_start() m_timer[TIMER_1] = timer_alloc(TIMER_1); m_timer[TIMER_2] = timer_alloc(TIMER_2); m_timer[TIMER_3] = timer_alloc(TIMER_3); - + // resolve callbacks devcb_resolve_write_line(&m_out_int_func, &m_config.m_out_int_func, this); devcb_resolve_read8(&m_in_pa_func, &m_config.m_in_pa_func, this); @@ -451,12 +451,12 @@ void z8536_device::device_start() void z8536_device::device_reset() { m_state = STATE_RESET; - + for (int i = 0; i < 48; i++) { m_register[i] = 0; } - + m_register[MASTER_INTERRUPT_CONTROL] = MICR_RESET; m_pointer = 0; } @@ -473,11 +473,11 @@ void z8536_device::device_timer(emu_timer &timer, device_timer_id id, int param, case TIMER_1: count(TIMER_1); break; - + case TIMER_2: count(TIMER_2); break; - + case TIMER_3: count(TIMER_3); break; @@ -527,7 +527,7 @@ READ8_MEMBER( z8536_device::read ) break; } } - + return data; } diff --git a/src/emu/machine/z8536.h b/src/emu/machine/z8536.h index 75f82f12988..9a71eafa92f 100644 --- a/src/emu/machine/z8536.h +++ b/src/emu/machine/z8536.h @@ -68,13 +68,13 @@ struct z8536_interface { devcb_write_line m_out_int_func; - + devcb_read8 m_in_pa_func; devcb_write8 m_out_pa_func; - + devcb_read8 m_in_pb_func; devcb_write8 m_out_pb_func; - + devcb_read8 m_in_pc_func; devcb_write8 m_out_pc_func; }; @@ -144,19 +144,19 @@ private: inline UINT8 read_register(offs_t offset, UINT8 mask); inline void write_register(offs_t offset, UINT8 data); inline void write_register(offs_t offset, UINT8 data, UINT8 mask); - + inline void count(device_timer_id id); inline void trigger(device_timer_id id); inline void gate(device_timer_id id); - + devcb_resolved_write_line m_out_int_func; - + devcb_resolved_read8 m_in_pa_func; devcb_resolved_write8 m_out_pa_func; - + devcb_resolved_read8 m_in_pb_func; devcb_resolved_write8 m_out_pb_func; - + devcb_resolved_read8 m_in_pc_func; devcb_resolved_write8 m_out_pc_func; diff --git a/src/emu/memory.c b/src/emu/memory.c index 17931f3fe18..9b496334176 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -2429,7 +2429,7 @@ void address_space::unmap_generic(offs_t addrstart, offs_t addrend, offs_t addrm //------------------------------------------------- -// install_readwrite_port - install a new I/O port +// install_readwrite_port - install a new I/O port // handler into this address space //------------------------------------------------- @@ -2471,7 +2471,7 @@ void address_space::install_readwrite_port(offs_t addrstart, offs_t addrend, off //------------------------------------------------- -// install_bank_generic - install a range as +// install_bank_generic - install a range as // mapping to a particular bank //------------------------------------------------- @@ -2502,7 +2502,7 @@ void address_space::install_bank_generic(offs_t addrstart, offs_t addrend, offs_ //------------------------------------------------- -// install_ram_generic - install a simple fixed +// install_ram_generic - install a simple fixed // RAM region into the given address space //------------------------------------------------- diff --git a/src/emu/memory.h b/src/emu/memory.h index 6d81349d7da..e6b59a07394 100644 --- a/src/emu/memory.h +++ b/src/emu/memory.h @@ -466,9 +466,9 @@ public: void install_read_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag, NULL); } void install_write_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, NULL, tag); } void install_readwrite_bank(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, const char *tag) { install_bank_generic(addrstart, addrend, addrmask, addrmirror, tag, tag); } - void *install_rom(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_READ, baseptr); } - void *install_writeonly(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_WRITE, baseptr); } - void *install_ram(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_READWRITE, baseptr); } + void *install_rom(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_READ, baseptr); } + void *install_writeonly(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_WRITE, baseptr); } + void *install_ram(offs_t addrstart, offs_t addrend, offs_t addrmask, offs_t addrmirror, void *baseptr = NULL) { return install_ram_generic(addrstart, addrend, addrmask, addrmirror, ROW_READWRITE, baseptr); } // install new-style delegate handlers (short form) UINT8 *install_read_handler(offs_t addrstart, offs_t addrend, read8_delegate rhandler, UINT64 unitmask = 0) { return install_read_handler(addrstart, addrend, 0, 0, rhandler, unitmask); } diff --git a/src/emu/softlist.h b/src/emu/softlist.h index b5dd563ee73..bc139cda09c 100644 --- a/src/emu/softlist.h +++ b/src/emu/softlist.h @@ -44,7 +44,7 @@ struct software_info const char *year; // Copyright year on title screen, actual release dates can be tracked in external resources const char *publisher; feature_list *other_info; // Here we store info like developer, serial #, etc. which belong to the software entry as a whole - feature_list *shared_info; // Here we store info like TV standard compatibility, or add-on requirements, etc. which get inherited + feature_list *shared_info; // Here we store info like TV standard compatibility, or add-on requirements, etc. which get inherited // by each part of this software entry (after loading these are stored in partdata->featurelist) UINT32 supported; software_part *partdata; diff --git a/src/emu/uiimage.c b/src/emu/uiimage.c index 5405ff6d2c3..4bd6359c8fe 100644 --- a/src/emu/uiimage.c +++ b/src/emu/uiimage.c @@ -849,7 +849,7 @@ static void menu_file_selector(running_machine &machine, ui_menu *menu, void *pa { int buflen = strlen(menustate->filename_buffer); bool update_selected = FALSE; - + /* if it's a backspace and we can handle it, do so */ if ((event->unichar == 8 || event->unichar == 0x7f) && buflen > 0) { @@ -886,7 +886,7 @@ static void menu_file_selector(running_machine &machine, ui_menu *menu, void *pa if (mame_strnicmp(entry->basename, menustate->filename_buffer, i) == 0) match = i; } - + if (match > bestmatch) { bestmatch = match; @@ -905,7 +905,7 @@ static void menu_file_selector(running_machine &machine, ui_menu *menu, void *pa if (mame_strnicmp(entry->basename, menustate->filename_buffer, i) == 0) match = i; } - + if (match > bestmatch) { bestmatch = match; @@ -913,11 +913,11 @@ static void menu_file_selector(running_machine &machine, ui_menu *menu, void *pa } } } - + if (selected_entry != NULL && selected_entry != cur_selected) ui_menu_set_selection(menu, (void *) selected_entry); } - } + } } } diff --git a/src/emu/video/msm6255.c b/src/emu/video/msm6255.c index 00d43391d2a..e8984719ddc 100644 --- a/src/emu/video/msm6255.c +++ b/src/emu/video/msm6255.c @@ -93,7 +93,7 @@ void msm6255_device_config::device_config_complete() if (intf != NULL) { *static_cast<msm6255_interface *>(this) = *intf; - + m_char_ram_r = intf->m_char_ram_r; } // or initialize to defaults if none provided @@ -178,7 +178,7 @@ void msm6255_device::device_reset() READ8_MEMBER( msm6255_device::read ) { UINT8 data = 0; - + if (offset & 0x01) { return m_ir; @@ -222,7 +222,7 @@ READ8_MEMBER( msm6255_device::read ) break; } } - + return data; } @@ -282,7 +282,7 @@ WRITE8_MEMBER( msm6255_device::write ) //------------------------------------------------- -// update_cursor - +// update_cursor - //------------------------------------------------- void msm6255_device::update_cursor() @@ -329,7 +329,7 @@ void msm6255_device::update_cursor() //------------------------------------------------- -// draw_scanline - +// draw_scanline - //------------------------------------------------- void msm6255_device::draw_scanline(bitmap_t *bitmap, const rectangle *cliprect, int y, UINT16 ma, UINT8 ra) @@ -370,7 +370,7 @@ void msm6255_device::draw_scanline(bitmap_t *bitmap, const rectangle *cliprect, //------------------------------------------------- -// update_graphics - +// update_graphics - //------------------------------------------------- void msm6255_device::update_graphics(bitmap_t *bitmap, const rectangle *cliprect) @@ -398,7 +398,7 @@ void msm6255_device::update_graphics(bitmap_t *bitmap, const rectangle *cliprect //------------------------------------------------- -// update_text - +// update_text - //------------------------------------------------- void msm6255_device::update_text(bitmap_t *bitmap, const rectangle *cliprect) diff --git a/src/emu/video/msm6255.h b/src/emu/video/msm6255.h index 074acec56a5..a627a188538 100644 --- a/src/emu/video/msm6255.h +++ b/src/emu/video/msm6255.h @@ -28,11 +28,11 @@ #define MSM6255_INTERFACE(name) \ const msm6255_interface (name) = - + #define MSM6255_CHAR_RAM_READ(_name) \ UINT8 _name(device_t *device, UINT16 ma, UINT8 ra) - + ///************************************************************************* // TYPE DEFINITIONS @@ -105,9 +105,9 @@ private: void draw_scanline(bitmap_t *bitmap, const rectangle *cliprect, int y, UINT16 ma, UINT8 ra); void update_graphics(bitmap_t *bitmap, const rectangle *cliprect); void update_text(bitmap_t *bitmap, const rectangle *cliprect); - + screen_device *m_screen; - + UINT8 m_ir; // instruction register UINT8 m_mor; // mode control register UINT8 m_pr; // character pitch register |
