diff options
author | Aaron Giles <aaron@aarongiles.com> | 2011-04-03 05:49:24 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2011-04-03 05:49:24 +0000 |
commit | 68958f72dbc99690f928abf5a4110019afa8c970 (patch) | |
tree | 465d7542c14c7138c7b8ae0a0dfdec56cf0d1252 | |
parent | fed05027808dbc1babf251c6bbfa6e788f3a9935 (diff) |
Cleanups and version bump.mame0142
77 files changed, 284 insertions, 284 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 diff --git a/src/mame/drivers/backfire.c b/src/mame/drivers/backfire.c index f051d3da290..95a5f8c99c6 100644 --- a/src/mame/drivers/backfire.c +++ b/src/mame/drivers/backfire.c @@ -72,7 +72,7 @@ static VIDEO_START( backfire ) state->m_left = auto_bitmap_alloc(machine, 80*8, 32*8, BITMAP_FORMAT_INDEXED16); state->m_right = auto_bitmap_alloc(machine, 80*8, 32*8, BITMAP_FORMAT_INDEXED16); - + state->save_pointer(NAME(state->m_spriteram_1), 0x2000/2); state->save_pointer(NAME(state->m_spriteram_2), 0x2000/2); diff --git a/src/mame/drivers/boogwing.c b/src/mame/drivers/boogwing.c index a167be4e8c8..f6d39a6b711 100644 --- a/src/mame/drivers/boogwing.c +++ b/src/mame/drivers/boogwing.c @@ -328,7 +328,7 @@ static const deco16ic_interface boogwing_deco16ic_tilegen1_intf = static const deco16ic_interface boogwing_deco16ic_tilegen2_intf = { "screen", - 0, 1, + 0, 1, 0x0f, 0x0f, 0, 16, 0x0f, 0x0f, diff --git a/src/mame/drivers/cosmic.c b/src/mame/drivers/cosmic.c index 73f7be0f714..c44ae28bf6f 100644 --- a/src/mame/drivers/cosmic.c +++ b/src/mame/drivers/cosmic.c @@ -56,8 +56,8 @@ static WRITE8_HANDLER( panic_sound_output_w ) { switch (offset) { - case 0: if (data) sample_start(state->m_samples, 0, 0, 0); break; /* Walk */ - case 1: if (data) sample_start(state->m_samples, 0, 5, 0); break; /* Enemy Die 1 */ + case 0: if (data) sample_start(state->m_samples, 0, 0, 0); break; /* Walk */ + case 1: if (data) sample_start(state->m_samples, 0, 5, 0); break; /* Enemy Die 1 */ case 2: if (data) /* Drop 1 */ { if (!sample_playing(state->m_samples, 1)) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 327048ad562..ae3646d66b8 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -823,13 +823,13 @@ static ADDRESS_MAP_START( cps2_map, AS_PROGRAM, 16 ) AM_RANGE(0x662020, 0x662021) AM_RAM /* Network adapter related, accessed in SSF2TB */ AM_RANGE(0x660000, 0x663fff) AM_RAM /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ AM_RANGE(0x664000, 0x664001) AM_RAM /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ - AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE_MEMBER(cps_state, m_objram1) /* Object RAM, no game seems to use it directly */ + AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE_MEMBER(cps_state, m_objram1) /* Object RAM, no game seems to use it directly */ AM_RANGE(0x708000, 0x709fff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* Object RAM */ AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE_MEMBER(cps_state, m_cps_a_regs) /* mirror (sfa) */ - AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE_MEMBER(cps_state, m_cps_b_regs) /* mirror (sfa) */ + AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE_MEMBER(cps_state, m_cps_b_regs) /* mirror (sfa) */ AM_RANGE(0x804000, 0x804001) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x804010, 0x804011) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x804020, 0x804021) AM_READ_PORT("IN2") /* IN2 + EEPROM */ @@ -854,13 +854,13 @@ static ADDRESS_MAP_START( dead_cps2_map, AS_PROGRAM, 16 ) AM_RANGE(0x662020, 0x662021) AM_RAM /* Network adapter related, accessed in SSF2TB */ AM_RANGE(0x660000, 0x663fff) AM_RAM /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */ AM_RANGE(0x664000, 0x664001) AM_RAM /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */ - AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE_MEMBER(cps_state, m_objram1) /* Object RAM, no game seems to use it directly */ + AM_RANGE(0x700000, 0x701fff) AM_WRITE(cps2_objram1_w) AM_BASE_MEMBER(cps_state, m_objram1) /* Object RAM, no game seems to use it directly */ AM_RANGE(0x708000, 0x709fff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* Object RAM */ AM_RANGE(0x70a000, 0x70bfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x70c000, 0x70dfff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x70e000, 0x70ffff) AM_READWRITE(cps2_objram2_r, cps2_objram2_w) AM_BASE_MEMBER(cps_state, m_objram2) /* mirror */ AM_RANGE(0x800100, 0x80013f) AM_WRITE(cps1_cps_a_w) AM_BASE_MEMBER(cps_state, m_cps_a_regs) /* mirror (sfa) */ - AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE_MEMBER(cps_state, m_cps_b_regs) /* mirror (sfa) */ + AM_RANGE(0x800140, 0x80017f) AM_READWRITE(cps1_cps_b_r, cps1_cps_b_w) AM_BASE_MEMBER(cps_state, m_cps_b_regs) /* mirror (sfa) */ AM_RANGE(0x804000, 0x804001) AM_READ_PORT("IN0") /* IN0 */ AM_RANGE(0x804010, 0x804011) AM_READ_PORT("IN1") /* IN1 */ AM_RANGE(0x804020, 0x804021) AM_READ_PORT("IN2") /* IN2 + EEPROM */ diff --git a/src/mame/drivers/darkseal.c b/src/mame/drivers/darkseal.c index 9d3b69137df..4fd4ca08184 100644 --- a/src/mame/drivers/darkseal.c +++ b/src/mame/drivers/darkseal.c @@ -66,7 +66,7 @@ static ADDRESS_MAP_START( darkseal_map, AS_PROGRAM, 16 ) AM_RANGE(0x140000, 0x140fff) AM_RAM_WRITE(darkseal_palette_24bit_rg_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0x141000, 0x141fff) AM_RAM_WRITE(darkseal_palette_24bit_b_w) AM_BASE_GENERIC(paletteram2) AM_RANGE(0x180000, 0x18000f) AM_READWRITE(darkseal_control_r, darkseal_control_w) - + AM_RANGE(0x200000, 0x201fff) AM_DEVREADWRITE("tilegen2", deco16ic_pf1_data_r, deco16ic_pf1_data_w) AM_RANGE(0x202000, 0x203fff) AM_DEVREADWRITE("tilegen2", deco16ic_pf2_data_r, deco16ic_pf2_data_w) AM_RANGE(0x240000, 0x24000f) AM_DEVWRITE("tilegen2", deco16ic_pf_control_w) @@ -74,7 +74,7 @@ static ADDRESS_MAP_START( darkseal_map, AS_PROGRAM, 16 ) AM_RANGE(0x220000, 0x220fff) AM_RAM AM_BASE_MEMBER(darkseal_state, m_pf1_rowscroll) // pf2 & 4 rowscrolls are where? (maybe don't exist?) AM_RANGE(0x222000, 0x222fff) AM_RAM AM_BASE_MEMBER(darkseal_state, m_pf3_rowscroll) - + AM_RANGE(0x260000, 0x261fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf1_data_r, deco16ic_pf1_data_w) AM_RANGE(0x262000, 0x263fff) AM_DEVREADWRITE("tilegen1", deco16ic_pf2_data_r, deco16ic_pf2_data_w) AM_RANGE(0x2a0000, 0x2a000f) AM_DEVWRITE("tilegen1", deco16ic_pf_control_w) diff --git a/src/mame/drivers/deco32.c b/src/mame/drivers/deco32.c index 6515511e5c1..0ad3ece6fb0 100644 --- a/src/mame/drivers/deco32.c +++ b/src/mame/drivers/deco32.c @@ -719,7 +719,7 @@ static WRITE32_HANDLER( deco32_buffer_spriteram_w ) { deco32_state *state = space->machine().driver_data<deco32_state>(); memcpy(state->m_spriteram16_buffered, state->m_spriteram16, 0x1000); -} +} static READ32_HANDLER( deco32_spriteram2_r ) { @@ -739,7 +739,7 @@ static WRITE32_HANDLER( deco32_buffer_spriteram2_w ) { deco32_state *state = space->machine().driver_data<deco32_state>(); memcpy(state->m_spriteram16_2_buffered, state->m_spriteram16_2, 0x1000); -} +} // tattass tests these as 32-bit ram, even if only 16-bits are hooked up to the tilemap chip - does it mirror parts of the dword? @@ -757,7 +757,7 @@ static ADDRESS_MAP_START( captaven_map, AS_PROGRAM, 32 ) AM_RANGE(0x108000, 0x108003) AM_WRITENOP /* ? */ AM_RANGE(0x110000, 0x111fff) AM_READWRITE(deco32_spriteram_r, deco32_spriteram_w) AM_RANGE(0x120000, 0x127fff) AM_RAM AM_BASE_MEMBER(deco32_state, m_ram) /* Main RAM */ - + AM_RANGE(0x128000, 0x128fff) AM_READ(captaven_prot_r) AM_RANGE(0x1280c8, 0x1280cb) AM_WRITE(deco32_sound_w) AM_RANGE(0x130000, 0x131fff) AM_RAM_WRITE(deco32_nonbuffered_palette_w) AM_BASE_GENERIC(paletteram) /* Palette RAM */ @@ -783,7 +783,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( fghthist_map, AS_PROGRAM, 32 ) -// AM_RANGE(0x000000, 0x001fff) AM_ROM AM_WRITE(deco32_pf1_data_w) // wtf?? +// AM_RANGE(0x000000, 0x001fff) AM_ROM AM_WRITE(deco32_pf1_data_w) // wtf?? AM_RANGE(0x000000, 0x0fffff) AM_ROM AM_RANGE(0x100000, 0x11ffff) AM_RAM AM_BASE_MEMBER(deco32_state, m_ram) AM_RANGE(0x120020, 0x12002f) AM_READ(fghthist_control_r) @@ -2174,7 +2174,7 @@ static MACHINE_CONFIG_START( tattass, deco32_state ) MCFG_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MCFG_SCREEN_SIZE(42*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 40*8-1, 1*8, 31*8-1) - + MCFG_SCREEN_UPDATE(nslasher) MCFG_DECO16IC_ADD("tilegen1", tattass_deco16ic_tilegen1_intf) @@ -2185,7 +2185,7 @@ static MACHINE_CONFIG_START( tattass, deco32_state ) MCFG_DEVICE_ADD("spritegen2", decospr_, 0) decospr_device_config::set_gfx_region(device, 4); - + MCFG_GFXDECODE(tattass) MCFG_PALETTE_LENGTH(2048) diff --git a/src/mame/drivers/deco_ld.c b/src/mame/drivers/deco_ld.c index 67976b1e263..0a1ff9ec9a0 100644 --- a/src/mame/drivers/deco_ld.c +++ b/src/mame/drivers/deco_ld.c @@ -164,7 +164,7 @@ static READ8_HANDLER( laserdisc_r ) { deco_ld_state *state = space->machine().driver_data<deco_ld_state>(); UINT8 result = laserdisc_data_r(state->m_laserdisc); -// mame_printf_debug("laserdisc_r = %02X\n", result); +// mame_printf_debug("laserdisc_r = %02X\n", result); return result; } diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index 6e5d2bc024d..6cc1060f06f 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -234,7 +234,7 @@ static MACHINE_CONFIG_START( dietgo, dietgo_state ) MCFG_DEVICE_ADD("spritegen", decospr_, 0) decospr_device_config::set_gfx_region(device, 2); - + /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/esd16.c b/src/mame/drivers/esd16.c index 76a37659b79..66b994dc14f 100644 --- a/src/mame/drivers/esd16.c +++ b/src/mame/drivers/esd16.c @@ -181,8 +181,8 @@ static ADDRESS_MAP_START( mchampdx_map, AS_PROGRAM, 16 ) AM_RANGE(0x600800, 0x600807) AM_WRITE(esd16_spriteram_w) // Sprites (Mirrored) AM_RANGE(0x700000, 0x700003) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_scroll_0) // Scroll AM_RANGE(0x700004, 0x700007) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_scroll_1) // - AM_RANGE(0x700008, 0x700009) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_x) // not used in mchampdx? - AM_RANGE(0x70000a, 0x70000b) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_y) // not used in mchampdx? + AM_RANGE(0x700008, 0x700009) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_x) // not used in mchampdx? + AM_RANGE(0x70000a, 0x70000b) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_y) // not used in mchampdx? AM_RANGE(0x70000c, 0x70000d) AM_WRITENOP // ?? AM_RANGE(0x70000e, 0x70000f) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_head_layersize) // ?? AM_RANGE(0xd00008, 0xd00009) AM_WRITE(hedpanic_platform_w) // not used in mchampdx? @@ -200,8 +200,8 @@ static ADDRESS_MAP_START( tangtang_map, AS_PROGRAM, 16 ) AM_RANGE(0x324000, 0x327fff) AM_WRITE(esd16_vram_1_w) AM_BASE_MEMBER(esd16_state, m_vram_1) // mirror? AM_RANGE(0x400000, 0x400003) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_scroll_0) // Scroll AM_RANGE(0x400004, 0x400007) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_scroll_1) // - AM_RANGE(0x400008, 0x400009) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_x) // not used in mchampdx? - AM_RANGE(0x40000a, 0x40000b) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_y) // not used in mchampdx? + AM_RANGE(0x400008, 0x400009) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_x) // not used in mchampdx? + AM_RANGE(0x40000a, 0x40000b) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_headpanic_platform_y) // not used in mchampdx? AM_RANGE(0x40000c, 0x40000d) AM_WRITENOP // ?? AM_RANGE(0x40000e, 0x40000f) AM_WRITEONLY AM_BASE_MEMBER(esd16_state, m_head_layersize) // ?? AM_RANGE(0x500000, 0x500001) AM_WRITENOP // IRQ Ack diff --git a/src/mame/drivers/funkyjet.c b/src/mame/drivers/funkyjet.c index af343df3e2b..339fbf5be06 100644 --- a/src/mame/drivers/funkyjet.c +++ b/src/mame/drivers/funkyjet.c @@ -293,7 +293,7 @@ static const deco16ic_interface funkyjet_deco16ic_tilegen1_intf = 0x0f, 0x0f, /* trans masks (default values) */ 0, 16, /* color base (default values) */ 0x0f, 0x0f, /* color masks (default values) */ - NULL, NULL, + NULL, NULL, 0,1, }; diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index cc9b81daf7f..76a7b6d4f05 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -23,7 +23,7 @@ There is another Karnov rom set - a bootleg version of the Japanese roms with the Data East copyright removed - not supported because the original Japanese roms work fine. - ^^ This should be added (DH, 30/03/11) + ^^ This should be added (DH, 30/03/11) One of the two color PROMs for chelnov and chelnoj is different; one is most likely a bad read, but I don't know which one. diff --git a/src/mame/drivers/konamim2.c b/src/mame/drivers/konamim2.c index a56d75b1b0f..0d4da9bad76 100644 --- a/src/mame/drivers/konamim2.c +++ b/src/mame/drivers/konamim2.c @@ -353,7 +353,7 @@ static WRITE64_HANDLER(unk4_w) { if (data & 0x800000) { -// mame_printf_debug("CPU '%s': CPU1 IRQ at %08X\n", space->device().tag(), cpu_get_pc(&space->device())); +// mame_printf_debug("CPU '%s': CPU1 IRQ at %08X\n", space->device().tag(), cpu_get_pc(&space->device())); cputag_set_input_line(space->machine(), "sub", INPUT_LINE_IRQ0, ASSERT_LINE); } @@ -433,11 +433,11 @@ static WRITE64_HANDLER(unk4000010_w) { if ((data & 0xff) == 0xd) { -// mame_printf_debug("\n"); +// mame_printf_debug("\n"); } else { -// mame_printf_debug("%c", (UINT8)(data & 0xff)); +// mame_printf_debug("%c", (UINT8)(data & 0xff)); } } @@ -525,7 +525,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_status_bytes[0] = 0x04; state->m_cde_status_byte_ptr = 0; -// mame_printf_debug("CDE: SET SPEED %02X, %02X\n", state->m_cde_command_bytes[1], state->m_cde_command_bytes[2]); +// mame_printf_debug("CDE: SET SPEED %02X, %02X\n", state->m_cde_command_bytes[1], state->m_cde_command_bytes[2]); break; } case 0x06: // Audio Format / Data Format @@ -537,11 +537,11 @@ static void cde_handle_command(running_machine &machine) if (state->m_cde_command_bytes[1] == 0x00) // Audio Format { -// mame_printf_debug("CDE: AUDIO FORMAT\n"); +// mame_printf_debug("CDE: AUDIO FORMAT\n"); } else if (state->m_cde_command_bytes[1] == 0x78) // Data Format { -// mame_printf_debug("CDE: DATA FORMAT\n"); +// mame_printf_debug("CDE: DATA FORMAT\n"); } else { @@ -558,16 +558,16 @@ static void cde_handle_command(running_machine &machine) if (state->m_cde_command_bytes[1] == 0x00) // Eject { -// mame_printf_debug("CDE: EJECT command\n"); +// mame_printf_debug("CDE: EJECT command\n"); } else if (state->m_cde_command_bytes[1] == 0x02) // Pause { -// mame_printf_debug("CDE: PAUSE command\n"); +// mame_printf_debug("CDE: PAUSE command\n"); state->m_cde_drive_state = CDE_DRIVE_STATE_PAUSED; } else if (state->m_cde_command_bytes[1] == 0x03) // Play { -// mame_printf_debug("CDE: PLAY command\n"); +// mame_printf_debug("CDE: PLAY command\n"); } else { @@ -584,7 +584,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_drive_state = CDE_DRIVE_STATE_SEEK_DONE; -// mame_printf_debug("CDE: SEEK %08X\n", (state->m_cde_command_bytes[1] << 16) | (state->m_cde_command_bytes[2] << 8) | (state->m_cde_command_bytes[3])); +// mame_printf_debug("CDE: SEEK %08X\n", (state->m_cde_command_bytes[1] << 16) | (state->m_cde_command_bytes[2] << 8) | (state->m_cde_command_bytes[3])); break; } case 0x0b: // Get Drive State @@ -605,7 +605,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_enable_seek_reports = 0; } -// mame_printf_debug("CDE: GET DRIVE STATE %02X\n", state->m_cde_command_bytes[1]); +// mame_printf_debug("CDE: GET DRIVE STATE %02X\n", state->m_cde_command_bytes[1]); break; } case 0x0c: // ? @@ -625,7 +625,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_enable_qchannel_reports = 0; } -// mame_printf_debug("CDE: UNKNOWN CMD 0x0c %02X\n", state->m_cde_command_bytes[1]); +// mame_printf_debug("CDE: UNKNOWN CMD 0x0c %02X\n", state->m_cde_command_bytes[1]); break; } case 0x0d: // Get Switch State @@ -637,7 +637,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_status_bytes[2] = 0x02; state->m_cde_status_byte_ptr = 0; -// mame_printf_debug("CDE: GET SWITCH STATE %02X\n", state->m_cde_command_bytes[1]); +// mame_printf_debug("CDE: GET SWITCH STATE %02X\n", state->m_cde_command_bytes[1]); break; } case 0x21: // Mech type @@ -655,7 +655,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_status_byte_ptr = 0; -// mame_printf_debug("CDE: MECH TYPE %02X, %02X, %02X\n", state->m_cde_command_bytes[1], state->m_cde_command_bytes[2], state->m_cde_command_bytes[3]); +// mame_printf_debug("CDE: MECH TYPE %02X, %02X, %02X\n", state->m_cde_command_bytes[1], state->m_cde_command_bytes[2], state->m_cde_command_bytes[3]); break; } case 0x83: // Read ID @@ -677,7 +677,7 @@ static void cde_handle_command(running_machine &machine) state->m_cde_status_byte_ptr = 0; -// mame_printf_debug("CDE: READ ID\n"); +// mame_printf_debug("CDE: READ ID\n"); break; } default: @@ -704,7 +704,7 @@ static void cde_handle_reports(running_machine &machine) state->m_cde_command_bytes[0] = 0x0c; -// mame_printf_debug("CDE: SEEK REPORT\n"); +// mame_printf_debug("CDE: SEEK REPORT\n"); } break; } @@ -800,7 +800,7 @@ static void cde_handle_reports(running_machine &machine) state->m_cde_status_byte_ptr = 0; state->m_cde_command_bytes[0] = 0x0c; -// mame_printf_debug("CDE: QCHANNEL REPORT\n"); +// mame_printf_debug("CDE: QCHANNEL REPORT\n"); break; } } @@ -961,7 +961,7 @@ static WRITE64_HANDLER(cde_w) case 0x300/4: // DMA Channel 0 enable { -// mame_printf_debug("CDE: DMA0 enable %08X\n", d); +// mame_printf_debug("CDE: DMA0 enable %08X\n", d); if (d & 0x20) { @@ -979,28 +979,28 @@ static WRITE64_HANDLER(cde_w) } case 0x308/4: // DMA Channel 0 destination address { -// mame_printf_debug("CDE: DMA0 dst addr %08X\n", d); +// mame_printf_debug("CDE: DMA0 dst addr %08X\n", d); state->m_cde_dma[0].dst_addr = d; break; } case 0x30c/4: // DMA Channel 0 length? { -// mame_printf_debug("CDE: DMA0 length %08X\n", d); +// mame_printf_debug("CDE: DMA0 length %08X\n", d); state->m_cde_dma[0].length = d; break; } case 0x318/4: // DMA Channel 0 next destination address { -// mame_printf_debug("CDE: DMA0 next dst addr %08X\n", d); +// mame_printf_debug("CDE: DMA0 next dst addr %08X\n", d); state->m_cde_dma[0].next_dst_addr = d; break; } case 0x31c/4: // DMA Channel 0 next length? { -// mame_printf_debug("CDE: DMA0 next length %08X\n", d); +// mame_printf_debug("CDE: DMA0 next length %08X\n", d); state->m_cde_dma[0].next_length = d; break; @@ -1008,33 +1008,33 @@ static WRITE64_HANDLER(cde_w) case 0x320/4: // DMA Channel 1 enable { -// mame_printf_debug("CDE: DMA1 enable %08X\n", d); +// mame_printf_debug("CDE: DMA1 enable %08X\n", d); break; } case 0x328/4: // DMA Channel 1 destination address { -// mame_printf_debug("CDE: DMA1 dst addr %08X\n", d); +// mame_printf_debug("CDE: DMA1 dst addr %08X\n", d); state->m_cde_dma[1].dst_addr = d; break; } case 0x32c/4: // DMA Channel 1 length? { -// mame_printf_debug("CDE: DMA1 length %08X\n", d); +// mame_printf_debug("CDE: DMA1 length %08X\n", d); state->m_cde_dma[1].length = d; break; } case 0x338/4: // DMA Channel 1 next destination address { -// mame_printf_debug("CDE: DMA1 next dst addr %08X\n", d); +// mame_printf_debug("CDE: DMA1 next dst addr %08X\n", d); state->m_cde_dma[1].next_dst_addr = d; break; } case 0x33c/4: // DMA Channel 1 next length? { -// mame_printf_debug("CDE: DMA1 next length %08X\n", d); +// mame_printf_debug("CDE: DMA1 next length %08X\n", d); state->m_cde_dma[1].next_length = d; break; diff --git a/src/mame/drivers/madmotor.c b/src/mame/drivers/madmotor.c index fb18d7dd1e2..42e703db3c1 100644 --- a/src/mame/drivers/madmotor.c +++ b/src/mame/drivers/madmotor.c @@ -38,13 +38,13 @@ static WRITE16_HANDLER( madmotor_sound_w ) /******************************************************************************/ - + static ADDRESS_MAP_START( madmotor_map, AS_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x180000, 0x180007) AM_DEVWRITE("tilegen1", deco_bac06_pf_control_0_w) /* text layer */ AM_RANGE(0x180010, 0x180017) AM_DEVWRITE("tilegen1", deco_bac06_pf_control_1_w) AM_RANGE(0x184000, 0x18407f) AM_DEVREADWRITE("tilegen1", deco_bac06_pf_colscroll_r, deco_bac06_pf_colscroll_w) - AM_RANGE(0x184080, 0x1843ff) AM_RAM + AM_RANGE(0x184080, 0x1843ff) AM_RAM AM_RANGE(0x184400, 0x1847ff) AM_DEVREADWRITE("tilegen1", deco_bac06_pf_rowscroll_r, deco_bac06_pf_rowscroll_w) AM_RANGE(0x188000, 0x189fff) AM_DEVREADWRITE("tilegen1", deco_bac06_pf_data_r, deco_bac06_pf_data_w) AM_RANGE(0x18c000, 0x18c001) AM_NOP diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 681cc4788be..86a97e22152 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -79,7 +79,7 @@ static SCREEN_UPDATE( mirage ) flip_screen_set(screen->machine(), BIT(flip, 7)); - screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, screen->machine().generic.buffered_spriteram.u16, 0x400); + screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, screen->machine().generic.buffered_spriteram.u16, 0x400); deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll); diff --git a/src/mame/drivers/pktgaldx.c b/src/mame/drivers/pktgaldx.c index f4f3bf2ce35..27ee5a65073 100644 --- a/src/mame/drivers/pktgaldx.c +++ b/src/mame/drivers/pktgaldx.c @@ -349,7 +349,7 @@ static MACHINE_CONFIG_START( pktgaldx, pktgaldx_state ) MCFG_DECOCOMN_ADD("deco_common", pktgaldx_decocomn_intf) MCFG_DECO16IC_ADD("tilegen1", pktgaldx_deco16ic_tilegen1_intf) - + MCFG_DEVICE_ADD("spritegen", decospr_, 0) decospr_device_config::set_gfx_region(device, 2); diff --git a/src/mame/drivers/simpl156.c b/src/mame/drivers/simpl156.c index 85005e2d336..cfa3f7fffd9 100644 --- a/src/mame/drivers/simpl156.c +++ b/src/mame/drivers/simpl156.c @@ -251,7 +251,7 @@ static WRITE32_HANDLER( simpl156_pf2_rowscroll_w ) static ADDRESS_MAP_START( joemacr_map, AS_PROGRAM, 32 ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x100000, 0x107fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, m_mainram) // main ram - AM_RANGE(0x110000, 0x111fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) + AM_RANGE(0x110000, 0x111fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_RANGE(0x120000, 0x120fff) AM_READWRITE(simpl156_palette_r, simpl156_palette_w) AM_RANGE(0x130000, 0x130003) AM_READWRITE(simpl156_system_r, simpl156_eeprom_w) AM_RANGE(0x140000, 0x14001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w) @@ -275,7 +275,7 @@ static ADDRESS_MAP_START( chainrec_map, AS_PROGRAM, 32 ) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, m_systemram) // work ram (32-bit) AM_RANGE(0x3c0000, 0x3c0003) AM_DEVREADWRITE8_MODERN("okimusic", okim6295_device, read, write, 0x000000ff) AM_RANGE(0x400000, 0x407fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, m_mainram) // main ram? - AM_RANGE(0x410000, 0x411fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) + AM_RANGE(0x410000, 0x411fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_RANGE(0x420000, 0x420fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) AM_RANGE(0x430000, 0x430003) AM_READWRITE(simpl156_system_r,simpl156_eeprom_w) AM_RANGE(0x440000, 0x44001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w) @@ -296,7 +296,7 @@ static ADDRESS_MAP_START( magdrop_map, AS_PROGRAM, 32 ) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, m_systemram) // work ram (32-bit) AM_RANGE(0x340000, 0x340003) AM_DEVREADWRITE8_MODERN("okimusic", okim6295_device, read, write, 0x000000ff) AM_RANGE(0x380000, 0x387fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, m_mainram) // main ram? - AM_RANGE(0x390000, 0x391fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) + AM_RANGE(0x390000, 0x391fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_RANGE(0x3a0000, 0x3a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) AM_RANGE(0x3b0000, 0x3b0003) AM_READWRITE(simpl156_system_r,simpl156_eeprom_w) AM_RANGE(0x3c0000, 0x3c001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w) @@ -317,7 +317,7 @@ static ADDRESS_MAP_START( magdropp_map, AS_PROGRAM, 32 ) AM_RANGE(0x201000, 0x201fff) AM_RAM AM_BASE_MEMBER(simpl156_state, m_systemram) // work ram (32-bit) AM_RANGE(0x4c0000, 0x4c0003) AM_DEVREADWRITE8_MODERN("okimusic", okim6295_device, read, write, 0x000000ff) AM_RANGE(0x680000, 0x687fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, m_mainram) // main ram? - AM_RANGE(0x690000, 0x691fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) + AM_RANGE(0x690000, 0x691fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_RANGE(0x6a0000, 0x6a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) AM_RANGE(0x6b0000, 0x6b0003) AM_READWRITE(simpl156_system_r,simpl156_eeprom_w) AM_RANGE(0x6c0000, 0x6c001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w) @@ -337,7 +337,7 @@ static ADDRESS_MAP_START( mitchell156_map, AS_PROGRAM, 32 ) AM_RANGE(0x100000, 0x100003) AM_DEVREADWRITE8_MODERN("okisfx", okim6295_device, read, write, 0x000000ff) AM_RANGE(0x140000, 0x140003) AM_DEVREADWRITE8_MODERN("okimusic", okim6295_device, read, write, 0x000000ff) AM_RANGE(0x180000, 0x187fff) AM_READWRITE(simpl156_mainram_r, simpl156_mainram_w) AM_BASE_MEMBER(simpl156_state, m_mainram) // main ram - AM_RANGE(0x190000, 0x191fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) + AM_RANGE(0x190000, 0x191fff) AM_READWRITE(simpl156_spriteram_r, simpl156_spriteram_w) AM_RANGE(0x1a0000, 0x1a0fff) AM_READWRITE(simpl156_palette_r,simpl156_palette_w) AM_RANGE(0x1b0000, 0x1b0003) AM_READWRITE(simpl156_system_r,simpl156_eeprom_w) AM_RANGE(0x1c0000, 0x1c001f) AM_DEVREADWRITE("tilegen1", deco16ic_pf_control_dword_r, deco16ic_pf_control_dword_w) diff --git a/src/mame/drivers/ssv.c b/src/mame/drivers/ssv.c index f6dc7a3f42c..40884dea74f 100644 --- a/src/mame/drivers/ssv.c +++ b/src/mame/drivers/ssv.c @@ -417,7 +417,7 @@ static READ16_HANDLER( fake_r ) { return ssv_scroll[offset]; } AM_RANGE(0x160000, 0x17ffff) AM_RAM /* */ \ AM_RANGE(0x1c0000, 0x1c0001) AM_READ(ssv_vblank_r ) /* Vblank? */ \ /**/AM_RANGE(0x1c0002, 0x1c007f) AM_READONLY /* Scroll */ \ - AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE_MEMBER(ssv_state, m_scroll) /* Scroll */ \ + AM_RANGE(0x1c0000, 0x1c007f) AM_WRITE(ssv_scroll_w) AM_BASE_MEMBER(ssv_state, m_scroll) /* Scroll */ \ AM_RANGE(0x210002, 0x210003) AM_READ_PORT("DSW1") \ AM_RANGE(0x210004, 0x210005) AM_READ_PORT("DSW2") \ AM_RANGE(0x210008, 0x210009) AM_READ_PORT("P1") \ diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 67f60c71270..53340efd3db 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -4,7 +4,7 @@ Emulation by Bryan McPhail, mish@tendril.co.uk - Are the colours correct on the scoreboard screen? they look strange + Are the colours correct on the scoreboard screen? they look strange ***************************************************************************/ diff --git a/src/mame/drivers/suprgolf.c b/src/mame/drivers/suprgolf.c index 6c4a0002d2b..c01fe9c3378 100644 --- a/src/mame/drivers/suprgolf.c +++ b/src/mame/drivers/suprgolf.c @@ -257,7 +257,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) //popmessage("%08x %02x",((data & 0x3f) * 0x4000),data); -// mame_printf_debug("ROM_BANK 0x8000 - %X @%X\n",data,cpu_get_previouspc(&space->device())); +// mame_printf_debug("ROM_BANK 0x8000 - %X @%X\n",data,cpu_get_previouspc(&space->device())); memory_set_bankptr(space->machine(), "bank2", region_base + (data&0x3f ) * 0x4000); state->m_msm_nmi_mask = data & 0x40; @@ -267,7 +267,7 @@ static WRITE8_HANDLER( rom_bank_select_w ) static WRITE8_HANDLER( rom2_bank_select_w ) { UINT8 *region_base = space->machine().region("user2")->base(); -// mame_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,cpu_get_previouspc(&space->device())); +// mame_printf_debug("ROM_BANK 0x4000 - %X @%X\n",data,cpu_get_previouspc(&space->device())); memory_set_bankptr(space->machine(), "bank1", region_base + (data&0x0f ) * 0x4000); diff --git a/src/mame/includes/actfancr.h b/src/mame/includes/actfancr.h index 4bf51d69ee7..5b5b7a49b10 100644 --- a/src/mame/includes/actfancr.h +++ b/src/mame/includes/actfancr.h @@ -14,7 +14,7 @@ public: UINT8 * m_main_ram; // UINT8 * m_spriteram; // currently this uses buffered_spriteram // UINT8 * m_paletteram; // currently this uses generic palette handling - UINT16 m_spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code + UINT16 m_spriteram16[0x800/2]; // a 16-bit copy of spriteram for use with the MXC06 code /* video-related */ int m_flipscreen; diff --git a/src/mame/includes/deco32.h b/src/mame/includes/deco32.h index 9768ca4aed6..ac515941d5f 100644 --- a/src/mame/includes/deco32.h +++ b/src/mame/includes/deco32.h @@ -22,7 +22,7 @@ public: int m_ace_ram_dirty; int m_has_ace_ram; UINT32 *m_ace_ram; - + UINT8 *m_dirty_palette; int m_pri; @@ -42,7 +42,7 @@ public: UINT32 *m_pf2_rowscroll32; UINT32 *m_pf3_rowscroll32; UINT32 *m_pf4_rowscroll32; - + device_t *m_deco_tilegen1; device_t *m_deco_tilegen2; }; diff --git a/src/mame/includes/m62.h b/src/mame/includes/m62.h index 5d0f8634de4..ee75202574a 100644 --- a/src/mame/includes/m62.h +++ b/src/mame/includes/m62.h @@ -27,7 +27,7 @@ public: /* misc */ int m_ldrun2_bankswap; //ldrun2 - int m_bankcontrol[2]; //ldrun2 + int m_bankcontrol[2]; //ldrun2 }; diff --git a/src/mame/includes/macrossp.h b/src/mame/includes/macrossp.h index 6739df0ec67..b950853c2de 100644 --- a/src/mame/includes/macrossp.h +++ b/src/mame/includes/macrossp.h @@ -36,7 +36,7 @@ public: int m_sndpending; int m_snd_toggle; INT32 m_fade_effect; - INT32 m_old_fade; + INT32 m_old_fade; /* devices */ device_t *m_maincpu; diff --git a/src/mame/includes/sshangha.h b/src/mame/includes/sshangha.h index d90b3faf404..fb40f5f5c3e 100644 --- a/src/mame/includes/sshangha.h +++ b/src/mame/includes/sshangha.h @@ -14,12 +14,12 @@ public: UINT16* m_pf1_rowscroll; UINT16* m_pf2_rowscroll; - + UINT16* m_sprite_paletteram; UINT16* m_sprite_paletteram2; UINT16* m_tile_paletteram1; UINT16* m_tile_paletteram2; - + required_device<deco16ic_device> m_deco_tilegen1; }; diff --git a/src/mame/includes/turbo.h b/src/mame/includes/turbo.h index ead8266b42c..d6bf925ad8e 100644 --- a/src/mame/includes/turbo.h +++ b/src/mame/includes/turbo.h @@ -48,7 +48,7 @@ public: /* Turbo-specific states */ UINT8 m_turbo_opa; UINT8 m_turbo_opb; - UINT8 m_turbo_opc; + UINT8 m_turbo_opc; UINT8 m_turbo_ipa; UINT8 m_turbo_ipb; UINT8 m_turbo_ipc; diff --git a/src/mame/machine/harddriv.c b/src/mame/machine/harddriv.c index 6673e91d953..7e67481123f 100644 --- a/src/mame/machine/harddriv.c +++ b/src/mame/machine/harddriv.c @@ -1853,9 +1853,9 @@ READ16_HANDLER( stmsp_speedup_r ) state->m_stmsp_sync[0][2] == 0 && /* 80030 */ state->m_stmsp_sync[0][3] == 0 && /* 80040 */ state->m_stmsp_sync[0][4] == 0 && /* 80050 */ - state->m_stmsp_sync[0][5] == 0 && /* 80060 */ - state->m_stmsp_sync[0][6] == 0 && /* 80070 */ - state->m_stmsp_sync[1][0] == 0 && /* 99680 */ + state->m_stmsp_sync[0][5] == 0 && /* 80060 */ + state->m_stmsp_sync[0][6] == 0 && /* 80070 */ + state->m_stmsp_sync[1][0] == 0 && /* 99680 */ state->m_stmsp_sync[2][0] == 0xffff && /* 99d30 */ state->m_stmsp_sync[2][1] == 0xffff && /* 99d40 */ state->m_stmsp_sync[2][2] == 0 && /* 99d50 */ diff --git a/src/mame/machine/snes.c b/src/mame/machine/snes.c index 85c2bed3b80..75c06730569 100644 --- a/src/mame/machine/snes.c +++ b/src/mame/machine/snes.c @@ -582,10 +582,10 @@ READ8_HANDLER( snes_r_io ) // case 0x420c: //PC: 9c7d - 8fab //only nss_ssoc default: -// mame_printf_debug("snes_r: offset = %x pc = %x\n",offset,cpu_get_pc(&space->device())); +// mame_printf_debug("snes_r: offset = %x pc = %x\n",offset,cpu_get_pc(&space->device())); // Added break; after commenting above line. If uncommenting, drop the break; break; - + #endif /* MESS */ } diff --git a/src/mame/video/cbuster.c b/src/mame/video/cbuster.c index 31b1967188a..fa2abd468cd 100644 --- a/src/mame/video/cbuster.c +++ b/src/mame/video/cbuster.c @@ -54,7 +54,7 @@ SCREEN_UPDATE( twocrude ) flip_screen_set(screen->machine(), !BIT(flip, 7)); - screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffer, 0x400); + screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffer, 0x400); deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll); diff --git a/src/mame/video/cninja.c b/src/mame/video/cninja.c index 6802c4a3643..aa43a914423 100644 --- a/src/mame/video/cninja.c +++ b/src/mame/video/cninja.c @@ -276,7 +276,7 @@ SCREEN_UPDATE( mutantf ) deco16ic_tilemap_2_draw(state->m_deco_tilegen2, bitmap, cliprect, TILEMAP_DRAW_OPAQUE, 0); deco16ic_tilemap_2_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 0); deco16ic_tilemap_1_draw(state->m_deco_tilegen2, bitmap, cliprect, 0, 0); - + if (priority & 1) { diff --git a/src/mame/video/darkseal.c b/src/mame/video/darkseal.c index 3e40285b812..17b317d2ab1 100644 --- a/src/mame/video/darkseal.c +++ b/src/mame/video/darkseal.c @@ -3,7 +3,7 @@ Dark Seal Video emulation - Bryan McPhail, mish@tendril.co.uk **************************************************************************** - + uses 2x DECO55 tilemaps ************************************************************************** @@ -71,7 +71,7 @@ SCREEN_UPDATE( darkseal ) deco16ic_tilemap_1_draw(state->m_deco_tilegen2, bitmap, cliprect, 0, 0); deco16ic_tilemap_2_draw(state->m_deco_tilegen2, bitmap, cliprect, 0, 0); - + deco16ic_tilemap_1_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 0); screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, screen->machine().generic.buffered_spriteram.u16, 0x400); deco16ic_tilemap_2_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 0); diff --git a/src/mame/video/dec8.c b/src/mame/video/dec8.c index 8149482d470..5967ea23442 100644 --- a/src/mame/video/dec8.c +++ b/src/mame/video/dec8.c @@ -313,7 +313,7 @@ VIDEO_START( cobracom ) state->m_game_uses_priority = 0; machine.device<deco_bac06_device>("tilegen1")->set_colmask(0x3); machine.device<deco_bac06_device>("tilegen2")->set_colmask(0x3); - + } /******************************************************************************/ diff --git a/src/mame/video/decbac06.c b/src/mame/video/decbac06.c index 390bc9c7b2f..cbcf12fca4d 100644 --- a/src/mame/video/decbac06.c +++ b/src/mame/video/decbac06.c @@ -179,7 +179,7 @@ void deco_bac06_device::create_tilemaps(int region8x8, int region16x16) pf16x16_tilemap[2] = tilemap_create_device(this, get_pf16x16_tile_info, tile_shape2_scan, 16, 16, 32, 64); } else - { + { pf16x16_tilemap[0] = tilemap_create_device(this, get_pf16x16_tile_info,tile_shape0_scan, 16,16, 64, 16); pf16x16_tilemap[1] = tilemap_create_device(this, get_pf16x16_tile_info,tile_shape1_scan, 16,16, 32, 32); pf16x16_tilemap[2] = tilemap_create_device(this, get_pf16x16_tile_info,tile_shape2_scan, 16,16, 16, 64); @@ -289,12 +289,12 @@ void deco_bac06_device::custom_tilemap_draw(running_machine &machine, p = *BITMAP_ADDR16(src_bitmap, (src_y + column_offset)&height_mask, src_x&width_mask); colpri = *BITMAP_ADDR8(flags_bitmap, (src_y + column_offset)&height_mask, src_x&width_mask)&0xf; - + src_x++; if ((flags&TILEMAP_DRAW_OPAQUE) || (p&m_bppmask)) { - + if ((p&penmask)==pencondition) if((colpri&colprimask)==colpricondition) *BITMAP_ADDR16(bitmap, y, x) = p+(colpri&m_gfxcolmask)*m_bppmult; diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h index ecdf8752601..8010258b10e 100644 --- a/src/mame/video/decbac06.h +++ b/src/mame/video/decbac06.h @@ -22,7 +22,7 @@ class deco_bac06_device : public device_t deco_bac06_device(running_machine &_machine, const deco_bac06_device_config &config); public: void set_gfxregion(int region8x8, int region16x16) { m_gfxregion8x8 = region8x8; m_gfxregion16x16 = region16x16; }; - + UINT16* pf_data; UINT16* pf_rowscroll, *pf_colscroll; @@ -65,7 +65,7 @@ protected: const UINT16 *control1, int flags, UINT16 penmask, UINT16 pencondition,UINT16 colprimask, UINT16 colpricondition); - + private: diff --git a/src/mame/video/deckarn.c b/src/mame/video/deckarn.c index 38079cdf81c..5b1ad977e63 100644 --- a/src/mame/video/deckarn.c +++ b/src/mame/video/deckarn.c @@ -36,7 +36,7 @@ deco_karnovsprites_device::deco_karnovsprites_device(running_machine &_machine, void deco_karnovsprites_device::device_start() { - + } void deco_karnovsprites_device::device_reset() diff --git a/src/mame/video/decmxc06.c b/src/mame/video/decmxc06.c index 841724c2382..ba8b2564294 100644 --- a/src/mame/video/decmxc06.c +++ b/src/mame/video/decmxc06.c @@ -91,7 +91,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_t *bitmap w = (1 << ((sy & 0x0600) >> 9)); /* 1x, 2x, 4x, 8x width */ /* multi width used only on the title screen? */ - + sx = sx & 0x01ff; sy = sy & 0x01ff; @@ -100,7 +100,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_t *bitmap sx = 240 - sx; sy = 240 - sy; - + if (flip_screen_get(machine)) { sy = 240 - sy; @@ -118,7 +118,7 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_t *bitmap code = spriteram[offs + 1] & 0x1fff; code &= ~(h-1); - + if (flipy) incy = -1; else @@ -146,14 +146,14 @@ void deco_mxc06_device::draw_sprites( running_machine &machine, bitmap_t *bitmap { if (pri_mask && (color >= pri_val)) continue; - + if (!pri_mask && !(color >= pri_val)) continue; draw = 1; } } - + if (draw) { drawgfx_transpen(bitmap,cliprect,machine.gfx[m_gfxregion], diff --git a/src/mame/video/deco16ic.c b/src/mame/video/deco16ic.c index c411ceb959e..5d93e2cb624 100644 --- a/src/mame/video/deco16ic.c +++ b/src/mame/video/deco16ic.c @@ -1,11 +1,11 @@ /******************************************************************************** - deco16ic.c + deco16ic.c Implementation of Data East tilemap ICs - Data East IC 55 / 56 / 74 / 141 + Data East IC 55 / 56 / 74 / 141 - original work by Bryan McPhail, various updates David Haywood + original work by Bryan McPhail, various updates David Haywood Data East video emulation & information by Bryan McPhail, mish@tendril.co.uk (c) 2000-2005 Bryan McPhail Please send me any additions to the table below. @@ -147,15 +147,15 @@ Rowscroll style: 2010-02: Converted to be a device. TODO: - - convert to c++ device - - should the decryption functions for the tilemap chips be here too? + - convert to c++ device + - should the decryption functions for the tilemap chips be here too? - it seems overall height / width of the tilemaps can be configured somehow - darkseal clearly needs 64 rows, whereas other games need 32. + it seems overall height / width of the tilemaps can be configured somehow + darkseal clearly needs 64 rows, whereas other games need 32. - width seems configurable in a similar way, with nitroball and lockload - needing narrower tilemaps. lockload/dragngun might be a good study case - as they run on the same harwdare, and both rely on different behavior. + width seems configurable in a similar way, with nitroball and lockload + needing narrower tilemaps. lockload/dragngun might be a good study case + as they run on the same harwdare, and both rely on different behavior. ***************************************************************************/ @@ -280,7 +280,7 @@ static TILE_GET_INFO_DEVICE( get_pf1_tile_info ) flags); } else - { + { SET_TILE_INFO_DEVICE( deco16ic->pf12_16x16_gfx_bank, (tile & 0xfff) | deco16ic->pf1_bank, @@ -399,7 +399,7 @@ static void custom_tilemap_draw( width_mask = src_bitmap0->width - 1; height_mask = src_bitmap0->height - 1; src_y = scrolly + starty; - + for (y = starty; y < endy; y++) { @@ -423,7 +423,7 @@ static void custom_tilemap_draw( if (src_bitmap1) { - p |= (*BITMAP_ADDR16(src_bitmap1, (src_y + column_offset) & height_mask, src_x) & combine_mask) << combine_shift; + p |= (*BITMAP_ADDR16(src_bitmap1, (src_y + column_offset) & height_mask, src_x) & combine_mask) << combine_shift; } src_x = (src_x + 1) & width_mask; @@ -462,7 +462,7 @@ static void custom_tilemap_draw( { UINT16 p2 = *BITMAP_ADDR16(src_bitmap1, (src_y + column_offset) & height_mask, src_x); p = 0x200+( ((p&0x30)<<4) | (p&0x0f) | ((p2 & 0x0f)<<4)); - } + } } src_x = (src_x + 1) & width_mask; @@ -560,7 +560,7 @@ WRITE16_DEVICE_HANDLER( deco16ic_pf1_data_w ) COMBINE_DATA(&deco16ic->pf1_data[offset]); tilemap_mark_tile_dirty(deco16ic->pf1_tilemap_8x8, offset); -// if (offset < 0x800) +// if (offset < 0x800) tilemap_mark_tile_dirty(deco16ic->pf1_tilemap_16x16, offset); } @@ -571,7 +571,7 @@ WRITE16_DEVICE_HANDLER( deco16ic_pf2_data_w ) COMBINE_DATA(&deco16ic->pf2_data[offset]); tilemap_mark_tile_dirty(deco16ic->pf2_tilemap_8x8, offset); -// if (offset < 0x800) +// if (offset < 0x800) tilemap_mark_tile_dirty(deco16ic->pf2_tilemap_16x16, offset); } @@ -928,7 +928,7 @@ static DEVICE_START( deco16ic ) fullwidth = 1; deco16ic->pf1_tilemap_16x16 = tilemap_create_device(device, get_pf1_tile_info, deco16_scan_rows, 16, 16, fullwidth ? 64 : 32, fullheight ?64 : 32); -// deco16ic->pf1_tilemap_8x8 = tilemap_create_device(device, get_pf1_tile_info_b, tilemap_scan_rows, 8, 8, intf->full_width12 ? 64 : 32, 32); +// deco16ic->pf1_tilemap_8x8 = tilemap_create_device(device, get_pf1_tile_info_b, tilemap_scan_rows, 8, 8, intf->full_width12 ? 64 : 32, 32); deco16ic->pf1_tilemap_8x8 = tilemap_create_device(device, get_pf1_tile_info_b, tilemap_scan_rows, 8, 8, 64 , 32); // nitroball deco16ic->pf12_8x8_gfx_bank = intf->_8x8_gfxregion; @@ -940,7 +940,7 @@ static DEVICE_START( deco16ic ) deco16ic->pf2_tilemap_16x16 = tilemap_create_device(device, get_pf2_tile_info, deco16_scan_rows, 16, 16, fullwidth ? 64 : 32, fullheight ? 64 : 32); deco16ic->pf2_tilemap_8x8 = tilemap_create_device(device, get_pf2_tile_info_b, tilemap_scan_rows, 8, 8, fullwidth ? 64 : 32, fullheight ? 64 : 32); - + tilemap_set_transparent_pen(deco16ic->pf1_tilemap_8x8, 0); tilemap_set_transparent_pen(deco16ic->pf2_tilemap_8x8, 0); tilemap_set_transparent_pen(deco16ic->pf1_tilemap_16x16, 0); diff --git a/src/mame/video/deco16ic.h b/src/mame/video/deco16ic.h index b834d1714ff..81853ac453d 100644 --- a/src/mame/video/deco16ic.h +++ b/src/mame/video/deco16ic.h @@ -3,7 +3,7 @@ deco16ic.h Implementation of Data East tilemap ICs - Data East IC 55 / 56 / 74 / 141 + Data East IC 55 / 56 / 74 / 141 **************************************************************************/ diff --git a/src/mame/video/deco32.c b/src/mame/video/deco32.c index 3fbb9a13e52..87b386fe5aa 100644 --- a/src/mame/video/deco32.c +++ b/src/mame/video/deco32.c @@ -548,7 +548,7 @@ VIDEO_START( dragngun ) { dragngun_state *state = machine.driver_data<dragngun_state>(); state->m_dirty_palette = auto_alloc_array(machine, UINT8, 4096); - + memset(state->m_dirty_palette,0,4096); state_save_register_global(machine, state->m_dragngun_sprite_ctrl); @@ -590,7 +590,7 @@ SCREEN_EOF( captaven ) SCREEN_EOF( dragngun ) { - + } @@ -628,7 +628,7 @@ SCREEN_UPDATE( captaven ) deco16ic_tilemap_1_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 4); screen->machine().device<decospr_device>("spritegen")->set_alt_format(true); - screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x400); + screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x400); return 0; } @@ -653,7 +653,7 @@ SCREEN_UPDATE( dragngun ) // zooming sprite draw is very slow, and sprites are buffered.. however, one of the levels attempts to use // partial updates for every line, which causes things to be very slow... the sprites appear to support // multiple layers of alpha, so rendering to a buffer for layer isn't easy (maybe there are multiple sprite - // chips at work?) + // chips at work?) // // really, it needs optimizing .. the raster effects also need fixing properly, they're not correct using // partial updates right now but the old buffering of scroll values was a hack and doesn't work properly @@ -689,7 +689,7 @@ SCREEN_UPDATE( fghthist ) deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll); deco16ic_pf_update(state->m_deco_tilegen2, state->m_pf3_rowscroll, state->m_pf4_rowscroll); - screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x800, true); + screen->machine().device<decospr_device>("spritegen")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x800, true); /* Draw screen */ deco16ic_tilemap_2_draw(state->m_deco_tilegen2, bitmap, cliprect, 0, 1); @@ -733,7 +733,7 @@ static void mixDualAlphaSprites(bitmap_t *bitmap, const rectangle *cliprect, con bitmap_t* sprite0_mix_bitmap = machine.device<decospr_device>("spritegen1")->get_sprite_temp_bitmap(); bitmap_t* sprite1_mix_bitmap = machine.device<decospr_device>("spritegen2")->get_sprite_temp_bitmap(); - + /* Mix sprites into main bitmap, based on priority & alpha */ for (y=8; y<248; y++) { UINT8* tilemapPri=BITMAP_ADDR8(machine.priority_bitmap, y, 0); @@ -879,10 +879,10 @@ SCREEN_UPDATE( nslasher ) screen->machine().device<decospr_device>("spritegen1")->set_pix_raw_shift(8); screen->machine().device<decospr_device>("spritegen2")->set_pix_raw_shift(8); - screen->machine().device<decospr_device>("spritegen1")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x800, true); - screen->machine().device<decospr_device>("spritegen2")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_2_buffered, 0x800, true); + screen->machine().device<decospr_device>("spritegen1")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_buffered, 0x800, true); + screen->machine().device<decospr_device>("spritegen2")->draw_sprites(screen->machine(), bitmap, cliprect, state->m_spriteram16_2_buffered, 0x800, true); + - /* Render alpha-blended tilemap to seperate buffer for proper mixing */ bitmap_fill(state->m_tilemap_alpha_bitmap,cliprect,0); diff --git a/src/mame/video/decocomn.c b/src/mame/video/decocomn.c index ee70a81acb3..98adaa01d1b 100644 --- a/src/mame/video/decocomn.c +++ b/src/mame/video/decocomn.c @@ -1,6 +1,6 @@ /* Common DECO video functions (general, not sorted by IC) */ /* I think most of this stuff is driver specific and really shouldn't be in a device at all. - It was only put here because I wanted to split deco_tilegen1 to just be the device for the + It was only put here because I wanted to split deco_tilegen1 to just be the device for the tilemap chips, and not contain all this extra unrelated stuff */ diff --git a/src/mame/video/madmotor.c b/src/mame/video/madmotor.c index a7277b85736..b99e8baad27 100644 --- a/src/mame/video/madmotor.c +++ b/src/mame/video/madmotor.c @@ -27,7 +27,7 @@ SCREEN_UPDATE( madmotor ) madmotor_state *state = screen->machine().driver_data<madmotor_state>(); flip_screen_set(screen->machine(), screen->machine().device<deco_bac06_device>("tilegen1")->get_flip_state()); -// tilemap_set_flip_all(screen->machine(), screen->machine().device<deco_bac06_device>("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); +// tilemap_set_flip_all(screen->machine(), screen->machine().device<deco_bac06_device>("tilegen1")->get_flip_state() ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen->machine().device<deco_bac06_device>("tilegen3")->deco_bac06_pf_draw(screen->machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); screen->machine().device<deco_bac06_device>("tilegen2")->deco_bac06_pf_draw(screen->machine(),bitmap,cliprect,0, 0x00, 0x00, 0x00, 0x00); diff --git a/src/mame/video/pcktgal.c b/src/mame/video/pcktgal.c index 4b170856f5e..aefbf9cb659 100644 --- a/src/mame/video/pcktgal.c +++ b/src/mame/video/pcktgal.c @@ -66,7 +66,7 @@ static void draw_sprites(running_machine &machine, bitmap_t *bitmap, const recta SCREEN_UPDATE( pcktgal ) { -// flip_screen_set(screen->machine(), screen->machine().device<deco_bac06_device>("tilegen1")->get_flip_state()); +// flip_screen_set(screen->machine(), screen->machine().device<deco_bac06_device>("tilegen1")->get_flip_state()); screen->machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen->machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); draw_sprites(screen->machine(), bitmap, cliprect); return 0; diff --git a/src/mame/video/realbrk.c b/src/mame/video/realbrk.c index b6ab91edcd3..a46352831e3 100644 --- a/src/mame/video/realbrk.c +++ b/src/mame/video/realbrk.c @@ -31,7 +31,7 @@ WRITE16_HANDLER( realbrk_flipscreen_w ) coin_counter_w(space->machine(), 0, data & 0x0001); coin_counter_w(space->machine(), 1, data & 0x0004); - flip_screen_set(space->machine(), data & 0x0080); + flip_screen_set(space->machine(), data & 0x0080); } if (ACCESSING_BITS_8_15) diff --git a/src/mame/video/sshangha.c b/src/mame/video/sshangha.c index b111c30e193..8a5590f9746 100644 --- a/src/mame/video/sshangha.c +++ b/src/mame/video/sshangha.c @@ -44,7 +44,7 @@ SCREEN_UPDATE( sshangha ) bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine())); deco16ic_pf_update(state->m_deco_tilegen1, state->m_pf1_rowscroll, state->m_pf2_rowscroll); - + /* the tilemap 4bpp + 4bpp = 8bpp mixing actually seems external to the tilemap, note video_control is not part of the tilemap chip */ if ((state->m_video_control&4)==0) { deco16ic_tilemap_12_combine_draw(state->m_deco_tilegen1, bitmap, cliprect, 0, 0, 1); diff --git a/src/mame/video/stadhero.c b/src/mame/video/stadhero.c index d0cc39c5906..7d43472add8 100644 --- a/src/mame/video/stadhero.c +++ b/src/mame/video/stadhero.c @@ -6,7 +6,7 @@ MXC-06 chip to produce sprites, see dec0.c BAC-06 chip for background - ??? for text layer + ??? for text layer ***************************************************************************/ @@ -22,7 +22,7 @@ SCREEN_UPDATE( stadhero ) { stadhero_state *state = screen->machine().driver_data<stadhero_state>(); -// tilemap_set_flip_all(screen->machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); +// tilemap_set_flip_all(screen->machine(),state->m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); screen->machine().device<deco_bac06_device>("tilegen1")->set_bppmultmask(0x8, 0x7); screen->machine().device<deco_bac06_device>("tilegen1")->deco_bac06_pf_draw(screen->machine(),bitmap,cliprect,TILEMAP_DRAW_OPAQUE, 0x00, 0x00, 0x00, 0x00); diff --git a/src/osd/sdl/input.c b/src/osd/sdl/input.c index ad01375dae1..d29a1071a79 100644 --- a/src/osd/sdl/input.c +++ b/src/osd/sdl/input.c @@ -1082,7 +1082,7 @@ static void sdlinput_register_keyboards(running_machine &machine) snprintf(defname, sizeof(defname)-1, "%s", key_trans_table[keynum].ui_name); // add the item to the device -// printf("Keynum %d => sdl key %d\n", keynum, OSD_SDL_INDEX(key_trans_table[keynum].sdl_key)); +// printf("Keynum %d => sdl key %d\n", keynum, OSD_SDL_INDEX(key_trans_table[keynum].sdl_key)); input_device_item_add(devinfo->device, defname, &devinfo->keyboard.state[OSD_SDL_INDEX(key_trans_table[keynum].sdl_key)], itemid, generic_button_get_state); } diff --git a/src/osd/windows/winmain.c b/src/osd/windows/winmain.c index df137fa36ec..8ffb2a29a05 100644 --- a/src/osd/windows/winmain.c +++ b/src/osd/windows/winmain.c @@ -175,10 +175,10 @@ private: struct cache_entry { - cache_entry(FPTR address, const char *symbol) : + cache_entry(FPTR address, const char *symbol) : m_next(NULL), m_address(address), m_name(symbol) { } cache_entry *next() const { return m_next; } - + cache_entry * m_next; FPTR m_address; astring m_name; diff --git a/src/version.c b/src/version.c index 121bb3e0109..d4c9b9e15f0 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.141u4 ("__DATE__")"; +const char build_version[] = "0.142 ("__DATE__")"; |