From a4bca37f8199fd68f2476644cb2d4c4d606ec201 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 4 Sep 2008 15:31:56 +0000 Subject: Cleanups and version bump. --- src/emu/cpu/mcs48/mcs48.c | 10 +++--- src/emu/machine/generic.c | 6 ++-- src/emu/machine/ldcore.c | 82 ++++++++++++++++++++++----------------------- src/emu/machine/ldcore.h | 42 +++++++++++------------ src/emu/machine/ldpr8210.c | 34 +++++++++---------- src/emu/machine/ldv1000.c | 52 ++++++++++++++-------------- src/emu/sound/snkwave.c | 6 ++-- src/emu/video.c | 2 +- src/mame/audio/mario.c | 2 +- src/mame/drivers/39in1.c | 30 ++++++++--------- src/mame/drivers/atarigt.c | 34 +++++++++---------- src/mame/drivers/cojag.c | 14 ++++---- src/mame/drivers/discoboy.c | 2 +- src/mame/drivers/dkong.c | 2 +- src/mame/drivers/hornet.c | 8 ++--- src/mame/drivers/mario.c | 2 +- src/mame/drivers/nwk-tr.c | 6 ++-- src/mame/drivers/shadfrce.c | 2 +- src/mame/drivers/skyarmy.c | 4 +-- src/mame/drivers/snk.c | 10 +++--- src/mame/drivers/stadhero.c | 2 +- src/mame/drivers/toaplan2.c | 2 +- src/mame/drivers/videopkr.c | 20 +++++------ src/mame/includes/dkong.h | 2 +- src/version.c | 2 +- 25 files changed, 189 insertions(+), 189 deletions(-) diff --git a/src/emu/cpu/mcs48/mcs48.c b/src/emu/cpu/mcs48/mcs48.c index e078c012724..a7c6566fbeb 100644 --- a/src/emu/cpu/mcs48/mcs48.c +++ b/src/emu/cpu/mcs48/mcs48.c @@ -700,12 +700,12 @@ static const mcs48_opcode opcode_table[256]= static void mcs48_init(int index, int clock, const void *config, int (*irqcallback)(int), UINT16 romsize) { memset(&mcs48, 0, sizeof(mcs48)); - + /* External access line - * EA=1 : read from external rom - * EA=0 : read from internal rom - */ - + * EA=1 : read from external rom + * EA=0 : read from internal rom + */ + /* FIXME: Current implementation suboptimal */ mcs48.ea = (romsize ? 0 : 1); diff --git a/src/emu/machine/generic.c b/src/emu/machine/generic.c index 289f019894a..6419cbb9d05 100644 --- a/src/emu/machine/generic.c +++ b/src/emu/machine/generic.c @@ -856,9 +856,9 @@ READ32_HANDLER( input_port_31_dword_r ) { return input_port_read_indexed(machine /*------------------------------------------------- custom_port_read - act like input_port_read - but it is a custom port, it is useful for - e.g. input ports which expect the same port - repeated both in the upper and lower half + but it is a custom port, it is useful for + e.g. input ports which expect the same port + repeated both in the upper and lower half -------------------------------------------------*/ CUSTOM_INPUT( custom_port_read ) diff --git a/src/emu/machine/ldcore.c b/src/emu/machine/ldcore.c index 05b6f512858..b8c67ea2068 100644 --- a/src/emu/machine/ldcore.c +++ b/src/emu/machine/ldcore.c @@ -46,7 +46,7 @@ struct _ldcore_data { /* general config */ laserdisc_config config; /* copy of the inline config */ - ldplayer_interface intf; /* interface to the player */ + ldplayer_interface intf; /* interface to the player */ /* disc parameters */ chd_file * disc; /* handle to the disc itself */ @@ -130,14 +130,14 @@ static void configuration_save(running_machine *machine, int config_type, xml_da GLOBAL VARIABLES ***************************************************************************/ -static const ldplayer_interface *player_interfaces[] = +static const ldplayer_interface *player_interfaces[] = { -// &pr7820_interface, +// &pr7820_interface, &pr8210_interface, &simutrek_interface, &ldv1000_interface, -// &ldp1450_interface, -// &vp932_interface +// &ldp1450_interface, +// &vp932_interface }; const custom_sound_interface laserdisc_custom_interface = @@ -346,7 +346,7 @@ void laserdisc_vsync(const device_config *device) /* wait for previous read and decode to finish */ process_track_data(device); - + /* update the state */ if (ldcore->intf.update != NULL) { @@ -534,7 +534,7 @@ UINT32 laserdisc_get_field_code(const device_config *device, UINT8 code) ***************************************************************************/ /*------------------------------------------------- - ldcore_get_safe_token - return a token with + ldcore_get_safe_token - return a token with type checking from a device -------------------------------------------------*/ @@ -545,7 +545,7 @@ laserdisc_state *ldcore_get_safe_token(const device_config *device) /*------------------------------------------------- - ldcore_set_audio_squelch - set the left/right + ldcore_set_audio_squelch - set the left/right audio squelch states -------------------------------------------------*/ @@ -556,7 +556,7 @@ void ldcore_set_audio_squelch(laserdisc_state *ld, UINT8 squelchleft, UINT8 sque /*------------------------------------------------- - ldcore_set_video_squelch - set the video + ldcore_set_video_squelch - set the video squelch state -------------------------------------------------*/ @@ -572,7 +572,7 @@ void ldcore_set_video_squelch(laserdisc_state *ld, UINT8 squelch) ***************************************************************************/ /*------------------------------------------------- - ldcore_generic_update - generically update in + ldcore_generic_update - generically update in a way that works for most situations -------------------------------------------------*/ @@ -580,10 +580,10 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi { INT32 advanceby = 0; int frame; - + /* start by assuming the state doesn't change */ *newstate = ld->state; - + /* handle things based on the state */ switch (ld->state.state) { @@ -592,29 +592,29 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi if (attotime_compare(curtime, ld->state.endtime) >= 0) newstate->state = LDSTATE_EJECTED; break; - + case LDSTATE_EJECTED: /* do nothing */ break; - + case LDSTATE_PARKED: /* do nothing */ break; - + case LDSTATE_LOADING: /* when time expires, switch to the spinup state */ if (attotime_compare(curtime, ld->state.endtime) >= 0) newstate->state = LDSTATE_SPINUP; advanceby = -GENERIC_SEARCH_SPEED; break; - + case LDSTATE_SPINUP: /* when time expires, switch to the playing state */ if (attotime_compare(curtime, ld->state.endtime) >= 0) newstate->state = LDSTATE_PLAYING; advanceby = -GENERIC_SEARCH_SPEED; break; - + case LDSTATE_PAUSING: /* if he hit the start of a frame, switch to paused state */ if (is_start_of_frame(vbi)) @@ -622,18 +622,18 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi newstate->state = LDSTATE_PAUSED; newstate->param = fieldnum; } - + /* else advance until we hit it */ else if (fieldnum == 1) advanceby = 1; break; - + case LDSTATE_PAUSED: /* if we paused on field 1, we must flip back and forth */ if (ld->state.param == 1) advanceby = (fieldnum == 1) ? 1 : -1; break; - + case LDSTATE_PLAYING: /* if we hit the target frame, switch to the paused state */ if (ld->state.param > 0 && is_start_of_frame(vbi) && frame_from_metadata(vbi) == ld->state.param) @@ -646,7 +646,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi else if (fieldnum == 1) advanceby = 1; break; - + case LDSTATE_PLAYING_SLOW_REVERSE: /* after the second field of each frame, see if we need to advance */ if (fieldnum == 1 && ++ld->state.substate > ld->state.param) @@ -655,7 +655,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi ld->state.substate = 0; } break; - + case LDSTATE_PLAYING_SLOW_FORWARD: /* after the second field of each frame, see if we need to advance */ if (fieldnum == 1 && ++ld->state.substate > ld->state.param) @@ -664,7 +664,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi ld->state.substate = 0; } break; - + case LDSTATE_PLAYING_FAST_REVERSE: /* advance after the second field of each frame */ if (fieldnum == 1) @@ -676,17 +676,17 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi if (fieldnum == 1) advanceby = ld->state.param; break; - + case LDSTATE_SCANNING: /* advance after the second field of each frame */ if (fieldnum == 1) advanceby = ld->state.param >> 8; - + /* after we run out of vsyncs, revert to the saved state */ if (++ld->state.substate >= (ld->state.param & 0xff)) *newstate = ld->savestate; break; - + case LDSTATE_STEPPING_REVERSE: /* wait for the first field of the frame and then leap backwards */ if (is_start_of_frame(vbi)) @@ -695,13 +695,13 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi newstate->state = LDSTATE_PAUSING; } break; - + case LDSTATE_STEPPING_FORWARD: /* wait for the first field of the frame and then switch to pausing state */ if (is_start_of_frame(vbi)) newstate->state = LDSTATE_PAUSING; break; - + case LDSTATE_SEEKING: /* if we're in the final state, look for a matching frame and pause there */ frame = frame_from_metadata(vbi); @@ -710,7 +710,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi newstate->state = LDSTATE_PAUSED; newstate->param = fieldnum; } - + /* otherwise, if we got frame data from the VBI, update our seeking logic */ else if (ld->state.substate == 0 && frame != FRAME_NOT_PRESENT) { @@ -719,7 +719,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi /* if we're within a couple of frames, just play until we hit it */ if (delta >= 0 && delta <= 2) ld->state.substate++; - + /* otherwise, compute the delta assuming 1:1 track to frame; this will correct eventually */ else { @@ -730,7 +730,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi advanceby = MAX(advanceby, -GENERIC_SEARCH_SPEED); } } - + /* otherwise, keep advancing until we know what's up */ else { @@ -739,7 +739,7 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi } break; } - + return advanceby; } @@ -755,7 +755,7 @@ static void read_track_data(laserdisc_state *ld) UINT32 tracknum = ldcore->curtrack; UINT32 fieldnum = ldcore->fieldnum; chd_error err; - + /* if the previous field had the white flag, force the new field to pair with it */ if (ldcore->metadata[fieldnum ^ 1].white) ldcore->videofields[ldcore->videoindex] = 1; @@ -856,8 +856,8 @@ static void process_track_data(const device_config *device) ldcore->last_chapter = chapter; /* render the display if present */ -// if (ldcore->display && ldcore->avconfig.video != NULL) -// render_display((UINT16 *)ldcore->avconfig.video->base, ldcore->avconfig.video->rowpixels, ldcore->avconfig.video->width, ldcore->last_frame); +// if (ldcore->display && ldcore->avconfig.video != NULL) +// render_display((UINT16 *)ldcore->avconfig.video->base, ldcore->avconfig.video->rowpixels, ldcore->avconfig.video->width, ldcore->last_frame); /* update video field */ if (ldcore->avconfig.video != NULL) @@ -1326,10 +1326,10 @@ static DEVICE_START( laserdisc ) int sndnum, index; int statesize; chd_error err; - + /* save a copy of the device pointer */ ld->device = device; - + /* allocate memory for the core state */ ld->core = auto_malloc(sizeof(*ld->core)); memset(ld->core, 0, sizeof(*ld->core)); @@ -1341,7 +1341,7 @@ static DEVICE_START( laserdisc ) statesize = MAX(statesize, player_interfaces[index]->statesize); ld->player = auto_malloc(statesize); memset(ld->player, 0, statesize); - + /* copy config data to the live state */ ldcore->config = *config; if (ldcore->config.overclip.max_x == ldcore->config.overclip.min_x || ldcore->config.overclip.max_y == ldcore->config.overclip.min_y) @@ -1399,7 +1399,7 @@ static DEVICE_START( laserdisc ) /* first allocate a YUY16 bitmap at 2x the height */ ldcore->videoframe[index] = auto_bitmap_alloc(width, height * 2, BITMAP_FORMAT_YUY16); fillbitmap_yuy16(ldcore->videoframe[index], 40, 109, 240); - + /* make a copy of the bitmap that clips out the VBI and horizontal blanking areas */ ldcore->videovisframe[index] = auto_malloc(sizeof(*ldcore->videovisframe[index])); *ldcore->videovisframe[index] = *ldcore->videoframe[index]; @@ -1407,7 +1407,7 @@ static DEVICE_START( laserdisc ) ldcore->videovisframe[index]->height -= 44; ldcore->videovisframe[index]->width -= 2 * ldcore->videoframe[index]->width * 8 / 720; } - + /* allocate an empty frame of the same size */ ldcore->emptyframe = auto_bitmap_alloc(width, height * 2, BITMAP_FORMAT_YUY16); fillbitmap_yuy16(ldcore->emptyframe, 0, 128, 128); @@ -1503,7 +1503,7 @@ static DEVICE_RESET( laserdisc ) ldcore->linein[line] = CLEAR_LINE; for (line = 0; line < LASERDISC_OUTPUT_LINES; line++) ldcore->lineout[line] = CLEAR_LINE; - + /* call the initialization */ if (ldcore->intf.init != NULL) (*ldcore->intf.init)(ld); diff --git a/src/emu/machine/ldcore.h b/src/emu/machine/ldcore.h index 74b912212ea..5960ef576fb 100644 --- a/src/emu/machine/ldcore.h +++ b/src/emu/machine/ldcore.h @@ -1,11 +1,11 @@ /************************************************************************* - ldcore.h + ldcore.h - Private core laserdisc player implementation. + Private core laserdisc player implementation. - Copyright Nicola Salmoria and the MAME Team. - Visit http://mamedev.org for licensing and usage restrictions. + Copyright Nicola Salmoria and the MAME Team. + Visit http://mamedev.org for licensing and usage restrictions. *************************************************************************/ @@ -20,7 +20,7 @@ /*************************************************************************** - CONSTANTS + CONSTANTS ***************************************************************************/ /* common laserdisc states */ @@ -77,7 +77,7 @@ enum /*************************************************************************** - MACROS + MACROS ***************************************************************************/ #define SCANNING_PARAM(speed,duration) (((speed) << 8) | ((duration) & 0xff)) @@ -85,7 +85,7 @@ enum /*************************************************************************** - TYPE DEFINITIONS + TYPE DEFINITIONS ***************************************************************************/ /* core-specific and player-specific data */ @@ -111,7 +111,7 @@ struct _laserdisc_state const device_config * device; /* pointer to owning device */ ldcore_data * core; /* private core data */ ldplayer_data * player; /* private player data */ - + ldplayer_state state; /* active state */ ldplayer_state savestate; /* saved state during temporary operations */ }; @@ -142,7 +142,7 @@ struct _ldplayer_interface /*************************************************************************** - GLOBAL VARIABLES + GLOBAL VARIABLES ***************************************************************************/ /* defined by each player */ @@ -156,7 +156,7 @@ extern const ldplayer_interface vp932_interface; /*************************************************************************** - FUNCTION PROTOTYPES + FUNCTION PROTOTYPES ***************************************************************************/ @@ -181,27 +181,27 @@ INT32 ldcore_generic_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi /*************************************************************************** - INLINE FUNCTIONS + INLINE FUNCTIONS ***************************************************************************/ /*------------------------------------------------- - is_start_of_frame - return TRUE if this is - the start of a frame + is_start_of_frame - return TRUE if this is + the start of a frame -------------------------------------------------*/ INLINE int is_start_of_frame(const vbi_metadata *vbi) { /* is it not known if the white flag or the presence of a frame code - determines the start of frame; the former seems to be the "official" - way, but the latter seems to be the practical implementation */ + determines the start of frame; the former seems to be the "official" + way, but the latter seems to be the practical implementation */ return (vbi->white || (vbi->line1718 & 0xf80000) == 0xf80000); } /*------------------------------------------------- - frame_from_metadata - return the frame number - encoded in the metadata, if present, or - FRAME_NOT_PRESENT + frame_from_metadata - return the frame number + encoded in the metadata, if present, or + FRAME_NOT_PRESENT -------------------------------------------------*/ INLINE int frame_from_metadata(const vbi_metadata *metadata) @@ -222,9 +222,9 @@ INLINE int frame_from_metadata(const vbi_metadata *metadata) /*------------------------------------------------- - chapter_from_metadata - return the chapter - number encoded in the metadata, if present, - or CHAPTER_NOT_PRESENT + chapter_from_metadata - return the chapter + number encoded in the metadata, if present, + or CHAPTER_NOT_PRESENT -------------------------------------------------*/ INLINE int chapter_from_metadata(const vbi_metadata *metadata) diff --git a/src/emu/machine/ldpr8210.c b/src/emu/machine/ldpr8210.c index de6cea47286..c361335c1cc 100644 --- a/src/emu/machine/ldpr8210.c +++ b/src/emu/machine/ldpr8210.c @@ -31,7 +31,7 @@ enum { LDSTATE_STEPPING_BY_PARAMETER = LDSTATE_OTHER }; - + /* Pioneer PR-8210 specific information */ #define PR8210_SCAN_SPEED (2000 / 30) /* 2000 frames/second */ #define PR8210_SCAN_DURATION (10) /* scan for 10 vsyncs each time */ @@ -197,7 +197,7 @@ static void pr8210_soft_reset(laserdisc_state *ld) player->accumulator = 0; player->firstbittime = curtime; player->lastbittime = curtime; - + pr8210_switch_state(ld, LDSTATE_PARKED, 0); } @@ -218,7 +218,7 @@ static void pr8210_update_squelch(laserdisc_state *ld) ldcore_set_audio_squelch(ld, player->audio1disable, player->audio2disable); ldcore_set_video_squelch(ld, FALSE); break; - + /* video on, audio off */ case LDSTATE_PAUSING: case LDSTATE_PAUSED: @@ -232,7 +232,7 @@ static void pr8210_update_squelch(laserdisc_state *ld) ldcore_set_audio_squelch(ld, TRUE, TRUE); ldcore_set_video_squelch(ld, FALSE); break; - + /* video off, audio off */ case LDSTATE_NONE: case LDSTATE_EJECTED: @@ -262,15 +262,15 @@ static void pr8210_update_squelch(laserdisc_state *ld) static int pr8210_switch_state(laserdisc_state *ld, UINT8 newstate, INT32 parameter) { attotime curtime = timer_get_time(); - + /* if this is the same state, ignore */ if (ld->state.state == newstate) return TRUE; - + /* if we're in a timed state, we ignore changes until the time elapses */ if (attotime_compare(curtime, ld->state.endtime) < 0) return FALSE; - + /* if moving to a state that requires it, save the old state */ if (requires_state_save(newstate) && !requires_state_save(ld->state.state)) ld->savestate = ld->state; @@ -288,15 +288,15 @@ static int pr8210_switch_state(laserdisc_state *ld, UINT8 newstate, INT32 parame case LDSTATE_EJECTING: ld->state.endtime = attotime_add(curtime, GENERIC_EJECT_TIME); break; - + case LDSTATE_LOADING: ld->state.endtime = attotime_add(curtime, GENERIC_LOAD_TIME); break; - + case LDSTATE_SPINUP: ld->state.endtime = attotime_add(curtime, GENERIC_SPINUP_TIME); break; - + case LDSTATE_SEEKING: ld->state.endtime = attotime_add(curtime, PR8210_MINIMUM_SEEK_TIME); break; @@ -315,7 +315,7 @@ static INT32 pr8210_update(laserdisc_state *ld, const vbi_metadata *vbi, int fie ldplayer_state newstate; INT32 advanceby = 0; int frame; - + /* handle things based on the state */ switch (ld->state.state) { @@ -344,25 +344,25 @@ static INT32 pr8210_update(laserdisc_state *ld, const vbi_metadata *vbi, int fie frame = frame_from_metadata(vbi); if (ld->state.substate == 3 && is_start_of_frame(vbi) && frame == ld->state.param) pr8210_switch_state(ld, LDSTATE_PAUSED, fieldnum); - + /* otherwise, if we got frame data from the VBI, update our seeking logic */ else if (ld->state.substate < 3 && frame != FRAME_NOT_PRESENT) { static const INT32 seekspeed[] = { -PR8210_SEEK_FAST_SPEED, PR8210_SEEK_FAST_SPEED, -PR8210_JUMP_REV_SPEED }; INT32 curseekspeed = seekspeed[ld->state.substate]; INT32 delta = (ld->state.param - 1) - frame; - + if ((curseekspeed < 0 && delta <= 0) || (curseekspeed > 0 && delta >= 0)) advanceby = curseekspeed; else ld->state.substate++; } - + /* otherwise, keep advancing until we know what's up */ else if (fieldnum == 1) advanceby = 1; break; - + case LDSTATE_STEPPING_BY_PARAMETER: /* advance after the second field of each frame */ if (fieldnum == 1) @@ -373,7 +373,7 @@ static INT32 pr8210_update(laserdisc_state *ld, const vbi_metadata *vbi, int fie } break; } - + return advanceby; } @@ -393,7 +393,7 @@ static void pr8210_command(laserdisc_state *ld) case 0x00: CMDPRINTF(("pr8210: EOC\n")); /* EOC marker - can be safely ignored */ break; - + case 0x01: CMDPRINTF(("pr8210: 0\n")); player->parameter = (player->parameter == -1) ? 0 : (player->parameter * 10 + 0); break; diff --git a/src/emu/machine/ldv1000.c b/src/emu/machine/ldv1000.c index 36f00853714..5c2354e0f51 100644 --- a/src/emu/machine/ldv1000.c +++ b/src/emu/machine/ldv1000.c @@ -32,7 +32,7 @@ enum LDSTATE_SKIPPING = LDSTATE_OTHER, LDSTATE_WAITING }; - + /* Pioneer LD-V1000 specific information */ enum { @@ -201,7 +201,7 @@ static void ldv1000_soft_reset(laserdisc_state *ld) player->readtotal = 0; memset(player->readbuf, 0, sizeof(player->readbuf)); player->lastvsynctime = curtime; - + ldv1000_switch_state(ld, LDSTATE_PARKED, 0); } @@ -222,7 +222,7 @@ static void ldv1000_update_squelch(laserdisc_state *ld) ldcore_set_audio_squelch(ld, player->audio1disable, player->audio2disable); ldcore_set_video_squelch(ld, FALSE); break; - + /* video on, audio off */ case LDSTATE_PAUSING: case LDSTATE_PAUSED: @@ -238,7 +238,7 @@ static void ldv1000_update_squelch(laserdisc_state *ld) ldcore_set_audio_squelch(ld, TRUE, TRUE); ldcore_set_video_squelch(ld, FALSE); break; - + /* video off, audio off */ case LDSTATE_NONE: case LDSTATE_EJECTING: @@ -263,15 +263,15 @@ static void ldv1000_update_squelch(laserdisc_state *ld) static int ldv1000_switch_state(laserdisc_state *ld, UINT8 newstate, INT32 parameter) { attotime curtime = timer_get_time(); - + /* if this is the same state, ignore */ if (ld->state.state == newstate) return TRUE; - + /* if we're in a timed state, we ignore changes until the time elapses */ if (attotime_compare(curtime, ld->state.endtime) < 0) return FALSE; - + /* if moving to a state that requires it, save the old state */ if (requires_state_save(newstate) && !requires_state_save(ld->state.state)) ld->savestate = ld->state; @@ -289,15 +289,15 @@ static int ldv1000_switch_state(laserdisc_state *ld, UINT8 newstate, INT32 param case LDSTATE_EJECTING: ld->state.endtime = attotime_add(curtime, GENERIC_EJECT_TIME); break; - + case LDSTATE_LOADING: ld->state.endtime = attotime_add(curtime, GENERIC_LOAD_TIME); break; - + case LDSTATE_SPINUP: ld->state.endtime = attotime_add(curtime, GENERIC_SPINUP_TIME); break; - + case LDSTATE_WAITING: ld->state.endtime = attotime_add(curtime, attotime_mul(ATTOTIME_IN_MSEC(100), ld->state.param)); break; @@ -317,7 +317,7 @@ static INT32 ldv1000_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi ldplayer_state newstate; INT32 advanceby = 0; int frame, chapter; - + /* remember the last frame and chapter */ player->lastvsynctime = curtime; frame = frame_from_metadata(vbi); @@ -350,19 +350,19 @@ static INT32 ldv1000_update(laserdisc_state *ld, const vbi_metadata *vbi, int fi advanceby = ldcore_generic_update(ld, vbi, fieldnum, curtime, &newstate); ldv1000_switch_state(ld, newstate.state, newstate.param); break; - + case LDSTATE_SKIPPING: /* just advance and return to previous state */ advanceby = ld->state.param; ldv1000_switch_state(ld, ld->savestate.state, ld->savestate.param); break; - + case LDSTATE_WAITING: /* keep trying to switch to the previous state until we succeed */ ldv1000_switch_state(ld, ld->savestate.state, ld->savestate.param); break; } - + return advanceby; } @@ -387,43 +387,43 @@ static void ldv1000_data_w(laserdisc_state *ld, UINT8 prev, UINT8 data) case 0x3f: CMDPRINTF(("ldv1000: 0\n")); player->parameter = (player->parameter == -1) ? 0 : (player->parameter * 10 + 0); return; - + case 0x0f: CMDPRINTF(("ldv1000: 1\n")); player->parameter = (player->parameter == -1) ? 1 : (player->parameter * 10 + 1); return; - + case 0x8f: CMDPRINTF(("ldv1000: 2\n")); player->parameter = (player->parameter == -1) ? 2 : (player->parameter * 10 + 2); return; - + case 0x4f: CMDPRINTF(("ldv1000: 3\n")); player->parameter = (player->parameter == -1) ? 3 : (player->parameter * 10 + 3); return; - + case 0x2f: CMDPRINTF(("ldv1000: 4\n")); player->parameter = (player->parameter == -1) ? 4 : (player->parameter * 10 + 4); return; - + case 0xaf: CMDPRINTF(("ldv1000: 5\n")); player->parameter = (player->parameter == -1) ? 5 : (player->parameter * 10 + 5); return; - + case 0x6f: CMDPRINTF(("ldv1000: 6\n")); player->parameter = (player->parameter == -1) ? 6 : (player->parameter * 10 + 6); return; - + case 0x1f: CMDPRINTF(("ldv1000: 7\n")); player->parameter = (player->parameter == -1) ? 7 : (player->parameter * 10 + 7); return; - + case 0x9f: CMDPRINTF(("ldv1000: 8\n")); player->parameter = (player->parameter == -1) ? 8 : (player->parameter * 10 + 8); return; - + case 0x5f: CMDPRINTF(("ldv1000: 9\n")); player->parameter = (player->parameter == -1) ? 9 : (player->parameter * 10 + 9); return; - + case 0x7f: CMDPRINTF(("ldv1000: %d Recall\n", player->parameter)); /* set the active register */ player->activereg = player->parameter; @@ -728,8 +728,8 @@ static UINT8 ldv1000_status_r(laserdisc_state *ld) case LDSTATE_STEPPING_REVERSE: status = 0xe5; break; case LDSTATE_SCANNING: status = 0x4c; break; case LDSTATE_SEEKING: status = 0x50; break; -// case LASERDISC_SEARCH_FINISHED: status = 0xd0; break; -// case LASERDISC_AUTOSTOPPED: status = 0x54; break; +// case LASERDISC_SEARCH_FINISHED: status = 0xd0; break; +// case LASERDISC_AUTOSTOPPED: status = 0x54; break; default: fatalerror("Unexpected disc state in ldv1000_status_r\n"); break; diff --git a/src/emu/sound/snkwave.c b/src/emu/sound/snkwave.c index b9319acdc13..2fdaf99a851 100644 --- a/src/emu/sound/snkwave.c +++ b/src/emu/sound/snkwave.c @@ -135,9 +135,9 @@ static void *snkwave_start(const char *tag, int sndindex, int clock, const void /********************************************************************************/ /* SNK wave register map - all registers are 6-bit - 0-1 frequency (12-bit) - 2-5 waveform (8 3-bit nibbles) + all registers are 6-bit + 0-1 frequency (12-bit) + 2-5 waveform (8 3-bit nibbles) */ WRITE8_HANDLER( snkwave_w ) diff --git a/src/emu/video.c b/src/emu/video.c index a86704da38a..ee3e7245ee0 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -2074,7 +2074,7 @@ static void update_refresh_speed(running_machine *machine) /* compute a target speed as an integral percentage */ /* note that we lop 0.25Hz off of the minrefresh when doing the computation to allow for - the fact that most refresh rates are not accurate to 10 digits... */ + the fact that most refresh rates are not accurate to 10 digits... */ target_speed = floor((minrefresh - 0.25f) * 100.0 / ATTOSECONDS_TO_HZ(min_frame_period)); target_speed = MIN(target_speed, original_speed); diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index 289979b481a..e0051d1d0af 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -274,7 +274,7 @@ static SOUND_RESET( mario ) #if USE_8039 set_ea(machine, 1); #endif - + soundlatch_clear_w(machine,0,0); soundlatch2_clear_w(machine,0,0); soundlatch3_clear_w(machine,0,0); diff --git a/src/mame/drivers/39in1.c b/src/mame/drivers/39in1.c index 18d764619dd..832012a1152 100644 --- a/src/mame/drivers/39in1.c +++ b/src/mame/drivers/39in1.c @@ -14,9 +14,9 @@ * * PCB also contains a custom ASIC, probably used for the decryption * - * TODO: - * Figure out weird memory test subroutine at 1c8 - * PXA255 MMU and peripherals + * TODO: + * Figure out weird memory test subroutine at 1c8 + * PXA255 MMU and peripherals * **************************************************************************/ @@ -95,28 +95,28 @@ GAME(2004, 39in1, 0, 39in1, 39in1, 0, ROT0, "????", "39 in 1 MAME bootleg", GAME /* -cpu #0 (PC=00000010): unmapped program memory dword write to 40E00024 = FFFFFFFF & FFFFFFFF GPIO pin output clear 31:0 -cpu #0 (PC=00000014): unmapped program memory dword write to 40E00028 = FFFFFFFF & FFFFFFFF 63:32 -cpu #0 (PC=00000018): unmapped program memory dword write to 40E0002C = FFFFFFFF & FFFFFFFF 80:64 -cpu #0 (PC=00000028): unmapped program memory dword write to 40E00018 = 01008000 & FFFFFFFF GPIO pin direction register 63:32 -cpu #0 (PC=0000002C): unmapped program memory dword write to 40E0001C = 00020802 & FFFFFFFF pin output set 63:32 -cpu #0 (PC=00000030): unmapped program memory dword write to 40E00020 = 0001CC00 & FFFFFFFF 80:64 -cpu #0 (PC=00000040): unmapped program memory dword write to 40E0000C = DFE3FFDC & FFFFFFFF GPIO pin direction 31:0 -cpu #0 (PC=00000044): unmapped program memory dword write to 40E00010 = FC9FAF83 & FFFFFFFF 63:32 +cpu #0 (PC=00000010): unmapped program memory dword write to 40E00024 = FFFFFFFF & FFFFFFFF GPIO pin output clear 31:0 +cpu #0 (PC=00000014): unmapped program memory dword write to 40E00028 = FFFFFFFF & FFFFFFFF 63:32 +cpu #0 (PC=00000018): unmapped program memory dword write to 40E0002C = FFFFFFFF & FFFFFFFF 80:64 +cpu #0 (PC=00000028): unmapped program memory dword write to 40E00018 = 01008000 & FFFFFFFF GPIO pin direction register 63:32 +cpu #0 (PC=0000002C): unmapped program memory dword write to 40E0001C = 00020802 & FFFFFFFF pin output set 63:32 +cpu #0 (PC=00000030): unmapped program memory dword write to 40E00020 = 0001CC00 & FFFFFFFF 80:64 +cpu #0 (PC=00000040): unmapped program memory dword write to 40E0000C = DFE3FFDC & FFFFFFFF GPIO pin direction 31:0 +cpu #0 (PC=00000044): unmapped program memory dword write to 40E00010 = FC9FAF83 & FFFFFFFF 63:32 cpu #0 (PC=00000048): unmapped program memory dword write to 40E00014 = 0001FFFF & FFFFFFFF -cpu #0 (PC=00000064): unmapped program memory dword write to 40E00054 = 80000000 & FFFFFFFF GPIO alternate function +cpu #0 (PC=00000064): unmapped program memory dword write to 40E00054 = 80000000 & FFFFFFFF GPIO alternate function cpu #0 (PC=00000068): unmapped program memory dword write to 40E00058 = 59000110 & FFFFFFFF cpu #0 (PC=0000006C): unmapped program memory dword write to 40E0005C = 600A9559 & FFFFFFFF cpu #0 (PC=00000070): unmapped program memory dword write to 40E00060 = AAA00008 & FFFFFFFF cpu #0 (PC=00000074): unmapped program memory dword write to 40E00064 = AAAAAAAA & FFFFFFFF cpu #0 (PC=00000078): unmapped program memory dword write to 40E00068 = 00000002 & FFFFFFFF -cpu #0 (PC=00000084): unmapped program memory dword write to 40F00004 = 00000020 & FFFFFFFF power manager sleep status +cpu #0 (PC=00000084): unmapped program memory dword write to 40F00004 = 00000020 & FFFFFFFF power manager sleep status test_rt_r_callback opcode=ee160e10 test_rt_w_callback opcode=ee060e10, data from ARM7 register=2 -cpu #0 (PC=0000009C): unmapped program memory dword write to 41300000 = 00000141 & FFFFFFFF core clock configure (multiplier=27, RAM is 99.53 MHz + multiplier = 2 * memory + turbo = 1x) +cpu #0 (PC=0000009C): unmapped program memory dword write to 41300000 = 00000141 & FFFFFFFF core clock configure (multiplier=27, RAM is 99.53 MHz + multiplier = 2 * memory + turbo = 1x) test_rt_w_callback opcode=ee060e10, data from ARM7 register=3 test_rt_w_callback opcode=ee060e10, data from ARM7 register=1 -cpu #0 (PC=000000B4): unmapped program memory dword read from 40A00010 & FFFFFFFF OS timer/counter +cpu #0 (PC=000000B4): unmapped program memory dword read from 40A00010 & FFFFFFFF OS timer/counter cpu #0 (PC=000000B8): unmapped program memory dword read from 40A00010 & FFFFFFFF cpu #0 (PC=000000B8): unmapped program memory dword read from 40A00010 & FFFFFFFF diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index 46f0f63e10b..fde00ea33b0 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -641,25 +641,25 @@ static INPUT_PORTS_START( common ) PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) PORT_BIT( 0x80000000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_START("SERVICE") /* 68.STATUS (A2=0) */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /A2DRDY */ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_TILT ) /* TILT */ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ23 */ - PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */ - PORT_BIT( 0x0030, IP_ACTIVE_LOW, IPT_UNUSED ) /* NC */ - PORT_SERVICE( 0x0040, IP_ACTIVE_LOW ) /* SELFTEST */ - PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) /* VBLANK */ + PORT_START("SERVICE") /* 68.STATUS (A2=0) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /A2DRDY */ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_TILT ) /* TILT */ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ23 */ + PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* A2D.EOC */ + PORT_BIT( 0x0030, IP_ACTIVE_LOW, IPT_UNUSED ) /* NC */ + PORT_SERVICE( 0x0040, IP_ACTIVE_LOW ) /* SELFTEST */ + PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_VBLANK ) /* VBLANK */ PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_START("COIN") /* 68.STATUS (A2=1) */ - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /VBIRQ */ - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /4MSIRQ */ - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ0 */ - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ1 */ - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /SERVICER */ - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /SER.L */ - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) /* COINR */ - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) /* COINL */ + PORT_START("COIN") /* 68.STATUS (A2=1) */ + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /VBIRQ */ + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /4MSIRQ */ + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ0 */ + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /XIRQ1 */ + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /SERVICER */ + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SPECIAL ) /* /SER.L */ + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) /* COINR */ + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) /* COINL */ PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/cojag.c b/src/mame/drivers/cojag.c index fa8a6e6fdcb..a366db92d8b 100644 --- a/src/mame/drivers/cojag.c +++ b/src/mame/drivers/cojag.c @@ -883,13 +883,13 @@ ADDRESS_MAP_END *************************************/ /* "FAKE0" is read at 0x04f17000 - D23-20 = /SER-4-1 - D19-16 = COINR4-1 - D7 = /VSYNCNEQ - D6 = /S-TEST - D5 = /VOLUMEUP - D4 = /VOLUMEDOWN - D3-D0 = ACTC4-1 + D23-20 = /SER-4-1 + D19-16 = COINR4-1 + D7 = /VSYNCNEQ + D6 = /S-TEST + D5 = /VOLUMEUP + D4 = /VOLUMEDOWN + D3-D0 = ACTC4-1 */ static INPUT_PORTS_START( area51 ) PORT_START("P1_P2") diff --git a/src/mame/drivers/discoboy.c b/src/mame/drivers/discoboy.c index 527087b43f8..598749fbc5c 100644 --- a/src/mame/drivers/discoboy.c +++ b/src/mame/drivers/discoboy.c @@ -466,7 +466,7 @@ static MACHINE_DRIVER_START( discoboy ) MDRV_CPU_ADD("audio", Z80,10000000/2) /* 5 MHz? */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) -// MDRV_CPU_IO_MAP(sound_io_map,0) +// MDRV_CPU_IO_MAP(sound_io_map,0) // MDRV_CPU_VBLANK_INT("main", irq0_line_hold) MDRV_CPU_VBLANK_INT_HACK(nmi_line_pulse,32) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index c92947154be..4c1bd180061 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -672,7 +672,7 @@ static READ8_HANDLER( s2650_port0_r ) case COMBINE_TYPE_PC(DK2650_SPCLFORC, 0x00a3): return 0x01; case COMBINE_TYPE_PC(DK2650_SPCLFORC, 0x007b): return 0x01; } - + switch (state->protect_type) { case DK2650_HUNCHBKD: return 0x00; diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 6040e68d71f..a0c9e88b881 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -1360,7 +1360,7 @@ ROM_START(sscope) ROM_LOAD( "830a10.14p", 0x400000, 0x400000, CRC(8b8aaf7e) SHA1(49b694dc171c149056b87c15410a6bf37ff2987f) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(ee815325) SHA1(91b10802791b68a8360c0cd6c376c0c4bbbc6fa0) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(ee815325) SHA1(91b10802791b68a8360c0cd6c376c0c4bbbc6fa0) ) ROM_END ROM_START(sscopea) @@ -1382,7 +1382,7 @@ ROM_START(sscopea) ROM_LOAD( "830a10.14p", 0x400000, 0x400000, CRC(8b8aaf7e) SHA1(49b694dc171c149056b87c15410a6bf37ff2987f) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(ee815325) SHA1(91b10802791b68a8360c0cd6c376c0c4bbbc6fa0) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(ee815325) SHA1(91b10802791b68a8360c0cd6c376c0c4bbbc6fa0) ) ROM_END ROM_START(sscope2) @@ -1408,7 +1408,7 @@ ROM_START(sscope2) ROM_LOAD( "931a11.bin", 0x800000, 0x400000, CRC(9c8362b2) SHA1(a8158c4db386e2bbd61dc9a600720f07a1eba294) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(d4e69d7a) SHA1(1e29eecf4886e5e098a388dedd5f3901c2bb65e5) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(d4e69d7a) SHA1(1e29eecf4886e5e098a388dedd5f3901c2bb65e5) ) ROM_END ROM_START(gradius4) @@ -1489,7 +1489,7 @@ ROM_START(terabrst) ROM_LOAD16_WORD_SWAP( "715a17.20k", 0x000000, 0x020000, CRC(f0b7ba0c) SHA1(863b260824b0ae2f890ba84d1c9a8f436891b1ff) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(62fecb78) SHA1(09509be8a947cf2d38e12a6ea755ec0de4aa9bd4) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(62fecb78) SHA1(09509be8a947cf2d38e12a6ea755ec0de4aa9bd4) ) ROM_END /*************************************************************************/ diff --git a/src/mame/drivers/mario.c b/src/mame/drivers/mario.c index 2bb0e07f67e..ab543ffbd83 100644 --- a/src/mame/drivers/mario.c +++ b/src/mame/drivers/mario.c @@ -412,7 +412,7 @@ ROM_START( mario ) ROM_LOAD( "tma1c-a.6k", 0x1000, 0x0800, CRC(06b9ff85) SHA1(111a29bcb9cda0d935675fa26eca6b099a88427f) ) /* second half always read */ ROM_CONTINUE( 0x0800, 0x0800) - + ROM_REGION( 0x2000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "mario.3f", 0x0000, 0x1000, CRC(28b0c42c) SHA1(46749568aff88a28c3b6a1ac423abd1b90742a4d) ) ROM_LOAD( "mario.3j", 0x1000, 0x1000, CRC(0c8cc04d) SHA1(15fae47d701dc1ef15c943cee6aa991776ecffdf) ) diff --git a/src/mame/drivers/nwk-tr.c b/src/mame/drivers/nwk-tr.c index 2dcfc0d5f23..2f80bd7382e 100644 --- a/src/mame/drivers/nwk-tr.c +++ b/src/mame/drivers/nwk-tr.c @@ -1191,7 +1191,7 @@ ROM_START(racingj) ROM_LOAD( "676a10.14p", 0x400000, 0x400000, CRC(7b5b7828) SHA1(aec224d62e4b1e8fdb929d7947ce70d84ba676cf) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(47e1628c) SHA1(7c42d06ae2f2cd24d083890f333552cbf4f1d3c9) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(47e1628c) SHA1(7c42d06ae2f2cd24d083890f333552cbf4f1d3c9) ) ROM_END ROM_START(racingj2) @@ -1215,7 +1215,7 @@ ROM_START(racingj2) ROM_LOAD( "888a10.14p", 0x400000, 0x400000, CRC(328ce610) SHA1(dbbc779a1890c53298c0db129d496df048929496) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(f691f5ab) SHA1(e81f652c5caa2caa8bd1c6d6db488d849bda058e) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(f691f5ab) SHA1(e81f652c5caa2caa8bd1c6d6db488d849bda058e) ) ROM_END ROM_START(thrilld) @@ -1238,7 +1238,7 @@ ROM_START(thrilld) ROM_LOAD( "713a10.14p", 0x400000, 0x400000, CRC(27f9833e) SHA1(1540f00d2571ecb81b914c553682b67fca94bbbd) ) ROM_REGION(0x2000, "m48t58",0) - ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(5d8fbcb2) SHA1(74ad91544d2a200cf599a565005476623075e7d6) ) + ROM_LOAD( "m48t58y-70pc1", 0x000000, 0x002000, CRC(5d8fbcb2) SHA1(74ad91544d2a200cf599a565005476623075e7d6) ) ROM_END /*****************************************************************************/ diff --git a/src/mame/drivers/shadfrce.c b/src/mame/drivers/shadfrce.c index 6e0f66e6d87..b5f76d085f3 100644 --- a/src/mame/drivers/shadfrce.c +++ b/src/mame/drivers/shadfrce.c @@ -588,7 +588,7 @@ static const ym2151_interface ym2151_config = }; /* - Interrupts generation is guessed, but it requires the same hack as in wwfsstar.c + Interrupts generation is guessed, but it requires the same hack as in wwfsstar.c */ static INTERRUPT_GEN( shadfrce_interrupt ) { diff --git a/src/mame/drivers/skyarmy.c b/src/mame/drivers/skyarmy.c index 7b3efb152e3..6bf31594c44 100644 --- a/src/mame/drivers/skyarmy.c +++ b/src/mame/drivers/skyarmy.c @@ -295,11 +295,11 @@ ROM_START( skyarmy ) ROM_REGION( 0x1000, "gfx1", ROMREGION_DISPOSE ) ROM_LOAD( "13b.bin", 0x0000, 0x0800, CRC(3b0e0f7c) SHA1(2bbba10121d3e745146f50c14dc6df97de40fb96) ) ROM_LOAD( "15b.bin", 0x0800, 0x0800, CRC(5ccfd782) SHA1(408406ae068e5578b8a742abed1c37dcd3720fe5) ) - + ROM_REGION( 0x1000, "gfx2", ROMREGION_DISPOSE ) ROM_LOAD( "8b.bin", 0x0000, 0x0800, CRC(6ac6bd98) SHA1(e653d80ec1b0f8e07821ea781942dae3de7d238d) ) ROM_LOAD( "10b.bin", 0x0800, 0x0800, CRC(cada7682) SHA1(83ce8336274cb8006a445ac17a179d9ffd4d6809) ) - + ROM_REGION( 0x0020, "proms", 0 ) ROM_LOAD( "a6.bin", 0x0000, 0x0020, CRC(c721220b) SHA1(61b3320fb616c0600d56840cb6438616c7e0c6eb) ) ROM_END diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 2f7d41116da..219acb2051d 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -1349,7 +1349,7 @@ static ADDRESS_MAP_START( hal21_sound_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xc000, 0xc000) AM_READ(sgladiat_sound_nmi_ack_r) AM_RANGE(0xe000, 0xe000) AM_WRITE(ay8910_control_port_0_w) AM_RANGE(0xe001, 0xe001) AM_WRITE(ay8910_write_port_0_w) -// AM_RANGE(0xe002, 0xe002) AM_WRITENOP // bitfielded(0-5) details unknown. Filter enable? +// AM_RANGE(0xe002, 0xe002) AM_WRITENOP // bitfielded(0-5) details unknown. Filter enable? AM_RANGE(0xe008, 0xe008) AM_WRITE(ay8910_control_port_1_w) AM_RANGE(0xe009, 0xe009) AM_WRITE(ay8910_write_port_1_w) ADDRESS_MAP_END @@ -1893,8 +1893,8 @@ static INPUT_PORTS_START( hal21 ) PORT_DIPSETTING( 0x20, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x18, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x38, DEF_STR( 1C_1C ) ) -// PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) /* duplicated setting */ -// PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) ) /* duplicated setting */ PORT_DIPSETTING( 0x30, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) @@ -2151,8 +2151,8 @@ static INPUT_PORTS_START( tnk3 ) PORT_DIPSETTING( 0x20, DEF_STR( 3C_1C ) ) PORT_DIPSETTING( 0x18, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x38, DEF_STR( 1C_1C ) ) -// PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) /* duplicated setting */ -// PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0x10, DEF_STR( 1C_1C ) ) /* duplicated setting */ +// PORT_DIPSETTING( 0x08, DEF_STR( 1C_1C ) ) /* duplicated setting */ PORT_DIPSETTING( 0x30, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x28, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x00, DEF_STR( Free_Play ) ) diff --git a/src/mame/drivers/stadhero.c b/src/mame/drivers/stadhero.c index 8c6c121df0d..bb2d3213365 100644 --- a/src/mame/drivers/stadhero.c +++ b/src/mame/drivers/stadhero.c @@ -180,7 +180,7 @@ static INPUT_PORTS_START( stadhero ) PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_VBLANK ) INPUT_PORTS_END /******************************************************************************/ diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 451df665a67..f963e189f87 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -4633,7 +4633,7 @@ ROM_END /* -------------------------- Raizing games ------------------------- */ -/* +/* For the two sets of Sorcer Striker (World) the only differences are 2 bytes plus a corrected checksum for each set: diff --git a/src/mame/drivers/videopkr.c b/src/mame/drivers/videopkr.c index d771b0ab120..11c54eef33f 100644 --- a/src/mame/drivers/videopkr.c +++ b/src/mame/drivers/videopkr.c @@ -46,7 +46,7 @@ 1x 5101 (256 x 4) SRAM Data Memory (Battery Backed RAM). 2x 2114 (1024 x 4) SRAM 8-Bit Char. RAM. 1x 2114 (1024 x 4) SRAM 4-Bit Color RAM. - 1x 74s287 (256 x 4) TTL PROM Color PROM. + 1x 74s287 (256 x 4) TTL PROM Color PROM. 1x 6 MHz.(or 8 MHz.) Crystal CPU clock. 1x 7.8643 MHz. Crystal Video System. @@ -163,19 +163,19 @@ Jugador tiene mas 2 4 6 8 10 que la banca - Jugador tiene menos 2 4 6 8 10 + Jugador tiene menos 2 4 6 8 10 de 22 con 6 cartas Jugador tiene blackjack 2 5 7 10 12 - y la Banca no + y la Banca no ---------------------------------------------------------------------------- - Video Cordoba + Video Cordoba ---------------------------------------------------------------------------- Fichas Jugadas 1 Ficha 2 Fichas 3 Fichas 4 Fichas 5 Fichas ---------------------------------------------------------------------------- - TRIPLE BAR 250 250 250 250 2000 + TRIPLE BAR 250 250 250 250 2000 ............................................................................ 3 x Doble Bar - 100 | Olive-Olive-Any Bar - 18 3 x Single Bar - 50 | 3 x Orange - 14 @@ -426,7 +426,7 @@ static WRITE8_HANDLER( videopkr_io_w ) video_ram[n_offs] = data; tilemap_mark_tile_dirty(bg_tilemap, n_offs); break; - } + } case 0xdf: { data_ram[offset] = (data & 0x0f) + 0xf0; @@ -544,7 +544,7 @@ static WRITE8_HANDLER(p4_w) 0xFA 11111010 Spinning reels sound Video Cordoba. 0xFB 11111011 Dice rolling sound Video Dado. 0xFB 11111011 Stopping reels sound Video Cordoba. - + */ static READ8_HANDLER(sound_io_r) @@ -682,7 +682,7 @@ static INPUT_PORTS_START( blckjack ) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Books") PORT_CODE(KEYCODE_9) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) PORT_IMPULSE(4) PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Start") PORT_CODE(KEYCODE_1) - PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hit") PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hit") PORT_CODE(KEYCODE_Z) PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Stand") PORT_CODE(KEYCODE_X) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Double") PORT_CODE(KEYCODE_C) @@ -708,7 +708,7 @@ static INPUT_PORTS_START( videodad ) PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Seven") PORT_CODE(KEYCODE_X) PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("8 or More") PORT_CODE(KEYCODE_C) - PORT_START("IN1") + PORT_START("IN1") PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Field") PORT_CODE(KEYCODE_S) PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Eleven") PORT_CODE(KEYCODE_V) PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Twelve") PORT_CODE(KEYCODE_B) @@ -951,7 +951,7 @@ ROM_END /************************* * Game Drivers * *************************/ - + /* YEAR NAME PARENT MACHINE INPUT INIT ROT COMPANY FULLNAME FLAGS */ GAME( 1984, videopkr, 0, videopkr, videopkr, 0, ROT0, "InterFlip", "Video Poker", 0 ) GAME( 1984, blckjack, videopkr, blckjack, blckjack, 0, ROT0, "InterFlip", "Black Jack", 0 ) diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 6a22dbab972..32bc4ca8230 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -101,7 +101,7 @@ struct _dkong_state /* Specific states */ INT8 decrypt_counter; - + /* 2650 protection */ UINT8 protect_type; UINT8 hunchloopback; diff --git a/src/version.c b/src/version.c index e2540e18c72..453d431be6d 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.127u1 ("__DATE__")"; +const char build_version[] = "0.127u2 ("__DATE__")"; -- cgit v1.2.3