Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-20 23:42:22 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Cleanups and version bump.

Browse Source
This commit is contained in:
Aaron Giles 2008-09-11 16:25:46 +00:00
parent ae2d1ed21a
commit aa2b6bd29a
46 changed files with 132 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/audit.c
View File

@ -123,7 +123,7 @@ int audit_images(core_options *options, const game_driver *gamedrv, UINT32 valid
}
}
}
machine_config_free(config);
return records;
}
@ -373,7 +373,7 @@ static int audit_one_rom(core_options *options, const rom_entry *rom, const char
break;
}
}
/* if not found, check the region as a backup */
if (record->length == 0 && regiontag != NULL)
{

2
src/emu/cheat.c
View File

@ -428,7 +428,7 @@ void *cheat_get_next_menu_entry(running_machine *machine, void *previous, const
else
{
parameter_item *item = NULL, *prev = NULL;
for (item = cheat->parameter->itemlist; item != NULL; prev = item, item = item->next)
if (item->value == cheat->parameter->value)
break;

2
src/emu/clifront.c
View File

@ -984,7 +984,7 @@ static void match_roms(const char *hash, int length, int *found)
mame_printf_info("= %s%-20s %s\n", baddump ? "(BAD) " : "", ROM_GETNAME(rom), drivers[drvindex]->description);
(*found)++;
}
machine_config_free(config);
}
}

4
src/emu/devintrf.c
View File

@ -488,7 +488,7 @@ void device_list_start(running_machine *machine)
device->region = memory_region(machine, device->tag);
device->regionbytes = memory_region_length(machine, device->tag);
}
/* iterate until we've started everything */
while (numstarted < devcount)
{
@ -502,7 +502,7 @@ void device_list_start(running_machine *machine)
device->started = TRUE;
numstarted += device->started;
}
/* if we didn't start anything new, we're in trouble */
if (numstarted == prevstarted)
fatalerror("Circular dependency in device startup; unable to start %d/%d devices\n", devcount - numstarted, devcount);

2
src/emu/info.c
View File

@ -367,7 +367,7 @@ static void print_game_rom(FILE *out, const game_driver *game, const machine_con
{
const rom_source *source;
const rom_entry *region;
/* iterate over ROM sources: first the game, then any devices */
for (source = rom_first_source(game, config); source != NULL; source = rom_next_source(game, config, source))
for (region = rom_first_region(game, source); region != NULL; region = rom_next_region(region))

4
src/emu/inptport.c
View File

@ -800,13 +800,13 @@ const input_field_config *input_field_by_tag_and_mask(const input_port_config *p
{
const input_port_config *port = input_port_by_tag(portlist, tag);
const input_field_config *field;
/* if we got the port, look for the field */
if (port != NULL)
for (field = port->fieldlist; field != NULL; field = field->next)
if ((field->mask & mask) != 0)
return field;
return NULL;
}

2
src/emu/machine/6532riot.c
View File

@ -467,7 +467,7 @@ static DEVICE_START( riot6532 )
state_save_register_item(unique_tag, 0, riot->timershift);
state_save_register_item(unique_tag, 0, riot->timerstate);
return DEVICE_START_OK;
}

2
src/emu/machine/68681.c
View File

@ -585,7 +585,7 @@ static DEVICE_START(duart68681)
state_save_register_item(unique_tag, 0, duart68681->channel[1].tx_enabled);
state_save_register_item(unique_tag, 0, duart68681->channel[1].tx_data);
state_save_register_item(unique_tag, 0, duart68681->channel[1].tx_ready);
return DEVICE_START_OK;
}

2
src/emu/machine/8237dma.c
View File

@ -395,7 +395,7 @@ static DEVICE_START( dma8237 ) {
dma8237_t *dma8237 = get_safe_token(device);
dma8237->intf = device->static_config;
return DEVICE_START_OK;
}

2
src/emu/machine/8255ppi.c
View File

@ -537,7 +537,7 @@ static DEVICE_START( ppi8255 ) {
state_save_register_item_array(unique_tag, 0, ppi8255->out_mask);
state_save_register_item_array(unique_tag, 0, ppi8255->read);
state_save_register_item_array(unique_tag, 0, ppi8255->latch);
return DEVICE_START_OK;
}

2
src/emu/machine/8257dma.c
View File

@ -388,7 +388,7 @@ static DEVICE_START( dma8257 )
state_save_register_item(unique_tag, 0, dma8257->msb);
state_save_register_item(unique_tag, 0, dma8257->drq);
state_save_register_item(unique_tag, 0, dma8257->status);
return DEVICE_START_OK;
}

2
src/emu/machine/at28c16.c
View File

@ -156,7 +156,7 @@ static DEVICE_START(at28c16)
state_save_register_item( unique_tag, 0, c->a9_12v );
state_save_register_item( unique_tag, 0, c->oe_12v );
state_save_register_item( unique_tag, 0, c->last_write );
return DEVICE_START_OK;
}

2
src/emu/machine/cdp1852.c
View File

@ -156,7 +156,7 @@ static DEVICE_START( cdp1852 )
state_save_register_item(unique_tag, 0, cdp1852->next_data);
state_save_register_item(unique_tag, 0, cdp1852->sr);
state_save_register_item(unique_tag, 0, cdp1852->next_sr);
return DEVICE_START_OK;
}

2
src/emu/machine/idectrl.c
View File

@ -1756,7 +1756,7 @@ static DEVICE_START( ide_controller )
state_save_register_item(unique_tag, 0, ide->master_password_enable);
state_save_register_item(unique_tag, 0, ide->user_password_enable);
return DEVICE_START_OK;
}

2
src/emu/machine/laserdsc.c
View File

@ -1963,7 +1963,7 @@ static DEVICE_START( laserdisc )
/* register callbacks */
config_register(device->machine, "laserdisc", configuration_load, configuration_save);
return DEVICE_START_OK;
}

2
src/emu/machine/latch8.c
View File

@ -223,7 +223,7 @@ static DEVICE_START( latch8 )
state_save_combine_module_and_tag(unique_tag, "latch8", device->tag);
state_save_register_item(unique_tag, 0, latch8->value);
return DEVICE_START_OK;
}

40
src/emu/machine/ldcore.c
View File

@ -283,8 +283,8 @@ INLINE void update_audio(ldcore_data *ldcore)
/*-------------------------------------------------
add_and_clamp_track - add a delta to the
current track and clamp to minimum/maximum
add_and_clamp_track - add a delta to the
current track and clamp to minimum/maximum
values
-------------------------------------------------*/
@ -336,14 +336,14 @@ static void update_slider_pos(ldcore_data *ldcore, attotime curtime)
/* if not moving, update to now */
if (ldcore->attospertrack == 0)
ldcore->sliderupdate = curtime;
/* otherwise, compute the number of tracks covered */
else
{
attoseconds_t delta = attotime_to_attoseconds(attotime_sub(curtime, ldcore->sliderupdate));
INT32 tracks_covered;
/* determine how many tracks we covered and advance */
/* determine how many tracks we covered and advance */
if (ldcore->attospertrack >= 0)
{
tracks_covered = delta / ldcore->attospertrack;
@ -373,7 +373,7 @@ static void vblank_state_changed(const device_config *screen, void *param, int v
laserdisc_state *ld = get_safe_token(device);
ldcore_data *ldcore = ld->core;
attotime curtime = timer_get_time();
/* update current track based on slider speed */
update_slider_pos(ldcore, curtime);
@ -384,7 +384,7 @@ static void vblank_state_changed(const device_config *screen, void *param, int v
(*ldcore->intf.vsync)(ld);
return;
}
/* on falling edge, do the bulk of the processing */
/* wait for previous read and decode to finish */
process_track_data(device);
@ -603,7 +603,7 @@ void ldcore_set_video_squelch(laserdisc_state *ld, UINT8 squelch)
/*-------------------------------------------------
ldcore_set_slider_speed - dynamically change
ldcore_set_slider_speed - dynamically change
the slider speed
-------------------------------------------------*/
@ -613,15 +613,15 @@ void ldcore_set_slider_speed(laserdisc_state *ld, INT32 tracks_per_vsync)
attotime vsyncperiod = video_screen_get_frame_period(ld->screen);
update_slider_pos(ldcore, timer_get_time());
/* if 0, set the time to 0 */
if (tracks_per_vsync == 0)
ldcore->attospertrack = 0;
/* positive values store positive times */
else if (tracks_per_vsync > 0)
ldcore->attospertrack = attotime_to_attoseconds(attotime_div(vsyncperiod, tracks_per_vsync));
/* negative values store negative times */
else
ldcore->attospertrack = -attotime_to_attoseconds(attotime_div(vsyncperiod, -tracks_per_vsync));
@ -631,7 +631,7 @@ printf("Slider speed = %d\n", tracks_per_vsync);
/*-------------------------------------------------
ldcore_advance_slider - advance the slider by
ldcore_advance_slider - advance the slider by
a certain number of tracks
-------------------------------------------------*/
@ -646,7 +646,7 @@ printf("Advance by %d\n", numtracks);
/*-------------------------------------------------
ldcore_get_slider_position - get the current
ldcore_get_slider_position - get the current
slider position
-------------------------------------------------*/
@ -656,7 +656,7 @@ slider_position ldcore_get_slider_position(laserdisc_state *ld)
/* update the slider position first */
update_slider_pos(ldcore, timer_get_time());
/* return the status */
if (ldcore->curtrack == 1)
return SLIDER_MINIMUM;
@ -1109,7 +1109,7 @@ static void custom_stream_callback(void *param, stream_sample_t **inputs, stream
stream_sample_t *dst1 = outputs[1];
INT16 leftand, rightand;
int samples_avail = 0;
/* compute AND values based on the squelch */
leftand = (ldcore->audiosquelch & 1) ? 0x0000 : 0xffff;
rightand = (ldcore->audiosquelch & 2) ? 0x0000 : 0xffff;
@ -1431,7 +1431,7 @@ static void init_disc(const device_config *device)
/* find the disc */
ldcore->disc = get_disk_handle(device->tag);
/* set default parameters */
ldcore->width = 720;
ldcore->height = 240;
@ -1454,7 +1454,7 @@ static void init_disc(const device_config *device)
err = chd_get_metadata(ldcore->disc, AV_METADATA_TAG, 0, metadata, sizeof(metadata), NULL, NULL);
if (err != CHDERR_NONE)
fatalerror("Non-A/V CHD file specified");
/* extract the metadata */
if (sscanf(metadata, AV_METADATA_FORMAT, &fps, &fpsfrac, &ldcore->width, &ldcore->height, &interlaced, &channels, &ldcore->samplerate) != 7)
fatalerror("Invalid metadata in CHD file");
@ -1482,7 +1482,7 @@ static void init_video(const device_config *device)
laserdisc_state *ld = get_safe_token(device);
ldcore_data *ldcore = ld->core;
int index;
/* register for VBLANK callbacks */
video_screen_register_vblank_callback(ld->screen, vblank_state_changed, (void *)device);
@ -1605,7 +1605,7 @@ static DEVICE_START( laserdisc )
ldcore->config.overscalex = 1.0f;
if (ldcore->config.overscaley == 0)
ldcore->config.overscaley = 1.0f;
/* initialize the various pieces */
init_disc(device);
init_video(device);
@ -1613,7 +1613,7 @@ static DEVICE_START( laserdisc )
/* register callbacks */
config_register(device->machine, "laserdisc", configuration_load, configuration_save);
return DEVICE_START_OK;
}
@ -1732,7 +1732,7 @@ DEVICE_GET_INFO( laserdisc )
intf = &ld->core->intf;
}
}
/* if we don't have an interface, but we have a config, look up the interface */
if (intf == NULL && config != NULL)
for (pltype = 0; pltype < ARRAY_LENGTH(player_interfaces); pltype++)

26
src/emu/machine/ldpr8210.c
View File

@ -73,7 +73,7 @@ struct _ldplayer_data
UINT8 cmdcnt; /* counter for multi-byte command */
UINT8 cmdbytes[3]; /* storage for multi-byte command */
void (*cmd_ack_callback)(void); /* callback to clear game command write flag */
/* low-level emulation data */
int cpunum;
UINT8 pia[0x100];
@ -230,12 +230,12 @@ INLINE void update_audio_squelch(laserdisc_state *ld)
static void pr8210_init(laserdisc_state *ld)
{
astring *tempstring = astring_alloc();
/* find our CPU */
astring_printf(tempstring, "%s:%s", ld->device->tag, "pr8210");
ld->player->cpunum = mame_find_cpu_index(ld->device->machine, astring_c(tempstring));
astring_free(tempstring);
/* do a soft reset */
pr8210_soft_reset(ld);
}
@ -435,8 +435,8 @@ printf("Frame:%05d\n", frame);
player->pia[0x20] = 0xf0 | ((chapter / 10) % 10);
player->pia[0x21] = 0xf0 | ((chapter / 1) % 10);
}
// else
// player->pia[0xc0] = 0x00;
// else
// player->pia[0xc0] = 0x00;
}
player->pia[0xc0] |= 12;//4;//fieldnum << 2;
@ -535,7 +535,7 @@ static INT32 pr8210_hle_update(laserdisc_state *ld, const vbi_metadata *vbi, int
pr8210_switch_state(ld, LDSTATE_STEPPING_BY_PARAMETER_PAUSED, 0);
}
break;
case LDSTATE_STEPPING_BY_PARAMETER_PAUSED:
/* generic pause behavior */
ld->state.state = LDSTATE_PAUSED;
@ -754,7 +754,7 @@ static void pr8210_control_w(laserdisc_state *ld, UINT8 prev, UINT8 data)
#if EMULATE_PR8210_ROM
printf("Command = %02X\n", newcommand);
// player->pia_porta = BITSWAP8(newcommand, 4,3,2,1,0,5,6,7);
// player->pia_porta = BITSWAP8(newcommand, 4,3,2,1,0,5,6,7);
player->pia_porta = BITSWAP8(newcommand, 0,1,2,3,4,5,6,7);
#else
/* if we got a double command, act on it */
@ -940,11 +940,11 @@ static READ8_HANDLER( pr8210_pia_r )
case 0xc0:
case 0xe0:
break;
case 0xa0:
// printf("%03X:pia_r(%02X) = %02X\n", activecpu_get_pc(), offset, player->pia_porta);
result = player->pia_porta;
// player->pia_porta = 0;
// player->pia_porta = 0;
break;
default:
@ -994,7 +994,7 @@ static WRITE8_HANDLER( pr8210_pia_w )
player->framedisplay = 1;
printf("%03X:pia_w(%02X) = %02X\n", activecpu_get_pc(), offset, data);
break;
case 0x60:
printf("%03X:pia_w(%02X) = %02X (PORT B LEDS:", activecpu_get_pc(), offset, data);
output_set_value("pr8210_audio1", (data & 0x01) != 0);
@ -1040,15 +1040,15 @@ static READ8_HANDLER( pr8210_bus_r )
/* bus bit 6: slider position limit detector, inside and outside */
if (sliderpos != SLIDER_MINIMUM && sliderpos != SLIDER_MAXIMUM)
result |= 0x40;
/* bus bit 4: /FOCUS LOCK */
if (!focus_on)
result |= 0x10;
/* bus bit 3: /SPDL LOCK */
if (!spdl_on)
result |= 0x08;
/* bus bit 1: spindle motor stop detector */
if (!spdl_on)
result |= 0x02;

2
src/emu/machine/msm6242.c
View File

@ -153,7 +153,7 @@ static DEVICE_START( msm6242 )
msm6242->reg[1] = 0;
msm6242->reg[2] = 0;
memset(&msm6242->hold_time, 0, sizeof(mame_system_time));
return DEVICE_START_OK;
}

2
src/emu/machine/pic8259.c
View File

@ -372,7 +372,7 @@ static DEVICE_START( pic8259 ) {
pic8259_t *pic8259 = get_safe_token(device);
pic8259->intf = device->static_config;
return DEVICE_START_OK;
}

2
src/emu/machine/pit8253.c
View File

@ -1087,7 +1087,7 @@ static device_start_err common_start( const device_config *device, int device_ty
state_save_register_item(unique_tag, timerno, timer->programmed);
state_save_register_item(unique_tag, timerno, timer->clock);
}
return DEVICE_START_OK;
}

2
src/emu/machine/smc91c9x.c
View File

@ -539,7 +539,7 @@ static DEVICE_START( smc91c9x )
state_save_register_item_array(unique_tag, 0, smc->tx);
state_save_register_item(unique_tag, 0, smc->sent);
state_save_register_item(unique_tag, 0, smc->recd);
return DEVICE_START_OK;
}

2
src/emu/machine/timekpr.c
View File

@ -339,7 +339,7 @@ static DEVICE_START(timekeeper)
timer = timer_alloc( timekeeper_tick, c );
duration = ATTOTIME_IN_SEC(1);
timer_adjust_periodic( timer, duration, 0, duration );
return DEVICE_START_OK;
}

2
src/emu/machine/z80dma.c
View File

@ -447,7 +447,7 @@ static DEVICE_START( z80dma )
state_save_register_item(unique_tag, 0, z80dma->is_read);
state_save_register_item(unique_tag, 0, z80dma->cur_cycle);
state_save_register_item(unique_tag, 0, z80dma->latch);
return DEVICE_START_OK;
}

18
src/emu/mconfig.c
View File

@ -27,7 +27,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
***************************************************************************/
/*-------------------------------------------------
create_tag - create a combined tag,
create_tag - create a combined tag,
allocating strings as necessary
-------------------------------------------------*/
@ -74,11 +74,11 @@ machine_config *machine_config_alloc(const machine_config_token *tokens)
void machine_config_free(machine_config *config)
{
int cpunum, soundnum;
/* release the device list */
while (config->devicelist != NULL)
device_list_remove(&config->devicelist, config->devicelist->type, config->devicelist->tag);
/* release the strings */
for (cpunum = 0; cpunum < ARRAY_LENGTH(config->cputag); cpunum++)
if (config->cputag[cpunum] != NULL)
@ -119,7 +119,7 @@ static cpu_config *cpu_add(machine_config *machine, const char *tag, cpu_type ty
/*-------------------------------------------------
cpu_find - find a tagged CPU during machine
cpu_find - find a tagged CPU during machine
driver expansion
-------------------------------------------------*/
@ -190,7 +190,7 @@ static sound_config *sound_add(machine_config *machine, const char *tag, sound_t
/*-------------------------------------------------
sound_find - find a tagged sound system during
sound_find - find a tagged sound system during
machine driver expansion
-------------------------------------------------*/
@ -208,7 +208,7 @@ static sound_config *sound_find(machine_config *machine, const char *tag)
/*-------------------------------------------------
sound_remove - remove a tagged sound system
sound_remove - remove a tagged sound system
during machine driver expansion
-------------------------------------------------*/
@ -244,7 +244,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
device_config *device = NULL;
sound_config *sound = NULL;
cpu_config *cpu = NULL;
/* loop over tokens until we hit the end */
while (entrytype != MCONFIG_TOKEN_END)
{
@ -571,7 +571,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
break;
}
}
/* if we are the outermost level, process any device-specific machine configurations */
if (depth == 0)
for (device = config->devicelist; device != NULL; device = device->next)
@ -580,6 +580,6 @@ static void machine_config_detokenize(machine_config *config, const machine_conf
if (tokens != NULL)
machine_config_detokenize(config, tokens, create_tag(tempstring, tagprefix, device->tag), depth + 1);
}
astring_free(tempstring);
}

12
src/emu/render.c
View File

@ -1724,15 +1724,15 @@ static int render_target_map_point_internal(render_target *target, INT32 target_
for (item = target->curview->itemlist[layer]; item != NULL; item = item->next)
{
int checkit;
/* if we're looking for a particular container, verify that we have the right one */
if (container != NULL)
checkit = (item->element == NULL && container == get_screen_container_by_index(item->index));
/* otherwise, assume we're looking for an input */
else
checkit = (item->input_tag[0] != 0);
/* this target is worth looking at; now check the point */
if (checkit && target_fx >= item->bounds.x0 && target_fx < item->bounds.x1 && target_fy >= item->bounds.y0 && target_fy < item->bounds.y1)
{
@ -1764,15 +1764,15 @@ int render_target_map_point_container(render_target *target, INT32 target_x, INT
/*-------------------------------------------------
render_target_map_point_input - attempts to map
a point on the specified render_target to the
specified container, if possible
a point on the specified render_target to the
specified container, if possible
-------------------------------------------------*/
int render_target_map_point_input(render_target *target, INT32 target_x, INT32 target_y, const char **input_tag, UINT32 *input_mask, float *input_x, float *input_y)
{
view_item *item = NULL;
int result;
result = render_target_map_point_internal(target, target_x, target_y, NULL, input_x, input_y, &item);
if (result && item != NULL)
{

16
src/emu/romload.c
View File

@ -118,11 +118,11 @@ int rom_source_is_gamedrv(const game_driver *drv, const rom_source *source)
const rom_source *rom_first_source(const game_driver *drv, const machine_config *config)
{
const device_config *device;
/* if the driver has a ROM pointer, that's what we want */
if (drv->rom != NULL)
return (rom_source *)drv;
/* otherwise, look through devices */
if (config != NULL)
for (device = config->devicelist; device != NULL; device = device->next)
@ -143,7 +143,7 @@ const rom_source *rom_first_source(const game_driver *drv, const machine_config
const rom_source *rom_next_source(const game_driver *drv, const machine_config *config, const rom_source *previous)
{
const device_config *device;
/* if the previous was the driver, we want the first device */
if (rom_source_is_gamedrv(drv, previous))
device = (config != NULL) ? config->devicelist : NULL;
@ -169,7 +169,7 @@ const rom_source *rom_next_source(const game_driver *drv, const machine_config *
const rom_entry *rom_first_region(const game_driver *drv, const rom_source *source)
{
const rom_entry *romp;
if (source == NULL || rom_source_is_gamedrv(drv, source))
romp = drv->rom;
else
@ -610,7 +610,7 @@ static int open_rom_file(running_machine *machine, rom_load_data *romdata, const
/* update status display */
++romdata->romsloaded;
display_loading_rom_message(machine, ROM_GETNAME(romp), romdata);
/* extract CRC to use for searching */
has_crc = hash_data_extract_binary_checksum(ROM_GETHASHDATA(romp), HASH_CRC, crcbytes);
if (has_crc)
@ -629,7 +629,7 @@ static int open_rom_file(running_machine *machine, rom_load_data *romdata, const
filerr = mame_fopen(SEARCHPATH_ROM, astring_c(fname), OPEN_FLAG_READ, &romdata->file);
astring_free(fname);
}
/* if the region is load by name, load the ROM from there */
if (regiontag != NULL)
{
@ -1256,7 +1256,7 @@ static void process_region_list(running_machine *machine, rom_load_data *romdata
for (source = rom_first_source(machine->gamedrv, machine->config); source != NULL; source = rom_next_source(machine->gamedrv, machine->config, source))
for (region = rom_first_region(machine->gamedrv, source); region != NULL; region = rom_next_region(region))
region_post_process(machine, romdata, ROMREGION_GETTAG(region));
astring_free(regiontag);
}
@ -1285,7 +1285,7 @@ void rom_init(running_machine *machine)
/* reset the disk list */
chd_list = NULL;
chd_list_tailptr = &chd_list;
/* process the ROM entries we were passed */
process_region_list(machine, &romdata);

2
src/emu/sound.c
View File

@ -821,7 +821,7 @@ static DEVICE_START( speaker_output )
/* copy in all the relevant info */
info->speaker = device->inline_config;
info->tag = device->tag;
return DEVICE_START_OK;
}

2
src/emu/timer.c
View File

@ -1070,7 +1070,7 @@ static DEVICE_START( timer )
fatalerror("Unknown timer device type");
break;
}
return DEVICE_START_OK;
}

26
src/emu/validity.c
View File

@ -184,7 +184,7 @@ INLINE int validate_tag(const game_driver *driver, const char *object, const cha
break;
}
}
if (begin == NULL)
begin = tag;
else
@ -583,7 +583,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
mame_printf_warning("%s: %s has empty ROM region (warning)\n", driver->source_file, driver->name);
items_since_region = (ROMREGION_ISERASE(romp) || ROMREGION_ISDISPOSE(romp) || ROMREGION_ISDISKDATA(romp)) ? 1 : 0;
currgn = NULL;
/* check for a valid tag */
if (regiontag == NULL)
{
@ -626,7 +626,7 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
}
}
}
/* validate the region tag */
error |= validate_tag(driver, "region", regiontag);
}
@ -665,15 +665,15 @@ static int validate_roms(int drivnum, const machine_config *config, region_info
}
/* if this is a bios rom, make sure it has the same flags as the last system bios entry */
/* bios_flags = ROM_GETBIOSFLAGS(romp);
if (bios_flags != 0)
{
if (bios_flags != last_bios)
{
mame_printf_error("%s: %s has bios rom name %s without preceding matching system bios definition\n", driver->source_file, driver->name, last_name);
error = TRUE;
}
}*/
/* bios_flags = ROM_GETBIOSFLAGS(romp);
if (bios_flags != 0)
{
if (bios_flags != last_bios)
{
mame_printf_error("%s: %s has bios rom name %s without preceding matching system bios definition\n", driver->source_file, driver->name, last_name);
error = TRUE;
}
}*/
/* make sure the has is valid */
hash = ROM_GETHASHDATA(romp);
@ -745,7 +745,7 @@ static int validate_cpu(int drivnum, const machine_config *config, const input_p
error = TRUE;
}
}
/* validate the CPU tag */
error |= validate_tag(driver, "CPU", cpu->tag);

2
src/emu/video.c
View File

@ -1268,7 +1268,7 @@ static DEVICE_START( video_screen )
state_save_register_item(unique_tag, 0, state->vblank_end_time.attoseconds);
state_save_register_item(unique_tag, 0, state->frame_number);
state_save_register_postload(device->machine, video_screen_postload, (void *)device);
return DEVICE_START_OK;
}

2
src/emu/video/cdp1869.c
View File

@ -839,7 +839,7 @@ static DEVICE_START( cdp1869 )
state_save_register_item(unique_tag, 0, cdp1869->toneamp);
state_save_register_item(unique_tag, 0, cdp1869->wnfreq);
state_save_register_item(unique_tag, 0, cdp1869->wnamp);
return DEVICE_START_OK;
}

2
src/emu/video/mc6845.c
View File

@ -746,7 +746,7 @@ static device_start_err common_start(const device_config *device, int device_typ
state_save_register_item(unique_tag, 0, mc6845->light_pen_latched);
state_save_register_item(unique_tag, 0, mc6845->cursor_state);
state_save_register_item(unique_tag, 0, mc6845->cursor_blink_count);
return DEVICE_START_OK;
}

2
src/emu/video/voodoo.c
View File

@ -4616,7 +4616,7 @@ static DEVICE_START( voodoo )
/* register for save states */
init_save_state(device);
return DEVICE_START_OK;
}

2
src/lib/util/corefile.c
View File

@ -135,7 +135,7 @@ file_error core_fopen(const char *filename, UINT32 openflags, core_file **file)
/*-------------------------------------------------
core_fopen_ram_internal - open a RAM-based buffer
for file-like access, possibly copying the data,
and return an error code
and return an error code
-------------------------------------------------*/
static file_error core_fopen_ram_internal(const void *data, size_t length, int copy_buffer, UINT32 openflags, core_file **file)

4
src/mame/drivers/fastfred.c
View File

@ -110,7 +110,7 @@ static READ8_HANDLER( jumpcoas_custom_io_r )
}
/*
Imago sprites DMA
Imago sprites DMA
*/
static UINT8 imago_sprites[0x800*3];
@ -900,7 +900,7 @@ ROM_START( imago )
ROM_FILL( 0x1000, 0x2000, 0 )
ROM_REGION( 0x1000, "gfx4", ROMREGION_DISPOSE )
ROM_LOAD( "imago15.191", 0x0000, 0x1000, CRC(85fcc195) SHA1(a76f24201c037d1e6f909fb0ea4ad59b1d6ddd57) )
ROM_LOAD( "imago15.191", 0x0000, 0x1000, CRC(85fcc195) SHA1(a76f24201c037d1e6f909fb0ea4ad59b1d6ddd57) )
ROM_REGION( 0x0300, "proms", 0 )
ROM_LOAD( "imago.96", 0x0000, 0x0100, CRC(5ba81edc) SHA1(b64ebbe054052583688cdf0f064794436c095e7e) )

2
src/mame/drivers/lethalj.c
View File

@ -79,7 +79,7 @@ Note 2: Some PCBs use a TMS34010FNL-40 instead of the TMS34010FNL-50
Service Switch | R | 14| Video GND
| S | 15|
Coin Switch 2 | T | 16| Coin Switch 1
Start Player 2 | U | 17| Start Player 1
Start Player 2 | U | 17| Start Player 1
| V | 18|
| W | 19|
| X | 20|

14
src/mame/drivers/limenko.c
View File

@ -126,7 +126,7 @@ static WRITE32_HANDLER( spriteram_buffer_w )
else
{
// draw the sprites to the frame buffer
draw_sprites(machine,spriteram32,&clip,prev_sprites_count);
draw_sprites(machine,spriteram32,&clip,prev_sprites_count);
}
// buffer the next number of sprites to draw
@ -214,7 +214,7 @@ static READ8_HANDLER( spotty_sound_r )
}
static ADDRESS_MAP_START( spotty_sound_io_map, ADDRESS_SPACE_IO, 8 )
AM_RANGE(0x0001, 0x0001) AM_READWRITE(spotty_sound_r, okim6295_data_0_w) //? sound latch and ?
AM_RANGE(0x0001, 0x0001) AM_READWRITE(spotty_sound_r, okim6295_data_0_w) //? sound latch and ?
AM_RANGE(0x0003, 0x0003) AM_READWRITE(spotty_sound_cmd_r, spotty_sound_cmd_w) //not sure about anything...
ADDRESS_MAP_END
@ -332,7 +332,7 @@ static void draw_single_sprite(bitmap_t *dest_bmp,const gfx_element *gfx,
dest[x] = pal_base+c;
pri[x] = priority;
}
x_index += dx;
}
@ -401,13 +401,13 @@ static void draw_sprites(running_machine *machine, UINT32 *sprites, const rectan
continue;
draw_single_sprite(sprites_bitmap,&gfx,0,color,flipx,flipy,x,y,cliprect,pri);
// wrap around x
draw_single_sprite(sprites_bitmap,&gfx,0,color,flipx,flipy,x-512,y,cliprect,pri);
// wrap around y
draw_single_sprite(sprites_bitmap,&gfx,0,color,flipx,flipy,x,y-512,cliprect,pri);
// wrap around x and y
draw_single_sprite(sprites_bitmap,&gfx,0,color,flipx,flipy,x-512,y-512,cliprect,pri);
}
@ -469,7 +469,7 @@ static VIDEO_UPDATE( limenko )
tilemap_draw(bitmap,cliprect,bg_tilemap,0,0);
tilemap_draw(bitmap,cliprect,md_tilemap,0,0);
tilemap_draw(bitmap,cliprect,fg_tilemap,0,1);
if(limenko_videoreg[0] & 8)
copy_sprites(screen->machine, bitmap, sprites_bitmap, cliprect);

8
src/mame/drivers/magic10.c
View File

@ -219,7 +219,7 @@ static WRITE16_HANDLER( magic10_out_w )
---x ---- Hold5 lamp.
--x- ---- Start lamp.
-x-- ---- Play (Bet/Take/Cancel) lamp.
- Hbits -
7654 3210
=========
@ -228,7 +228,7 @@ static WRITE16_HANDLER( magic10_out_w )
*/
// popmessage("lamps: %02X", data);
// popmessage("lamps: %02X", data);
output_set_lamp_value(1, (data & 1)); /* Lamp 1 - HOLD 1 */
output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - HOLD 2 */
@ -559,7 +559,7 @@ static INPUT_PORTS_START( sgsafari )
PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C)
PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4 / Tail") PORT_CODE(KEYCODE_V)
PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5 / Half Gamble") PORT_CODE(KEYCODE_B)
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start")
PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start")
PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Play (Bet/Take/Cancel)") PORT_CODE(KEYCODE_A)
PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
@ -1035,7 +1035,7 @@ ROMs:
2x M27C512 (1,2)
1x M27C2001 (3)
4x M27C1001 (4,5,6,7)
Note:
1x JAMMA edge connector
1x 12 legs connector (j2)

6
src/mame/drivers/mainsnk.c
View File

@ -230,8 +230,8 @@ static INPUT_PORTS_START( mainsnk )
PORT_START("DSW2")
PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW2:1,2,3")
// PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) // duplicate
// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) // duplicate
// PORT_DIPSETTING( 0x01, DEF_STR( 3C_1C ) ) // duplicate
// PORT_DIPSETTING( 0x02, DEF_STR( 3C_1C ) ) // duplicate
PORT_DIPSETTING( 0x04, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x06, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x07, DEF_STR( 1C_1C ) )
@ -299,7 +299,7 @@ static INPUT_PORTS_START( canvas )
PORT_DIPSETTING( 0x04, "3" )
PORT_DIPSETTING( 0x00, "5" )
PORT_DIPNAME( 0x38, 0x38, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSW1:4,5,6")
// PORT_DIPSETTING( 0x08, DEF_STR( 5C_1C ) ) // duplicate
// PORT_DIPSETTING( 0x08, DEF_STR( 5C_1C ) ) // duplicate
PORT_DIPSETTING( 0x10, DEF_STR( 5C_1C ) )
PORT_DIPSETTING( 0x20, DEF_STR( 3C_1C ) )
PORT_DIPSETTING( 0x18, DEF_STR( 2C_1C ) )

2
src/mame/drivers/mitchell.c
View File

@ -388,7 +388,7 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 )
ADDRESS_MAP_GLOBAL_MASK(0xff)
AM_RANGE(0x00, 0x00) AM_WRITE(pang_gfxctrl_w) /* Palette bank, layer enable, coin counters, more */
AM_RANGE(0x00, 0x02) AM_READ(input_r) /* Super Pang needs a kludge to initialize EEPROM.
The Mahjong games and Block Block need special input treatment */
The Mahjong games and Block Block need special input treatment */
AM_RANGE(0x01, 0x01) AM_WRITE(input_w)
AM_RANGE(0x02, 0x02) AM_WRITE(pang_bankswitch_w) /* Code bank register */
AM_RANGE(0x03, 0x03) AM_READWRITE(input_port_12_r, ym2413_data_port_0_w) /* mgakuen only */

10
src/mame/drivers/sderby.c
View File

@ -142,7 +142,7 @@ static READ16_HANDLER( rprot_r )
or simply throw a deliberated losing number.
If someone more skilled in 68K code can help to trace it,
searching for an accurated response, I'll appreciate.
searching for an accurated response, I'll appreciate.
*/
return mame_rand(machine) & 0x1f;
}
@ -181,7 +181,7 @@ static WRITE16_HANDLER( sderby_out_w )
=========
---- ---x Start lamp.
---- --x- Bet lamp.
- Hbits -
7654 3210
=========
@ -230,7 +230,7 @@ static WRITE16_HANDLER( scmatto_out_w )
---x ---- Hold5 lamp.
--x- ---- Start lamp.
-x-- ---- Bet lamp.
- Hbits -
7654 3210
=========
@ -272,7 +272,7 @@ static WRITE16_HANDLER( roulette_out_w )
---- ---x Start lamp.
---- --x- Bet lamp.
---- x--- Unknown (always activated).
*/
output_set_lamp_value(1, (data & 1)); /* Lamp 1 - START */
output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */
@ -586,7 +586,7 @@ ROM_END
/* Scacco Matto / Space Win
Playmark, 1996.
CPU:
1x MC68000P12 (main)(u24)

2
src/mame/drivers/wwfwfest.c
View File

@ -398,7 +398,7 @@ static MACHINE_DRIVER_START( wwfwfest )
MDRV_SOUND_ROUTE(0, "mono", 0.45)
MDRV_SOUND_ROUTE(1, "mono", 0.45)
MDRV_SOUND_ADD("oki", OKIM6295, 1024188)
MDRV_SOUND_ADD("oki", OKIM6295, 1024188)
MDRV_SOUND_CONFIG(okim6295_interface_pin7high) /* Verified - Pin 7 tied to +5VDC */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
MACHINE_DRIVER_END

10
src/mame/video/m90.c
View File

@ -13,13 +13,13 @@
Bit 0x04 - Playfield 1 width (0 is 64 tiles, 0x4 is 128 tiles)
Bit 0x10 - Playfield 1 disable
Bit 0x20 - Playfield 1 rowscroll enable
Bit 0x40 - Playfield 1 y-offset table enable
Bit 0x40 - Playfield 1 y-offset table enable
12: Playfield 2 control
Bits0x03 - Playfield 2 VRAM base
Bit 0x04 - Playfield 2 width (0 is 64 tiles, 0x4 is 128 tiles)
Bit 0x10 - Playfield 2 disable
Bit 0x20 - Playfield 2 rowscroll enable
Bit 0x40 - Playfield 1 y-offset table enable
Bit 0x40 - Playfield 1 y-offset table enable
14: Bits0x03 - Sprite/Tile Priority (related to sprite color)
Emulation by Bryan McPhail, mish@tendril.co.uk, thanks to Chris Hardy!
@ -348,7 +348,7 @@ VIDEO_UPDATE( m90 )
tilemap_set_scrollx( pf2_layer,0, m90_video_control_data[3]-2);
tilemap_set_scrollx( pf2_wide_layer,0, m90_video_control_data[3]+256-2 );
}
fillbitmap(priority_bitmap,0,cliprect);
if (video_enable) {
@ -367,7 +367,7 @@ VIDEO_UPDATE( m90 )
for(line = 0; line < 512; line++)
{
clip.min_y = clip.max_y = line;
clip.min_y = clip.max_y = line;
if (m90_video_control_data[6] & 0x4) {
tilemap_set_scrolly(pf2_wide_layer, 0, m90_video_control_data[2] + m90_video_data[0xfc00/2 + line] + 128);
@ -422,7 +422,7 @@ VIDEO_UPDATE( m90 )
else
{
if (m90_video_control_data[5] & 0x4) {
tilemap_set_scrolly( pf1_wide_layer,0, m90_video_control_data[0] );
tilemap_set_scrolly( pf1_wide_layer,0, m90_video_control_data[0] );
tilemap_draw(bitmap,cliprect,pf1_wide_layer,0,0);
tilemap_draw(bitmap,cliprect,pf1_wide_layer,1,1);
} else {

2
src/osd/windows/ledutil.c
View File

@ -384,7 +384,7 @@ static LRESULT handle_copydata(WPARAM wparam, LPARAM lparam)
entry = malloc(sizeof(*entry));
if (entry == NULL)
return 0;
string = malloc(strlen(data->string) + 1);
if (string == NULL)
{

2
src/version.c
View File

@ -9,4 +9,4 @@
***************************************************************************/
const char build_version[] = "0.127u2 ("__DATE__")";
const char build_version[] = "0.127u3 ("__DATE__")";