From 0e5fb7952698795a3fa8bc68257a59e799b46c0a Mon Sep 17 00:00:00 2001 From: Angelo Salese Date: Thu, 27 Oct 2011 17:20:11 +0000 Subject: clean-ups and version bump --- src/emu/cpu/sh4/sh4.c | 4 ++-- src/lib/formats/flopimg.c | 2 +- src/lib/formats/ipf_dsk.c | 10 +++++----- src/mame/drivers/laserbas.c | 2 +- src/mame/drivers/naomi.c | 2 +- src/mame/drivers/taito_z.c | 2 +- src/version.c | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/emu/cpu/sh4/sh4.c b/src/emu/cpu/sh4/sh4.c index f424cffba55..7edab8007e5 100644 --- a/src/emu/cpu/sh4/sh4.c +++ b/src/emu/cpu/sh4/sh4.c @@ -3176,12 +3176,12 @@ static CPU_EXECUTE( sh4be ) master_ophandler_table[opcode](sh4, opcode); - + if (sh4->test_irq && !sh4->delay) { sh4_check_pending_irq(sh4, "mame_sh4_execute"); } - + } else diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c index ca573f9303d..06e5b2455d1 100644 --- a/src/lib/formats/flopimg.c +++ b/src/lib/formats/flopimg.c @@ -1420,7 +1420,7 @@ void floppy_image_format_t::generate_track_from_levels(int track, int head, UINT meh: ; - + } // Maximal number of cells which happens when the buffer is all MG_1/MG_N alternated, which would be 3/2 diff --git a/src/lib/formats/ipf_dsk.c b/src/lib/formats/ipf_dsk.c index f2fd9190649..150c34f205d 100644 --- a/src/lib/formats/ipf_dsk.c +++ b/src/lib/formats/ipf_dsk.c @@ -200,7 +200,7 @@ bool ipf_format::scan_all_tags(UINT8 *data, UINT32 size) while(pos != size) { UINT8 *tag; UINT32 tsize; - + if(!scan_one_tag(data, size, pos, tag, tsize)) return false; @@ -427,7 +427,7 @@ void ipf_format::track_write_raw(UINT32 *&track, const UINT8 *data, UINT32 cells for(UINT32 i=0; i != cells; i++) *track++ = data[i>>3] & (0x80 >> (i & 7)) ? MG_1 : MG_0; if(cells) - context = track[-1] == MG_1; + context = track[-1] == MG_1; } void ipf_format::track_write_mfm(UINT32 *&track, const UINT8 *data, UINT32 start_offset, UINT32 patlen, UINT32 cells, bool &context) @@ -472,7 +472,7 @@ bool ipf_format::generate_block_data(const UINT8 *data, const UINT8 *dlimit, UIN break; case 2: // MFM-decoded data bytes - case 3: // MFM-decoded gap bytes + case 3: // MFM-decoded gap bytes if(16*param > tleft) return false; track_write_mfm(track, data, 0, 8*param, 16*param, context); @@ -579,7 +579,7 @@ bool ipf_format::generate_gap_from_description(const UINT8 *&data, const UINT8 * block_size = size - pos; if(pos + block_size > size) return false; - // printf("pat=%02x size=%d pre\n", pattern[0], block_size); + // printf("pat=%02x size=%d pre\n", pattern[0], block_size); track_write_mfm(track, pattern, 0, pattern_size, block_size, context); pos += block_size; } else { @@ -589,7 +589,7 @@ bool ipf_format::generate_gap_from_description(const UINT8 *&data, const UINT8 * block_size = size - res_size; if(pos + block_size > size) return false; - // printf("pat=%02x block_size=%d size=%d res_size=%d post\n", pattern[0], block_size, size, res_size); + // printf("pat=%02x block_size=%d size=%d res_size=%d post\n", pattern[0], block_size, size, res_size); track_write_mfm(track, pattern, -block_size, pattern_size, block_size, context); pos += block_size; } diff --git a/src/mame/drivers/laserbas.c b/src/mame/drivers/laserbas.c index b3649035ed4..eb052ff8afe 100644 --- a/src/mame/drivers/laserbas.c +++ b/src/mame/drivers/laserbas.c @@ -135,7 +135,7 @@ static ADDRESS_MAP_START( laserbas_io, AS_IO, 8 ) AM_RANGE(0x20, 0x20) AM_READ_PORT("IN1") // DSW + something else? AM_RANGE(0x21, 0x21) AM_READ_PORT("IN0") AM_RANGE(0x22, 0x22) AM_READ_PORT("IN2") -// AM_RANGE(0x23, 0x23) AM_WRITE(test_w) bit 2 presumably is a mux for 0x20? +// AM_RANGE(0x23, 0x23) AM_WRITE(test_w) bit 2 presumably is a mux for 0x20? AM_RANGE(0x40, 0x43) AM_DEVREADWRITE("pit0", pit8253_r, pit8253_w) AM_RANGE(0x44, 0x47) AM_DEVREADWRITE("pit1", pit8253_r, pit8253_w) AM_RANGE(0x80, 0x9f) AM_RAM_WRITE(paletteram_RRRGGGBB_w) AM_BASE_GENERIC(paletteram) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index efd4753f073..5ee7baf409c 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -380,7 +380,7 @@ Quiz Ah Megamisama 840-0030C 23227 16 (64Mb) pre Shootout Pool 840-0098C 23844 4 (64mb) present 317-0336-COM Shootout Pool - Shootout Pool Prize 840-0128C 24065 4 (64mb) present 317-0367-COM Shootout Pool Medal ? 24148 4 (64Mb) ? ? -Touch de UNO! 2 840-0022C 23071 6 (64Mb) present 317-0276-JPN +Touch de UNO! 2 840-0022C 23071 6 (64Mb) present 317-0276-JPN Virtua Fighter 4 Evolution 840-0106B 23934 20 (64Mb) present 317-0339-COM Virtua Tennis 2 / Power Smash 2 (Rev A) 840-0084C 22327A 18 (64Mb) present 317-0320-COM diff --git a/src/mame/drivers/taito_z.c b/src/mame/drivers/taito_z.c index f1d824f8540..d1a001f817e 100644 --- a/src/mame/drivers/taito_z.c +++ b/src/mame/drivers/taito_z.c @@ -1610,7 +1610,7 @@ static ADDRESS_MAP_START( bsharkjjs_map, AS_PROGRAM, 16 ) AM_RANGE(0x110000, 0x113fff) AM_RAM AM_SHARE("share1") AM_RANGE(0x400000, 0x40000f) AM_DEVREADWRITE8("tc0220ioc", tc0220ioc_r, tc0220ioc_w, 0x00ff) AM_RANGE(0x600000, 0x600001) AM_WRITE(cpua_ctrl_w) -// AM_RANGE(0x800000, 0x800007) AM_READWRITE(bshark_stick_r, bshark_stick_w) /* No analog stick, this is the Joystick version */ +// AM_RANGE(0x800000, 0x800007) AM_READWRITE(bshark_stick_r, bshark_stick_w) /* No analog stick, this is the Joystick version */ AM_RANGE(0xa00000, 0xa01fff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE_GENERIC(paletteram) AM_RANGE(0xc00000, 0xc00fff) AM_RAM AM_BASE_SIZE_MEMBER(taitoz_state, m_spriteram, m_spriteram_size) AM_RANGE(0xd00000, 0xd0ffff) AM_DEVREADWRITE("tc0100scn", tc0100scn_word_r, tc0100scn_word_w) /* tilemaps */ diff --git a/src/version.c b/src/version.c index 8e9253d9124..28d3821e029 100644 --- a/src/version.c +++ b/src/version.c @@ -38,4 +38,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.143u8 ("__DATE__")"; +const char build_version[] = "0.143u9 ("__DATE__")"; -- cgit v1.2.3