diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c index 2bc61b2a9df..a2d54d66fa9 100644 --- a/src/emu/cpu/i386/i386.c +++ b/src/emu/cpu/i386/i386.c @@ -107,7 +107,7 @@ static void i386_set_descriptor_accessed(i386_state *cpustate, UINT16 selector) UINT8 rights; if(!(selector & ~3)) return; - + if ( selector & 0x4 ) base = cpustate->ldtr.base; else @@ -458,8 +458,8 @@ static void i386_sreg_load(i386_state *cpustate, UINT16 selector, UINT8 reg, boo i386_load_segment_descriptor(cpustate, reg); if(fault) *fault = false; return; - } - + } + if(fault) *fault = true; if(reg == SS) { @@ -1030,7 +1030,7 @@ static void i286_task_switch(i386_state *cpustate, UINT16 selector, UINT8 nested WRITE16(cpustate,tss+0x28,cpustate->sreg[DS].selector); old_task = cpustate->task.segment; - + /* Load task register with the selector of the incoming task */ cpustate->task.segment = selector; memset(&seg, 0, sizeof(seg)); diff --git a/src/emu/cpu/powerpc/ppc.h b/src/emu/cpu/powerpc/ppc.h index f8078b928a5..ddf1deede92 100644 --- a/src/emu/cpu/powerpc/ppc.h +++ b/src/emu/cpu/powerpc/ppc.h @@ -152,7 +152,7 @@ struct _powerpc_config { UINT32 bus_frequency; read32_device_func dcr_read_func; - write32_device_func dcr_write_func; + write32_device_func dcr_write_func; }; diff --git a/src/emu/cpu/powerpc/ppccom.h b/src/emu/cpu/powerpc/ppccom.h index af4366d0b9a..3e70d536eab 100644 --- a/src/emu/cpu/powerpc/ppccom.h +++ b/src/emu/cpu/powerpc/ppccom.h @@ -567,7 +567,7 @@ struct _powerpc_state ppcimp_state * impstate; read32_device_func dcr_read_func; - write32_device_func dcr_write_func; + write32_device_func dcr_write_func; }; diff --git a/src/emu/info.c b/src/emu/info.c index e6b49bf88ed..62fe531e094 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -690,10 +690,10 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) { astring newtag(screendev->tag()), oldtag(":"); newtag.substr(newtag.find(oldtag.cat(root_tag)) + oldtag.len()); - + fprintf(m_output, "\t\tscreen_type()) { case SCREEN_TYPE_RASTER: fprintf(m_output, " type=\"raster\""); break; @@ -701,7 +701,7 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) case SCREEN_TYPE_LCD: fprintf(m_output, " type=\"lcd\""); break; default: fprintf(m_output, " type=\"unknown\""); break; } - + // output the orientation as a string switch (m_drivlist.driver().flags & ORIENTATION_MASK) { @@ -730,7 +730,7 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) fprintf(m_output, " rotate=\"0\""); break; } - + // output width and height only for games that are not vector if (screendev->screen_type() != SCREEN_TYPE_VECTOR) { @@ -738,16 +738,16 @@ void info_xml_creator::output_display(device_t &device, const char *root_tag) fprintf(m_output, " width=\"%d\"", visarea.width()); fprintf(m_output, " height=\"%d\"", visarea.height()); } - + // output refresh rate fprintf(m_output, " refresh=\"%f\"", ATTOSECONDS_TO_HZ(screendev->refresh_attoseconds())); - + // output raw video parameters only for games that are not vector // and had raw parameters specified if (screendev->screen_type() != SCREEN_TYPE_VECTOR && !screendev->oldstyle_vblank_supplied()) { int pixclock = screendev->width() * screendev->height() * ATTOSECONDS_TO_HZ(screendev->refresh_attoseconds()); - + fprintf(m_output, " pixclock=\"%d\"", pixclock); fprintf(m_output, " htotal=\"%d\"", screendev->width()); fprintf(m_output, " hbend=\"%d\"", screendev->visible_area().min_x); diff --git a/src/emu/ioport.c b/src/emu/ioport.c index e7ecb2b434e..380e23c3b4d 100644 --- a/src/emu/ioport.c +++ b/src/emu/ioport.c @@ -992,7 +992,7 @@ natural_keyboard::natural_keyboard(running_machine &machine) m_timer(NULL), m_current_rate(attotime::zero) { - m_queue_chars = ioport_queue_chars_delegate(); + m_queue_chars = ioport_queue_chars_delegate(); m_accept_char = ioport_accept_char_delegate(); m_charqueue_empty = ioport_charqueue_empty_delegate(); @@ -1833,10 +1833,10 @@ ioport_type_class ioport_field::type_class() const unicode_char ioport_field::keyboard_code(int which) const { unicode_char ch; - + if (which >= ARRAY_LENGTH(m_chars)) throw emu_fatalerror("Tried to access keyboard_code with out-of-range index %d\n", which); - + ch = m_chars[which]; // special hack to allow for PORT_CODE('\xA3') @@ -3849,8 +3849,8 @@ void ioport_configurer::field_add_char(unicode_char ch) m_curfield->m_chars[index] = ch; return; } - - throw emu_fatalerror("PORT_CHAR(%d) could not be added - maximum amount exceeded\n", ch); + + throw emu_fatalerror("PORT_CHAR(%d) could not be added - maximum amount exceeded\n", ch); } @@ -3875,7 +3875,7 @@ void ioport_configurer::setting_alloc(ioport_value value, const char *name) throw emu_fatalerror("alloc_setting called with no active field (value=%X name=%s)\n", value, name); m_cursetting = global_alloc(ioport_setting(*m_curfield, value & m_curfield->mask(), string_from_token(name))); - // append a new setting + // append a new setting m_curfield->m_settinglist.append(*m_cursetting); } diff --git a/src/emu/ioport.h b/src/emu/ioport.h index 29c1d601fce..6a3655b542b 100644 --- a/src/emu/ioport.h +++ b/src/emu/ioport.h @@ -833,7 +833,7 @@ public: natural_keyboard(running_machine &machine); void initialize(); - + // getters and queries running_machine &machine() const { return m_machine; } bool empty() const { return (m_bufbegin == m_bufend); } diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index e1d4391c49c..2774c40482b 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -660,7 +660,7 @@ WRITE8_DEVICE_HANDLER(duart68681_w) rate = attotime::from_hz(2*device->clock()/(2*16*16*0x10000)); } } - + //hz = ATTOSECONDS_TO_HZ(rate.attoseconds); duart68681->duart_timer->adjust(rate, 0, rate); diff --git a/src/emu/rendlay.c b/src/emu/rendlay.c index 8c906795c77..12cb156db61 100644 --- a/src/emu/rendlay.c +++ b/src/emu/rendlay.c @@ -821,7 +821,7 @@ void layout_element::component::draw(running_machine &machine, bitmap_argb32 &de case CTYPE_DOTMATRIXDOT: draw_dotmatrix(1, dest, bounds, state); break; - + case CTYPE_SIMPLECOUNTER: draw_simplecounter(machine, dest, bounds, state); break; diff --git a/src/emu/rendlay.h b/src/emu/rendlay.h index 756bb0a453b..b802084239a 100644 --- a/src/emu/rendlay.h +++ b/src/emu/rendlay.h @@ -122,7 +122,7 @@ private: CTYPE_LED16SEGSC, CTYPE_DOTMATRIX, CTYPE_DOTMATRIX5DOT, - CTYPE_DOTMATRIXDOT, + CTYPE_DOTMATRIXDOT, CTYPE_SIMPLECOUNTER, CTYPE_REEL, CTYPE_MAX diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index 60dc5d92ba4..db0fc24be44 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -500,10 +500,10 @@ void pokeyn_device::sound_stream_update(sound_stream &stream, stream_sample_t ** sum += (((m_channel[ch].m_output ^ m_channel[ch].m_filter_sample) || (m_channel[ch].m_AUDC & VOLUME_ONLY)) ? m_channel[ch].m_volume : 0 ); } - /* store sum of output signals into the buffer */ + /* store sum of output signals into the buffer */ - *buffer++ = (sum > 0x7fff) ? 0x7fff : sum; - samples--; + *buffer++ = (sum > 0x7fff) ? 0x7fff : sum; + samples--; } m_rtimer->adjust(attotime::never); @@ -1199,12 +1199,12 @@ char *pokeyn_device::audctl2str(int val) pokeyn_device::pokey_channel::pokey_channel() : m_AUDF(0), - m_AUDC(0), + m_AUDC(0), m_borrow_cnt(0), - m_counter(0), - m_volume(0), - m_output(0), - m_filter_sample(0) + m_counter(0), + m_volume(0), + m_output(0), + m_filter_sample(0) { } diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h index 8b6db763665..16ccfae6240 100644 --- a/src/emu/sound/pokey.h +++ b/src/emu/sound/pokey.h @@ -158,8 +158,8 @@ private: UINT8 m_output; /* channel output signal (1 active, 0 inactive) */ UINT8 m_filter_sample; /* high-pass filter sample */ - inline void sample(void) { m_filter_sample = m_output; } - inline void reset_channel(void) { m_counter = m_AUDF ^ 0xff; } + inline void sample(void) { m_filter_sample = m_output; } + inline void reset_channel(void) { m_counter = m_AUDF ^ 0xff; } inline void inc_chan(void) { m_counter = (m_counter + 1) & 0xff; diff --git a/src/emu/sound/tc8830f.c b/src/emu/sound/tc8830f.c index 7426d889996..cf855c8ee04 100644 --- a/src/emu/sound/tc8830f.c +++ b/src/emu/sound/tc8830f.c @@ -2,7 +2,7 @@ tc8830f.c - Toshiba TC8830F, CMOS voice recording/reproducing LSI 1-bit ADM (Adaptive Delta Modulation), similar to TC8801 and T6668. - + Very preliminary... TODO: @@ -36,7 +36,7 @@ void tc8830f_device::device_start() m_mem_base = (UINT8 *)device().machine().root_device().memregion(":tc8830f")->base(); m_mem_mask = device().machine().root_device().memregion(":tc8830f")->bytes() - 1; - + // register for savestates save_item(NAME(m_playing)); save_item(NAME(m_address)); @@ -46,7 +46,7 @@ void tc8830f_device::device_start() save_item(NAME(m_command)); save_item(NAME(m_cmd_rw)); save_item(NAME(m_phrase)); - + reset(); } @@ -81,7 +81,7 @@ void tc8830f_device::sound_stream_update(sound_stream &stream, stream_sample_t * if (m_address == m_stop_address) m_playing = false; } - + // compute sample // this is a placeholder until ADM is implemented mix = bit * 0x7fff; @@ -111,7 +111,7 @@ void tc8830f_device::write_p(UINT8 data) { m_stream->update(); data &= 0xf; - + if (m_cmd_rw == 0) { // select command @@ -138,13 +138,13 @@ void tc8830f_device::write_p(UINT8 data) case 0x8: case 0x9: case 0xa: case 0xb: logerror("tc8830f: Unemulated command %X\n", m_command); break; - + default: logerror("tc8830f: Invalid command %X\n", m_command); break; } } - + else { // write command @@ -170,14 +170,14 @@ void tc8830f_device::write_p(UINT8 data) m_cmd_rw = -1; } break; - + case 0x6: // CNDT: d0-d1: bitrate, d2: enable overflow m_bitrate = data & 3; device_clock_changed(); m_cmd_rw = -1; break; - + case 0x7: // LABEL: set phrase if (m_cmd_rw == 1) @@ -199,7 +199,7 @@ void tc8830f_device::write_p(UINT8 data) m_cmd_rw = -1; } break; - + default: m_cmd_rw = -1; break; diff --git a/src/emu/sound/tc8830f.h b/src/emu/sound/tc8830f.h index 23200938316..193dfda038b 100644 --- a/src/emu/sound/tc8830f.h +++ b/src/emu/sound/tc8830f.h @@ -54,7 +54,7 @@ private: UINT8 m_command; int m_cmd_rw; UINT8 m_phrase; - + UINT8 *m_mem_base; UINT32 m_mem_mask; }; diff --git a/src/emu/timer.c b/src/emu/timer.c index 607e4eaad3d..191377610fd 100644 --- a/src/emu/timer.c +++ b/src/emu/timer.c @@ -199,10 +199,10 @@ void timer_device::device_validity_check(validity_checker &valid) const mame_printf_warning("Scanline timer specified parameters for a periodic timer\n"); if (m_param != 0) mame_printf_warning("Scanline timer specified parameter which is ignored\n"); -// if (m_first_vpos < 0) -// mame_printf_error("Scanline timer specified invalid initial position\n"); -// if (m_increment < 0) -// mame_printf_error("Scanline timer specified invalid increment\n"); +// if (m_first_vpos < 0) +// mame_printf_error("Scanline timer specified invalid initial position\n"); +// if (m_increment < 0) +// mame_printf_error("Scanline timer specified invalid increment\n"); break; default: diff --git a/src/ldplayer/ldplayer.c b/src/ldplayer/ldplayer.c index 95c052e5e5d..f2af0b4578f 100644 --- a/src/ldplayer/ldplayer.c +++ b/src/ldplayer/ldplayer.c @@ -402,7 +402,7 @@ void pr8210_state::device_timer(emu_timer &timer, device_timer_id id, int param, // if we have bits, process if (bitsleft != 0) { - // assert the line and set a timer for deassertion + // assert the line and set a timer for deassertion m_laserdisc->control_w(ASSERT_LINE); timer_set(attotime::from_usec(250), TIMER_ID_BIT_OFF); @@ -437,7 +437,7 @@ void pr8210_state::device_timer(emu_timer &timer, device_timer_id id, int param, void pr8210_state::machine_start() { ldplayer_state::machine_start(); - m_bit_timer = timer_alloc(TIMER_ID_BIT); + m_bit_timer = timer_alloc(TIMER_ID_BIT); } void pr8210_state::machine_reset() diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c index 004d12b3a76..6b7cdee261c 100644 --- a/src/mame/drivers/bzone.c +++ b/src/mame/drivers/bzone.c @@ -309,7 +309,7 @@ static ADDRESS_MAP_START( bzone_map, AS_PROGRAM, 8, bzone_state ) AM_RANGE(0x1800, 0x1800) AM_DEVREAD_LEGACY("mathbox", mathbox_status_r) AM_RANGE(0x1810, 0x1810) AM_DEVREAD_LEGACY("mathbox", mathbox_lo_r) AM_RANGE(0x1818, 0x1818) AM_DEVREAD_LEGACY("mathbox", mathbox_hi_r) -// AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w) +// AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE_LEGACY("pokey", pokey_r, pokey_w) AM_RANGE(0x1820, 0x182f) AM_DEVREADWRITE("pokey", pokeyn_device, read, write) AM_RANGE(0x1840, 0x1840) AM_DEVWRITE_LEGACY("discrete", bzone_sounds_w) AM_RANGE(0x1860, 0x187f) AM_DEVWRITE_LEGACY("mathbox", mathbox_go_w) diff --git a/src/mame/drivers/chance32.c b/src/mame/drivers/chance32.c index 770d5b36bd6..5bbfb4f8d55 100644 --- a/src/mame/drivers/chance32.c +++ b/src/mame/drivers/chance32.c @@ -143,7 +143,7 @@ WRITE8_MEMBER(chance32_state::muxout_w) There are 2 groups of 7 output lines muxed in port 60h The first bit is the group/mux selector. - + - bits - 7654 3210 ---- ---x Mux selector. @@ -208,7 +208,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( chance32_portmap, AS_IO, 8, chance32_state ) ADDRESS_MAP_GLOBAL_MASK(0xff) - AM_RANGE(0x10, 0x10) AM_WRITENOP // writting bit3 constantly... watchdog? + AM_RANGE(0x10, 0x10) AM_WRITENOP // writting bit3 constantly... watchdog? AM_RANGE(0x13, 0x13) AM_WRITE(mux_w) AM_RANGE(0x20, 0x20) AM_READ_PORT("DSW0") AM_RANGE(0x21, 0x21) AM_READ_PORT("DSW1") @@ -355,7 +355,7 @@ static INPUT_PORTS_START( chance32 ) PORT_DIPSETTING( 0x80, DEF_STR( On ) ) PORT_START("UNK") - PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Otherwise is a 'Freeze' DIP switch */ + PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen") /* Otherwise is a 'Freeze' DIP switch */ PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) PORT_DIPSETTING( 0x02, DEF_STR( On ) ) @@ -477,7 +477,7 @@ static MACHINE_CONFIG_START( chance32, chance32_state ) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(52.786) -// MCFG_SCREEN_REFRESH_RATE(60) +// MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40*16, 32*8) MCFG_SCREEN_VISIBLE_AREA(0, 35*16-1, 0, 29*8-1) diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index 24ec18d7594..a71c220bb39 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -9148,10 +9148,10 @@ ROM_START( xmvsfu1d ) ROM_REGION( CODE_SIZE, "maincpu", 0 ) /* 68000 code */ ROM_LOAD16_WORD_SWAP( "xvsud.03h", 0x000000, 0x80000, CRC(4e2e76b7) SHA1(812ebe4063a1c5d8c86200a51e6ab00e57e02869) ) ROM_LOAD16_WORD_SWAP( "xvsud.04h", 0x080000, 0x80000, CRC(290c61a7) SHA1(f0d409048c9d477ee98e6df92febcd4492a291ee) ) -// ROM_LOAD16_WORD_SWAP( "xvsd.05a", 0x100000, 0x80000, CRC(de347b11) SHA1(297ae207811df9a4973de1df00b2efaa14a0137d) ) // bad dump? +// ROM_LOAD16_WORD_SWAP( "xvsd.05a", 0x100000, 0x80000, CRC(de347b11) SHA1(297ae207811df9a4973de1df00b2efaa14a0137d) ) // bad dump? ROM_LOAD16_WORD_SWAP( "xvs.05a", 0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) ) ROM_LOAD16_WORD_SWAP( "xvs.06a", 0x180000, 0x80000, CRC(e8e2c75c) SHA1(929408cb5d98e95cec75ea58e4701b0cbdbcd016) ) -// ROM_LOAD16_WORD_SWAP( "xvsd.07", 0x200000, 0x80000, CRC(f761ded7) SHA1(e49277398734dea044e7c8ec16800db196905e6f) ) // bad dump ? +// ROM_LOAD16_WORD_SWAP( "xvsd.07", 0x200000, 0x80000, CRC(f761ded7) SHA1(e49277398734dea044e7c8ec16800db196905e6f) ) // bad dump ? ROM_LOAD16_WORD_SWAP( "xvs.07", 0x200000, 0x80000, CRC(08f0abed) SHA1(ef16c376232dba63b0b9bc3aa0640f9001ccb68a) ) ROM_LOAD16_WORD_SWAP( "xvs.08", 0x280000, 0x80000, CRC(81929675) SHA1(19cf7afbc1daaefec40195e40ba74970f3906a1c) ) ROM_LOAD16_WORD_SWAP( "xvs.09", 0x300000, 0x80000, CRC(9641f36b) SHA1(dcba3482d1ba37ccfb30d402793ee063c6621aed) ) diff --git a/src/mame/drivers/crimfght.c b/src/mame/drivers/crimfght.c index 0010c612bd6..35f2bebd92d 100644 --- a/src/mame/drivers/crimfght.c +++ b/src/mame/drivers/crimfght.c @@ -26,7 +26,7 @@ static KONAMI_SETLINES_CALLBACK( crimfght_banking ); static INTERRUPT_GEN( crimfght_interrupt ) { crimfght_state *state = device->machine().driver_data(); - + if (k051960_is_irq_enabled(state->m_k051960)) device_set_input_line(device, KONAMI_IRQ_LINE, HOLD_LINE); } diff --git a/src/mame/drivers/decocass.c b/src/mame/drivers/decocass.c index 1d931d50a2d..8830e43154c 100644 --- a/src/mame/drivers/decocass.c +++ b/src/mame/drivers/decocass.c @@ -28,7 +28,7 @@ The actual cassettes use a custom player hooked to the BIO board, and are roughly microcassette form factor, but are larger and will not fit in a conventional microcassette player. Each cassette has two tracks on it: a clock track and a data track, for a form of synchronous serial. The data is stored in blocks with headers and checksums. - + ***********************************************************************/ @@ -1080,7 +1080,7 @@ ROM_START( cdsteljn ) // version 4-A-3 ROM_LOAD( "a-0061.dgl", 0x0000, 0x0020, CRC(1bc9fccb) SHA1(ffc59c7660d5c87a8deca294f80260b6bc7c3027) ) /* Should be dp-1144a?? */ ROM_REGION( 0x10000, "cassette", 0 ) /* (max) 64k for cassette image */ - ROM_LOAD( "dt-1144-a3.cas", 0x000000, 0x007300, CRC(1336a912) SHA1(0c64e069713b411da38b43f14306953621726d35) ) + ROM_LOAD( "dt-1144-a3.cas", 0x000000, 0x007300, CRC(1336a912) SHA1(0c64e069713b411da38b43f14306953621726d35) ) ROM_END /* 15 Lucky Poker */ @@ -1567,7 +1567,7 @@ static DRIVER_INIT( decocrom ) /* 12 */ // 1981.08 Flash Boy/DECO Kid /* 13 */ GAME( 1981, cprogolf, decocass, cprogolf, cprogolf, decocass, ROT270, "Data East Corporation", "Tournament Pro Golf (DECO Cassette)", 0 ) GAME( 1981, cprogolfj, cprogolf, cprogolfj,cprogolf, decocass, ROT270, "Data East Corporation", "Tournament Pro Golf (DECO Cassette, Japan)", 0 ) -/* 14 */ GAME( 1981, cdsteljn, decocass, cdsteljn, decocass, decocass, ROT270, "Data East Corporation", "DS Telejan (DECO Cassette, Japan)", 0) +/* 14 */ GAME( 1981, cdsteljn, decocass, cdsteljn, decocass, decocass, ROT270, "Data East Corporation", "DS Telejan (DECO Cassette, Japan)", 0) /* 15 */ GAME( 1981, cluckypo, decocass, cluckypo, decocass, decocass, ROT270, "Data East Corporation", "Lucky Poker (DECO Cassette)", 0 ) /* 16 */ GAME( 1981, ctisland, decocass, ctisland, decocass, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 1)", 0 ) GAME( 1981, ctisland2, ctisland, ctisland, decocass, decocrom, ROT270, "Data East Corporation", "Treasure Island (DECO Cassette, set 2)", 0 ) diff --git a/src/mame/drivers/fortecar.c b/src/mame/drivers/fortecar.c index 3a8a4778d89..e2165f95673 100644 --- a/src/mame/drivers/fortecar.c +++ b/src/mame/drivers/fortecar.c @@ -448,7 +448,7 @@ static READ8_DEVICE_HANDLER( ppi0_portc_r ) static I8255A_INTERFACE( ppi8255_intf ) { /* Init with 0x9a... A, B and high C as input - Serial Eprom connected to Port C */ + Serial Eprom connected to Port C */ DEVCB_INPUT_PORT("SYSTEM"), /* Port A read */ DEVCB_NULL, /* Port A write */ DEVCB_INPUT_PORT("INPUT"), /* Port B read */ diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c index 412a0a38ce7..3ecc364d54b 100644 --- a/src/mame/drivers/gei.c +++ b/src/mame/drivers/gei.c @@ -1059,7 +1059,7 @@ static I8255A_INTERFACE( getrivia_ppi8255_0_intf ) DEVCB_NULL, /* Port C read */ DEVCB_HANDLER(sound_w) /* Port C write */ }; - + static I8255A_INTERFACE( getrivia_ppi8255_1_intf ) { DEVCB_INPUT_PORT("IN1"), /* Port A read */ @@ -1069,7 +1069,7 @@ static I8255A_INTERFACE( getrivia_ppi8255_1_intf ) DEVCB_NULL, /* Port C read */ DEVCB_HANDLER(lamps2_w) /* Port C write */ }; - + static I8255A_INTERFACE( gselect_ppi8255_0_intf ) { DEVCB_INPUT_PORT("DSWA"), /* Port A read */ @@ -1079,7 +1079,7 @@ static I8255A_INTERFACE( gselect_ppi8255_0_intf ) DEVCB_NULL, /* Port C read */ DEVCB_HANDLER(sound2_w) /* Port C write */ }; - + static I8255A_INTERFACE( gselect_ppi8255_1_intf ) { DEVCB_INPUT_PORT("IN1"), /* Port A read */ @@ -1089,7 +1089,7 @@ static I8255A_INTERFACE( gselect_ppi8255_1_intf ) DEVCB_INPUT_PORT("IN2"), /* Port C read */ DEVCB_HANDLER(nmi_w) /* Port C write */ }; - + static I8255A_INTERFACE( findout_ppi8255_1_intf ) { DEVCB_INPUT_PORT("IN1"), /* Port A read */ @@ -1099,7 +1099,7 @@ static I8255A_INTERFACE( findout_ppi8255_1_intf ) DEVCB_HANDLER(portC_r), /* Port C read */ DEVCB_NULL /* Port C write */ }; - + static INTERRUPT_GEN( vblank_irq ) { diff --git a/src/mame/drivers/igs017.c b/src/mame/drivers/igs017.c index c2bd99174db..d1f18f86a51 100644 --- a/src/mame/drivers/igs017.c +++ b/src/mame/drivers/igs017.c @@ -1978,7 +1978,7 @@ WRITE16_MEMBER(igs017_state::lhzb2a_prot_w) ( BIT(~x, 1) << 2 ) | ( BIT( x, 0) << 1 ) | ( bit0 << 0 ) ; - + logerror("%s: exec bitswap - mode_3 %02x, mode_f %02x, xor0 %x, val %04x -> %04x\n", machine().describe_context(), m_prot_m3, m_prot_mf, xor0, x, m_prot_val); break; @@ -2148,7 +2148,7 @@ static ADDRESS_MAP_START( lhzb2a, AS_PROGRAM, 16, igs017_state ) AM_RANGE(0x000000, 0x07ffff) AM_ROM AM_RANGE(0x500000, 0x503fff) AM_RAM -// AM_RANGE(0x910000, 0x910003) accesses appear to be from leftover code where the final checks were disabled +// AM_RANGE(0x910000, 0x910003) accesses appear to be from leftover code where the final checks were disabled AM_RANGE(0xb02000, 0xb02fff) AM_READWRITE( spriteram_lsb_r, spriteram_lsb_w ) AM_SHARE("spriteram") AM_RANGE(0xb03000, 0xb037ff) AM_RAM_WRITE( lhzb2a_paletteram_w ) AM_SHARE("paletteram") AM_RANGE(0xb04024, 0xb04025) AM_WRITE( video_disable_lsb_w ) diff --git a/src/mame/drivers/megasys1.c b/src/mame/drivers/megasys1.c index 2bc71ca9017..c62ff97ebc9 100644 --- a/src/mame/drivers/megasys1.c +++ b/src/mame/drivers/megasys1.c @@ -4020,7 +4020,7 @@ READ16_MEMBER(megasys1_state::monkelf_input_r) static DRIVER_INIT( monkelf ) { DRIVER_INIT_CALL(avspirit); - + megasys1_state *state = machine.driver_data(); UINT16 *ROM = (UINT16*)state->memregion("maincpu")->base(); ROM[0x00744/2] = 0x4e71; // weird check, 0xe000e R is a port-based trap? diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index b8baebb4a57..4693c953e8e 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -5549,7 +5549,7 @@ ROM_START( ninjaslt ) ROM_LOAD( "nja3-key.bin", 0x000000, 0x000004, CRC(e6997eb0) SHA1(c866a5069e28939be5a8fc867bc14791decac3c8) ) ROM_REGION( 0x20000, "jyu_io", 0 ) // H8/3334-based I/O board ROM, eventually should be separated out - ROM_LOAD( "jyu1_prg0a.ic3", 0x000000, 0x020000, CRC(aec4dbc1) SHA1(bddd4f345baf7f594998a39c09da18b3834f0ac2) ) + ROM_LOAD( "jyu1_prg0a.ic3", 0x000000, 0x020000, CRC(aec4dbc1) SHA1(bddd4f345baf7f594998a39c09da18b3834f0ac2) ) ROM_END // this one's weird: the rom test checksum for IC 1 matches a screenshot from h/w, but on h/w it says ---- instead of BAD. diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index 3c583639850..55b779bece0 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -547,11 +547,11 @@ Unofficial pcb's from NG:DEV.TEAM: - + MVS CHA: GIGA CHAR Board 1.0 GIGA CHAR Board 1.5 - + MVS PROG: GIGA PROG Board 1.0 GIGA PROG Board 1.5 @@ -646,7 +646,7 @@ ***************************************************************************** - Neo-Geo bios + Neo-Geo bios ***************************************************************************** @@ -817,7 +817,7 @@ /**************************************************************************** - Official sets + Official sets ***************************************************************************** @@ -7511,12 +7511,12 @@ ROM_END /* Some info about the 2nd AES release of Samurai Shodown 5 Special (samsh5sph): - The fixed carts have a small round neogeo sticker applied to the front side of the cart (top right near cart sticker). - SNK Playmore had authorized a recall of all Samurai Shodown V Special (Samurai Spirits 0 Special) home cartridges. This recall involved bug fixes - and the addition of fatalities. (The fatalities were originally removed at the last minute due to the Nagasaki incident, a murder caused by a child killing her classmate by knife.) - Bug fixes: Improvements on Voice, Back Ground Music, and Practice mode. - Fatalities: SNK PLAYMORE modified the game program by including the removed "Zetumei Ougi" in a modified version. - This new version does not show the complete fatalities, they are instead replaced by what SNK PLAYMORE refers to as "lessened fatalities". + The fixed carts have a small round neogeo sticker applied to the front side of the cart (top right near cart sticker). + SNK Playmore had authorized a recall of all Samurai Shodown V Special (Samurai Spirits 0 Special) home cartridges. This recall involved bug fixes + and the addition of fatalities. (The fatalities were originally removed at the last minute due to the Nagasaki incident, a murder caused by a child killing her classmate by knife.) + Bug fixes: Improvements on Voice, Back Ground Music, and Practice mode. + Fatalities: SNK PLAYMORE modified the game program by including the removed "Zetumei Ougi" in a modified version. + This new version does not show the complete fatalities, they are instead replaced by what SNK PLAYMORE refers to as "lessened fatalities". */ @@ -7596,7 +7596,7 @@ ROM_END /**************************************************************************** - BrezzaSoft games, licensed? + BrezzaSoft games, licensed? ****************************************************************************/ @@ -7711,7 +7711,7 @@ ROM_END /**************************************************************************** - Vektorlogic games, unlicensed + Vektorlogic games, unlicensed ****************************************************************************/ @@ -7753,7 +7753,7 @@ ROM_END /**************************************************************************** - Jamma PCB sets + Jamma PCB sets ****************************************************************************/ @@ -7924,7 +7924,7 @@ ROM_END /**************************************************************************** - Bootleg sets + Bootleg sets ****************************************************************************/ @@ -8953,7 +8953,7 @@ ROM_END /**************************************************************************** - Game specific input definitions + Game specific input definitions ****************************************************************************/ @@ -9253,7 +9253,7 @@ INPUT_PORTS_END /**************************************************************************** - Game specific inits + Game specific inits ****************************************************************************/ @@ -9924,7 +9924,7 @@ static DRIVER_INIT(sbp ) /**************************************************************************** - Softlist stuff + Softlist stuff ****************************************************************************/ diff --git a/src/mame/drivers/pacman.c b/src/mame/drivers/pacman.c index 4ab99008bf6..cf0c9b6072d 100644 --- a/src/mame/drivers/pacman.c +++ b/src/mame/drivers/pacman.c @@ -4050,7 +4050,7 @@ ROM_START( mspacii ) ROM_REGION( 0x2000, "gfx1", 0 ) ROM_LOAD( "p1.5e", 0x0000, 0x1000, CRC(04333722) SHA1(bb179d5302b26b815b5d7eff14865e7b4f8a6880) ) - ROM_LOAD( "p2.5f", 0x1000, 0x1000, CRC(615af909) SHA1(fd6a1dde780b39aea76bf1c4befa5882573c2ef4) ) + ROM_LOAD( "p2.5f", 0x1000, 0x1000, CRC(615af909) SHA1(fd6a1dde780b39aea76bf1c4befa5882573c2ef4) ) ROM_REGION( 0x0120, "proms", 0 ) ROM_LOAD( "82s123.7f", 0x0000, 0x0020, CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) ) @@ -4073,7 +4073,7 @@ ROM_START( mspacii2 ) ROM_REGION( 0x2000, "gfx1", 0 ) ROM_LOAD( "p7.bin", 0x0000, 0x1000, CRC(04333722) SHA1(bb179d5302b26b815b5d7eff14865e7b4f8a6880) ) - ROM_LOAD( "p8.bin", 0x1000, 0x1000, CRC(615af909) SHA1(fd6a1dde780b39aea76bf1c4befa5882573c2ef4) ) + ROM_LOAD( "p8.bin", 0x1000, 0x1000, CRC(615af909) SHA1(fd6a1dde780b39aea76bf1c4befa5882573c2ef4) ) ROM_REGION( 0x0120, "proms", 0 ) ROM_LOAD( "82s123.7f", 0x0000, 0x0020, CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) ) diff --git a/src/mame/drivers/statriv2.c b/src/mame/drivers/statriv2.c index c73ced440da..a050e7daf3b 100644 --- a/src/mame/drivers/statriv2.c +++ b/src/mame/drivers/statriv2.c @@ -273,8 +273,8 @@ static WRITE8_DEVICE_HANDLER( ppi_portc_hi_w ) static I8255A_INTERFACE( ppi8255_intf ) { /* PPI 8255 group A & B set to Mode 0. - Port A, B and lower 4 bits of C set as Input. - High 4 bits of C set as Output */ + Port A, B and lower 4 bits of C set as Input. + High 4 bits of C set as Output */ DEVCB_INPUT_PORT("IN0"), /* Port A read */ DEVCB_NULL, /* Port A write */ DEVCB_INPUT_PORT("IN1"), /* Port B read */ diff --git a/src/mame/drivers/tecmo.c b/src/mame/drivers/tecmo.c index 99acdc0a0d9..d41cc352ad6 100644 --- a/src/mame/drivers/tecmo.c +++ b/src/mame/drivers/tecmo.c @@ -1078,7 +1078,7 @@ ROM_START( backfirt ) ROM_LOAD( "b14-s3.bin", 0x30000, 0x08000, CRC(4d29637a) SHA1(28e85925138256b8ce5a1c4a5df5b219b1b6b197) ) /* tiles #2 */ // half size is correct, rom type 27256 ROM_REGION( 0x8000, "adpcm", ROMREGION_ERASE00 ) /* ADPCM samples */ -// ROM_LOAD( "silkworm.1", 0x0000, 0x8000, CRC(5b553644) SHA1(5d39d2251094c17f7b732b4861401b3516fce9b1) ) +// ROM_LOAD( "silkworm.1", 0x0000, 0x8000, CRC(5b553644) SHA1(5d39d2251094c17f7b732b4861401b3516fce9b1) ) ROM_END ROM_START( gemini ) diff --git a/src/mame/drivers/timeplt.c b/src/mame/drivers/timeplt.c index d0396f50a23..c6bfd5e2732 100644 --- a/src/mame/drivers/timeplt.c +++ b/src/mame/drivers/timeplt.c @@ -97,13 +97,13 @@ READ8_MEMBER(timeplt_state::psurge_protection_r) static WRITE8_DEVICE_HANDLER(chkun_sound_w) { timeplt_state *state = device->machine().driver_data(); - + // d0-d3: P0-P3 // d5: /R (unused?) // d6: /W if (~data & 0x40) state->m_tc8830f->write_p(data & 0xf); - + // d4 (or d7?): /ACL if (~data & 0x10) state->m_tc8830f->reset(); diff --git a/src/mame/machine/mega32x.c b/src/mame/machine/mega32x.c index fd3139358ab..c6f2bceeb72 100644 --- a/src/mame/machine/mega32x.c +++ b/src/mame/machine/mega32x.c @@ -195,7 +195,7 @@ GFX check (these don't explicitly fails): #161 Runlength Mode */ - + #include "includes/megadriv.h" diff --git a/src/mame/machine/megavdp.c b/src/mame/machine/megavdp.c index 983d7274f18..f9668a8e707 100644 --- a/src/mame/machine/megavdp.c +++ b/src/mame/machine/megavdp.c @@ -2936,4 +2936,4 @@ void megadriv_reset_vdp(void) megadrive_visible_scanlines = 224; megadrive_irq6_scanline = 224; megadrive_z80irq_scanline = 226; -} +} diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 6a4bfbbfe5d..a28c1581713 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -5227,7 +5227,7 @@ clocknch // 11 1981.04 Lock'n'Chase // 12 1981.08 Flash Boy/DECO Kid cprogolf // 13 1981.08 Tournament Pro Golf cprogolfj // 13 1981.08 Tournament Pro Golf (Japan) -cdsteljn // 14 1981.06 DS Telejan +cdsteljn // 14 1981.06 DS Telejan cluckypo // 15 1981.?? Lucky Poker ctisland // 16 1982.02 Treasure Island ctisland2 // 16 @@ -5243,7 +5243,7 @@ cptennis // 22 1982.06 Pro Tennis // 24 1982.07 Tsumego Kaisyou // 25 1982.10 Angler Dangler? (fishing) cbtime // 26 1982.08 Hamburger/Burger Time -chamburger // 26 1982.08 Hamburger (Japan) +chamburger // 26 1982.08 Hamburger (Japan) cburnrub // 27 1982.11 Burnin' Rubber cburnrub2 // 27 cbnj // 27 Bump 'n' Jump diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c index 7d5e68cce90..50865b9a1f7 100644 --- a/src/mame/video/bfm_dm01.c +++ b/src/mame/video/bfm_dm01.c @@ -58,7 +58,7 @@ typedef struct _dm01 int data_avail, control, xcounter, - segbuffer[65], + segbuffer[65], busy; UINT8 scanline[DM_BYTESPERROW], @@ -152,13 +152,13 @@ static WRITE8_HANDLER( mux_w ) { UINT8 d = dm01.scanline[p]; - + for (int bitpos=0; bitpos <8; bitpos++) { if (((p*8)+bitpos) <65) { if (d & 1<<(7-bitpos)) dm01.segbuffer[(p*8)+bitpos]=1; - else dm01.segbuffer[(p*8)+bitpos]=0; + else dm01.segbuffer[(p*8)+bitpos]=0; } } p++; @@ -167,7 +167,7 @@ static WRITE8_HANDLER( mux_w ) for (int pos=0;pos<65;pos++) { output_set_indexed_value("dotmatrix", pos +(65*row), dm01.segbuffer[(pos)]); - } + } } } } diff --git a/src/version.c b/src/version.c index b8d01fc9340..a49d451d677 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.145u8 ("__DATE__")"; +const char build_version[] = "0.146 ("__DATE__")";