summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/cpu/mcs48/mcs48.c10
-rw-r--r--src/emu/machine/generic.c6
-rw-r--r--src/emu/machine/ldcore.c82
-rw-r--r--src/emu/machine/ldcore.h42
-rw-r--r--src/emu/machine/ldpr8210.c34
-rw-r--r--src/emu/machine/ldv1000.c52
-rw-r--r--src/emu/sound/snkwave.c6
-rw-r--r--src/emu/video.c2
8 files changed, 117 insertions, 117 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);