diff options
author | 2009-02-17 15:31:20 +0000 | |
---|---|---|
committer | 2009-02-17 15:31:20 +0000 | |
commit | cef6764910e75f5e212fdef18ab75135b4144020 (patch) | |
tree | 2aceb9a6b874fc333ad98ce42a580ded9a6039f9 | |
parent | 77a98627d90a3ea23a955272856c15cdada0ddae (diff) |
Cleanups and version bump.mame0129u4
78 files changed, 633 insertions, 632 deletions
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 4afd6a1107e..06c6ee62862 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -1685,7 +1685,7 @@ BUILD += $(TMSMAKE) $(TMSMAKE): $(CPUOBJ)/tms57002/tmsmake.o $(LIBOCORE) @echo Linking $@... $(LD) $(LDFLAGS) $(OSDBGLDFLAGS) $^ $(LIBS) -o $@ - + endif diff --git a/src/emu/cpu/tms57002/tms57002.c b/src/emu/cpu/tms57002/tms57002.c index 1d30b5b031c..52f6bfcd931 100644 --- a/src/emu/cpu/tms57002/tms57002.c +++ b/src/emu/cpu/tms57002/tms57002.c @@ -199,7 +199,7 @@ WRITE8_DEVICE_HANDLER(tms57002_pload_w) if(data) s->sti &= ~IN_PLOAD; else - s->sti |= IN_PLOAD; + s->sti |= IN_PLOAD; if(olds ^ s->sti) s->hidx = 0; @@ -212,7 +212,7 @@ WRITE8_DEVICE_HANDLER(tms57002_cload_w) if(data) s->sti &= ~IN_CLOAD; else - s->sti |= IN_CLOAD; + s->sti |= IN_CLOAD; if(olds ^ s->sti) s->hidx = 0; } @@ -233,7 +233,7 @@ static CPU_RESET(tms57002) ST0_PBCO | ST0_CNS); s->st1 &= ~(ST1_AOV | ST1_SFAI | ST1_SFAO | ST1_MOVM | ST1_MOV | ST1_SFMA | ST1_SFMO | ST1_RND | ST1_CRM | ST1_DBP); - + s->xba = 0; // Not sure but makes sense tms57002_cache_flush(s); @@ -268,7 +268,7 @@ WRITE8_DEVICE_HANDLER(tms57002_data_w) memory_write_dword_32le(s->program, (s->pc++) << 2, val); break; } - } + } break; case IN_CLOAD: if(s->sti & SU_CVAL) { @@ -283,7 +283,7 @@ WRITE8_DEVICE_HANDLER(tms57002_data_w) s->hidx = 0; s->sti |= SU_CVAL; } - + break; case IN_PLOAD|IN_CLOAD: s->host[s->hidx++] = data; @@ -1073,7 +1073,7 @@ void tms57002_execute(tms57002_t *s) s->sti &= ~S_BRANCH; else s->pc++; // Wraps if it reaches 256 - + if(s->rptc_next) { s->rptc = s->rptc_next; s->rptc_next = 0; @@ -1308,7 +1308,7 @@ static int tms57002_decode_get_pc(tms57002_t *s) s->cache.inst[cs.ipc].next = ipc; break; } - cs.hnode = tms57002_get_hashnode(s, adr, s->st1, pnode); + cs.hnode = tms57002_get_hashnode(s, adr, s->st1, pnode); } s->st1 = st1; @@ -1367,7 +1367,7 @@ static CPU_EXECUTE(tms57002) ipc = -1; } else s->pc++; // Wraps if it reaches 256, next wraps too - + if(s->rptc_next) { s->rptc = s->rptc_next; s->rptc_next = 0; diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index ba93ecb64e0..c3712de34a1 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -1827,7 +1827,7 @@ UINT64 debug_read_opcode(const address_space *space, offs_t address, int size, i fatalerror("debug_read_opcode: unknown type = %d", space->dbits / 8 * 10 + size); break; } - + /* turn on debugger access */ if (!global->debugger_access) memory_set_debugger_access(space, global->debugger_access = TRUE); diff --git a/src/emu/devcb.h b/src/emu/devcb.h index 0fc1a52fea5..c5bd10e1d3e 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -24,7 +24,7 @@ The adapted callback types supported are: input port (port) - cpu input line (cpu input line) + cpu input line (cpu input line) read_line_device_func: (device) write_line_device_func: (device, data) read8_device_func: (device, offset) diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index 616aac761a2..692c16384a4 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -635,7 +635,7 @@ void device_list_start(running_machine *machine) /*------------------------------------------------- - device_delay_init - delay the startup of a + device_delay_init - delay the startup of a given device for dependency reasons -------------------------------------------------*/ diff --git a/src/emu/machine/6522via.c b/src/emu/machine/6522via.c index 13b31e15509..1a9377f5ddf 100644 --- a/src/emu/machine/6522via.c +++ b/src/emu/machine/6522via.c @@ -236,7 +236,7 @@ static DEVICE_START( via6522 ) const via6522_interface *intf = get_interface(device); memset(v, 0, sizeof(*v)); - + devcb_resolve_read8(&v->in_a_func, &intf->in_a_func, device); devcb_resolve_read8(&v->in_b_func, &intf->in_b_func, device); devcb_resolve_read_line(&v->in_ca1_func, &intf->in_ca1_func, device); diff --git a/src/emu/machine/msm6242.c b/src/emu/machine/msm6242.c index 2da8c6063cd..6bd6774457b 100644 --- a/src/emu/machine/msm6242.c +++ b/src/emu/machine/msm6242.c @@ -79,7 +79,7 @@ READ8_DEVICE_HANDLER( msm6242_r ) { if (hour >= 12) pm = 1; - + hour %= 12; if ( hour == 0 ) diff --git a/src/emu/mame.c b/src/emu/mame.c index 938bff007da..6954a4a0f8e 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -1507,7 +1507,7 @@ static void init_machine(running_machine *machine) /* intialize UI input */ ui_input_init(machine); - + /* initialize the streams engine before the sound devices start */ streams_init(machine); diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 01118f1a679..b4cf1728cbe 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -32,7 +32,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf ***************************************************************************/ /*------------------------------------------------- - remove_device - remove the head device from + remove_device - remove the head device from the given configuration -------------------------------------------------*/ @@ -40,7 +40,7 @@ INLINE void remove_device(device_config **listheadptr, device_type type, const c { device_config *device = (device_config *)device_list_find_by_tag(*listheadptr, type, tag); device_custom_config_func custom; - + assert(device != NULL); /* call the custom config free function first */ @@ -162,7 +162,7 @@ static void machine_config_detokenize(machine_config *config, const machine_conf assert(device != NULL); device->static_config = TOKEN_GET_PTR(tokens, voidptr); break; - + case MCONFIG_TOKEN_DEVICE_CONFIG_CUSTOM_1: case MCONFIG_TOKEN_DEVICE_CONFIG_CUSTOM_2: case MCONFIG_TOKEN_DEVICE_CONFIG_CUSTOM_3: diff --git a/src/emu/sound.c b/src/emu/sound.c index 33cf0a18cd4..d3fea90ab0a 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -289,11 +289,11 @@ static DEVICE_START( sound ) { sound_stream *stream = stream_find_by_device(device, outputnum); int curoutput, numoutputs; - + /* stop when we run out of streams */ if (stream == NULL) break; - + /* accumulate the number of outputs from this stream */ numoutputs = stream_get_outputs(stream); assert(classdata->outputs < MAX_OUTPUTS); @@ -325,7 +325,7 @@ static DEVICE_START( sound ) static DEVICE_CUSTOM_CONFIG( sound ) { sound_config *config = device->inline_config; - + switch (entrytype) { /* custom config 1 is a new route */ @@ -338,7 +338,7 @@ static DEVICE_CUSTOM_CONFIG( sound ) /* put back the token that was originally fetched so we can grab a packed 64-bit token */ TOKEN_UNGET_UINT32(tokens); TOKEN_GET_UINT64_UNPACK4(tokens, entrytype, 8, output, 12, input, 12, gain, 32); - + /* allocate a new route */ for (routeptr = &config->routelist; *routeptr != NULL; routeptr = &(*routeptr)->next) ; *routeptr = malloc_or_die(sizeof(**routeptr)); @@ -349,7 +349,7 @@ static DEVICE_CUSTOM_CONFIG( sound ) (*routeptr)->target = TOKEN_GET_STRING(tokens); break; } - + /* custom config free is also used as a reset of sound routes */ case MCONFIG_TOKEN_DEVICE_CONFIG_CUSTOM_FREE: while (config->routelist != NULL) @@ -360,7 +360,7 @@ static DEVICE_CUSTOM_CONFIG( sound ) } break; } - + return tokens; } @@ -389,7 +389,7 @@ DEVICE_GET_INFO( sound ) case DEVINFO_FCT_START: info->start = DEVICE_START_NAME(sound); break; case DEVINFO_FCT_SET_INFO: info->set_info = NULL; break; case DEVINFO_FCT_CUSTOM_CONFIG: info->custom_config = DEVICE_CUSTOM_CONFIG_NAME(sound); break; - + /* --- the following bits of info are returned as NULL-terminated strings --- */ case DEVINFO_STR_NAME: if (config != NULL) @@ -428,13 +428,13 @@ static void route_sound(running_machine *machine) const sound_config *config = sound->inline_config; int numoutputs = stream_get_device_outputs(sound); const sound_route *route; - + /* iterate over all routes */ for (route = config->routelist; route != NULL; route = route->next) { const device_config *target_speaker = devtag_get_device(machine, SPEAKER_OUTPUT, route->target); const device_config *target_sound = devtag_get_device(machine, SOUND, route->target); - + /* if neither found, it's fatal */ if (target_speaker == NULL && target_sound == NULL) fatalerror("Sound route \"%s\" not found!\n", route->target); @@ -444,7 +444,7 @@ static void route_sound(running_machine *machine) get_safe_token(target_speaker)->inputs += (route->output == ALL_OUTPUTS) ? numoutputs : 1; } } - + /* now allocate the mixers and input data */ for (curspeak = speaker_output_first(machine->config); curspeak != NULL; curspeak = speaker_output_next(curspeak)) { @@ -466,7 +466,7 @@ static void route_sound(running_machine *machine) const sound_config *config = sound->inline_config; int numoutputs = stream_get_device_outputs(sound); const sound_route *route; - + /* iterate over all routes */ for (route = config->routelist; route != NULL; route = route->next) { @@ -499,13 +499,13 @@ static void route_sound(running_machine *machine) if (stream_device_output_to_stream_output(sound, outputnum, &stream, &streamoutput)) stream_set_input(speakerinfo->mixer_stream, speakerinfo->inputs++, stream, streamoutput, route->gain); } - + /* otherwise, it's a sound chip */ else { sound_stream *inputstream; int streaminput; - + if (stream_device_input_to_stream_input(target_sound, inputnum++, &inputstream, &streaminput)) if (stream_device_output_to_stream_output(sound, outputnum, &stream, &streamoutput)) stream_set_input(inputstream, streaminput, stream, streamoutput, route->gain); @@ -514,7 +514,7 @@ static void route_sound(running_machine *machine) } } - /* free up our temporary string */ + /* free up our temporary string */ astring_free(tempstring); } @@ -915,7 +915,7 @@ void sound_set_output_gain(const device_config *device, int output, float gain) { sound_stream *stream; int outputnum; - + if (stream_device_output_to_stream_output(device, output, &stream, &outputnum)) stream_set_output_gain(stream, outputnum, gain); } diff --git a/src/emu/sound/2203intf.c b/src/emu/sound/2203intf.c index ba3e2074f3e..04af9db7156 100644 --- a/src/emu/sound/2203intf.c +++ b/src/emu/sound/2203intf.c @@ -63,7 +63,7 @@ static const ssg_callbacks psgintf = static void IRQHandler(void *param,int irq) { ym2203_state *info = param; - if (info->intf->handler != NULL) + if (info->intf->handler != NULL) (*info->intf->handler)(info->device, irq); } diff --git a/src/emu/sound/2612intf.c b/src/emu/sound/2612intf.c index be1e6db2d75..313c9f7ba48 100644 --- a/src/emu/sound/2612intf.c +++ b/src/emu/sound/2612intf.c @@ -196,7 +196,7 @@ DEVICE_GET_INFO( ym3438 ) { /* --- the following bits of info are returned as NULL-terminated strings --- */ case DEVINFO_STR_NAME: strcpy(info->s, "YM3438"); break; - + default: DEVICE_GET_INFO_CALL(ym2612); break; } } diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index c12ef2f3999..376fef2c97d 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -963,7 +963,7 @@ DEVICE_GET_INFO( ymz294 ) *************************************/ READ8_DEVICE_HANDLER( ay8910_r ) -{ +{ return ay8910_read_ym(get_safe_token(device)); } diff --git a/src/emu/sound/c6280.c b/src/emu/sound/c6280.c index daa3083d917..2a11f7cbe25 100644 --- a/src/emu/sound/c6280.c +++ b/src/emu/sound/c6280.c @@ -342,7 +342,7 @@ READ8_DEVICE_HANDLER( c6280_r ) WRITE8_DEVICE_HANDLER( c6280_w ) { c6280_t *info = get_safe_token(device); - h6280io_set_buffer(info->cpudevice, data); + h6280io_set_buffer(info->cpudevice, data); c6280_write(info, offset, data); } diff --git a/src/emu/sound/cdda.c b/src/emu/sound/cdda.c index c9172bb8a66..2d1b8195c4d 100644 --- a/src/emu/sound/cdda.c +++ b/src/emu/sound/cdda.c @@ -96,7 +96,7 @@ void cdda_set_cdrom(const device_config *device, void *file) const device_config *cdda_from_cdrom(running_machine *machine, void *file) { const device_config *device; - + for (device = sound_first(machine->config); device != NULL; device = sound_next(device)) if (sound_get_type(device) == SOUND_CDDA) { @@ -104,7 +104,7 @@ const device_config *cdda_from_cdrom(running_machine *machine, void *file) if (info->disc == file) return device; } - + return NULL; } diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index dbd49601519..01b9f2929e3 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -10,7 +10,7 @@ - white noise - scanline based update - - CMSEL output + - CMSEL output */ @@ -101,8 +101,8 @@ INLINE cdp1869_t *get_safe_token(const device_config *device) ***************************************************************************/ /*------------------------------------------------- - update_prd_changed_timer - update predisplay - changed timer + update_prd_changed_timer - update predisplay + changed timer -------------------------------------------------*/ static void update_prd_changed_timer(cdp1869_t *cdp1869) @@ -152,7 +152,7 @@ static void update_prd_changed_timer(cdp1869_t *cdp1869) } /*------------------------------------------------- - TIMER_CALLBACK( prd_changed_tick ) + TIMER_CALLBACK( prd_changed_tick ) -------------------------------------------------*/ static TIMER_CALLBACK( prd_changed_tick ) @@ -166,7 +166,7 @@ static TIMER_CALLBACK( prd_changed_tick ) } /*------------------------------------------------- - STATE_POSTLOAD( cdp1869_state_save_postload ) + STATE_POSTLOAD( cdp1869_state_save_postload ) -------------------------------------------------*/ static STATE_POSTLOAD( cdp1869_state_save_postload ) @@ -175,7 +175,7 @@ static STATE_POSTLOAD( cdp1869_state_save_postload ) } /*------------------------------------------------- - cdp1802_get_r_x - get CDP1802 R(X) value + cdp1802_get_r_x - get CDP1802 R(X) value -------------------------------------------------*/ static UINT16 cdp1802_get_r_x(cdp1869_t *cdp1869) @@ -184,7 +184,7 @@ static UINT16 cdp1802_get_r_x(cdp1869_t *cdp1869) } /*------------------------------------------------- - get_rgb - get RGB value + get_rgb - get RGB value -------------------------------------------------*/ static rgb_t get_rgb(int i, int c, int l) @@ -205,7 +205,7 @@ static rgb_t get_rgb(int i, int c, int l) } /*------------------------------------------------- - get_lines - get number of character lines + get_lines - get number of character lines -------------------------------------------------*/ static int get_lines(const device_config *device) @@ -227,7 +227,7 @@ static int get_lines(const device_config *device) } /*------------------------------------------------- - get_pmemsize - get page memory size + get_pmemsize - get page memory size -------------------------------------------------*/ static UINT16 get_pmemsize(const device_config *device, int cols, int rows) @@ -243,7 +243,7 @@ static UINT16 get_pmemsize(const device_config *device, int cols, int rows) } /*------------------------------------------------- - get_pma - get page memory address + get_pma - get page memory address -------------------------------------------------*/ static UINT16 get_pma(const device_config *device) @@ -261,7 +261,7 @@ static UINT16 get_pma(const device_config *device) } /*------------------------------------------------- - get_pen - get pen for color bits + get_pen - get pen for color bits -------------------------------------------------*/ static int get_pen(const device_config *device, int ccb0, int ccb1, int pcb) @@ -305,7 +305,7 @@ static int get_pen(const device_config *device, int ccb0, int ccb1, int pcb) } /*------------------------------------------------- - draw_line - draw character line + draw_line - draw character line -------------------------------------------------*/ static void draw_line(const device_config *device, bitmap_t *bitmap, int x, int y, int data, int color) @@ -350,7 +350,7 @@ static void draw_line(const device_config *device, bitmap_t *bitmap, int x, int } /*------------------------------------------------- - draw_char - draw character + draw_char - draw character -------------------------------------------------*/ static void draw_char(const device_config *device, bitmap_t *bitmap, int x, int y, UINT16 pma, const rectangle *screenrect) @@ -381,7 +381,7 @@ static void draw_char(const device_config *device, bitmap_t *bitmap, int x, int } /*------------------------------------------------- - PALETTE_INIT( cdp1869 ) + PALETTE_INIT( cdp1869 ) -------------------------------------------------*/ PALETTE_INIT( cdp1869 ) @@ -406,7 +406,7 @@ PALETTE_INIT( cdp1869 ) } /*------------------------------------------------- - cdp1869_out3_w - register 3 write + cdp1869_out3_w - register 3 write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_out3_w ) @@ -434,7 +434,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out3_w ) } /*------------------------------------------------- - cdp1869_out4_w - register 4 write + cdp1869_out4_w - register 4 write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_out4_w ) @@ -470,7 +470,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out4_w ) } /*------------------------------------------------- - cdp1869_out5_w - register 5 write + cdp1869_out5_w - register 5 write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_out5_w ) @@ -525,7 +525,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out5_w ) } /*------------------------------------------------- - cdp1869_out6_w - register 6 write + cdp1869_out6_w - register 6 write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_out6_w ) @@ -558,7 +558,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out6_w ) } /*------------------------------------------------- - cdp1869_out7_w - register 7 write + cdp1869_out7_w - register 7 write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_out7_w ) @@ -591,7 +591,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_out7_w ) } /*------------------------------------------------- - cdp1869_pageram_r - page memory read + cdp1869_pageram_r - page memory read -------------------------------------------------*/ READ8_DEVICE_HANDLER( cdp1869_pageram_r ) @@ -613,7 +613,7 @@ READ8_DEVICE_HANDLER( cdp1869_pageram_r ) } /*------------------------------------------------- - cdp1869_pageram_w - page memory write + cdp1869_pageram_w - page memory write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_pageram_w ) @@ -638,7 +638,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_pageram_w ) } /*------------------------------------------------- - cdp1869_charram_r - character memory read + cdp1869_charram_r - character memory read -------------------------------------------------*/ READ8_DEVICE_HANDLER( cdp1869_charram_r ) @@ -666,7 +666,7 @@ READ8_DEVICE_HANDLER( cdp1869_charram_r ) } /*------------------------------------------------- - cdp1869_charram_w - character memory write + cdp1869_charram_w - character memory write -------------------------------------------------*/ WRITE8_DEVICE_HANDLER( cdp1869_charram_w ) @@ -697,7 +697,7 @@ WRITE8_DEVICE_HANDLER( cdp1869_charram_w ) } /*------------------------------------------------- - cdp1869_update - screen update + cdp1869_update - screen update -------------------------------------------------*/ void cdp1869_update(const device_config *device, bitmap_t *bitmap, const rectangle *cliprect) @@ -778,7 +778,7 @@ void cdp1869_update(const device_config *device, bitmap_t *bitmap, const rectang } /*------------------------------------------------- - STREAM_UPDATE( cdp1869_stream_update ) + STREAM_UPDATE( cdp1869_stream_update ) -------------------------------------------------*/ static STREAM_UPDATE( cdp1869_stream_update ) @@ -839,7 +839,7 @@ static STREAM_UPDATE( cdp1869_stream_update ) } /*------------------------------------------------- - DEVICE_START( cdp1869 ) + DEVICE_START( cdp1869 ) -------------------------------------------------*/ static DEVICE_START( cdp1869 ) @@ -904,7 +904,7 @@ static DEVICE_START( cdp1869 ) } /*------------------------------------------------- - DEVICE_GET_INFO( cdp1869 ) + DEVICE_GET_INFO( cdp1869 ) -------------------------------------------------*/ DEVICE_GET_INFO( cdp1869 ) diff --git a/src/emu/sound/k054539.c b/src/emu/sound/k054539.c index 8c2e71b8501..95a149aed86 100644 --- a/src/emu/sound/k054539.c +++ b/src/emu/sound/k054539.c @@ -646,7 +646,7 @@ static DEVICE_START( k054539 ) static const k054539_interface defintrf = { 0 }; int i; k054539_state *info = get_safe_token(device); - + info->device = device; for (i = 0; i < 8; i++) diff --git a/src/emu/sound/msm5205.c b/src/emu/sound/msm5205.c index a93cc4c6e24..81081e1de10 100644 --- a/src/emu/sound/msm5205.c +++ b/src/emu/sound/msm5205.c @@ -161,7 +161,7 @@ static TIMER_CALLBACK( MSM5205_vclk_callback ) static DEVICE_RESET( msm5205 ) { msm5205_state *voice = get_safe_token(device); - + /* initialize work */ voice->data = 0; voice->vclk = 0; diff --git a/src/emu/sound/msm5232.c b/src/emu/sound/msm5232.c index 3c6c022e776..1912bf8c894 100644 --- a/src/emu/sound/msm5232.c +++ b/src/emu/sound/msm5232.c @@ -790,7 +790,7 @@ static DEVICE_START( msm5232 ) const msm5232_interface *intf = device->static_config; int rate = device->clock/CLOCK_RATE_DIVIDER; MSM5232 *chip = device->token; - + chip->device = device; msm5232_init(chip, intf, device->clock, rate); diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c index a457faf7c80..70667af0f25 100644 --- a/src/emu/sound/multipcm.c +++ b/src/emu/sound/multipcm.c @@ -494,7 +494,7 @@ static STREAM_UPDATE( MultiPCM_update ) READ8_DEVICE_HANDLER( multipcm_r ) { -// MultiPCM *ptChip = get_safe_token(device); +// MultiPCM *ptChip = get_safe_token(device); return 0; } diff --git a/src/emu/sound/qsound.c b/src/emu/sound/qsound.c index 6b8e679bad1..914dfd5002b 100644 --- a/src/emu/sound/qsound.c +++ b/src/emu/sound/qsound.c @@ -181,15 +181,15 @@ WRITE8_DEVICE_HANDLER( qsound_w ) case 0: chip->data=(chip->data&0xff)|(data<<8); break; - + case 1: chip->data=(chip->data&0xff00)|data; break; - + case 2: qsound_set_command(chip, data, chip->data); break; - + default: logerror("%s: unexpected qsound write to offset %d == %02X\n", cpuexec_describe_context(device->machine), offset, data); break; diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c index acd10f6bb91..45e4ed59820 100644 --- a/src/emu/sound/sid6581.c +++ b/src/emu/sound/sid6581.c @@ -15,9 +15,9 @@ static SID6581 *get_sid(int indx) { return NULL; -// sound_type type = sndnum_to_sndti(indx, NULL); -// assert((type == SOUND_SID6581) || (type == SOUND_SID8580)); -// return (SID6581 *) sndti_token(space->machine, type, indx); +// sound_type type = sndnum_to_sndti(indx, NULL); +// assert((type == SOUND_SID6581) || (type == SOUND_SID8580)); +// return (SID6581 *) sndti_token(space->machine, type, indx); } diff --git a/src/emu/sound/vrender0.c b/src/emu/sound/vrender0.c index 480a1a761f2..9c3a938032b 100644 --- a/src/emu/sound/vrender0.c +++ b/src/emu/sound/vrender0.c @@ -14,7 +14,7 @@ reverb interrupts *************/ -typedef struct _vr0_state vr0_state; +typedef struct _vr0_state vr0_state; struct _vr0_state { UINT32 *TexBase; diff --git a/src/emu/sound/ymf278b.c b/src/emu/sound/ymf278b.c index 083ea2e17b5..cb1a8b0139b 100644 --- a/src/emu/sound/ymf278b.c +++ b/src/emu/sound/ymf278b.c @@ -660,7 +660,7 @@ WRITE8_DEVICE_HANDLER( ymf278b_w ) case 5: ymf278b_C_w(chip, chip->port_C, data); break; - + default: logerror("%s: unexpected write at offset %X to ymf278b = %02X\n", cpuexec_describe_context(device->machine), offset, data); break; diff --git a/src/emu/streams.c b/src/emu/streams.c index 31d4f01f0e8..22b5c20f11c 100644 --- a/src/emu/streams.c +++ b/src/emu/streams.c @@ -412,7 +412,7 @@ sound_stream *stream_create(const device_config *device, int inputs, int outputs /*------------------------------------------------- - stream_device_output_to_stream_output - + stream_device_output_to_stream_output - convert a device/output pair to a stream/ output pair -------------------------------------------------*/ @@ -439,7 +439,7 @@ int stream_device_output_to_stream_output(const device_config *device, int outpu /*------------------------------------------------- - stream_device_input_to_stream_input - + stream_device_input_to_stream_input - convert a device/input pair to a stream/ input pair -------------------------------------------------*/ @@ -604,7 +604,7 @@ attotime stream_get_sample_period(sound_stream *stream) ***************************************************************************/ /*------------------------------------------------- - stream_get_device_outputs - return the total + stream_get_device_outputs - return the total number of outputs for the given device -------------------------------------------------*/ diff --git a/src/emu/ui.c b/src/emu/ui.c index 5b283501013..a39ca49771b 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -926,13 +926,13 @@ static astring *warnings_string(running_machine *machine, astring *string) astring_catc(string, "The game lacks sound.\n"); if (machine->gamedrv->flags & GAME_NO_COCKTAIL) astring_catc(string, "Screen flipping in cocktail mode is not supported.\n"); - + /* check if external artwork is present before displaying this warning? */ if (machine->gamedrv->flags & GAME_REQUIRES_ARTWORK) astring_catc(string, "The game requires external artwork files\n"); - - - + + + /* if there's a NOT WORKING or UNEMULATED PROTECTION warning, make it stronger */ if (machine->gamedrv->flags & (GAME_NOT_WORKING | GAME_UNEMULATED_PROTECTION)) diff --git a/src/mame/audio/irem.c b/src/mame/audio/irem.c index 31eb7de4e01..80f802f0969 100644 --- a/src/mame/audio/irem.c +++ b/src/mame/audio/irem.c @@ -122,7 +122,7 @@ static WRITE8_DEVICE_HANDLER( ay8910_0_portb_w ) { const device_config *adpcm0 = devtag_get_device(device->machine, SOUND, "msm1"); const device_config *adpcm1 = devtag_get_device(device->machine, SOUND, "msm2"); - + /* bits 2-4 select MSM5205 clock & 3b/4b playback mode */ msm5205_playmode_w(adpcm0, (data >> 2) & 7); if (adpcm1 != NULL) @@ -190,7 +190,7 @@ static WRITE8_HANDLER( m62_adpcm_w ) static void adpcm_int(const device_config *device) { const device_config *msm2 = devtag_get_device(device->machine, SOUND, "msm2"); - + cpu_set_input_line(device->machine->cpu[1], INPUT_LINE_NMI, PULSE_LINE); /* the first MSM5205 clocks the second */ diff --git a/src/mame/audio/mario.c b/src/mame/audio/mario.c index cfc6203c000..6aca9101e66 100644 --- a/src/mame/audio/mario.c +++ b/src/mame/audio/mario.c @@ -22,7 +22,7 @@ /* as connected to +5V on schematics. This does not match */ /* recordings */ -#define RUN_VCO_VOLTAGE (0.0) /* 5 in schematics */ +#define RUN_VCO_VOLTAGE (0.0) /* 5 in schematics */ #define USE_8039 (0) /* set to 1 to try 8039 hack */ @@ -144,7 +144,7 @@ /************************************************************************ * * Custom mario run - * + * * Two VCO with XOR'd signal * * input[0] - Enable / Amplitude @@ -160,14 +160,14 @@ * C1 | * -||- | * | | -- +--- - * ------ --- |AND| R1 - * In1 >---+ Y1 +--------+ | |(*)+---ZZZ--+------> Out - * | | |XOR+------+--- | - * | | ---+ | | + * ------ --- |AND| R1 + * In1 >---+ Y1 +--------+ | |(*)+---ZZZ--+------> Out + * | | |XOR+------+--- | + * | | ---+ | | * | | | --- --- * In2 >---+ Y2 +---- --- C3 - * ------ | - * | | Gnd + * ------ | + * | | Gnd * -||- * C2 ************************************************************************/ @@ -196,10 +196,10 @@ static DISCRETE_STEP( mario_custom_run ) double t2 = 0.5 / LS624_F(MARIO_CUSTOM_C2, MARIO_CUSTOM_IN2, RUN_VCO_VOLTAGE); double sample_t = discrete_current_context->sample_time; double vn, t; - + //if (MARIO_CUSTOM_VOUT) - // printf("%f %f %f %f\n", MARIO_CUSTOM_IN1, MARIO_CUSTOM_IN2, 0.5 / t1, 0.5 / t2); - while (sample_t > 0.0f) + // printf("%f %f %f %f\n", MARIO_CUSTOM_IN1, MARIO_CUSTOM_IN2, 0.5 / t1, 0.5 / t2); + while (sample_t > 0.0f) { /* state before time advance */ vn = (double) (context->state1 ^ context->state2); @@ -240,7 +240,7 @@ static DISCRETE_STEP( mario_custom_run ) sample_t = 0.0f; } } - + context->vc3 += (vn - context->vc3) * (1.0 - exp(- t / (MARIO_CUSTOM_R1 * MARIO_CUSTOM_C3))); } node->output[0] = context->vc3; @@ -284,7 +284,7 @@ static DISCRETE_SOUND_START(mario) DISCRETE_LS123(NODE_10, DS_SOUND0_INV, MR_R17, CAP_AGE(MR_C14, 0.7)) DISCRETE_RCFILTER(NODE_11, 1, NODE_10, MR_R6, CAP_AGE(MR_C3, 0.5) ) - DISCRETE_CUSTOM7(NODE_12, NODE_10, NODE_11, NODE_11, MR_C6, MR_C17, + DISCRETE_CUSTOM7(NODE_12, NODE_10, NODE_11, NODE_11, MR_C6, MR_C17, MR_MIXER_RPAR, MR_C31, &mario_custom_run_info) DISCRETE_MULTIPLY(DS_OUT_SOUND0, 1, NODE_12, MR_MIXER_RPAR / MR_R20) @@ -294,7 +294,7 @@ static DISCRETE_SOUND_START(mario) DISCRETE_LS123(NODE_20, DS_SOUND1_INV, MR_R18, CAP_AGE(MR_C15, 0.7)) DISCRETE_RCFILTER(NODE_21, 1, NODE_20, MR_R7, CAP_AGE(MR_C4, 0.5) ) - DISCRETE_CUSTOM7(NODE_22, NODE_20, NODE_21, NODE_21, MR_C5, MR_C16, + DISCRETE_CUSTOM7(NODE_22, NODE_20, NODE_21, NODE_21, MR_C5, MR_C16, MR_MIXER_RPAR, MR_C31, &mario_custom_run_info) DISCRETE_MULTIPLY(DS_OUT_SOUND1, 1, NODE_22, MR_MIXER_RPAR / MR_R19) @@ -332,7 +332,7 @@ static DISCRETE_SOUND_START(mario) DISCRETE_MULTIPLY(NODE_170, 1, DS_DAC, TTL_HIGH/256.0) DISCRETE_RCFILTER(NODE_171, 1, NODE_170, RES_K(750), CAP_P(200)) - + DISCRETE_MULTIPLY(NODE_172, 1, NODE_171, MR_MIXER_RPAR / MR_R40) DISCRETE_RCFILTER(DS_OUT_DAC, 1, NODE_172, MR_MIXER_RPAR, MR_C31) diff --git a/src/mame/audio/qix.c b/src/mame/audio/qix.c index d1e56d358c0..528174183f2 100644 --- a/src/mame/audio/qix.c +++ b/src/mame/audio/qix.c @@ -124,7 +124,7 @@ MACHINE_DRIVER_START( slither_audio ) MDRV_SPEAKER_REMOVE("left") MDRV_SPEAKER_REMOVE("right") MDRV_SPEAKER_STANDARD_MONO("mono") - + MDRV_SOUND_REMOVE("discrete") MDRV_SOUND_ADD("sn1", SN76489, SLITHER_CLOCK_OSC/4/4) diff --git a/src/mame/audio/redalert.c b/src/mame/audio/redalert.c index 96111309e44..42b4aab218e 100644 --- a/src/mame/audio/redalert.c +++ b/src/mame/audio/redalert.c @@ -128,9 +128,9 @@ static const ay8910_interface redalert_ay8910_interface = { AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, - DEVCB_MEMORY_HANDLER("audio", PROGRAM, soundlatch_r), + DEVCB_MEMORY_HANDLER("audio", PROGRAM, soundlatch_r), DEVCB_NULL, /* port A/B read */ - DEVCB_NULL, + DEVCB_NULL, DEVCB_HANDLER(redalert_analog_w) /* port A/B write */ }; @@ -362,9 +362,9 @@ static const ay8910_interface demoneye_ay8910_interface = { AY8910_LEGACY_OUTPUT, AY8910_DEFAULT_LOADS, - DEVCB_MEMORY_HANDLER("audio", PROGRAM, soundlatch_r), + DEVCB_MEMORY_HANDLER("audio", PROGRAM, soundlatch_r), DEVCB_NULL, /* port A/B read */ - DEVCB_NULL, + DEVCB_NULL, DEVCB_NULL /* port A/B write */ }; diff --git a/src/mame/audio/tx1.c b/src/mame/audio/tx1.c index 61935d36440..7531740b373 100644 --- a/src/mame/audio/tx1.c +++ b/src/mame/audio/tx1.c @@ -427,10 +427,10 @@ WRITE8_DEVICE_HANDLER( bb_ym2_b_w ) } /* - Until we support > 2 speakers, double the gain of the front speakers + Until we support > 2 speakers, double the gain of the front speakers - TODO: We do support more than 2 speakers but the output is downmixed to stereo. - */ + TODO: We do support more than 2 speakers but the output is downmixed to stereo. + */ /* Rear left speaker */ gain = data & 0x80 ? 1.0 : 2.0; diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c index 1ffe0762de1..10a01e4b1f1 100644 --- a/src/mame/drivers/88games.c +++ b/src/mame/drivers/88games.c @@ -111,7 +111,7 @@ static UINT8 speech_chip[8]; static WRITE8_HANDLER( speech_control_w ) { const device_config *upd; - + strcpy((char *)speech_chip, ( data & 4 ) ? "upd2" : "upd1"); upd = devtag_get_device(space->machine, SOUND, (char *)speech_chip); diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index cf8633b2a93..52f03bacb41 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -1133,7 +1133,7 @@ ROM_END - No scroll in the attract. - Analysis page in operator/supervisor mode. - Min-Max bet, and a kind of 3-strings password given in supervisor mode. - + */ ROM_START( ampkr228 ) ROM_REGION( 0x10000, "main", 0 ) diff --git a/src/mame/drivers/bfm_sc2.c b/src/mame/drivers/bfm_sc2.c index 6817f850c80..65ca8be6fd3 100644 --- a/src/mame/drivers/bfm_sc2.c +++ b/src/mame/drivers/bfm_sc2.c @@ -2625,12 +2625,12 @@ GAMEL( 1997, gldncrwn, 0, scorpion2_vid, gldncrwn, gldncrwn, 0, "BFM /************************************************************************** Mechanical Scorpion 2 Games - AGEMAME driver - + AGEMAME driver + *************************************************************************** 30-12-2006: J Wallace: Fixed init routines. - 07-03-2006: El Condor: Recoded to more accurately represent the hardware + 07-03-2006: El Condor: Recoded to more accurately represent the hardware setup. 18-01-2006: Cleaned up for MAME inclusion 19-08-2005: Re-Animator @@ -2903,7 +2903,7 @@ static ADDRESS_MAP_START( sc3_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x2F00, 0x2F00) AM_WRITE(vfd2_data_w) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM -// AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) +// AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END @@ -2953,7 +2953,7 @@ static ADDRESS_MAP_START( memmap_sc2_dm01, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x3FFE, 0x3FFE) AM_READ( direct_input_r) AM_RANGE(0x3FFF, 0x3FFF) AM_READ( coin_input_r) AM_RANGE(0x4000, 0x5FFF) AM_ROM -// AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) +// AM_RANGE(0x4000, 0xFFFF) AM_WRITE(unknown_w) AM_RANGE(0x6000, 0x7FFF) AM_READ(SMH_BANK1) AM_RANGE(0x8000, 0xFFFF) AM_ROM ADDRESS_MAP_END @@ -4094,7 +4094,7 @@ static DRIVER_INIT (luvjub) } /********************************************* -Dr.Who The Timelord +Dr.Who The Timelord *********************************************/ ROM_START( m_bdrwho ) @@ -4285,7 +4285,7 @@ ROM_START( m_luvjub ) ROM_END /********************************************* -Club Public Enemy No.1 +Club Public Enemy No.1 *********************************************/ ROM_START( m_cpeno1 ) diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c index 01fc93a4ab6..dd17fb524b1 100644 --- a/src/mame/drivers/centiped.c +++ b/src/mame/drivers/centiped.c @@ -1570,7 +1570,7 @@ static const pokey_interface milliped_pokey_interface_2 = static const pokey_interface warlords_pokey_interface = { - { + { DEVCB_INPUT_PORT("PADDLE0"), DEVCB_INPUT_PORT("PADDLE1"), DEVCB_INPUT_PORT("PADDLE2"), diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index 002600ad1c0..4c212d5841c 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -185,9 +185,9 @@ ADDRESS_MAP_END // (see also Model 3): static ADDRESS_MAP_START( system_h1_sound_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x000000, 0x07ffff) AM_RAM -// AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp1", scsp_r, scsp_w) +// AM_RANGE(0x100000, 0x100fff) AM_DEVREADWRITE(SOUND, "scsp1", scsp_r, scsp_w) AM_RANGE(0x200000, 0x27ffff) AM_RAM -// AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE(SOUND, "scsp2", scsp_r, scsp_w) +// AM_RANGE(0x300000, 0x300fff) AM_DEVREADWRITE(SOUND, "scsp2", scsp_r, scsp_w) ADDRESS_MAP_END diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c index beb7f8ae94b..8a5d7f987f7 100644 --- a/src/mame/drivers/cps2.c +++ b/src/mame/drivers/cps2.c @@ -8532,7 +8532,7 @@ ROM_START( dimahoud ) ROM_LOAD16_WORD_SWAP( "gmd.04", 0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) ) ROM_LOAD16_WORD_SWAP( "gmd.05", 0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) ) ROM_LOAD16_WORD_SWAP( "gmdud.06", 0x180000, 0x80000, CRC(d825efda) SHA1(7299f3629d5136f567f5cf373754ea13b2190533) ) - + ROM_REGION( 0x1000000, "gfx", 0 ) ROMX_LOAD( "gmd.13m", 0x000000, 0x400000, CRC(80dd19f0) SHA1(0fd8b1e8d73cc83e6c34f0d94487938da2344f76) , ROM_GROUPWORD | ROM_SKIP(6) ) ROMX_LOAD( "gmd.15m", 0x000002, 0x400000, CRC(dfd93a78) SHA1(c343d5ddcc25bd0739491e7439d7c0d0a8881a04) , ROM_GROUPWORD | ROM_SKIP(6) ) @@ -8554,7 +8554,7 @@ ROM_START( mmatrixd ) ROM_LOAD16_WORD_SWAP( "mmxjd.03", 0x000000, 0x80000, CRC(36711e60) SHA1(a192e786798f69320761017437ee4d2d47dc80c5) ) ROM_LOAD16_WORD_SWAP( "mmxjd.04", 0x080000, 0x80000, CRC(4687226f) SHA1(b831582f578eb1e40bce1d1cbf231e4c27f510cd) ) ROM_LOAD16_WORD_SWAP( "mmxjd.05", 0x100000, 0x80000, CRC(52124398) SHA1(0a18b9d2a7e3335ddf7ff9ac5c5f8298951f8c67) ) - + ROM_REGION( 0x2000000, "gfx", 0 ) ROMX_LOAD( "mmx.13m", 0x0000000, 0x400000, CRC(04748718) SHA1(d2e84d9dcc779c08469d815ccd709f30705954b8) , ROM_GROUPWORD | ROM_SKIP(6) ) ROMX_LOAD( "mmx.15m", 0x0000002, 0x400000, CRC(38074f44) SHA1(2002c4862c156b314bc4f3372b713c48e0667ec3) , ROM_GROUPWORD | ROM_SKIP(6) ) diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index c33519deab6..7473538f80e 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -104,7 +104,7 @@ static READ8_DEVICE_HANDLER( ddrible_vlm5030_busy_r ) static WRITE8_DEVICE_HANDLER( ddrible_vlm5030_ctrl_w ) { UINT8 *SPEECH_ROM = memory_region(device->machine, "vlm"); - + /* b7 : vlm data bus OE */ /* b6 : VLM5030-RST */ /* b5 : VLM5030-ST */ diff --git a/src/mame/drivers/feversoc.c b/src/mame/drivers/feversoc.c index 1c404e3c927..4bfc89ae01d 100644 --- a/src/mame/drivers/feversoc.c +++ b/src/mame/drivers/feversoc.c @@ -153,7 +153,7 @@ static ADDRESS_MAP_START( feversoc_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x06000004, 0x06000007) AM_WRITENOP //??? AM_RANGE(0x06000008, 0x0600000b) AM_READ(in0_r) AM_RANGE(0x0600000c, 0x0600000f) AM_DEVREADWRITE8(SOUND, "oki", okim6295_r, okim6295_w, 0x00ff0000) -// AM_RANGE(0x06010000, 0x06017fff) AM_RAM //contains RISE11 keys and other related stuff. +// AM_RANGE(0x06010000, 0x06017fff) AM_RAM //contains RISE11 keys and other related stuff. AM_RANGE(0x06018000, 0x06019fff) AM_RAM_WRITE(fs_paletteram_w) AM_BASE(&paletteram32) ADDRESS_MAP_END @@ -187,9 +187,9 @@ static INPUT_PORTS_START( feversoc ) PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) //hopper i/o PORT_DIPSETTING( 0x20, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) -// PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) //vblank/eeprom read bit? -// PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) -// PORT_DIPSETTING( 0x00, DEF_STR( On ) ) +// PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) //vblank/eeprom read bit? +// PORT_DIPSETTING( 0x40, DEF_STR( Off ) ) +// PORT_DIPSETTING( 0x00, DEF_STR( On ) ) PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) //PORT_NAME("Slottle") PORT_CODE(KEYCODE_Z) PORT_DIPNAME( 0x0100, 0x0100, "DIP 1-1" ) PORT_DIPSETTING( 0x0100, DEF_STR( Off ) ) diff --git a/src/mame/drivers/firefox.c b/src/mame/drivers/firefox.c index 168c1a5d397..675d7b7ceef 100644 --- a/src/mame/drivers/firefox.c +++ b/src/mame/drivers/firefox.c @@ -300,7 +300,7 @@ static UINT8 riot_porta_r(const device_config *device, UINT8 olddata) /* bit 2 = TMS /ready */ /* bit 1 = TMS /read */ /* bit 0 = TMS /write */ - + const device_config *tms = devtag_get_device(device->machine, SOUND, "tms"); return (main_to_sound_flag << 7) | (sound_to_main_flag << 6) | 0x10 | (!tms5220_ready_r(tms) << 2); } diff --git a/src/mame/drivers/foodf.c b/src/mame/drivers/foodf.c index 5713c58cd64..10e17b4a389 100644 --- a/src/mame/drivers/foodf.c +++ b/src/mame/drivers/foodf.c @@ -337,7 +337,7 @@ static READ8_DEVICE_HANDLER( pot_r ) static const pokey_interface pokey_config = { - { + { DEVCB_HANDLER(pot_r), DEVCB_HANDLER(pot_r), DEVCB_HANDLER(pot_r), diff --git a/src/mame/drivers/galdrvr.c b/src/mame/drivers/galdrvr.c index 3a89ec5a3c7..21031123431 100644 --- a/src/mame/drivers/galdrvr.c +++ b/src/mame/drivers/galdrvr.c @@ -1279,7 +1279,7 @@ INPUT_PORTS_START( frogger ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1319,7 +1319,7 @@ INPUT_PORTS_START( froggrmc ) PORT_DIPSETTING( 0x06, "A 1/1 B 1/1 C 1/1" ) PORT_DIPSETTING( 0x00, "A 1/1 B 1/6 C 1/1" ) PORT_BIT( 0xf8, IP_ACTIVE_HIGH, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1383,7 +1383,7 @@ INPUT_PORTS_START( turtles ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1547,7 +1547,7 @@ INPUT_PORTS_START( theend ) PORT_DIPSETTING( 0x00, DEF_STR( Upright ) ) PORT_DIPSETTING( 0x08, DEF_STR( Cocktail ) ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) /* output bits */ - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1591,7 +1591,7 @@ INPUT_PORTS_START( scramble ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(scramble_protection_alt_r, (void *)0) /* protection bit */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SPECIAL ) PORT_CUSTOM(scramble_protection_alt_r, (void *)1) /* protection bit */ - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1723,7 +1723,7 @@ INPUT_PORTS_START( atlantis ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1771,7 +1771,7 @@ INPUT_PORTS_START( scorpion ) PORT_DIPSETTING( 0x80, DEF_STR( Medium ) ) PORT_DIPSETTING( 0x20, DEF_STR( Hard ) ) PORT_DIPSETTING( 0x00, DEF_STR( Very_Hard ) ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1862,7 +1862,7 @@ INPUT_PORTS_START( sfx ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused */ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) /* unused */ - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1907,7 +1907,7 @@ INPUT_PORTS_START( scobra ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -1955,7 +1955,7 @@ static INPUT_PORTS_START( spdcoin ) PORT_DIPSETTING( 0x08, "3" ) PORT_DIPSETTING( 0x00, "5" ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2017,7 +2017,7 @@ static INPUT_PORTS_START( superbon ) PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) ) PORT_DIPSETTING( 0x80, DEF_STR( Off ) ) PORT_DIPSETTING( 0x00, DEF_STR( On ) ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2057,7 +2057,7 @@ INPUT_PORTS_START( losttomb ) PORT_DIPSETTING( 0x06, "A 1/4 B 4/1" ) PORT_DIPUNKNOWN( 0x08, 0x00 ) PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2102,7 +2102,7 @@ INPUT_PORTS_START( armorcar ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2147,7 +2147,7 @@ INPUT_PORTS_START( tazmania ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2193,7 +2193,7 @@ INPUT_PORTS_START( anteater ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END @@ -2239,7 +2239,7 @@ static INPUT_PORTS_START( calipso ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) - + PORT_START("IN3") /* need for some PPI accesses */ PORT_BIT( 0xff, 0x00, IPT_UNUSED ) INPUT_PORTS_END diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 9eb304bbc5a..1fdf98bf30c 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -52,9 +52,9 @@ static ADDRESS_MAP_START( go2000_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xa00000, 0xa00001) AM_READ_PORT("INPUTS") AM_RANGE(0xa00002, 0xa00003) AM_READ_PORT("DSW") AM_RANGE(0x620002, 0x620003) AM_WRITE(sound_cmd_w) -// AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP -// AM_RANGE(0xe00010, 0xe00011) AM_WRITENOP -// AM_RANGE(0xe00020, 0xe00021) AM_WRITENOP +// AM_RANGE(0xe00000, 0xe00001) AM_WRITENOP +// AM_RANGE(0xe00010, 0xe00011) AM_WRITENOP +// AM_RANGE(0xe00020, 0xe00021) AM_WRITENOP ADDRESS_MAP_END static WRITE8_HANDLER( go2000_pcm_1_bankswitch_w ) diff --git a/src/mame/drivers/goldstar.c b/src/mame/drivers/goldstar.c index e59d24e46fb..59e2bf1cefa 100644 --- a/src/mame/drivers/goldstar.c +++ b/src/mame/drivers/goldstar.c @@ -4401,7 +4401,7 @@ static PALETTE_INIT(cm) data = proms[0x000 + i] | (proms[0x100 + i] << 4); palette_set_color_rgb(machine, i, pal3bit(data >> 0), pal3bit(data >> 3), pal2bit(data >> 6)); - } + } } static PALETTE_INIT(cmast91) @@ -5813,9 +5813,9 @@ ROM_START( skill98 ) ROM_CONTINUE(0xd000,0x1000) ROM_CONTINUE(0xe000,0x1000) ROM_CONTINUE(0xf000,0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "sk98h.bin", 0x00000, 0x10000, CRC(0574357b) SHA1(96a846f6d49dd67ad078ad9240e632f79ae1b437) ) ROM_LOAD( "sk98l.bin", 0x10000, 0x10000, CRC(ebe802a4) SHA1(178542c204fd1027874e6d2c099edaa7878c993f) ) @@ -5865,9 +5865,9 @@ ROM_START( schery97 ) ROM_CONTINUE(0xd000,0x1000) ROM_CONTINUE(0xe000,0x1000) ROM_CONTINUE(0xf000,0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "sc97h.bin", 0x00000, 0x10000, CRC(def39ee2) SHA1(5e6817bd947ebf16d0313285a00876b796b71cab) ) ROM_LOAD( "sc97l.bin", 0x10000, 0x10000, CRC(6f4d6aea) SHA1(6809c26e6975cac97b0f8c01a508d4e022859b1a) ) @@ -5915,13 +5915,13 @@ ROM_START( schery97a ) ROM_CONTINUE(0xd000,0x1000) ROM_CONTINUE(0xe000,0x1000) ROM_CONTINUE(0xf000,0x1000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "sc97h.bin", 0x00000, 0x10000, CRC(def39ee2) SHA1(5e6817bd947ebf16d0313285a00876b796b71cab) ) ROM_LOAD( "sc97l.bin", 0x10000, 0x10000, CRC(6f4d6aea) SHA1(6809c26e6975cac97b0f8c01a508d4e022859b1a) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -5964,7 +5964,7 @@ ROM_START( roypok96 ) ROM_LOAD( "rp35l.bin", 0x10000, 0x10000, CRC(ef416c4e) SHA1(5aac157ba15c66f79a7a68935095bef9a2636f7b) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -5999,13 +5999,13 @@ ROM_START( roypok96a ) ROM_CONTINUE(0x5000,0x1000) ROM_CONTINUE(0x8000,0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "rp35h.bin", 0x00000, 0x10000, CRC(664649ea) SHA1(7915ab31afd2a1bbb8f817f961e0e522d76f5c05) ) ROM_LOAD( "rp35l.bin", 0x10000, 0x10000, CRC(ef416c4e) SHA1(5aac157ba15c66f79a7a68935095bef9a2636f7b) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6041,13 +6041,13 @@ ROM_START( roypok96b ) ROM_CONTINUE(0x5000,0x1000) ROM_CONTINUE(0x8000,0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "rp35h.bin", 0x00000, 0x10000, CRC(664649ea) SHA1(7915ab31afd2a1bbb8f817f961e0e522d76f5c05) ) ROM_LOAD( "rp35l.bin", 0x10000, 0x10000, CRC(ef416c4e) SHA1(5aac157ba15c66f79a7a68935095bef9a2636f7b) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6084,13 +6084,13 @@ ROM_START( pokonl97 ) ROM_CONTINUE(0x2000,0x1000) ROM_CONTINUE(0x5000,0x1000) ROM_CONTINUE(0x8000,0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "po97h.bin", 0x00000, 0x10000, CRC(fe845426) SHA1(80a1ffa28f92ad381ccf01b387afddd3ee849a58) ) ROM_LOAD( "po97l.bin", 0x10000, 0x10000, CRC(d389d5be) SHA1(a88db3bf411dd1bdf8dc42c8c440d71b24ef95ee) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6105,7 +6105,7 @@ ROM_START( pokonl97 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "po97u19.bin", 0x0000, 0x0100, CRC(889dd4b3) SHA1(dc4b2506bf61f1bc4d491c3a9c410be11d93b76f) ) ROM_LOAD( "po97u20.bin", 0x0100, 0x0100, CRC(e44d1b48) SHA1(0a21b79c03f33d31303ba6cabc4b5a23d7c9cfe3) ) @@ -6136,9 +6136,9 @@ ROM_START( nfb96 ) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) ROM_CONTINUE(0xf000, 0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "fbseh.bin", 0x00000, 0x10000, CRC(2fc10ce7) SHA1(a2418cfbe7ed217848ace8ea06587bcaa6b2c8f2) ) ROM_LOAD( "fbsel.bin", 0x10000, 0x10000, CRC(fb9d679a) SHA1(a4f6246bdbbf2e25f702006b30a62bc7873137de) ) @@ -6186,10 +6186,10 @@ ROM_START( nfb96a ) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) ROM_CONTINUE(0xf000, 0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - - + + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "fbseh.bin", 0x00000, 0x10000, CRC(2fc10ce7) SHA1(a2418cfbe7ed217848ace8ea06587bcaa6b2c8f2) ) ROM_LOAD( "fbsel.bin", 0x10000, 0x10000, CRC(fb9d679a) SHA1(a4f6246bdbbf2e25f702006b30a62bc7873137de) ) @@ -6237,9 +6237,9 @@ ROM_START( nfb96b ) ROM_CONTINUE(0xd000, 0x1000) ROM_CONTINUE(0xe000, 0x1000) ROM_CONTINUE(0xf000, 0x1000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + /* these graphic roms display a different copyright */ ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "fb96seh.bin", 0x00000, 0x10000, CRC(12042a0a) SHA1(4bc5f87f4b92f303fef100bf16e3d7b27670b793) ) @@ -6281,10 +6281,10 @@ ROM_START( nfb96c ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - - /* these graphic roms display a different copyright */ + + /* these graphic roms display a different copyright */ ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "fb96seh.bin", 0x00000, 0x10000, CRC(12042a0a) SHA1(4bc5f87f4b92f303fef100bf16e3d7b27670b793) ) ROM_LOAD( "fb96sel.bin", 0x10000, 0x10000, CRC(d611f10b) SHA1(425cad584e85f21de214bf978555a7811b13aa35) ) @@ -6326,10 +6326,10 @@ ROM_START( nfb96txt ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - - /* these graphic roms display a different copyright */ + + /* these graphic roms display a different copyright */ ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "txfbh.bin", 0x00000, 0x10000, CRC(9e9ba897) SHA1(901bb2596ff67c0290977fd508247aa1da0a09b9) ) ROM_LOAD( "txfbl.bin", 0x10000, 0x10000, CRC(d1b8920c) SHA1(c6dc065134724baafed4c1cfa4aaf3c23dfb7a32) ) @@ -6371,13 +6371,13 @@ ROM_START( nc96 ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "chseh.bin", 0x00000, 0x10000, CRC(fb90df1d) SHA1(84ec1f40a014a0043b3c3c999428dd274caba1b8) ) ROM_LOAD( "chsel.bin", 0x10000, 0x10000, CRC(e0166f3e) SHA1(27e180fe6e03f48771b540e34415eee54951788f) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6391,7 +6391,7 @@ ROM_START( nc96 ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + // no proms present, using nfb96 ones ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -6416,13 +6416,13 @@ ROM_START( nc96a ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "chseh.bin", 0x00000, 0x10000, CRC(fb90df1d) SHA1(84ec1f40a014a0043b3c3c999428dd274caba1b8) ) ROM_LOAD( "chsel.bin", 0x10000, 0x10000, CRC(e0166f3e) SHA1(27e180fe6e03f48771b540e34415eee54951788f) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6436,7 +6436,7 @@ ROM_START( nc96a ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + // no proms present, using nfb96 ones ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -6462,14 +6462,14 @@ ROM_START( nc96b ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "ch96seh.bin", 0x00000, 0x10000, CRC(65dee6ba) SHA1(77f5769ed0b745a4735576e9f0ce90dcdd9b5410) ) ROM_LOAD( "ch96sel.bin", 0x10000, 0x10000, CRC(c21cc114) SHA1(f7b6ff5ac34dc1a7332e8c1b9cc40f3b65deac05) ) - + ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6483,7 +6483,7 @@ ROM_START( nc96b ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + // no proms present, using nfb96 ones ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -6508,13 +6508,13 @@ ROM_START( nc96c ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "ch96seh.bin", 0x00000, 0x10000, CRC(65dee6ba) SHA1(77f5769ed0b745a4735576e9f0ce90dcdd9b5410) ) ROM_LOAD( "ch96sel.bin", 0x10000, 0x10000, CRC(c21cc114) SHA1(f7b6ff5ac34dc1a7332e8c1b9cc40f3b65deac05) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6528,7 +6528,7 @@ ROM_START( nc96c ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + // no proms present, using nfb96 ones ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -6552,13 +6552,13 @@ ROM_START( nc96txt ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "txchh.bin", 0x00000, 0x10000, CRC(07621bde) SHA1(65fd52545a399694394e623a7249d180d1a4fa9f) ) ROM_LOAD( "txchl.bin", 0x10000, 0x10000, CRC(3b00b7dc) SHA1(99d513d23eea28fedf59ad272a3280abd0d3c2ab) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6572,7 +6572,7 @@ ROM_START( nc96txt ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + // no proms present, using nfb96 ones ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "chu19.bin", 0x0000, 0x0100, CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) ) @@ -6596,13 +6596,13 @@ ROM_START( match98 ) ROM_CONTINUE(0x2000, 0x1000) ROM_CONTINUE(0x5000, 0x1000) ROM_CONTINUE(0x8000, 0x8000) - + ROM_REGION( 0x20000, "graphics", ROMREGION_DISPOSE ) ROM_LOAD( "match98h.bin", 0x00000, 0x10000, CRC(94899f26) SHA1(1b6f953b6251496d7d06fb0a2d0b861e04ebc3df) ) ROM_LOAD( "match98l.bin", 0x10000, 0x10000, CRC(6db4b962) SHA1(7d476e244d70a86dacf85dd9c790f63aef4b7cd9) ) ROM_REGION( 0x10000, "user1", ROMREGION_DISPOSE | ROMREGION_ERASEFF ) - + ROM_REGION( 0x18000, "gfx1", ROMREGION_DISPOSE ) ROM_COPY( "graphics", 0x18000, 0x00000, 0x4000 ) // 1 ROM_COPY( "graphics", 0x08000, 0x08000, 0x4000 ) // 1 @@ -6616,7 +6616,7 @@ ROM_START( match98 ) ROM_COPY( "graphics", 0x12000, 0x02000, 0x2000 ) ROM_COPY( "graphics", 0x00000, 0x04000, 0x2000 ) ROM_COPY( "graphics", 0x10000, 0x06000, 0x2000 ) - + ROM_REGION( 0x200, "proms", 0 ) // palette ROM_LOAD( "matchu19.bin", 0x0000, 0x0100, CRC(59cd3566) SHA1(e9726aad631d86e2c122e3d75f87abc22ea7ef97) ) ROM_LOAD( "matchu20.bin", 0x0100, 0x0100, CRC(f421503c) SHA1(591c80d6ff63021fab31b3bfcde1b47cd75fd7bb) ) @@ -6626,7 +6626,7 @@ ROM_START( match98 ) ROM_REGION( 0x100, "proms3", 0 ) // ? none of the other sets have this ROM_LOAD( "matchu8.bin", 0x0000, 0x0100, CRC(dba4579d) SHA1(fba0a5adad13728c805fbe9666a8e02484cfa821) ) - + ROM_REGION( 0x80000, "oki", ROMREGION_ERASEFF ) // samples ROM_LOAD( "match98t.bin", 0x00000, 0x40000, CRC(830f4e01) SHA1(fbc41e9100a69663b0f799aee447edd5fabd2af7) ) ROM_END @@ -7085,7 +7085,7 @@ static DRIVER_INIT( nfb96sea ) { int i; UINT8 *ROM = memory_region(machine, "main"); - + for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; @@ -7159,9 +7159,9 @@ static DRIVER_INIT( schery97a ) ROM[i] = x; } - - - + + + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedval38_r); /* Oki 6295 at 0x20 */ } @@ -7188,7 +7188,7 @@ static DRIVER_INIT( skill98 ) ROM[i] = x; } - + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x1e, 0x1e, 0, 0, fixedvalea_r); /* Oki 6295 at 0x20 */ } @@ -7205,7 +7205,7 @@ static DRIVER_INIT( fb36xc1 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 0x12) { case 0x00: x = BITSWAP8(x^0xf5, 6,4,3,7,0,1,5,2); break; @@ -7215,7 +7215,7 @@ static DRIVER_INIT( fb36xc1 ) } ROM[i] = x; } - + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x31, 0x31, 0, 0, fixedval68_r); } @@ -7242,7 +7242,7 @@ static DRIVER_INIT( fbse354 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 5) { case 0: x = BITSWAP8(x^0x6a, 2,1,0,7,6,5,4,3); break; case 1: x = BITSWAP8(x^0xcc, 0,7,6,5,4,3,2,1); break; @@ -7254,9 +7254,9 @@ static DRIVER_INIT( fbse354 ) // nfb96b needs both of these memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x23, 0x23, 0, 0, fixedval80_r); memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x5a, 0x5a, 0, 0, fixedvalaa_r); - + // csel96b - memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x6e, 0x6e, 0, 0, fixedval96_r); + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x6e, 0x6e, 0, 0, fixedval96_r); } @@ -7273,7 +7273,7 @@ static DRIVER_INIT( fbse362 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 5) { case 0: x = BITSWAP8(x^0xce, 1,0,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0x9e, 3,2,1,0,7,6,5,4); break; @@ -7282,7 +7282,7 @@ static DRIVER_INIT( fbse362 ) } ROM[i] = x; } - + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x2e, 0x2e, 0, 0, fixedvalbe_r); } @@ -7304,7 +7304,7 @@ static DRIVER_INIT( rp35 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 3) { case 0: x = BITSWAP8(x^0x2a, 0,7,6,5,4,3,2,1); break; case 1: x = BITSWAP8(x^0x1c, 4,3,2,1,0,7,6,5); break; @@ -7330,14 +7330,14 @@ static DRIVER_INIT( rp36 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 5) { case 0: x = BITSWAP8(x^0xee, 2,1,0,7,6,5,4,3); break; case 1: x = BITSWAP8(x^0x9f, 3,2,1,0,7,6,5,4); break; case 4: x = BITSWAP8(x^0xc7, 3,2,1,0,7,6,5,4); break; case 5: x = BITSWAP8(x^0xc3, 3,2,1,0,7,6,5,4); break; } - + ROM[i] = x; } @@ -7356,14 +7356,14 @@ static DRIVER_INIT( rp36c3 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 0xa) { case 0x0: x = BITSWAP8(x^0xfd, 6,4,0,7,3,1,5,2); break; case 0x2: x = BITSWAP8(x^0xee, 4,6,7,0,3,2,1,5); break; case 0x8: x = BITSWAP8(x^0x2c, 0,3,4,2,5,6,1,7); break; case 0xa: x = BITSWAP8(x^0xd6, 2,0,6,1,4,5,3,7); break; } - + ROM[i] = x; } @@ -7388,14 +7388,14 @@ static DRIVER_INIT( po33 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 0x14) { case 0x00: x = BITSWAP8(x^0xde, 2,1,0,7,6,5,4,3); break; case 0x04: x = BITSWAP8(x^0x3c, 0,7,6,5,4,3,2,1); break; case 0x10: x = BITSWAP8(x^0x2f, 3,2,1,0,7,6,5,4); break; case 0x14: x = BITSWAP8(x^0x5b, 4,3,2,1,0,7,6,5); break; } - + ROM[i] = x; } memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x32, 0x32, 0, 0, fixedval74_r); @@ -7415,14 +7415,14 @@ static DRIVER_INIT( tc132axt ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 0x22) { case 0x00: x = BITSWAP8(x^0x5f, 6,4,3,7,0,5,2,1); break; case 0x02: x = BITSWAP8(x^0xe7, 4,6,3,0,7,5,1,2); break; case 0x20: x = BITSWAP8(x^0x18, 0,3,5,2,4,7,1,6); break; case 0x22: x = BITSWAP8(x^0x74, 2,0,4,1,6,7,3,5); break; } - + ROM[i] = x; } @@ -7446,17 +7446,17 @@ static DRIVER_INIT( match133 ) for (i = 0;i < 0x10000;i++) { UINT8 x = ROM[i]; - + switch(i & 0x12) { case 0x00: x = BITSWAP8(x^0xde, 3,2,1,0,7,6,5,4); break; case 0x02: x = BITSWAP8(x^0x3d, 1,0,7,6,5,4,3,2); break; case 0x10: x = BITSWAP8(x^0x2f, 4,3,2,1,0,7,6,5); break; case 0x12: x = BITSWAP8(x^0x5c, 4,3,2,1,0,7,6,5); break; } - + ROM[i] = x; } - + memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x16, 0x16, 0, 0, fixedvalc7_r); memory_install_read8_handler(cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO), 0x1a, 0x1a, 0, 0, fixedvale4_r); } diff --git a/src/mame/drivers/igspoker.c b/src/mame/drivers/igspoker.c index 888d1a88e00..63c46d91763 100644 --- a/src/mame/drivers/igspoker.c +++ b/src/mame/drivers/igspoker.c @@ -58,7 +58,7 @@ FIX: csk227it has video issues, as after Ability game, bg_tilemap is not reset background tilemap. FIX: PK Tetris have an input named AMUSE which I couldn't map. Maybe it is - necessary for the Amuse game, because I can't understand how to play it. + necessary for the Amuse game, because I can't understand how to play it. *****************************************************************************/ diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c index afb122f2b60..7b5b40def6b 100644 --- a/src/mame/drivers/ilpag.c +++ b/src/mame/drivers/ilpag.c @@ -189,10 +189,10 @@ static WRITE16_HANDLER( blit_copy_w ) if(x_size == 0) { x_size = 0x200; } /* TODO: used by steaser "Game Over" msg on attract mode*/ -// if(y_size == 1) { y_size = 32; } +// if(y_size == 1) { y_size = 32; } src = blit_romaddr[0] | (blit_attr1_ram[0] & 0x1f00)<<8; -// src|= (blit_transpen[0xc/2] & 0x0100)<<12; +// src|= (blit_transpen[0xc/2] & 0x0100)<<12; for(y=0;y<y_size;y++) { @@ -230,7 +230,7 @@ static READ16_HANDLER( blitter_status_r ) /*TODO*/ static WRITE16_HANDLER( lamps_w ) { -// popmessage("%02x",data); +// popmessage("%02x",data); } static READ16_HANDLER( test_r ) @@ -241,7 +241,7 @@ static READ16_HANDLER( test_r ) #if 0 static WRITE16_HANDLER( irq_callback_w ) { -// popmessage("%02x",data); +// popmessage("%02x",data); cpu_set_input_line(space->machine->cpu[0],3,HOLD_LINE ); } @@ -257,8 +257,8 @@ static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x100000, 0x1fffff) AM_ROM AM_REGION("blit_data", 0) AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) -// AM_RANGE(0x800000, 0x800001) AM_READ(test_r) -// AM_RANGE(0x880000, 0x880001) AM_READ(test_r) +// AM_RANGE(0x800000, 0x800001) AM_READ(test_r) +// AM_RANGE(0x880000, 0x880001) AM_READ(test_r) AM_RANGE(0x900000, 0x900005) AM_WRITE( paletteram_io_w ) //RAMDAC AM_RANGE(0x980000, 0x98000f) AM_RAM AM_BASE(&blit_transpen) //video registers for the blitter write @@ -272,9 +272,9 @@ static ADDRESS_MAP_START( ilpag_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xc00000, 0xc00001) AM_WRITE(lamps_w) AM_RANGE(0xc00180, 0xc00181) AM_READ_PORT("IN2") -// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) +// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) AM_RANGE(0xc00380, 0xc00381) AM_READ_PORT("IN3") -// AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w) +// AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w) ADDRESS_MAP_END static ADDRESS_MAP_START( steaser_map, ADDRESS_SPACE_PROGRAM, 16 ) @@ -283,9 +283,9 @@ static ADDRESS_MAP_START( steaser_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x200000, 0x20ffff) AM_RAM AM_BASE(&generic_nvram16) AM_SIZE(&generic_nvram_size) AM_RANGE(0x800000, 0x800001) AM_READ(test_r) -// AM_RANGE(0x840000, 0x840001) AM_WRITE(sound_write_w) +// AM_RANGE(0x840000, 0x840001) AM_WRITE(sound_write_w) AM_RANGE(0x880000, 0x880001) AM_READ(test_r) -// AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(sound_write_w) +// AM_RANGE(0x8c0000, 0x8c0001) AM_WRITE(sound_write_w) AM_RANGE(0x900000, 0x900005) AM_WRITE( paletteram_io_w ) //RAMDAC AM_RANGE(0x940000, 0x940001) AM_WRITENOP //? Seems a dword write for some read, written consecutively @@ -301,11 +301,11 @@ static ADDRESS_MAP_START( steaser_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x9e0000, 0x9e0001) AM_READ(blitter_status_r) AM_RANGE(0x9f0000, 0x9f0001) AM_WRITENOP //??? -// AM_RANGE(0xc00000, 0xc00001) AM_WRITE(lamps_w) +// AM_RANGE(0xc00000, 0xc00001) AM_WRITE(lamps_w) AM_RANGE(0xbd0000, 0xbd0001) AM_READ(test_r) -// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) -// AM_RANGE(0xc00380, 0xc00381) AM_READ_PORT("IN3") -// AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w) +// AM_RANGE(0xc00200, 0xc00201) AM_WRITE(sound_write_w) +// AM_RANGE(0xc00380, 0xc00381) AM_READ_PORT("IN3") +// AM_RANGE(0xc00300, 0xc00301) AM_WRITE(irq_callback_w) ADDRESS_MAP_END static INPUT_PORTS_START( ilpag ) @@ -351,14 +351,14 @@ static INPUT_PORTS_START( ilpag ) PORT_DIPSETTING( 0x8000, DEF_STR( Off ) ) PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) /* - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Take Button") PORT_CODE(KEYCODE_A) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Risk Button") PORT_CODE(KEYCODE_S) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Take Button") PORT_CODE(KEYCODE_A) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Risk Button") PORT_CODE(KEYCODE_S) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z) */ PORT_START("IN3") PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 ) @@ -398,14 +398,14 @@ static INPUT_PORTS_START( ilpag ) INPUT_PORTS_END /* - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Take Button") PORT_CODE(KEYCODE_A) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Risk Button") PORT_CODE(KEYCODE_S) - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z) + PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON7 ) PORT_NAME("Take Button") PORT_CODE(KEYCODE_A) + PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2") PORT_CODE(KEYCODE_X) + PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4") PORT_CODE(KEYCODE_V) + PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Risk Button") PORT_CODE(KEYCODE_S) + PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3") PORT_CODE(KEYCODE_C) + PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5") PORT_CODE(KEYCODE_B) + PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1") PORT_CODE(KEYCODE_Z) */ static INPUT_PORTS_START( steaser ) @@ -486,12 +486,12 @@ MACHINE_DRIVER_END static TIMER_DEVICE_CALLBACK( steaser_mcu_sim ) { -// static int i; +// static int i; /*first off, signal the "MCU is running" flag*/ generic_nvram16[0x932/2] = 0xffff; /*clear the inputs (they are impulsed)*/ -// for(i=0;i<8;i+=2) -// generic_nvram16[((0x8a0)+i)/2] = 0; +// for(i=0;i<8;i+=2) +// generic_nvram16[((0x8a0)+i)/2] = 0; /*finally, read the inputs*/ generic_nvram16[0x89e/2] = input_port_read(timer->machine, "MENU") & 0xffff; generic_nvram16[0x8a0/2] = input_port_read(timer->machine, "STAT") & 0xffff; diff --git a/src/mame/drivers/ironhors.c b/src/mame/drivers/ironhors.c index ec6ae21bdd4..accdb19a8b8 100644 --- a/src/mame/drivers/ironhors.c +++ b/src/mame/drivers/ironhors.c @@ -117,7 +117,7 @@ static ADDRESS_MAP_START( farwest_master_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x1a01, 0x1a01) AM_RAM_WRITE(ironhors_charbank_w) AM_RANGE(0x1a02, 0x1a02) AM_WRITE(ironhors_palettebank_w) AM_RANGE(0x0000, 0x1bff) AM_ROM -// AM_RANGE(0x1c00, 0x1fff) AM_RAM +// AM_RANGE(0x1c00, 0x1fff) AM_RAM AM_RANGE(0x2000, 0x23ff) AM_RAM_WRITE(ironhors_colorram_w) AM_BASE(&colorram) AM_RANGE(0x2400, 0x27ff) AM_RAM_WRITE(ironhors_videoram_w) AM_BASE(&videoram) AM_RANGE(0x2800, 0x2fff) AM_RAM diff --git a/src/mame/drivers/jackie.c b/src/mame/drivers/jackie.c index aacb9bc8466..72f138ad222 100644 --- a/src/mame/drivers/jackie.c +++ b/src/mame/drivers/jackie.c @@ -175,7 +175,7 @@ static UINT16 unk_reg[3][5]; static void show_out(void) { #ifdef MAME_DEBUG -// popmessage("%02x %02x %02x", out[0], out[1], out[2]); +// popmessage("%02x %02x %02x", out[0], out[1], out[2]); popmessage("520: %04x %04x %04x %04x %04x\n560: %04x %04x %04x %04x %04x\n5A0: %04x %04x %04x %04x %04x", unk_reg[0][0],unk_reg[0][1],unk_reg[0][2],unk_reg[0][3],unk_reg[0][4], unk_reg[1][0],unk_reg[1][1],unk_reg[1][2],unk_reg[1][3],unk_reg[1][4], @@ -256,7 +256,7 @@ static READ8_HANDLER( igs_irqack_r ) static WRITE8_HANDLER( igs_irqack_w ) { -// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE); +// cpu_set_input_line(space->machine->cpu[0], 0, CLEAR_LINE); out[2] = data; show_out(); } @@ -266,7 +266,7 @@ static READ8_HANDLER( expram_r ) UINT8 *rom = memory_region(space->machine, "gfx3"); offset += exp_bank * 0x8000; -// logerror("PC %06X: %04x = %02x\n",cpu_get_pc(space->cpu),offset,rom[offset]); +// logerror("PC %06X: %04x = %02x\n",cpu_get_pc(space->cpu),offset,rom[offset]); return rom[offset]; } diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 9b22a663c26..15579150ca5 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -901,12 +901,12 @@ GAME( 1984?,luckygrl, 0, cntrygrl, cntrygrl, luckygrl, ROT0, "Wing", "L /* Some other games that might run on this HW: - Jangou (non-BET version) (WR score listed on MyCom magazines) - Jangou Night (first "mature" mahjong ever made) - Jangou Lady (BET version) (images on the flyer, it might not exists) - Hana Royal - Hana Puter - Royal Card - Fruits Bunny (clone of Country Girl) - Monoshiri Quiz Osyaberi Macha (Logitec, same board as jangou) + Jangou (non-BET version) (WR score listed on MyCom magazines) + Jangou Night (first "mature" mahjong ever made) + Jangou Lady (BET version) (images on the flyer, it might not exists) + Hana Royal + Hana Puter + Royal Card + Fruits Bunny (clone of Country Girl) + Monoshiri Quiz Osyaberi Macha (Logitec, same board as jangou) */ diff --git a/src/mame/drivers/konamigx.c b/src/mame/drivers/konamigx.c index d06b06422cc..2f8ebbc7a03 100644 --- a/src/mame/drivers/konamigx.c +++ b/src/mame/drivers/konamigx.c @@ -1250,7 +1250,7 @@ static READ16_HANDLER(tms57002_status_word_r) static WRITE16_HANDLER(tms57002_control_word_w) { - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { tms57002_pload_w(space->machine->cpu[2], 0, data & 4); tms57002_cload_w(space->machine->cpu[2], 0, data & 8); diff --git a/src/mame/drivers/megatech.c b/src/mame/drivers/megatech.c index 340129a31fe..1b030e5fb41 100644 --- a/src/mame/drivers/megatech.c +++ b/src/mame/drivers/megatech.c @@ -310,7 +310,7 @@ static void megatech_set_genz80_as_sms_standard_ports(running_machine *machine) const address_space *io = cpu_get_address_space(machine->cpu[1], ADDRESS_SPACE_IO); const device_config *sn = devtag_get_device(machine, SOUND, "sn"); - + memory_install_readwrite8_handler(io, 0x0000, 0xffff, 0, 0, z80_unmapped_port_r, z80_unmapped_port_w); memory_install_read8_handler (io, 0x7e, 0x7e, 0, 0, md_sms_vdp_vcounter_r); diff --git a/src/mame/drivers/mpu5.c b/src/mame/drivers/mpu5.c index 3816afeb27d..638eb375d37 100644 --- a/src/mame/drivers/mpu5.c +++ b/src/mame/drivers/mpu5.c @@ -1,15 +1,15 @@ /* - MPU5 + MPU5 - Skeleton Driver - - -- there are a wide range of titles running on this hardware, the recent ones are said to be encrypted - -- the driver does nothing, and currently only serves to act as a placeholder to document what existed on this hardware - - -- the main CPU is a 68340, which is a 32-bit 680xx variant with modified opcodes etc. + Skeleton Driver - -- should there be a bios using an 8-bit cpu like MPU4, or is the 68340 the only CPU? + -- there are a wide range of titles running on this hardware, the recent ones are said to be encrypted + -- the driver does nothing, and currently only serves to act as a placeholder to document what existed on this hardware + + -- the main CPU is a 68340, which is a 32-bit 680xx variant with modified opcodes etc. + + -- should there be a bios using an 8-bit cpu like MPU4, or is the 68340 the only CPU? */ @@ -37,7 +37,7 @@ VIDEO_UPDATE(mpu5) static MACHINE_DRIVER_START( mpu5 ) MDRV_CPU_ADD("main", M68EC020, 16000000) // ? MDRV_CPU_PROGRAM_MAP(mpu5_map,0) - + /* actually non-video? */ MDRV_SCREEN_ADD("main", RASTER) MDRV_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 25e297bd12c..ee363e551c9 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -3116,7 +3116,7 @@ ROM_START( vstrik3c ) ROM_LOAD("ic21",0xa000000, 0x0800000, NO_DUMP ) ROM_END - + ROM_START( vstrik3 ) NAOMI2_BIOS diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index e79df9d3e72..197d5eb4c21 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -9,7 +9,7 @@ XTAL:12.000MHZ RY050012 (TEXAS INSTRUMENTS) XTAL:10.738MHZ -SOUND :MSM5205 & ? +SOUND :MSM5205 & ? DIP SWITCH:8BIT x 3 @@ -71,7 +71,7 @@ static void pf_adpcm_int(const device_config *device) { adpcm_pos++; //if((ROM[adpcm_pos] & 0xff) == 0xff) - // adpcm_idle = 1; + // adpcm_idle = 1; } } } @@ -93,8 +93,8 @@ static MACHINE_DRIVER_START( pachifev ) MDRV_CPU_ADD("main",Z80,8000000/2) MDRV_CPU_PROGRAM_MAP(pachifev_map,0) MDRV_CPU_IO_MAP(pachifev_io,0) -// MDRV_CPU_FLAGS(CPU_DISABLE) -// MDRV_CPU_VBLANK_INT("main",irq0_line_hold) +// MDRV_CPU_FLAGS(CPU_DISABLE) +// MDRV_CPU_VBLANK_INT("main",irq0_line_hold) /* video hardware */ MDRV_SCREEN_ADD("main", RASTER) diff --git a/src/mame/drivers/ppmast93.c b/src/mame/drivers/ppmast93.c index abf4c4a2491..d056048b086 100644 --- a/src/mame/drivers/ppmast93.c +++ b/src/mame/drivers/ppmast93.c @@ -195,7 +195,7 @@ static WRITE8_HANDLER(ppmast_sound_w) { switch(offset&0xff) { - case 0: + case 0: case 1: ym2413_w(devtag_get_device(space->machine, SOUND, "ym"),offset,data); break; case 2: dac_data_w(devtag_get_device(space->machine, SOUND, "dac"),data);break; default: logerror("%x %x - %x\n",offset,data,cpu_get_previouspc(space->cpu)); diff --git a/src/mame/drivers/psychic5.c b/src/mame/drivers/psychic5.c index 402f7b11bd7..f9735f26290 100644 --- a/src/mame/drivers/psychic5.c +++ b/src/mame/drivers/psychic5.c @@ -824,7 +824,7 @@ ROM_START( psychic5a ) ROM_REGION( 0x08000, "proms", ROMREGION_DISPOSE ) /* Proms */ ROM_LOAD( "my10.7l", 0x000, 0x200, CRC(6a7d13c0) SHA1(2a835a4ac1acb7663d0b915d0339af9800284da6) ) - ROM_LOAD( "my09.3t", 0x200, 0x400, CRC(59e44236) SHA1(f53d99694fa5acd7cc51dd78e09f0d2ef730e7a4) ) + ROM_LOAD( "my09.3t", 0x200, 0x400, CRC(59e44236) SHA1(f53d99694fa5acd7cc51dd78e09f0d2ef730e7a4) ) ROM_END /* diff --git a/src/mame/drivers/punchout.c b/src/mame/drivers/punchout.c index 8bf193dd2cf..c9f3d9c1ebf 100644 --- a/src/mame/drivers/punchout.c +++ b/src/mame/drivers/punchout.c @@ -373,8 +373,8 @@ static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x02, 0x02) AM_READ_PORT("DSW2") AM_WRITE(soundlatch_w) AM_RANGE(0x03, 0x03) AM_READ_PORT("DSW1") AM_WRITE(soundlatch2_w) AM_RANGE(0x04, 0x04) AM_DEVWRITE(SOUND, "vlm", vlm5030_data_w) /* VLM5030 */ -// AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP) /* unused */ -// AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) +// AM_RANGE(0x05, 0x05) AM_WRITE(SMH_NOP) /* unused */ +// AM_RANGE(0x06, 0x06) AM_WRITE(SMH_NOP) AM_RANGE(0x08, 0x08) AM_WRITE(interrupt_enable_w) AM_RANGE(0x09, 0x09) AM_WRITE(SMH_NOP) /* watchdog reset, seldom used because 08 clears the watchdog as well */ AM_RANGE(0x0a, 0x0a) AM_WRITE(SMH_NOP) /* ?? */ diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index aab4c1628fb..1a51bf80125 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -2697,7 +2697,7 @@ ROM_START( mjifb3 ) ROM_LOAD( "d29-2.4d", 0x000, 0x200, CRC(78252f6a) SHA1(1869147bc6b7573c2543bdf6b17d6c3c1debdddb) ) ROM_LOAD( "d29-1.4c", 0x200, 0x200, CRC(4aaec8cf) SHA1(fbe1c3729d078a422ffe68dfde495fcb9f329cdd) ) ROM_END - + /*************************************************************************** Colour proms are TBP28S42's diff --git a/src/mame/drivers/segae.c b/src/mame/drivers/segae.c index 69927c808f8..fbd8b4ef78c 100644 --- a/src/mame/drivers/segae.c +++ b/src/mame/drivers/segae.c @@ -2159,7 +2159,7 @@ static void init_ports_systeme(running_machine *machine) const address_space *io = cpu_get_address_space(machine->cpu[0], ADDRESS_SPACE_IO); const device_config *sn1 = devtag_get_device(machine, SOUND, "sn1"); const device_config *sn2 = devtag_get_device(machine, SOUND, "sn2"); - + memory_install_write8_device_handler(io, sn2, 0x7b, 0x7b, 0, 0, sn76496_w); memory_install_write8_device_handler(io, sn1, 0x7e, 0x7f, 0, 0, sn76496_w); memory_install_read8_handler (io, 0x7e, 0x7e, 0, 0, sms_vcounter_r); diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 94b37b278a4..fa4e532614a 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -852,7 +852,7 @@ static WRITE32_HANDLER( ds2404_clk_w ) static WRITE32_HANDLER( eeprom_w ) { const device_config *oki2 = devtag_get_device(space->machine, SOUND, "oki2"); - + // tile banks if( ACCESSING_BITS_16_23 ) { rf2_set_layer_banks(data >> 16); diff --git a/src/mame/drivers/sfbonus.c b/src/mame/drivers/sfbonus.c index f76b2bcf1c7..7c0e50b00e7 100644 --- a/src/mame/drivers/sfbonus.c +++ b/src/mame/drivers/sfbonus.c @@ -6,18 +6,18 @@ Notes: it defaults to 123456 - The games don't cope well with corrupt NVRAM, and may fail to boot completely(!) - + - There are still some video problems, coin cut in half on pir2002v2 & missing spinning 7 on classice for example maybe the reel tilemap should be one big tilemap, and the 'select' ram is extra scroll bits.. - + - The code to handle the 'multple' reel layers is dubious. rowscroll values are always used based on only one of the tilemaps displayed in that screen region. - -- Inputs not done, Lamps not done - - Thanks to Olivier Galibert for the handy bitswapper tool :-) - + +- Inputs not done, Lamps not done + + Thanks to Olivier Galibert for the handy bitswapper tool :-) + */ #include "driver.h" @@ -168,7 +168,7 @@ static WRITE8_HANDLER( sfbonus_videoram_w ) VIDEO_START(sfbonus) { temp_reel_bitmap = auto_bitmap_alloc(1024,512,BITMAP_FORMAT_INDEXED16); - + sfbonus_tilemap = tilemap_create(machine,get_sfbonus_tile_info,tilemap_scan_rows,8,8, 128, 64); sfbonus_reel_tilemap = tilemap_create(machine,get_sfbonus_reel_tile_info,tilemap_scan_rows,8,32, 64, 16); sfbonus_reel2_tilemap = tilemap_create(machine,get_sfbonus_reel2_tile_info,tilemap_scan_rows,8,32, 64, 16); @@ -181,14 +181,14 @@ VIDEO_START(sfbonus) tilemap_set_transparent_pen(sfbonus_reel3_tilemap,255); tilemap_set_transparent_pen(sfbonus_reel4_tilemap,255); - tilemap_set_scroll_rows(sfbonus_tilemap,64); - + tilemap_set_scroll_rows(sfbonus_tilemap,64); + tilemap_set_scroll_cols(sfbonus_reel_tilemap, 64); tilemap_set_scroll_cols(sfbonus_reel2_tilemap, 64); tilemap_set_scroll_cols(sfbonus_reel3_tilemap, 64); tilemap_set_scroll_cols(sfbonus_reel4_tilemap, 64); - + } static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, const rectangle *cliprect, const device_config *screen, int catagory) @@ -204,9 +204,9 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, int globalxscrollreels = (sfbonus_vregs[4] | sfbonus_vregs[5]<<8); globalyscrollreels += 8; globalxscrollreels += 8; - + startclipmin = 0; - + for (i= 0;i < 0x80;i++) { int scroll; @@ -223,21 +223,21 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, tilemap_set_scrolly(sfbonus_reel4_tilemap, i, scroll + globalyscrollreels); } -// printf("------------\n"); +// printf("------------\n"); for (zz=0;zz<288;zz++) { rectangle clip; - + // other bits are used too.. int line = ((zz+globalyscrollreels)&0x1ff); int rowenable = selectbase[line]&0x3; int rowenable2 = (selectbase[line]&0xc)>>2; int xxxscroll; int rowscroll; - - + + //printf("%04x %04x %d\n",zz, xxxscroll, line/8); - + /* draw top of screen */ clip.min_x = visarea->min_x; clip.max_x = 511; @@ -245,12 +245,12 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, clip.max_y = startclipmin; - + // other bits are set, what do they mean? if (rowenable==0) - { + { rowscroll = reels_rowscroll[((line/8)*2)+0x000] | (reels_rowscroll[((line/8)*2)+0x001]<<8); - xxxscroll = globalxscrollreels + rowscroll; + xxxscroll = globalxscrollreels + rowscroll; tilemap_set_scrollx(sfbonus_reel_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel2_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel3_tilemap, 0, xxxscroll ); @@ -259,7 +259,7 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, else if (rowenable==0x1) { rowscroll = reels_rowscroll[((line/8)*2)+0x080] | (reels_rowscroll[((line/8)*2)+0x081]<<8); - xxxscroll = globalxscrollreels + rowscroll; + xxxscroll = globalxscrollreels + rowscroll; tilemap_set_scrollx(sfbonus_reel_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel2_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel3_tilemap, 0, xxxscroll ); @@ -268,7 +268,7 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, else if (rowenable==0x2) { rowscroll = reels_rowscroll[((line/8)*2)+0x100] | (reels_rowscroll[((line/8)*2)+0x101]<<8); - xxxscroll = globalxscrollreels + rowscroll; + xxxscroll = globalxscrollreels + rowscroll; tilemap_set_scrollx(sfbonus_reel_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel2_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel3_tilemap, 0, xxxscroll ); @@ -277,22 +277,22 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, else if (rowenable==0x3) { rowscroll = reels_rowscroll[((line/8)*2)+0x180] | (reels_rowscroll[((line/8)*2)+0x181]<<8); - xxxscroll = globalxscrollreels + rowscroll; + xxxscroll = globalxscrollreels + rowscroll; tilemap_set_scrollx(sfbonus_reel_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel2_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel3_tilemap, 0, xxxscroll ); tilemap_set_scrollx(sfbonus_reel4_tilemap, 0, xxxscroll ); } - + if (rowenable2==0) - { + { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel_tilemap,TILEMAP_DRAW_CATEGORY(catagory),3); } if (rowenable==0) - { + { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel_tilemap,TILEMAP_DRAW_CATEGORY(catagory),3); - } - + } + if (rowenable2==0x1) { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel2_tilemap,TILEMAP_DRAW_CATEGORY(catagory),2); @@ -300,8 +300,8 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, if (rowenable==0x1) { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel2_tilemap,TILEMAP_DRAW_CATEGORY(catagory),2); - } - + } + if (rowenable2==0x2) { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel3_tilemap,TILEMAP_DRAW_CATEGORY(catagory),1); @@ -310,7 +310,7 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel3_tilemap,TILEMAP_DRAW_CATEGORY(catagory),1); } - + if (rowenable2==0x3) { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel4_tilemap,TILEMAP_DRAW_CATEGORY(catagory),4); @@ -319,11 +319,11 @@ static void sfbonus_draw_reel_layer(running_machine* machine, bitmap_t *bitmap, { tilemap_draw(temp_reel_bitmap,&clip,sfbonus_reel4_tilemap,TILEMAP_DRAW_CATEGORY(catagory),4); } - - - + + + startclipmin+=1; } @@ -336,11 +336,11 @@ VIDEO_UPDATE(sfbonus) int globalxscroll = (sfbonus_vregs[0] | sfbonus_vregs[1]<<8); UINT8* front_rowscroll = &sfbonus_videoram[0x200]; int i; - + // align to 0 globalyscroll += 8; globalxscroll += 8; - + bitmap_fill(bitmap,cliprect,screen->machine->pens[0]); bitmap_fill(temp_reel_bitmap,cliprect,screen->machine->pens[0]); @@ -349,20 +349,20 @@ VIDEO_UPDATE(sfbonus) { int y,x; - + for (y=0;y<288;y++) { for (x=0;x<512;x++) { UINT16* src = BITMAP_ADDR16(temp_reel_bitmap, y, x); UINT16* dst = BITMAP_ADDR16(bitmap, y, x); - + if ((src[0]&0x100)==0x000) - dst[0] = src[0]; + dst[0] = src[0]; } } } - + /* Normal Tilemap */ tilemap_set_scrolly(sfbonus_tilemap, 0, globalyscroll ); for (i=0;i<64;i++) @@ -375,23 +375,23 @@ VIDEO_UPDATE(sfbonus) { int y,x; - + for (y=0;y<288;y++) { for (x=0;x<512;x++) { UINT16* src = BITMAP_ADDR16(temp_reel_bitmap, y, x); UINT16* dst = BITMAP_ADDR16(bitmap, y, x); - + if ((src[0]&0x100)==0x100) - dst[0] = src[0]-0x100; + dst[0] = src[0]-0x100; } } - } - + } + /* High Priority Reels */ -// sfbonus_draw_reel_layer(screen->machine,bitmap,cliprect, screen, 1); - +// sfbonus_draw_reel_layer(screen->machine,bitmap,cliprect, screen, 1); + return 0; } @@ -752,13 +752,13 @@ static MACHINE_DRIVER_START( sfbonus ) MDRV_CPU_PROGRAM_MAP(0,sfbonus_map) MDRV_CPU_IO_MAP(0,sfbonus_io) MDRV_CPU_VBLANK_INT("main",irq0_line_hold) -// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,100) +// MDRV_CPU_PERIODIC_INT(nmi_line_pulse,100) MDRV_MACHINE_RESET( sfbonus ) MDRV_NVRAM_HANDLER(sfbonus) - + MDRV_GFXDECODE(sfbonus) MDRV_SCREEN_ADD("main", RASTER) @@ -803,7 +803,7 @@ ROM_START( sfbonusa ) ROM_REGION( 0x010000, "debugram", ROMREGION_ERASE00 ) /* DEBUG */ - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "skfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -851,7 +851,7 @@ ROM_END ROM_START( sfbonusv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "skfbv19r.bin", 0x00000, 0x40000, CRC(f032be45) SHA1(63007ee7de6203ed7bda34e127328d085df20369) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "skfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -887,7 +887,7 @@ ROM_START( parrot3b ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "p4rom2.bin", 0x00000, 0x40000, CRC(d0574efc) SHA1(dd6628450883f0f723744e7caf6525bca7b18a43) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "p4rom3.bin", 0x00000, 0x80000, CRC(2701d7ab) SHA1(9efeaa3dab2aa3f20501876db2100eae4a5b8af1) ) ROM_LOAD16_BYTE( "p4rom4.bin", 0x00001, 0x80000, CRC(46ebe619) SHA1(811c2d35e4e04e8ecd7f4f2a7040de302d2ed91c) ) @@ -903,7 +903,7 @@ ROM_START( parrot3d ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "p4rom2.bin", 0x00000, 0x40000, CRC(d0574efc) SHA1(dd6628450883f0f723744e7caf6525bca7b18a43) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "p4rom3.bin", 0x00000, 0x80000, CRC(2701d7ab) SHA1(9efeaa3dab2aa3f20501876db2100eae4a5b8af1) ) ROM_LOAD16_BYTE( "p4rom4.bin", 0x00001, 0x80000, CRC(46ebe619) SHA1(811c2d35e4e04e8ecd7f4f2a7040de302d2ed91c) ) @@ -980,7 +980,7 @@ ROM_END ROM_START( hldspin1d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "hs1d27t.bin", 0x00000, 0x40000, CRC(c3fc35a3) SHA1(59a02815e004738f5eee43dffbeaca34412da308) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "hs_2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) @@ -996,7 +996,7 @@ ROM_END ROM_START( hldspin1v ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "hs1v27t.bin", 0x00000, 0x40000, CRC(99347659) SHA1(f8af779046e93a2514dc59b11bb8d7a11487b08e) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "hs_2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) @@ -1127,7 +1127,7 @@ ROM_START( pickwinb2 ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pw-3.bin", 0x00000, 0x40000, CRC(9a27acbd) SHA1(3a3a6d0b5f6eeeebcb2ccaff773b8971b3bfd3c7) ) ROM_LOAD16_BYTE( "pw-4.bin", 0x00001, 0x40000, CRC(6b629619) SHA1(3842a7579f67866aa9744b0d6fa6a47c923be6fe) ) @@ -1144,8 +1144,8 @@ ROM_START( pickwind ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) - - + + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pw-3.bin", 0x00000, 0x40000, CRC(9a27acbd) SHA1(3a3a6d0b5f6eeeebcb2ccaff773b8971b3bfd3c7) ) ROM_LOAD16_BYTE( "pw-4.bin", 0x00001, 0x40000, CRC(6b629619) SHA1(3842a7579f67866aa9744b0d6fa6a47c923be6fe) ) @@ -1158,7 +1158,7 @@ ROM_END ROM_START( pickwind2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pwd29r.bin", 0x00000, 0x40000, CRC(cb9f77e1) SHA1(5c851e70537ad4e418c3b6aca394bd2ecc4b4c08) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) @@ -1177,7 +1177,7 @@ ROM_START( pickwinv ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pw-3.bin", 0x00000, 0x40000, CRC(9a27acbd) SHA1(3a3a6d0b5f6eeeebcb2ccaff773b8971b3bfd3c7) ) ROM_LOAD16_BYTE( "pw-4.bin", 0x00001, 0x40000, CRC(6b629619) SHA1(3842a7579f67866aa9744b0d6fa6a47c923be6fe) ) @@ -1194,7 +1194,7 @@ ROM_START( pickwinv2 ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pw-3.bin", 0x00000, 0x40000, CRC(9a27acbd) SHA1(3a3a6d0b5f6eeeebcb2ccaff773b8971b3bfd3c7) ) ROM_LOAD16_BYTE( "pw-4.bin", 0x00001, 0x40000, CRC(6b629619) SHA1(3842a7579f67866aa9744b0d6fa6a47c923be6fe) ) @@ -1210,7 +1210,7 @@ ROM_START( pickwinv3 ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "pw-2.bin", 0x00000, 0x40000, CRC(3b0f5374) SHA1(7e7b185b62d1a321e2853b4b08e8ee2aa54933f5) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pw-3.bin", 0x00000, 0x40000, CRC(9a27acbd) SHA1(3a3a6d0b5f6eeeebcb2ccaff773b8971b3bfd3c7) ) ROM_LOAD16_BYTE( "pw-4.bin", 0x00001, 0x40000, CRC(6b629619) SHA1(3842a7579f67866aa9744b0d6fa6a47c923be6fe) ) @@ -1305,7 +1305,7 @@ ROM_END ROM_START( tighookv2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "thkv21e.bin", 0x00000, 0x40000, CRC(df0df2fa) SHA1(244086e9233f36531c005f6f9a09128738771753) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "thkrom2.bin", 0x00000, 0x40000, CRC(61b61b75) SHA1(e71c5ab6aedb7ca4db32a2f4d7d2818dcdd92417) ) @@ -1321,7 +1321,7 @@ ROM_END ROM_START( tighookv3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "thkv20lt.bin", 0x00000, 0x40000, CRC(07a8e921) SHA1(2c92ec7187d441d1b205eea626d32a6a41a53918) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "thkrom2.bin", 0x00000, 0x40000, CRC(61b61b75) SHA1(e71c5ab6aedb7ca4db32a2f4d7d2818dcdd92417) ) @@ -1353,7 +1353,7 @@ ROM_END ROM_START( tighookd2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "thkd20lt.bin", 0x00000, 0x40000, CRC(2be25e14) SHA1(2d906ce8d505bc2620ed218fdb401c0faf426eda) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "thkrom2.bin", 0x00000, 0x40000, CRC(61b61b75) SHA1(e71c5ab6aedb7ca4db32a2f4d7d2818dcdd92417) ) @@ -1490,8 +1490,8 @@ ROM_START( anibonus3 ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) - - /* unsure which gfx roms */ + + /* unsure which gfx roms */ ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "abrom3.bin", 0x00000, 0x80000, CRC(85f19e19) SHA1(2dd259af132e0cfd34974526c96f0d96ff868516) ) ROM_LOAD16_BYTE( "abrom4.bin", 0x00001, 0x80000, CRC(c12b954c) SHA1(83556abbad0f285360da5f5e0fb93514d46b436b) ) @@ -1538,7 +1538,7 @@ ROM_START( anibonus5 ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) - /* unsure which gfx roms */ + /* unsure which gfx roms */ ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "abrom3.bin", 0x00000, 0x80000, CRC(85f19e19) SHA1(2dd259af132e0cfd34974526c96f0d96ff868516) ) ROM_LOAD16_BYTE( "abrom4.bin", 0x00001, 0x80000, CRC(c12b954c) SHA1(83556abbad0f285360da5f5e0fb93514d46b436b) ) @@ -1561,7 +1561,7 @@ ROM_START( anibonus6 ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) - /* unsure which gfx roms */ + /* unsure which gfx roms */ ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "abrom3.bin", 0x00000, 0x80000, CRC(85f19e19) SHA1(2dd259af132e0cfd34974526c96f0d96ff868516) ) ROM_LOAD16_BYTE( "abrom4.bin", 0x00001, 0x80000, CRC(c12b954c) SHA1(83556abbad0f285360da5f5e0fb93514d46b436b) ) @@ -1602,7 +1602,7 @@ ROM_START( anibonusb2 ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "abrom3n.bin", 0x00000, 0x80000, CRC(aab2161a) SHA1(d472746c68720935fedfc6b2d06a4fe1152cc804) ) ROM_LOAD16_BYTE( "abrom4n.bin", 0x00001, 0x80000, CRC(d776862c) SHA1(03b3c0e9adb11b560b8773e88ea97e712323f25e) ) @@ -1647,7 +1647,7 @@ ROM_END ROM_START( anibonusv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "abv18r.bin", 0x00000, 0x40000, CRC(56672865) SHA1(44d141b307a2cb0cb4731ad6db8235941f80ae23) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1663,7 +1663,7 @@ ROM_END ROM_START( anibonusv2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "abv18lt.bin", 0x00000, 0x40000, CRC(26bc1901) SHA1(c17f6bf5380c3c141cc79f4fb2e01bb8299e93b0) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1679,7 +1679,7 @@ ROM_END ROM_START( anibonusv3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "abv18e.bin", 0x00000, 0x40000, CRC(c05b8fb5) SHA1(8ae4e00a66d2825ceea072c58750915618477304) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1727,7 +1727,7 @@ ROM_END ROM_START( abnudged ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "abd20n.bin", 0x00000, 0x40000, CRC(e189ca0b) SHA1(ba3a3f84b302b737043ac56b0872d65c4ea77903) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1743,7 +1743,7 @@ ROM_END ROM_START( abnudgev ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "abv21n.bin", 0x00000, 0x40000, CRC(48d8f3a6) SHA1(5ccde4bf574ba779dc43769fda62aa6d9b284a8e) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1759,7 +1759,7 @@ ROM_END ROM_START( anithunt ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "ath17.bin", 0x00000, 0x40000, CRC(07facf55) SHA1(2de5ca12e06a6896099672ec7383e6324d23fa12) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "athrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1791,7 +1791,7 @@ ROM_END ROM_START( anithuntb ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "athb19r.bin", 0x00000, 0x40000, CRC(71d0604f) SHA1(c2f40c58dce2f6b69dc0234c0fb7a656ea04168b) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "athrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1807,7 +1807,7 @@ ROM_END ROM_START( anithuntd ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "athd19r.bin", 0x00000, 0x40000, CRC(807585d4) SHA1(643ceb51e81797b330310ddbe9e0d8b21ba215e5) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "athrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1823,7 +1823,7 @@ ROM_END ROM_START( anithuntv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "athv19r.bin", 0x00000, 0x40000, CRC(74c2cf89) SHA1(f3efad66f668a0a6dbf35a0c6518ece842d069e6) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "athrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -1840,7 +1840,7 @@ ROM_END ROM_START( dblchal ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "dc11.bin", 0x00000, 0x40000, CRC(05a27f07) SHA1(02b7b2731f8821bd7e0e3be005bd3024db0a7e42) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "dcrom2.bin", 0x00000, 0x20000, CRC(ce099327) SHA1(b1dc43839e9e3bf788141d58c81e1380a12d582a) ) @@ -1856,7 +1856,7 @@ ROM_END ROM_START( dblchalb ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "dcb15r.bin", 0x00000, 0x40000, CRC(d89a9756) SHA1(7a4cb88da9d02351a996202fb5b4545db042867b) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "dcrom2.bin", 0x00000, 0x20000, CRC(ce099327) SHA1(b1dc43839e9e3bf788141d58c81e1380a12d582a) ) @@ -1872,7 +1872,7 @@ ROM_END ROM_START( dblchalc ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "dcc15r.bin", 0x00000, 0x40000, CRC(ac0ed555) SHA1(5ac93132a94fec8811b4b5525dd2d31eb6749d6e) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "dcrom2.bin", 0x00000, 0x20000, CRC(ce099327) SHA1(b1dc43839e9e3bf788141d58c81e1380a12d582a) ) @@ -1888,7 +1888,7 @@ ROM_END ROM_START( dblchald ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "dcd15r.bin", 0x00000, 0x40000, CRC(2b72350d) SHA1(439765028417af6ceeb2724c7b7e737a209bf844) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "dcrom2.bin", 0x00000, 0x20000, CRC(ce099327) SHA1(b1dc43839e9e3bf788141d58c81e1380a12d582a) ) @@ -1904,7 +1904,7 @@ ROM_END ROM_START( dblchalv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "dcv15r.bin", 0x00000, 0x40000, CRC(1e5fc8fd) SHA1(9b688966bd52828fde31003510ee6a2a3444525d) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "dcrom2.bin", 0x00000, 0x20000, CRC(ce099327) SHA1(b1dc43839e9e3bf788141d58c81e1380a12d582a) ) @@ -1969,7 +1969,7 @@ ROM_END ROM_START( robadv2v1 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "r2av17sh.bin", 0x00000, 0x40000, CRC(fe4a3199) SHA1(d8c8f3d4e399e757b551748435ede1cb6a04ee3b) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "rarom2.bin", 0x00000, 0x40000, CRC(092392cb) SHA1(fd52a0c4f46cb3242bf1b9e35ad5f41cda64010b) ) @@ -2001,7 +2001,7 @@ ROM_END ROM_START( robadv2v3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "r2av17lt.bin", 0x00000, 0x40000, CRC(0ebc91fe) SHA1(d64a29e05ce62d662eccb025ea905275eb8806f9) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "rarom2.bin", 0x00000, 0x40000, CRC(092392cb) SHA1(fd52a0c4f46cb3242bf1b9e35ad5f41cda64010b) ) @@ -2017,7 +2017,7 @@ ROM_END ROM_START( robadv2v4 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "r2av17e.bin", 0x00000, 0x40000, CRC(81166cbd) SHA1(a2751752a95cac5181311af867457cac48854283) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "rarom2.bin", 0x00000, 0x40000, CRC(092392cb) SHA1(fd52a0c4f46cb3242bf1b9e35ad5f41cda64010b) ) @@ -2033,7 +2033,7 @@ ROM_END ROM_START( robadv2d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "r2ad17lt.bin", 0x00000, 0x40000, CRC(e0ea8ce9) SHA1(cf6a58d1cc654c41ae245f26fff6b26483bc01ce) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "rarom2.bin", 0x00000, 0x40000, CRC(092392cb) SHA1(fd52a0c4f46cb3242bf1b9e35ad5f41cda64010b) ) @@ -2068,7 +2068,7 @@ ROM_START( pirpok2b ) ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "p3rom2.bin", 0x00000, 0x20000, CRC(db6182e4) SHA1(65f05247629d5a1f37bf179f468acf8420342d2c) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "p3rom3.bin", 0x00000, 0x80000, CRC(34d3e6c5) SHA1(1d89677605188f135c8dbbc2ab20510cae7548fe) ) ROM_LOAD16_BYTE( "p3rom4.bin", 0x00001, 0x80000, CRC(3861b5fb) SHA1(72f085a1fd951919f479e5c6984304f7bbddc054) ) @@ -2081,7 +2081,7 @@ ROM_END ROM_START( pirpok2d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "p3pd22r.bin", 0x00000, 0x40000, CRC(10262317) SHA1(561088d1ace055cd568d667f690e95fc9ee3fed3) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "p3rom2.bin", 0x00000, 0x20000, CRC(db6182e4) SHA1(65f05247629d5a1f37bf179f468acf8420342d2c) ) @@ -2113,7 +2113,7 @@ ROM_END ROM_START( pirpok2v2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "p3pv24e.bin", 0x00000, 0x40000, CRC(0e77fb66) SHA1(732f9c160682dcfb6839c0ad28dfe7e4899e693c) ) - + ROM_REGION( 0x040000, "oki", 0 ) /* Samples */ ROM_LOAD( "p3rom2.bin", 0x00000, 0x20000, CRC(db6182e4) SHA1(65f05247629d5a1f37bf179f468acf8420342d2c) ) @@ -2126,7 +2126,7 @@ ROM_START( pirpok2v2 ) ROM_LOAD16_BYTE( "p3rom6.bin", 0x00001, 0x80000, CRC(d990cbb8) SHA1(6f822e38bf401b2eb0b2e36f3b4fc6822fafd3fa) ) ROM_END - + ROM_START( fcnudge ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ @@ -2163,7 +2163,7 @@ ROM_END ROM_START( fruitcar2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fcb20n.bin", 0x00000, 0x40000, CRC(f8de6fe2) SHA1(ff47b3f467e701897471b6aa912c086019d9ee6a) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2179,7 +2179,7 @@ ROM_END ROM_START( fruitcar3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fcd20n.bin", 0x00000, 0x40000, CRC(64c6a5cc) SHA1(dadc22ef7c2415c269619f63bca7761775eacf74) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "abrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2340,7 +2340,7 @@ ROM_END ROM_START( sfruitbv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "sfbv25r.bin", 0x00000, 0x40000, CRC(beb1ee59) SHA1(d6f72d66085309f33965640b25c788657eee01e1) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "sfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2356,7 +2356,7 @@ ROM_END ROM_START( sfruitbv2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "sfbv25e.bin", 0x00000, 0x40000, CRC(a9c7edba) SHA1(f860b1077a9a12ff49e2dea0aac888e210787327) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "sfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2372,7 +2372,7 @@ ROM_END ROM_START( sfruitbv3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "sfbv22eb.bin", 0x00000, 0x40000, CRC(64d31a39) SHA1(cd2fc75b8d16e444796c52255de298b3b52e40e6) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "sfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2388,7 +2388,7 @@ ROM_END ROM_START( sfruitbv4 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "sfbv22b.bin", 0x00000, 0x40000, CRC(ec0e8486) SHA1(249b8ecada6b7c0b3e16baa614620af80d7d8c6e) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "sfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2404,7 +2404,7 @@ ROM_END ROM_START( sfruitbv5 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "sfbv20lt.bin", 0x00000, 0x40000, CRC(63560472) SHA1(14446f2d8fd0314ca00478159cbb0507ac096e34) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "sfbrom2.bin", 0x00000, 0x20000, CRC(3823a36e) SHA1(4136e380b63546b9490033ad26d776f326eb9290) ) @@ -2486,7 +2486,7 @@ ROM_END ROM_START( fb2genv ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "f2gv18r.bin", 0x00000, 0x40000, CRC(c827362b) SHA1(3a407d8f009666cc80d1588d034ed135e18ec34b) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) @@ -2521,7 +2521,7 @@ ROM_START( fb2genv3 ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb2grom3.bin", 0x00000, 0x80000, CRC(21ade753) SHA1(ca70ab941740983626f4d274aa4a9edea366f38a) ) ROM_LOAD16_BYTE( "fb2grom4.bin", 0x00001, 0x80000, CRC(56605a08) SHA1(09022dc797dd824a973c5126cafe7b086a94184c) ) @@ -2537,7 +2537,7 @@ ROM_START( fb2gend ) ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb2grom3.bin", 0x00000, 0x80000, CRC(21ade753) SHA1(ca70ab941740983626f4d274aa4a9edea366f38a) ) ROM_LOAD16_BYTE( "fb2grom4.bin", 0x00001, 0x80000, CRC(56605a08) SHA1(09022dc797dd824a973c5126cafe7b086a94184c) ) @@ -2631,7 +2631,7 @@ ROM_END ROM_START( fb2ndv2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "f2ev18lt.bin", 0x00000, 0x40000, CRC(b59418b9) SHA1(8d45709176db09d052a26d57f41bc18d78632ad0) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) @@ -2647,7 +2647,7 @@ ROM_END ROM_START( fb2ndd ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "f2ed18r.bin", 0x00000, 0x40000, CRC(48a4dbcd) SHA1(e1a2163be6345983d05b1931b5619678f025d667) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) @@ -2663,7 +2663,7 @@ ROM_END ROM_START( fb2ndd2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "f2ed18lt.bin", 0x00000, 0x40000, CRC(3c469121) SHA1(0a694ff77dd2f797acf5889a8773bb798f64f11b) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb2grom2.bin", 0x00000, 0x40000, CRC(1cbbd43a) SHA1(6e31c3bdd677d9d3cb445294cf17a0efcb16d4ed) ) @@ -2700,7 +2700,7 @@ ROM_START( fb4a ) ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x040000, "debugram", ROMREGION_ERASE00 ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) @@ -2713,15 +2713,15 @@ ROM_END ROM_START( fb4b ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4b15lt.bin", 0x00000, 0x40000, CRC(480651c3) SHA1(3ac434070b00c04eda9c78209e1c6e21fd488287) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -2730,50 +2730,50 @@ ROM_END ROM_START( fb4b2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4b15r.bin", 0x00000, 0x40000, CRC(511a1c54) SHA1(7b554be602e74088ca4ab90a0b10965dc30b18ab) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) - + ROM_END ROM_START( fb4v ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4v15r.bin", 0x00000, 0x40000, CRC(891f119f) SHA1(1823826cd958a951a930b9a1a23f7cf092ed6ab2) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) - + ROM_END ROM_START( fb4v2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4v15lt.bin", 0x00000, 0x40000, CRC(d1cf9bd8) SHA1(59b1507e2d37eef8bea8d07194465506a52e7286)) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -2782,14 +2782,14 @@ ROM_END ROM_START( fb4v3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4v15e.bin", 0x00000, 0x40000, CRC(b28db56e) SHA1(b14c0b62fc1c3195ee3703b5500f5a36a2cde3e2) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3e.bin", 0x00000, 0x80000, CRC(d47d9969) SHA1(172771896b9ac75c34ae4c9958e26ba30371bdde) ) ROM_LOAD16_BYTE( "fb4rom4e.bin", 0x00001, 0x80000, CRC(680fc5d1) SHA1(92d46b72584d2bc906901d7e7f44c017995ef2c0) ) - + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5e.bin", 0x00000, 0x80000, CRC(ddc02e07) SHA1(b1cce95ab09822646c835b066d4510a51633d107) ) ROM_LOAD16_BYTE( "fb4rom6e.bin", 0x00001, 0x80000, CRC(e3de53a4) SHA1(3168ec7e10eee205655ee259fb5ba7201d7eb711) ) @@ -2798,15 +2798,15 @@ ROM_END ROM_START( fb4d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4d15r.bin", 0x00000, 0x40000, CRC(aeed6133) SHA1(8658708fbfd7f662f72a30a3f37baca98e931589) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -2815,15 +2815,15 @@ ROM_END ROM_START( fb4d2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4d15lt.bin", 0x00000, 0x40000, CRC(41b0177b) SHA1(9fc74f54a21fb2846e9f818e9b9714643cad0295) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -2832,15 +2832,15 @@ ROM_END ROM_START( fb4c ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4c15r.bin", 0x00000, 0x40000, CRC(f50ce62f) SHA1(7a1c37f42da0506ff3bcebcd587f0105004b47e2) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -2849,15 +2849,15 @@ ROM_END ROM_START( fb4c2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "fb4c15lt.bin", 0x00000, 0x40000, CRC(280a0d31) SHA1(dba0dc3f14f08f8045934acd85cb549ca4292808) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "fb4rom2.bin", 0x00000, 0x3ffff, BAD_DUMP CRC(bf49ba49) SHA1(eea40e34298f7fd98771f0869ef541c5e1514f2a) ) ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "fb4rom3.bin", 0x00000, 0x80000, CRC(4176937d) SHA1(dbde944a154f648a86628a8165fa27032115c417) ) ROM_LOAD16_BYTE( "fb4rom4.bin", 0x00001, 0x80000, CRC(f8c57041) SHA1(ca8f58e89d31563b363a78db89e2711402f3ba80) ) - - + + ROM_REGION( 0x100000, "gfx2", 0 ) ROM_LOAD16_BYTE( "fb4rom5.bin", 0x00000, 0x80000, CRC(41ad506c) SHA1(19086ab859a60e5127af0e51381cbb9fda6de74a) ) ROM_LOAD16_BYTE( "fb4rom6.bin", 0x00001, 0x80000, CRC(f6c07f3d) SHA1(709fe2a443fdd32a3f9ab9161d5321a01c0119bb) ) @@ -3336,8 +3336,8 @@ ROM_END ROM_START( pir2001v ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ - ROM_LOAD( "pi1v25r.bin", 0x00000, 0x40000, CRC(666207ea) SHA1(0d1fbd10aa85d4e5b8072266ce52b535b275fc5a) ) - + ROM_LOAD( "pi1v25r.bin", 0x00000, 0x40000, CRC(666207ea) SHA1(0d1fbd10aa85d4e5b8072266ce52b535b275fc5a) ) + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "piratrom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3353,7 +3353,7 @@ ROM_END ROM_START( pir2001v2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi1v25e.bin", 0x00000, 0x40000, CRC(0440d844) SHA1(14f62aee8cb56cdfa399b8052181f60fcbcedbba) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "piratrom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3369,7 +3369,7 @@ ROM_END ROM_START( pir2001v3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi1v24xt.bin", 0x00000, 0x40000, CRC(bc69b7e2) SHA1(bb4fc3ce17a9e97823bd9801fa549e5ddba6787d) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "piratrom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3385,7 +3385,7 @@ ROM_END ROM_START( pir2001d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi1d25r.bin", 0x00000, 0x40000, CRC(579a753e) SHA1(82d70362c22d4a4f4836f1e10effdc05041bd425) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "piratrom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3401,7 +3401,7 @@ ROM_END ROM_START( pir2001d2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi1d24xt.bin", 0x00000, 0x40000,CRC(0e3e68ed) SHA1(a0e007a1f905dd6e7ba6a8202c9e21893ff819e3) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "piratrom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3466,7 +3466,7 @@ ROM_END ROM_START( pir2002b2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2b19xt.bin", 0x00000, 0x40000, CRC(c9eed644) SHA1(6cd40196bdd8e84738c970198e770f87964aab5d) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3482,7 +3482,7 @@ ROM_END ROM_START( pir2002b3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2b20r.bin", 0x00000, 0x40000, CRC(4b2e45c0) SHA1(b96ba54034a0e61d53e317559bfe83f337e63618) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3498,12 +3498,12 @@ ROM_END ROM_START( pir2002v ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2v20r.bin", 0x00000, 0x40000, CRC(e4155252) SHA1(136ac929633bc6ee759285dcdb725aaaf7cdf225) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) - + ROM_REGION( 0x100000, "gfx1", 0 ) ROM_LOAD16_BYTE( "pirom3.bin", 0x00000, 0x80000, CRC(ad175fea) SHA1(07585fcb0d4828fb2b99bebfe583e54a835636ed) ) ROM_LOAD16_BYTE( "pirom4.bin", 0x00001, 0x80000, CRC(a94061ec) SHA1(2c3b37a1144a873f0b4b884cbeb938947270f5a3) ) @@ -3516,7 +3516,7 @@ ROM_END ROM_START( pir2002v2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2v20e.bin", 0x00000, 0x40000, CRC(208fec36) SHA1(779f87cb436e7d59b6c410921b030430020577ec) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3532,7 +3532,7 @@ ROM_END ROM_START( pir2002v3 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2v19xt.bin", 0x00000, 0x40000, CRC(0ef73818) SHA1(7d1c856c78f4d7b36f318725de3dffb5ad9279fe) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3548,8 +3548,8 @@ ROM_END ROM_START( pir2002d ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2d20r.bin", 0x00000, 0x40000, CRC(83a264c4) SHA1(7de1902f5b63d6c44df5726c450ff21b5d911ec4) ) - - + + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3565,7 +3565,7 @@ ROM_END ROM_START( pir2002d2 ) ROM_REGION( 0x80000, "main", 0 ) /* Z80 Code */ ROM_LOAD( "pi2d19xt.bin", 0x00000, 0x40000, CRC(1c045c9a) SHA1(dd3c6d2c1f084b4af262e52339d0c25c7e733b70) ) - + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "pirom2.bin", 0x00000, 0x20000, CRC(eeb92009) SHA1(e6c69437a7fd0f9fae375bf0b6dcfd6226823cf2) ) @@ -3711,8 +3711,8 @@ ROM_START( seawld ) ROM_LOAD( "swd16r.bin", 0x00000, 0x80000, CRC(081c84c1) SHA1(5f0d40c38ca26d3633cfe4c7ead2773a1dcc177d) ) ROM_REGION( 0x010000, "debugram", ROMREGION_ERASE00 ) /* DEBUG */ - - + + ROM_REGION( 0x040000, "oki", ROMREGION_ERASE00 ) /* Samples */ ROM_LOAD( "swrom2.bin", 0x00000, 0x40000, CRC(e1afe0ad) SHA1(097233255b486944b79a8504b4312173ab1aad06) ) @@ -3857,7 +3857,7 @@ ROM_END //ROM_REGION( 0x80000, "user1", 0 ) /* Z80 Code */ //ROM_LOAD( "dummy.rom", 0x00000, 0x40000, CRC(1) SHA1(1) ) - + static DRIVER_INIT( sfbonus_common) { sfbonus_tilemap_ram = auto_malloc(0x4000); @@ -3878,7 +3878,7 @@ static DRIVER_INIT( sfbonus_common) // hack, because the debugger is broken sfbonus_videoram = memory_region(machine,"debugram"); if (!sfbonus_videoram) sfbonus_videoram = auto_malloc(0x10000); - + state_save_register_global_pointer(machine, sfbonus_videoram, 0x10000); @@ -4971,7 +4971,7 @@ static DRIVER_INIT(anibonus3) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(fruitcar2) { int i; @@ -5047,7 +5047,7 @@ static DRIVER_INIT(moneymacv) DRIVER_INIT_CALL(sfbonus_common); }// - + static DRIVER_INIT(moneymacd) { int i; @@ -5096,7 +5096,7 @@ static DRIVER_INIT(pirpok2d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -}// +}// static DRIVER_INIT(pirpok2v) { @@ -5172,7 +5172,7 @@ static DRIVER_INIT(dblchald) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(dblchalv) { int i; @@ -5196,8 +5196,8 @@ static DRIVER_INIT(dblchalv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} // - +} // + static DRIVER_INIT(abnudged) { int i; @@ -5222,8 +5222,8 @@ static DRIVER_INIT(abnudged) } DRIVER_INIT_CALL(sfbonus_common); } - - + + static DRIVER_INIT(abnudgev) { int i; @@ -5248,7 +5248,7 @@ static DRIVER_INIT(abnudgev) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(pickwind) { int i; @@ -5272,8 +5272,8 @@ static DRIVER_INIT(pickwind) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} // - +} // + static DRIVER_INIT(pickwinv) { int i; @@ -5297,9 +5297,9 @@ static DRIVER_INIT(pickwinv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - - +} + + static DRIVER_INIT(pickwinv2) { int i; @@ -5323,7 +5323,7 @@ static DRIVER_INIT(pickwinv2) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(anithuntd) { @@ -5373,8 +5373,8 @@ static DRIVER_INIT(anithuntv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} // - +} // + static DRIVER_INIT(anibonusd) { int i; @@ -5398,7 +5398,7 @@ static DRIVER_INIT(anibonusd) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(anibonusv) { @@ -5423,7 +5423,7 @@ static DRIVER_INIT(anibonusv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(anibonusv3) { @@ -5473,7 +5473,7 @@ static DRIVER_INIT(hldspin1d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(hldspin1v) { @@ -5488,7 +5488,7 @@ static DRIVER_INIT(hldspin1d) { case 0: x = BITSWAP8(x^0x3c, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xea, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; + case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3f, 2,1,7,6,5,4,3,0); break; case 5: x = BITSWAP8(x^0xed, 2,7,6,5,4,3,1,0); break; @@ -5498,9 +5498,9 @@ static DRIVER_INIT(hldspin1d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} + - static DRIVER_INIT(parrot3d) { int i; @@ -5539,7 +5539,7 @@ static DRIVER_INIT(parrot3v) { case 0: x = BITSWAP8(x^0x3c, 1,0,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xef, 0,7,6,5,4,3,2,1); break; - case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3f, 2,1,7,6,5,4,3,0); break; case 5: x = BITSWAP8(x^0xed, 2,7,6,5,4,3,1,0); break; @@ -5549,7 +5549,7 @@ static DRIVER_INIT(parrot3v) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(parrot3v2) { @@ -5574,7 +5574,7 @@ static DRIVER_INIT(parrot3v2) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(sfruitbd) { @@ -5589,7 +5589,7 @@ static DRIVER_INIT(sfruitbd) { case 0: x = BITSWAP8(x^0x3e, 1,0,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xed, 1,7,6,5,4,3,0,2); break; - case 2: x = BITSWAP8(x^0x25, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x25, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa9, 4,3,0,1,2,7,6,5); break; case 4: x = BITSWAP8(x^0x3c, 0,1,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xed, 2,7,6,5,4,3,1,0); break; @@ -5599,7 +5599,7 @@ static DRIVER_INIT(sfruitbd) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(sfruitbv) { @@ -5624,7 +5624,7 @@ static DRIVER_INIT(sfruitbv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(sfruitbv2) { @@ -5639,7 +5639,7 @@ static DRIVER_INIT(sfruitbv2) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x25, 2,1,0,7,6,5,4,3); break; + case 2: x = BITSWAP8(x^0x25, 2,1,0,7,6,5,4,3); break; case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3b, 0,1,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xee, 1,7,6,5,4,3,0,2); break; @@ -5649,8 +5649,8 @@ static DRIVER_INIT(sfruitbv2) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - +} + static DRIVER_INIT(sfbonusd) { int i; @@ -5674,8 +5674,8 @@ static DRIVER_INIT(sfbonusd) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - +} + static DRIVER_INIT(sfbonusv) { int i; @@ -5700,7 +5700,7 @@ static DRIVER_INIT(sfbonusv) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(fb2ndv) { int i; @@ -5714,7 +5714,7 @@ static DRIVER_INIT(fb2ndv) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3a, 2,1,7,6,5,4,3,0); break; case 5: x = BITSWAP8(x^0xec, 0,7,6,5,4,3,2,1); break; @@ -5724,8 +5724,8 @@ static DRIVER_INIT(fb2ndv) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - +} + static DRIVER_INIT(fb2ndd) { int i; @@ -5739,7 +5739,7 @@ static DRIVER_INIT(fb2ndd) { case 0: x = BITSWAP8(x^0x3b, 1,0,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xeb, 1,7,6,5,4,3,0,2); break; - case 2: x = BITSWAP8(x^0x25, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x25, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xad, 4,3,0,1,2,7,6,5); break; case 4: x = BITSWAP8(x^0x3c, 0,1,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xeb, 2,7,6,5,4,3,1,0); break; @@ -5749,7 +5749,7 @@ static DRIVER_INIT(fb2ndd) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(robadv2v1) { @@ -5774,8 +5774,8 @@ static DRIVER_INIT(robadv2v1) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - +} + static DRIVER_INIT(robadv2v4) { int i; @@ -5799,7 +5799,7 @@ static DRIVER_INIT(robadv2v4) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(robadv2d) { @@ -5824,7 +5824,7 @@ static DRIVER_INIT(robadv2d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(hldspin2d) { @@ -5839,7 +5839,7 @@ static DRIVER_INIT(hldspin2d) { case 0: x = BITSWAP8(x^0x3b, 0,1,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xef, 0,7,6,5,4,3,2,1); break; - case 2: x = BITSWAP8(x^0x27, 1,0,2,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x27, 1,0,2,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa9, 4,3,0,1,2,7,6,5); break; case 4: x = BITSWAP8(x^0x3e, 0,2,7,6,5,4,3,1); break; case 5: x = BITSWAP8(x^0xeb, 1,7,6,5,4,3,0,2); break; @@ -5864,7 +5864,7 @@ static DRIVER_INIT(hldspin2v) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3f, 2,1,7,6,5,4,3,0); break; case 5: x = BITSWAP8(x^0xed, 2,7,6,5,4,3,1,0); break; @@ -5924,7 +5924,7 @@ static DRIVER_INIT(tighookv2) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(tighookd) { @@ -5939,7 +5939,7 @@ static DRIVER_INIT(tighookd) { case 0: x = BITSWAP8(x^0x3d, 0,1,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xed, 1,7,6,5,4,3,0,2); break; - case 2: x = BITSWAP8(x^0x26, 2,1,0,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x26, 2,1,0,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa9, 4,3,0,1,2,7,6,5); break; case 4: x = BITSWAP8(x^0x3c, 1,0,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xed, 2,7,6,5,4,3,1,0); break; @@ -5949,7 +5949,7 @@ static DRIVER_INIT(tighookd) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(pir2001v) { @@ -5974,7 +5974,7 @@ static DRIVER_INIT(pir2001v) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(pir2001v2) { @@ -5989,7 +5989,7 @@ static DRIVER_INIT(pir2001v2) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x22, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x39, 1,0,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xe9, 1,7,6,5,4,3,0,2); break; @@ -6015,7 +6015,7 @@ static DRIVER_INIT(pir2001d) { case 0: x = BITSWAP8(x^0x3c, 0,1,7,6,5,4,3,2); break; case 1: x = BITSWAP8(x^0xeb, 0,7,6,5,4,3,2,1); break; - case 2: x = BITSWAP8(x^0x27, 1,0,2,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x27, 1,0,2,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa9, 4,3,0,1,2,7,6,5); break; case 4: x = BITSWAP8(x^0x3e, 0,2,7,6,5,4,3,1); break; case 5: x = BITSWAP8(x^0xeb, 1,7,6,5,4,3,0,2); break; @@ -6053,7 +6053,7 @@ static DRIVER_INIT(pir2002d) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(pir2002v) { int i; @@ -6067,7 +6067,7 @@ static DRIVER_INIT(pir2002v) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x23, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x23, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3b, 1,0,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xe9, 1,7,6,5,4,3,0,2); break; @@ -6093,7 +6093,7 @@ static DRIVER_INIT(pir2002v2) { case 0: x = BITSWAP8(x^0x39, 1,2,7,6,5,4,3,0); break; case 1: x = BITSWAP8(x^0xef, 2,7,6,5,4,3,0,1); break; - case 2: x = BITSWAP8(x^0x26, 2,0,1,7,6,5,4,3); break; // + case 2: x = BITSWAP8(x^0x26, 2,0,1,7,6,5,4,3); break; // case 3: x = BITSWAP8(x^0xa8, 4,3,1,2,0,7,6,5); break; case 4: x = BITSWAP8(x^0x3b, 1,0,7,6,5,4,3,2); break; case 5: x = BITSWAP8(x^0xec, 1,7,6,5,4,3,0,2); break; @@ -6130,7 +6130,7 @@ static DRIVER_INIT(fb2genv) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(fb2genv3) { int i; @@ -6154,8 +6154,8 @@ static DRIVER_INIT(fb2genv3) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} - +} + static DRIVER_INIT(fb2gend) { int i; @@ -6179,7 +6179,7 @@ static DRIVER_INIT(fb2gend) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb4d) { @@ -6204,7 +6204,7 @@ static DRIVER_INIT(fb4d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb4v) { @@ -6229,7 +6229,7 @@ static DRIVER_INIT(fb4v) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb4v3) { @@ -6270,7 +6270,7 @@ static DRIVER_INIT(fb5) { case 0: x = BITSWAP8(x^0x20, 0,3,7,6,5,1,4,2); break; case 1: x = BITSWAP8(x^0xf1, 1,7,6,5,3,2,4,0); break; - case 2: x = BITSWAP8(x^0x33, 2,3,1,7,6,5,0,4); break; // + case 2: x = BITSWAP8(x^0x33, 2,3,1,7,6,5,0,4); break; // case 3: x = BITSWAP8(x^0xaf, 2,0,1,4,3,7,6,5); break; case 4: x = BITSWAP8(x^0x2d, 2,4,7,6,5,1,0,3); break; case 5: x = BITSWAP8(x^0xfb, 4,7,6,5,1,0,3,2); break; @@ -6280,7 +6280,7 @@ static DRIVER_INIT(fb5) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb5d) { @@ -6305,7 +6305,7 @@ static DRIVER_INIT(fb5d) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb5v) { @@ -6356,7 +6356,7 @@ static DRIVER_INIT(fb6) } DRIVER_INIT_CALL(sfbonus_common); } - + static DRIVER_INIT(fb6d) @@ -6407,7 +6407,7 @@ static DRIVER_INIT(fb6v) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb6v3) { @@ -6432,7 +6432,7 @@ static DRIVER_INIT(fb6v3) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(fb6s) { @@ -6607,7 +6607,7 @@ static DRIVER_INIT(dvisland) ROM[i] = x; } DRIVER_INIT_CALL(sfbonus_common); -} +} static DRIVER_INIT(funriver) @@ -6660,17 +6660,17 @@ static DRIVER_INIT(funriverv) DRIVER_INIT_CALL(sfbonus_common); } #endif - - + + /* - case 0: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 1: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 2: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 3: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 4: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 5: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 6: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; - case 7: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 0: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 1: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 2: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 3: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 4: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 5: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 6: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; + case 7: x = BITSWAP8(x^0xff, 7,6,5,4,3,2,1,0); break; */ diff --git a/src/mame/drivers/shangkid.c b/src/mame/drivers/shangkid.c index 7524eb8f3fb..2a86296cd6a 100644 --- a/src/mame/drivers/shangkid.c +++ b/src/mame/drivers/shangkid.c @@ -438,7 +438,7 @@ static MACHINE_DRIVER_START( shangkid ) /* video hardware */ MDRV_GFXDECODE(shangkid) - + MDRV_SOUND_MODIFY("ay") MDRV_SOUND_CONFIG(shangkid_ay8910_interface) MACHINE_DRIVER_END diff --git a/src/mame/drivers/silkroad.c b/src/mame/drivers/silkroad.c index 76d17fb1d6c..fb92b27d76f 100644 --- a/src/mame/drivers/silkroad.c +++ b/src/mame/drivers/silkroad.c @@ -379,7 +379,7 @@ ROM_START( silkroad ) ROM_REGION( 0x080000, "user1", 0 ) ROM_LOAD( "rom00.bin", 0x000000, 0x080000, CRC(b10ba7ab) SHA1(a6a3ae71b803af9c31d7e97dc86cfcc123ee9a40) ) - + /* $00000-$20000 stays the same in all sound banks, */ /* the second half of the bank is what gets switched */ ROM_REGION( 0xc0000, "oki1", 0 ) /* Samples */ diff --git a/src/mame/drivers/sprint2.c b/src/mame/drivers/sprint2.c index faf734de334..1f646c2cb8c 100644 --- a/src/mame/drivers/sprint2.c +++ b/src/mame/drivers/sprint2.c @@ -541,7 +541,7 @@ static MACHINE_DRIVER_START( sprint1 ) MDRV_SPEAKER_REMOVE("left") MDRV_SPEAKER_REMOVE("right") MDRV_SPEAKER_STANDARD_MONO("mono") - + MDRV_SOUND_REMOVE("discrete") MDRV_SOUND_ADD("discrete", DISCRETE, 0) diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 100993e5044..ea2ff0c0ab3 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -1,23 +1,23 @@ /* - Atari Tomcat prototype hardware + Atari Tomcat prototype hardware - Driver by Mariusz Wojcieszek + Driver by Mariusz Wojcieszek - Notes: - - game has no sound, while sound hardware was developed, sound program was - not prepared + Notes: + - game has no sound, while sound hardware was developed, sound program was + not prepared - ToDo: - - add proper timing of interrupts and framerate (currently commented out, - as they cause test mode to hang) - - vector quality appears to be worse than original game (compared to original - game videos) - - verify controls - - implement game linking (after MAME supports network) - - current implementation of 68010 <-> tms32010 is a little bit hacky, after - tms32010 is started by 68010, 68010 is suspended until tms32010 reads command - and starts executing + ToDo: + - add proper timing of interrupts and framerate (currently commented out, + as they cause test mode to hang) + - vector quality appears to be worse than original game (compared to original + game videos) + - verify controls + - implement game linking (after MAME supports network) + - current implementation of 68010 <-> tms32010 is a little bit hacky, after + tms32010 is started by 68010, 68010 is suspended until tms32010 reads command + and starts executing */ @@ -128,26 +128,26 @@ static WRITE16_HANDLER(tomcat_txbuffh_w) static WRITE16_HANDLER(tomcat_sndresl_w) { - // Sound Reset Low (Address Strobe) + // Sound Reset Low (Address Strobe) // Reset Sound System } static WRITE16_HANDLER(tomcat_sndresh_w) { - // Sound Reset high (Address Strobe) + // Sound Reset high (Address Strobe) // Release reset of sound system } static WRITE16_HANDLER(tomcat_mresl_w) { - // 320 Reset Low (Address Strobe) + // 320 Reset Low (Address Strobe) // Reset TMS320 cpu_set_input_line(cputag_get_cpu(space->machine, "dsp"), INPUT_LINE_RESET, ASSERT_LINE); } static WRITE16_HANDLER(tomcat_mresh_w) { - // 320 Reset high (Address Strobe) + // 320 Reset high (Address Strobe) // Release reset of TMS320 dsp_BIO = 0; cpu_set_input_line(cputag_get_cpu(space->machine, "dsp"), INPUT_LINE_RESET, CLEAR_LINE); @@ -162,14 +162,14 @@ static WRITE16_HANDLER(tomcat_irqclr_w) static READ16_HANDLER(tomcat_inputs2_r) { /* -* D15 LNKFLAG (Game Link) -* D14 PC3 " " -* D13 PC2 " " -* D12 PC0 " " -* D11 MAINFLAG (Sound System) -* D10 SOUNDFLAG " " -* D9 /IDLE* (TMS320 System) -* D8 +* D15 LNKFLAG (Game Link) +* D14 PC3 " " +* D13 PC2 " " +* D12 PC0 " " +* D11 MAINFLAG (Sound System) +* D10 SOUNDFLAG " " +* D9 /IDLE* (TMS320 System) +* D8 */ return dsp_idle ? 0 : (1 << 9); } @@ -275,13 +275,13 @@ static WRITE8_HANDLER(soundlatches_w) { switch(offset) { - case 0x00: break; // XLOAD 0 Write the Sequential ROM counter Low Byte - case 0x20: break; // XLOAD 1 Write the Sequential ROM counter High Byte - case 0x40: break; // SOUNDWR Write to Sound Interface Latch (read by Main) + case 0x00: break; // XLOAD 0 Write the Sequential ROM counter Low Byte + case 0x20: break; // XLOAD 1 Write the Sequential ROM counter High Byte + case 0x40: break; // SOUNDWR Write to Sound Interface Latch (read by Main) case 0x60: break; // unused - case 0x80: break; // XREAD Read the Sequential ROM (64K bytes) and increment the counter + case 0x80: break; // XREAD Read the Sequential ROM (64K bytes) and increment the counter case 0xa0: break; // unused - case 0xc0: break; // SOUNDREAD Read the Sound Interface Latch (written by Main) + case 0xc0: break; // SOUNDREAD Read the Sound Interface Latch (written by Main) } } @@ -351,20 +351,20 @@ static const riot6532_interface tomcat_riot6532_intf = { NULL, /* - PA0 = /WS OUTPUT (TMS-5220 WRITE STROBE) - PA1 = /RS OUTPUT (TMS-5220 READ STROBE) - PA2 = /READY INPUT (TMS-5220 READY FLAG) - PA3 = FSEL OUTPUT Select TMS5220 clock; - 0 = 325 KHz (8 KHz sampling) - 1 = 398 KHz (10 KHz sampling) - PA4 = /CC1 OUTPUT Coin Counter 1 - PA5 = /CC2 OUTPUT Coin Counter 2 - PA6 = /MUSRES OUTPUT (Reset the Yamaha) - PA7 = MAINFLAG INPUT + PA0 = /WS OUTPUT (TMS-5220 WRITE STROBE) + PA1 = /RS OUTPUT (TMS-5220 READ STROBE) + PA2 = /READY INPUT (TMS-5220 READY FLAG) + PA3 = FSEL OUTPUT Select TMS5220 clock; + 0 = 325 KHz (8 KHz sampling) + 1 = 398 KHz (10 KHz sampling) + PA4 = /CC1 OUTPUT Coin Counter 1 + PA5 = /CC2 OUTPUT Coin Counter 2 + PA6 = /MUSRES OUTPUT (Reset the Yamaha) + PA7 = MAINFLAG INPUT */ NULL, NULL, - NULL, // PB0 - PB7 OUTPUT Speech Data + NULL, // PB0 - PB7 OUTPUT Speech Data NULL // connected to IRQ line of 6502 }; diff --git a/src/mame/drivers/vamphalf.c b/src/mame/drivers/vamphalf.c index f02fe1e78bf..ca60ef4f9b9 100644 --- a/src/mame/drivers/vamphalf.c +++ b/src/mame/drivers/vamphalf.c @@ -17,7 +17,7 @@ Mission Craft (c) 2000 Sun (version 2.4) Final Godori (c) 2001 SemiCom (version 2.20.5915) Wyvern Wings (c) 2001 SemiCom - Age Of Heroes - Silkroad 2 (c) 2001 Unico (v0.63 - 2001/02/07) + Age Of Heroes - Silkroad 2 (c) 2001 Unico (v0.63 - 2001/02/07) Real games bugs: - dquizgo2: bugged video test @@ -757,7 +757,7 @@ static MACHINE_DRIVER_START( aoh ) MDRV_PALETTE_LENGTH(0x8000) MDRV_GFXDECODE(vamphalf) - + MDRV_VIDEO_UPDATE(aoh) /* sound hardware */ @@ -771,7 +771,7 @@ static MACHINE_DRIVER_START( aoh ) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 1.0) - + MDRV_SOUND_ADD("oki_2", OKIM6295, 32000000/32) MDRV_SOUND_CONFIG(okim6295_interface_pin7high) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 1.0) @@ -1327,13 +1327,13 @@ ROM_START( aoh ) ROM_LOAD32_WORD( "g11", 0x2000000, 0x800000, CRC(5f0461b8) SHA1(a0ac37d9a357e69367b8fee68bc358bfea5ecca0) ) ROM_LOAD32_WORD( "g08", 0x3000002, 0x800000, CRC(1fd08aa0) SHA1(376a91220cd6e63418b04d590b232bb1079a40c7) ) ROM_LOAD32_WORD( "g12", 0x3000000, 0x800000, CRC(e437b35f) SHA1(411d2926d619fba057476864f0e580f608830522) ) - + ROM_REGION( 0x40000, "oki_1", 0 ) /* Oki Samples */ ROM_LOAD( "rom3", 0x00000, 0x40000, CRC(db8cb455) SHA1(6723b4018208d554bd1bf1e0640b72d2f4f47302) ) - + ROM_REGION( 0x80000, "user2", 0 ) /* Oki Samples */ ROM_LOAD( "rom4", 0x00000, 0x80000, CRC(bba47755) SHA1(e6eeb5f64eaa88a74536119b731a76921e79f8ff) ) - + /* $00000-$20000 stays the same in all sound banks, */ /* the second half of the bank is what gets switched */ ROM_REGION( 0x100000, "oki_2", 0 ) /* Samples */ diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c index e43d5ea5ee6..aa91eb88324 100644 --- a/src/mame/drivers/wecleman.c +++ b/src/mame/drivers/wecleman.c @@ -721,7 +721,7 @@ static WRITE16_HANDLER( hotchase_soundlatch_w ) static WRITE8_HANDLER( hotchase_sound_control_w ) { const device_config *sound[3]; - + int reg[8]; sound[0] = devtag_get_device(space->machine, SOUND, "konami1"); diff --git a/src/mame/drivers/wiz.c b/src/mame/drivers/wiz.c index 93985fb5a8f..a488ac982bb 100644 --- a/src/mame/drivers/wiz.c +++ b/src/mame/drivers/wiz.c @@ -741,7 +741,7 @@ static MACHINE_DRIVER_START( stinger ) /* basic machine hardware */ MDRV_IMPORT_FROM(wiz) - + MDRV_CPU_MODIFY("audio") MDRV_CPU_PROGRAM_MAP(stinger_sound_map,0) diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 8ec2a4b8893..68a62965748 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -875,7 +875,7 @@ static TIMER_CALLBACK( delayed_6502_sound_w ) void atarigen_set_vol(running_machine *machine, int volume, sound_type type) { const device_config *device; - + for (device = sound_first(machine->config); device != NULL; device = sound_next(device)) if (sound_get_type(device) == type) sound_set_output_gain(device, ALL_OUTPUTS, volume / 100.0); diff --git a/src/mame/machine/nmk004.c b/src/mame/machine/nmk004.c index 4121f8f3bc4..e22829c9397 100644 --- a/src/mame/machine/nmk004.c +++ b/src/mame/machine/nmk004.c @@ -95,7 +95,7 @@ static struct UINT8 to_main; // answer to main CPU int protection_check; - running_machine *machine; + running_machine *machine; const device_config *ymdevice; const device_config *oki1device; const device_config *oki2device; @@ -1019,7 +1019,7 @@ static TIMER_CALLBACK( real_nmk004_init ) int i; memset(&NMK004_state, 0, sizeof(NMK004_state)); - + NMK004_state.machine = machine; NMK004_state.ymdevice = devtag_get_device(machine, SOUND, "ym"); NMK004_state.oki1device = devtag_get_device(machine, SOUND, "oki1"); diff --git a/src/mame/machine/seibuspi.c b/src/mame/machine/seibuspi.c index 0271d676fc7..1ba72787719 100644 --- a/src/mame/machine/seibuspi.c +++ b/src/mame/machine/seibuspi.c @@ -189,9 +189,9 @@ rdft2 CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00000000 & 0000FFFF CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 0000ABCB & 0000FFFF // okok -CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 0000ABCB & 0000FFFF // duplicate -CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00006543 & 0000FFFF // okok -CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 000021D9 & 0000FFFF // ok?? +CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 0000ABCB & 0000FFFF // duplicate +CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00006543 & 0000FFFF // okok +CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 000021D9 & 0000FFFF // ok?? CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00006655 & 0000FFFF // okok CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 000099AA & 0000FFFF // okok CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00006655 & 0000FFFF // duplicate @@ -201,8 +201,8 @@ CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 0000 CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 00005237 & 0000FFFF // okok CPU 'main' (PC=002A0709): unmapped program memory dword write to 0000054C = 0000A948 & 0000FFFF // okok - plane54 = partial_carry_sum16( plane54, 0xabcb, 0x55aa ) ^ 0x6699; - plane3210 = partial_carry_sum32( plane3210, 0x654321d9 ^ 0x42, 0x1d463748 ) ^ 0x0ca352a9; + plane54 = partial_carry_sum16( plane54, 0xabcb, 0x55aa ) ^ 0x6699; + plane3210 = partial_carry_sum32( plane3210, 0x654321d9 ^ 0x42, 0x1d463748 ) ^ 0x0ca352a9; ******************************************************************************************/ diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 6fd5ad09902..514ec3e5fdb 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -561,6 +561,7 @@ const game_driver * const drivers[] = DRIVER( phoenixa ) /* (c) 1980 Amstar + Centuri license */ DRIVER( phoenixb ) /* (c) 1980 Amstar + Centuri license */ DRIVER( phoenixt ) /* (c) 1980 Taito */ + DRIVER( phoenixj ) /* (c) 1980 Taito */ DRIVER( phoenix3 ) /* bootleg */ DRIVER( phoenixc ) /* bootleg */ DRIVER( condor ) /* bootleg */ @@ -5231,7 +5232,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( alphaone ) /* (proto) (c) 1983 */ DRIVER( alphaona ) /* (proto) (c) 1983 */ DRIVER( esb ) /* 136031 (c) 1985 */ - DRIVER( tomcat ) /* (proto) (c) 1985 */ + DRIVER( tomcat ) /* (proto) (c) 1985 */ /* Atari "Centipede hardware" games */ DRIVER( warlords ) /* 037153-037159 (c) 1980 */ @@ -8662,16 +8663,16 @@ Other Sun games DRIVER( tighooka ) DRIVER( tighookc ) DRIVER( tighookc2 ) - DRIVER( tighookv ) + DRIVER( tighookv ) DRIVER( tighookv2 ) DRIVER( tighookv3 ) DRIVER( tighookd ) - DRIVER( tighookd2 ) + DRIVER( tighookd2 ) DRIVER( robadv ) DRIVER( robadvc ) DRIVER( robadvd ) DRIVER( robadvv1 ) - DRIVER( robadvv2 ) + DRIVER( robadvv2 ) DRIVER( robadv2 ) DRIVER( robadv2a ) DRIVER( robadv2c ) @@ -8679,7 +8680,7 @@ Other Sun games DRIVER( robadv2v2 ) DRIVER( robadv2v3 ) DRIVER( robadv2v4 ) - DRIVER( robadv2d ) + DRIVER( robadv2d ) DRIVER( pirpok2 ) DRIVER( pirpok2b ) DRIVER( pirpok2d ) @@ -8725,7 +8726,7 @@ Other Sun games DRIVER( sfruitbv2 ) DRIVER( sfruitbv3 ) DRIVER( sfruitbv4 ) - DRIVER( sfruitbv5 ) + DRIVER( sfruitbv5 ) DRIVER( fb2gen ) DRIVER( fb2gena ) DRIVER( fb2genc ) @@ -8741,7 +8742,7 @@ Other Sun games DRIVER( fb2ndv ) DRIVER( fb2ndv2 ) DRIVER( fb2ndd ) - DRIVER( fb2ndd2 ) + DRIVER( fb2ndd2 ) DRIVER( fb4 ) DRIVER( fb4a ) DRIVER( fb4b ) @@ -8752,7 +8753,7 @@ Other Sun games DRIVER( fb4d2 ) DRIVER( fb4v ) DRIVER( fb4v2 ) - DRIVER( fb4v3 ) + DRIVER( fb4v3 ) DRIVER( act2000 ) DRIVER( act2000a ) DRIVER( act2000a2 ) @@ -8784,7 +8785,7 @@ Other Sun games DRIVER( pir2001v2 ) DRIVER( pir2001v3 ) DRIVER( pir2001d ) - DRIVER( pir2001d2 ) + DRIVER( pir2001d2 ) DRIVER( pir2002 ) DRIVER( pir2002a ) DRIVER( pir2002b ) @@ -8794,7 +8795,7 @@ Other Sun games DRIVER( pir2002v2 ) DRIVER( pir2002v3 ) DRIVER( pir2002d ) - DRIVER( pir2002d2 ) + DRIVER( pir2002d2 ) DRIVER( classice ) DRIVER( classicea ) DRIVER( classiced ) @@ -8812,7 +8813,7 @@ Other Sun games DRIVER( moneymacd2 ) DRIVER( atworld ) DRIVER( atworlda ) - + DRIVER( 3super8 ) /* unknown */ DRIVER( buster ) /* (c) 1987 Marian Electronics Ltd. */ DRIVER( spielbud ) /* (c) 1985 ADP */ @@ -8829,12 +8830,12 @@ Other Sun games DRIVER( pachifev ) /* (c) 1983? */ /* Drivers below are mechanical games, usually with no video display, requiring external artwork to function. - These are currently mostly 'fruit machine' style games, although this may later be extended to system logic - emulation for pinball machiens. + These are currently mostly 'fruit machine' style games, although this may later be extended to system logic + emulation for pinball machiens. - the m_ prefix is used to identify them as many have very generic names. + the m_ prefix is used to identify them as many have very generic names. - */ + */ /* Scorpion 2 */ DRIVER( m_bdrwho ) diff --git a/src/mame/video/bfm_dm01.c b/src/mame/video/bfm_dm01.c index c38e1539e12..54b15edaed6 100644 --- a/src/mame/video/bfm_dm01.c +++ b/src/mame/video/bfm_dm01.c @@ -72,7 +72,7 @@ static bitmap_t *dm_bitmap; #else #define VERBOSE 0 #endif - + #define LOG(x) do { if (VERBOSE) logerror x; } while (0) /////////////////////////////////////////////////////////////////////////// diff --git a/src/mame/video/deco_mlc.c b/src/mame/video/deco_mlc.c index 3fc39c1ea71..2dde34861a3 100644 --- a/src/mame/video/deco_mlc.c +++ b/src/mame/video/deco_mlc.c @@ -27,7 +27,7 @@ VIDEO_START( mlc ) else colour_mask=0x1f; -// temp_bitmap = auto_bitmap_alloc( 512, 512, BITMAP_FORMAT_RGB32 ); +// temp_bitmap = auto_bitmap_alloc( 512, 512, BITMAP_FORMAT_RGB32 ); mlc_buffered_spriteram = auto_malloc(0x3000); } @@ -239,9 +239,9 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan int useIndicesInRom=0; int hibits=0; int tileFormat=0; -// int rasterMode=0; -// int lastRasterMode=0; -// int rasterDirty=0; +// int rasterMode=0; +// int lastRasterMode=0; +// int rasterDirty=0; int clipper=0; rectangle user_clip; UINT32* mlc_spriteram=mlc_buffered_spriteram; // spriteram32 @@ -300,7 +300,7 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan fx = mlc_spriteram[offs+1]&0x8000; fy = mlc_spriteram[offs+1]&0x4000; color = mlc_spriteram[offs+1]&0xff; -// rasterMode = (mlc_spriteram[offs+1]>>10)&0x1; +// rasterMode = (mlc_spriteram[offs+1]>>10)&0x1; clipper = (mlc_spriteram[offs+1]>>8)&0x3; indx = mlc_spriteram[offs+0]&0x3fff; yscale = mlc_spriteram[offs+4]&0x3ff; @@ -479,8 +479,8 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan } } -// if (rasterMode) -// rasterDirty=1; +// if (rasterMode) +// rasterDirty=1; mlc_drawgfxzoom(machine, /*rasterMode ? temp_bitmap : */bitmap,machine->gfx[0], @@ -497,13 +497,13 @@ static void draw_sprites(running_machine* machine, bitmap_t *bitmap,const rectan ybase+=yinc; } -// if (lastRasterMode!=0 && rasterDirty) -// { -// blitRaster(bitmap, rasterMode); -// bitmap_fill(temp_bitmap,cliprect,0); -// rasterDirty=0; -// } -// lastRasterMode=rasterMode; +// if (lastRasterMode!=0 && rasterDirty) +// { +// blitRaster(bitmap, rasterMode); +// bitmap_fill(temp_bitmap,cliprect,0); +// rasterDirty=0; +// } +// lastRasterMode=rasterMode; if (use8bppMode) offs-=8; diff --git a/src/mame/video/hd63484.c b/src/mame/video/hd63484.c index 427c031e9c1..d96a363d0ad 100644 --- a/src/mame/video/hd63484.c +++ b/src/mame/video/hd63484.c @@ -1404,8 +1404,8 @@ static int regno; READ16_HANDLER( HD63484_status_r ) { -// if (cpu_get_pc(space->cpu) != 0xfced6 && cpu_get_pc(space->cpu) != 0xfe1d6) -// logerror("%05x: HD63484 status read\n",cpu_get_pc(space->cpu)); +// if (cpu_get_pc(space->cpu) != 0xfced6 && cpu_get_pc(space->cpu) != 0xfe1d6) +// logerror("%05x: HD63484 status read\n",cpu_get_pc(space->cpu)); return 0xff22|(mame_rand(space->machine) & 0x0004); /* write FIFO ready + command end + (read FIFO ready or read FIFO not ready) */ } diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index 9b3ec6fea61..38be3a74e2d 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -258,7 +258,7 @@ static TILE_GET_INFO( farwest_get_bg_tile_info ) int code = videoram[tile_index] + ((colorram[tile_index] & 0x40) << 2) + ((colorram[tile_index] & 0x20) << 4) + (charbank << 10); int color = (colorram[tile_index] & 0x0f) + 16 * palettebank; - int flags = 0;//((colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); + int flags = 0;//((colorram[tile_index] & 0x10) ? TILE_FLIPX : 0) | ((colorram[tile_index] & 0x20) ? TILE_FLIPY : 0); SET_TILE_INFO(0, code, color, flags); } @@ -277,8 +277,8 @@ static void farwest_draw_sprites(running_machine *machine, bitmap_t *bitmap, con UINT8 *sr=spriteram_2; UINT8 *sr2=spriteram; -// if (spriterambank != 0) - // sr = spriteram; +// if (spriterambank != 0) + // sr = spriteram; //else //sr = ; @@ -295,12 +295,12 @@ static void farwest_draw_sprites(running_machine *machine, bitmap_t *bitmap, con // int mod = flip_screen_get() ? -8 : 8; -// if (flip_screen_get()) +// if (flip_screen_get()) { - // sx = 240 - sx; + // sx = 240 - sx; sy = 240 - sy; - // flipx = !flipx; - // flipy = !flipy; + // flipx = !flipx; + // flipy = !flipy; } switch (sr[offs+3] & 0x0c) diff --git a/src/mame/video/silkroad.c b/src/mame/video/silkroad.c index 2e78f24bac7..6607c9c8900 100644 --- a/src/mame/video/silkroad.c +++ b/src/mame/video/silkroad.c @@ -14,7 +14,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta const gfx_element *gfx = machine->gfx[0]; UINT32 *source = silkroad_sprram; UINT32 *finish = source + 0x1000/4; - + while( source < finish ) { @@ -25,10 +25,10 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta int flipx = (attr & 0x0080); int width = ((attr & 0x0f00) >> 8) + 1; int wcount; - int color = (attr & 0x003f) ; + int color = (attr & 0x003f) ; int pri = ((attr & 0x1000)>>12); // Priority (1 = Low) int pri_mask = ~((1 << (pri+1)) - 1); // Above the first "pri" levels - + // attr & 0x2000 -> another priority bit? if ( (source[1] & 0xff00) == 0xff00 ) break; @@ -47,7 +47,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta } } - + source += 2; } } @@ -124,7 +124,7 @@ VIDEO_START(silkroad) fg_tilemap = tilemap_create(machine, get_fg_tile_info, tilemap_scan_rows,16,16,64, 64); fg2_tilemap = tilemap_create(machine, get_fg2_tile_info,tilemap_scan_rows,16,16,64, 64); fg3_tilemap = tilemap_create(machine, get_fg3_tile_info,tilemap_scan_rows,16,16,64, 64); - + tilemap_set_transparent_pen(fg_tilemap,0); tilemap_set_transparent_pen(fg2_tilemap,0); tilemap_set_transparent_pen(fg3_tilemap,0); @@ -143,7 +143,7 @@ VIDEO_UPDATE(silkroad) tilemap_set_scrolly( fg2_tilemap, 0, ((silkroad_regs[5] & 0xffff0000) >> 16)); tilemap_set_scrollx( fg2_tilemap, 0, (silkroad_regs[2] & 0x0000ffff) >> 0 ); - + tilemap_draw(bitmap,cliprect,fg_tilemap, 0,0); tilemap_draw(bitmap,cliprect,fg2_tilemap,0,1); tilemap_draw(bitmap,cliprect,fg3_tilemap,0,2); diff --git a/src/version.c b/src/version.c index 66e245488f2..b16f56985ad 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.129u3 ("__DATE__")"; +const char build_version[] = "0.129u4 ("__DATE__")"; |