From 40bcc29e8acd360309630cf1ac472c9ed9a17563 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Fri, 11 Dec 2009 06:19:46 +0000 Subject: Cleanups and version bump. --- src/emu/memory.c | 294 +++++++++++++++++++++---------------------- src/emu/sound/cdp1869.c | 4 +- src/emu/validity.c | 4 +- src/emu/video/s2636.c | 2 +- src/emu/video/s2636.h | 2 +- src/mame/audio/cyberbal.c | 2 +- src/mame/audio/timeplt.c | 4 +- src/mame/drivers/40love.c | 6 +- src/mame/drivers/8080bw.c | 2 +- src/mame/drivers/alpha68k.c | 24 ++-- src/mame/drivers/amspdwy.c | 4 +- src/mame/drivers/astrof.c | 6 +- src/mame/drivers/atarig1.c | 2 +- src/mame/drivers/atarigt.c | 2 +- src/mame/drivers/atarisy2.c | 2 +- src/mame/drivers/bking.c | 6 +- src/mame/drivers/buggychl.c | 4 +- src/mame/drivers/coolridr.c | 62 ++++----- src/mame/drivers/dec0.c | 6 +- src/mame/drivers/dominob.c | 6 +- src/mame/drivers/expro02.c | 2 +- src/mame/drivers/fromanc2.c | 4 +- src/mame/drivers/fromance.c | 8 +- src/mame/drivers/galaxia.c | 2 +- src/mame/drivers/galaxold.c | 6 +- src/mame/drivers/gcpinbal.c | 2 +- src/mame/drivers/ginganin.c | 4 +- src/mame/drivers/go2000.c | 30 ++--- src/mame/drivers/good.c | 2 +- src/mame/drivers/gstream.c | 40 +++--- src/mame/drivers/hnayayoi.c | 2 +- src/mame/drivers/hng64.c | 8 +- src/mame/drivers/homedata.c | 6 +- src/mame/drivers/hotblock.c | 2 +- src/mame/drivers/hyprduel.c | 8 +- src/mame/drivers/imolagp.c | 2 +- src/mame/drivers/inufuku.c | 4 +- src/mame/drivers/jackal.c | 2 +- src/mame/drivers/jailbrek.c | 4 +- src/mame/drivers/jangou.c | 14 +-- src/mame/drivers/jollyjgr.c | 2 +- src/mame/drivers/jongkyo.c | 2 +- src/mame/drivers/junofrst.c | 4 +- src/mame/drivers/karnov.c | 18 +-- src/mame/drivers/kickgoal.c | 32 ++--- src/mame/drivers/koikoi.c | 8 +- src/mame/drivers/ksayakyu.c | 6 +- src/mame/drivers/kyugo.c | 4 +- src/mame/drivers/ladyfrog.c | 6 +- src/mame/drivers/laserbat.c | 12 +- src/mame/drivers/lastfght.c | 12 +- src/mame/drivers/lazercmd.c | 28 ++--- src/mame/drivers/lemmings.c | 8 +- src/mame/drivers/lwings.c | 14 +-- src/mame/drivers/mcr.c | 12 +- src/mame/drivers/msisaac.c | 4 +- src/mame/drivers/norautp.c | 76 +++++------ src/mame/drivers/psikyo.c | 4 +- src/mame/drivers/taito_l.c | 2 +- src/mame/drivers/tickee.c | 40 +++--- src/mame/drivers/vsnes.c | 2 +- src/mame/drivers/wink.c | 8 +- src/mame/drivers/yiear.c | 6 +- src/mame/drivers/yunsung8.c | 4 +- src/mame/includes/aerofgt.h | 2 +- src/mame/includes/amspdwy.h | 2 +- src/mame/includes/buggychl.h | 4 +- src/mame/includes/cyberbal.h | 2 +- src/mame/includes/fromance.h | 2 +- src/mame/includes/gaelco.h | 2 +- src/mame/includes/galspnbl.h | 2 +- src/mame/includes/gcpinbal.h | 2 +- src/mame/includes/ginganin.h | 2 +- src/mame/includes/glass.h | 2 +- src/mame/includes/gng.h | 6 +- src/mame/includes/goal92.h | 4 +- src/mame/includes/gotcha.h | 2 +- src/mame/includes/gumbo.h | 2 +- src/mame/includes/himesiki.h | 2 +- src/mame/includes/inufuku.h | 2 +- src/mame/includes/jack.h | 2 +- src/mame/includes/jailbrek.h | 2 +- src/mame/includes/karnov.h | 16 +-- src/mame/includes/kickgoal.h | 2 +- src/mame/includes/ladyfrog.h | 4 +- src/mame/includes/lastduel.h | 2 +- src/mame/includes/lemmings.h | 4 +- src/mame/includes/lwings.h | 6 +- src/mame/includes/timeplt.h | 2 +- src/mame/includes/trackfld.h | 2 +- src/mame/includes/yunsung8.h | 2 +- src/mame/machine/buggychl.c | 10 +- src/mame/machine/vsnes.c | 2 +- src/mame/video/aerofgt.c | 58 ++++----- src/mame/video/alpha68k.c | 32 ++--- src/mame/video/amspdwy.c | 4 +- src/mame/video/atarig42.c | 2 +- src/mame/video/buggychl.c | 10 +- src/mame/video/fromanc2.c | 18 +-- src/mame/video/fromance.c | 4 +- src/mame/video/gaelco.c | 2 +- src/mame/video/galivan.c | 10 +- src/mame/video/gberet.c | 2 +- src/mame/video/ginganin.c | 12 +- src/mame/video/glass.c | 4 +- src/mame/video/gotcha.c | 12 +- src/mame/video/gunsmoke.c | 6 +- src/mame/video/higemaru.c | 2 +- src/mame/video/hng64.c | 36 +++--- src/mame/video/holeland.c | 4 +- src/mame/video/homedata.c | 98 +++++++-------- src/mame/video/hyprduel.c | 46 +++---- src/mame/video/inufuku.c | 20 +-- src/mame/video/ironhors.c | 2 +- src/mame/video/jackal.c | 4 +- src/mame/video/kan_pand.c | 12 +- src/mame/video/karnov.c | 32 ++--- src/mame/video/kickgoal.c | 2 +- src/mame/video/kingobox.c | 2 +- src/mame/video/kncljoe.c | 6 +- src/mame/video/kyugo.c | 6 +- src/mame/video/lastduel.c | 6 +- src/mame/video/lemmings.c | 6 +- src/mame/video/lwings.c | 4 +- src/mame/video/psikyo.c | 4 +- src/mame/video/rallyx.c | 6 +- src/mame/video/yunsung8.c | 24 ++-- src/version.c | 2 +- 128 files changed, 753 insertions(+), 753 deletions(-) diff --git a/src/emu/memory.c b/src/emu/memory.c index e9bee208fd7..dc0be581550 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -79,69 +79,69 @@ value of 0x14000 would map the bucket at 0x00000, 0x04000, 0x10000, and 0x14000. - AM_ROM - Specifies that this bucket contains ROM data by attaching an - internal read handler. If this address space describes the first - address space for a device, and if there is a region whose name - matches the device's name, and if the bucket start/end range is - within the bounds of that region, then this bucket will automatically - map to the memory contained in that region. - + AM_ROM + Specifies that this bucket contains ROM data by attaching an + internal read handler. If this address space describes the first + address space for a device, and if there is a region whose name + matches the device's name, and if the bucket start/end range is + within the bounds of that region, then this bucket will automatically + map to the memory contained in that region. + AM_RAM AM_READONLY AM_WRITEONLY - Specifies that this bucket contains RAM data by attaching internal - read and/or write handlers. Memory is automatically allocated to back - this area. AM_RAM maps both reads and writes, while AM_READONLY only - maps reads and AM_WRITEONLY only maps writes. - - AM_NOP - AM_READNOP - AM_WRITENOP - Specifies that reads and/or writes in this bucket are unmapped, but - that accesses to them should not be logged. AM_NOP unmaps both reads - and writes, while AM_READNOP only unmaps reads, and AM_WRITENOP only - unmaps writes. - - AM_UNMAP - Specifies that both reads and writes in thus bucket are unmapeed, - and that accesses to them should be logged. There is rarely a need - for this, as the entire address space is initialized to behave this - way by default. - + Specifies that this bucket contains RAM data by attaching internal + read and/or write handlers. Memory is automatically allocated to back + this area. AM_RAM maps both reads and writes, while AM_READONLY only + maps reads and AM_WRITEONLY only maps writes. + + AM_NOP + AM_READNOP + AM_WRITENOP + Specifies that reads and/or writes in this bucket are unmapped, but + that accesses to them should not be logged. AM_NOP unmaps both reads + and writes, while AM_READNOP only unmaps reads, and AM_WRITENOP only + unmaps writes. + + AM_UNMAP + Specifies that both reads and writes in thus bucket are unmapeed, + and that accesses to them should be logged. There is rarely a need + for this, as the entire address space is initialized to behave this + way by default. + AM_READ_BANK(tag) AM_WRITE_BANK(tag) AM_READWRITE_BANK(tag) - Specifies that reads and/or writes in this bucket map to a memory - bank with the provided 'tag'. The actual memory this bank points to - can be later controlled via the same tag. + Specifies that reads and/or writes in this bucket map to a memory + bank with the provided 'tag'. The actual memory this bank points to + can be later controlled via the same tag. AM_READ(read) AM_WRITE(write) AM_READWRITE(read, write) - Specifies read and/or write handler callbacks for this bucket. All + Specifies read and/or write handler callbacks for this bucket. All reads and writes in this bucket will trigger a call to the provided functions. - - AM_DEVREAD(tag, read) - AM_DEVWRITE(tag, read) - AM_DEVREADWRITE(tag, read) - Specifies a device-specific read and/or write handler for this - bucket, automatically bound to the device specified by the provided - 'tag'. - - AM_READ_PORT(tag) - AM_WRITE_PORT(tag) - AM_READWRITE_PORT(tag) - Specifies that read and/or write accesses in this bucket will map - to the I/O port with the provided 'tag'. An internal read/write - handler is set up to handle this mapping. - + + AM_DEVREAD(tag, read) + AM_DEVWRITE(tag, read) + AM_DEVREADWRITE(tag, read) + Specifies a device-specific read and/or write handler for this + bucket, automatically bound to the device specified by the provided + 'tag'. + + AM_READ_PORT(tag) + AM_WRITE_PORT(tag) + AM_READWRITE_PORT(tag) + Specifies that read and/or write accesses in this bucket will map + to the I/O port with the provided 'tag'. An internal read/write + handler is set up to handle this mapping. + AM_REGION(class, tag, offs) Only useful if used in conjunction with AM_ROM, AM_RAM, or - AM_READ/WRITE_BANK. By default, memory is allocated to back each - bucket. By specifying AM_REGION, you can tell the memory system to - point the base of the memory backing this bucket to a given memory + AM_READ/WRITE_BANK. By default, memory is allocated to back each + bucket. By specifying AM_REGION, you can tell the memory system to + point the base of the memory backing this bucket to a given memory 'region' at the specified 'offs' instead of allocating it. AM_SHARE(tag) @@ -159,16 +159,16 @@ with the size, in bytes, of the current bucket. AM_BASE_MEMBER(struct, basefield) - AM_SIZE_MEMBER(struct, sizefield) - Specifies a field within a given struct as where to store the base - or size of the current bucket. The struct is assumed to be hanging - off of the machine->driver_data pointer. - - AM_BASE_GENERIC(basefield) - AM_SIZE_GENERIC(sizefield) - Specifies a field within the global generic_pointers struct as - where to store the base or size of the current bucket. The global - generic_pointer struct lives in machine->generic. + AM_SIZE_MEMBER(struct, sizefield) + Specifies a field within a given struct as where to store the base + or size of the current bucket. The struct is assumed to be hanging + off of the machine->driver_data pointer. + + AM_BASE_GENERIC(basefield) + AM_SIZE_GENERIC(sizefield) + Specifies a field within the global generic_pointers struct as + where to store the base or size of the current bucket. The global + generic_pointer struct lives in machine->generic. ***************************************************************************/ @@ -342,7 +342,7 @@ struct _memory_private tagmap * bankmap; /* map for fast bank lookups */ bank_info * banklist; /* data gathered for each bank */ UINT8 banknext; /* next bank to allocate */ - + tagmap * sharemap; /* map for share lookups */ UINT8 * wptable; /* watchpoint-fill table */ @@ -821,7 +821,7 @@ void memory_init(running_machine *machine) /* dump the final memory configuration */ mem_dump(machine); - + /* we are now initialized */ memdata->initialized = TRUE; } @@ -1104,7 +1104,7 @@ void memory_configure_bank(running_machine *machine, const char *tag, int starte memory_private *memdata = machine->memory_data; bank_info *bank = tagmap_find_hash_only(memdata->bankmap, tag); int entrynum; - + /* validation checks */ if (bank == NULL) fatalerror("memory_configure_bank called for unknown bank '%s'", tag); @@ -1504,22 +1504,22 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a address_space *spacerw = (address_space *)space; FPTR bankindex; void *handler; - + /* map for read */ if (install_read) { handler = bank_find_or_allocate(space, NULL, addrstart, addrend, addrmask, addrmirror, ROW_READ); space_map_range(spacerw, ROW_READ, space->dbits, 0, addrstart, addrend, addrmask, addrmirror, handler, spacerw, "ram"); - + /* if we are provided a pointer, set it */ bankindex = (FPTR)handler; if (baseptr != NULL) memdata->bank_ptr[bankindex] = baseptr; - /* if we don't have a bank pointer yet, try to find one */ + /* if we don't have a bank pointer yet, try to find one */ if (memdata->bank_ptr[bankindex] == NULL) memdata->bank_ptr[bankindex] = (UINT8 *)space_find_backing_memory(space, addrstart, addrend); - + /* if we still don't have a pointer, and we're past the initialization phase, allocate a new block */ if (memdata->bank_ptr[bankindex] == NULL && memdata->initialized) { @@ -1540,10 +1540,10 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a if (baseptr != NULL) memdata->bank_ptr[bankindex] = baseptr; - /* if we don't have a bank pointer yet, try to find one */ + /* if we don't have a bank pointer yet, try to find one */ if (memdata->bank_ptr[bankindex] == NULL) memdata->bank_ptr[bankindex] = (UINT8 *)space_find_backing_memory(space, addrstart, addrend); - + /* if we still don't have a pointer, and we're past the initialization phase, allocate a new block */ if (memdata->bank_ptr[bankindex] == NULL && memdata->initialized) { @@ -1555,10 +1555,10 @@ void *_memory_install_ram(const address_space *space, offs_t addrstart, offs_t a return (void *)space_find_backing_memory(spacerw, addrstart, addrend); } - + /*------------------------------------------------- - _memory_unmap - unmap a section of address + _memory_unmap - unmap a section of address space -------------------------------------------------*/ @@ -1820,7 +1820,7 @@ static void memory_init_preflight(running_machine *machine) { memory_private *memdata = machine->memory_data; address_space *space; - + /* reset the banking state */ memdata->banknext = STATIC_BANK1; @@ -1916,7 +1916,7 @@ static void memory_init_populate(running_machine *machine) /* find the entry before the last one we processed */ for (entry = space->map->entrylist; entry->next != last_entry; entry = entry->next) ; last_entry = entry; - + /* map both read and write halves */ memory_init_map_entry(space, entry, ROW_READ); memory_init_map_entry(space, entry, ROW_WRITE); @@ -1941,22 +1941,22 @@ static void memory_init_map_entry(address_space *space, const address_map_entry { case AMH_NONE: return; - + case AMH_ROM: if (readorwrite == ROW_WRITE) return; /* fall through to the RAM case otherwise */ - + case AMH_RAM: - _memory_install_ram(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + _memory_install_ram(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, readorwrite == ROW_READ, readorwrite == ROW_WRITE, NULL); break; - + case AMH_NOP: _memory_unmap(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, readorwrite == ROW_READ, readorwrite == ROW_WRITE, TRUE); break; - + case AMH_UNMAP: _memory_unmap(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, readorwrite == ROW_READ, readorwrite == ROW_WRITE, FALSE); @@ -1965,83 +1965,83 @@ static void memory_init_map_entry(address_space *space, const address_map_entry case AMH_HANDLER: switch ((handler->bits != 0) ? handler->bits : space->dbits) { - case 8: - _memory_install_handler8(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.shandler8 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.shandler8 : NULL, handler->name, - handler->mask); + case 8: + _memory_install_handler8(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.shandler8 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.shandler8 : NULL, handler->name, + handler->mask); break; - case 16: - _memory_install_handler16(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.shandler16 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.shandler16 : NULL, handler->name, - handler->mask); + case 16: + _memory_install_handler16(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.shandler16 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.shandler16 : NULL, handler->name, + handler->mask); break; - case 32: - _memory_install_handler32(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.shandler32 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.shandler32 : NULL, handler->name, - handler->mask); + case 32: + _memory_install_handler32(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.shandler32 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.shandler32 : NULL, handler->name, + handler->mask); break; - + case 64: - _memory_install_handler64(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.shandler64 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.shandler64 : NULL, handler->name, - handler->mask); + _memory_install_handler64(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.shandler64 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.shandler64 : NULL, handler->name, + handler->mask); break; } break; - + case AMH_DEVICE_HANDLER: device = devtag_get_device(space->machine, handler->tag); if (device == NULL) fatalerror("Attempted to map a non-existent device '%s' in space %s of device '%s'\n", handler->tag, space->name, (space->cpu != NULL) ? space->cpu->tag : "??"); switch ((handler->bits != 0) ? handler->bits : space->dbits) { - case 8: - _memory_install_device_handler8(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.dhandler8 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler8 : NULL, handler->name, - handler->mask); + case 8: + _memory_install_device_handler8(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.dhandler8 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler8 : NULL, handler->name, + handler->mask); break; - case 16: - _memory_install_device_handler16(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.dhandler16 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler16 : NULL, handler->name, - handler->mask); + case 16: + _memory_install_device_handler16(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.dhandler16 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler16 : NULL, handler->name, + handler->mask); break; - case 32: - _memory_install_device_handler32(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.dhandler32 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler32 : NULL, handler->name, - handler->mask); + case 32: + _memory_install_device_handler32(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.dhandler32 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler32 : NULL, handler->name, + handler->mask); break; - + case 64: - _memory_install_device_handler64(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->handler.read.dhandler64 : NULL, handler->name, - (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler64 : NULL, handler->name, - handler->mask); + _memory_install_device_handler64(space, device, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->handler.read.dhandler64 : NULL, handler->name, + (readorwrite == ROW_WRITE) ? handler->handler.write.dhandler64 : NULL, handler->name, + handler->mask); break; } break; - + case AMH_PORT: - _memory_install_port(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->tag : NULL, + _memory_install_port(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->tag : NULL, (readorwrite == ROW_WRITE) ? handler->tag : NULL); break; - + case AMH_BANK: - _memory_install_bank(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, - (readorwrite == ROW_READ) ? handler->tag : NULL, + _memory_install_bank(space, entry->addrstart, entry->addrend, entry->addrmask, entry->addrmirror, + (readorwrite == ROW_READ) ? handler->tag : NULL, (readorwrite == ROW_WRITE) ? handler->tag : NULL); - break; + break; } } @@ -2205,12 +2205,12 @@ static void memory_exit(running_machine *machine) memdata->memory_block_list = block->next; free(block); } - + /* free banks */ while (memdata->banklist != NULL) { bank_info *bank = memdata->banklist; - + /* free references within each bank */ while (bank->reflist != NULL) { @@ -2218,7 +2218,7 @@ static void memory_exit(running_machine *machine) bank->reflist = ref->next; free(ref); } - + memdata->banklist = bank->next; free(bank); } @@ -2496,7 +2496,7 @@ static void map_detokenize(memory_private *memdata, address_map *map, const game break; } } - + /* post-process to apply the global mask */ if (map->globalmask != 0) for (entry = map->entrylist; entry != NULL; entry = entry->next) @@ -2628,12 +2628,12 @@ static int space_needs_backing_store(const address_space *space, const address_m /* if we're writing to any sort of bank or RAM, then yes, we do need backing */ if (entry->write.type == AMH_BANK || entry->write.type == AMH_RAM) return TRUE; - + /* if we're reading from RAM or from ROM outside of address space 0 or its region, then yes, we do need backing */ - if (entry->read.type == AMH_RAM || + if (entry->read.type == AMH_RAM || (entry->read.type == AMH_ROM && (space->spacenum != ADDRESS_SPACE_0 || entry->addrstart >= memory_region_length(space->machine, space->cpu->tag)))) return TRUE; - + /* all other cases don't need backing */ return FALSE; } @@ -2645,8 +2645,8 @@ static int space_needs_backing_store(const address_space *space, const address_m ***************************************************************************/ /*------------------------------------------------- - bank_find_or_allocate - allocate a new - bank, or find an existing one, and return the + bank_find_or_allocate - allocate a new + bank, or find an existing one, and return the read/write handler -------------------------------------------------*/ @@ -2660,14 +2660,14 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, bank_info *bank = NULL; char temptag[10]; char name[30]; - + /* adjust the addresses, handling mirrors and such */ adjust_addresses(space, &bytestart, &byteend, &bytemask, &bytemirror); - + /* if this bank is named, look it up */ if (tag != NULL) bank = tagmap_find_hash_only(memdata->bankmap, tag); - + /* else try to find an exact match */ else { @@ -2675,12 +2675,12 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, if (bank->tag[0] == '~' && bank->bytestart == bytestart && bank->byteend == byteend && bank->reflist != NULL && bank->reflist->space == space) break; } - + /* if we don't have a bank yet, find a free one */ if (bank == NULL) { int banknum = memdata->banknext++; - + /* handle failure */ if (banknum > STATIC_BANKMAX) { @@ -2689,7 +2689,7 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, else fatalerror("Unable to allocate bank for RAM/ROM area %X-%X\n", bytestart, byteend); } - + /* generate an internal tag if we don't have one */ if (tag == NULL) { @@ -2699,10 +2699,10 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, } else sprintf(name, "Bank '%s'", tag); - + /* allocate the bank */ bank = (bank_info *)alloc_array_clear_or_die(UINT8, sizeof(bank_info) + strlen(tag) + 1 + strlen(name)); - + /* populate it */ bank->index = banknum; bank->handler = (void *)(FPTR)(STATIC_BANK1 + banknum - 1); @@ -2712,11 +2712,11 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, strcpy(bank->tag, tag); bank->name = bank->tag + strlen(tag) + 1; strcpy(bank->name, name); - + /* add us to the list */ bank->next = memdata->banklist; memdata->banklist = bank; - + /* for named banks, add to the map and register for save states */ if (tag[0] != '~') { @@ -2725,7 +2725,7 @@ static void *bank_find_or_allocate(const address_space *space, const char *tag, state_save_register_item(space->machine, "memory", bank->tag, 0, bank->curentry); } } - + /* update the read/write state for this bank */ if (readorwrite == ROW_READ) bank->read = TRUE; @@ -3761,7 +3761,7 @@ static const char *handler_to_string(const address_space *space, const address_t "bank 120", "bank 121", "bank 122", "ram", "rom", "nop", "unmapped", "watchpoint" }; - + /* banks have names */ if (entry >= STATIC_BANK1 && entry <= STATIC_BANKMAX) { @@ -3770,7 +3770,7 @@ static const char *handler_to_string(const address_space *space, const address_t if (info->index == entry) return info->name; } - + /* constant strings for lower entries */ if (entry < STATIC_COUNT) return strings[entry]; diff --git a/src/emu/sound/cdp1869.c b/src/emu/sound/cdp1869.c index e039e2a2cda..a304dc58519 100644 --- a/src/emu/sound/cdp1869.c +++ b/src/emu/sound/cdp1869.c @@ -8,8 +8,8 @@ TODO: - - remove CDP1802 dependency - - sound base frequencies are TPA/TPB + - remove CDP1802 dependency + - sound base frequencies are TPA/TPB - white noise - scanline based update - CMSEL output diff --git a/src/emu/validity.c b/src/emu/validity.c index 8ed341b9fce..f88a3c58b13 100644 --- a/src/emu/validity.c +++ b/src/emu/validity.c @@ -1311,7 +1311,7 @@ static int validate_devices(int drivnum, const machine_config *config, const inp { UINT32 bytestart = SPACE_SHIFT(entry->addrstart); UINT32 byteend = SPACE_SHIFT_END(entry->addrend); - + /* look for overlapping entries */ if (!detected_overlap) { @@ -1401,7 +1401,7 @@ static int validate_devices(int drivnum, const machine_config *config, const inp error |= validate_tag(driver, "bank", entry->write.tag); if (entry->share != NULL) error |= validate_tag(driver, "share", entry->share); - + /* if there are base or size members, check that they are within bounds */ if (entry->baseptroffs_plus1 != 0 && (entry->baseptroffs_plus1 - 1) >= config->driver_data_size) { diff --git a/src/emu/video/s2636.c b/src/emu/video/s2636.c index c12450a2ff2..4f9b43f5135 100644 --- a/src/emu/video/s2636.c +++ b/src/emu/video/s2636.c @@ -96,7 +96,7 @@ static const int sprite_offsets[4] = { 0x00, 0x10, 0x20, 0x40 }; *************************************/ typedef struct _s2636_state s2636_state; -struct _s2636_state +struct _s2636_state { UINT8 *work_ram; int work_ram_size; diff --git a/src/emu/video/s2636.h b/src/emu/video/s2636.h index 432b52f8946..0f07d30eb50 100644 --- a/src/emu/video/s2636.h +++ b/src/emu/video/s2636.h @@ -23,7 +23,7 @@ struct _s2636_interface { const char *screen; int work_ram_size; - int y_offset; + int y_offset; int x_offset; }; diff --git a/src/mame/audio/cyberbal.c b/src/mame/audio/cyberbal.c index e786538d6d0..cbb0f03ec27 100644 --- a/src/mame/audio/cyberbal.c +++ b/src/mame/audio/cyberbal.c @@ -18,7 +18,7 @@ static void update_sound_68k_interrupts(running_machine *machine); void cyberbal_sound_reset(running_machine *machine) { cyberbal_state *state = (cyberbal_state *)machine->driver_data; - + /* reset the sound system */ state->bank_base = &memory_region(machine, "audiocpu")[0x10000]; memory_set_bankptr(machine, "soundbank", &state->bank_base[0x0000]); diff --git a/src/mame/audio/timeplt.c b/src/mame/audio/timeplt.c index 117bfbf099a..1a0e1e098af 100644 --- a/src/mame/audio/timeplt.c +++ b/src/mame/audio/timeplt.c @@ -91,9 +91,9 @@ static void filter_w( const device_config *device, int data ) { int C = 0; - if (data & 1) + if (data & 1) C += 220000; /* 220000pF = 0.220uF */ - if (data & 2) + if (data & 2) C += 47000; /* 47000pF = 0.047uF */ filter_rc_set_RC(device, FLT_RC_LOWPASS, 1000, 5100, 0, CAP_P(C)); diff --git a/src/mame/drivers/40love.c b/src/mame/drivers/40love.c index b9e5d108631..4c514ebca79 100644 --- a/src/mame/drivers/40love.c +++ b/src/mame/drivers/40love.c @@ -228,9 +228,9 @@ Notes - Has jumper setting for 122HZ or 61HZ) static TIMER_CALLBACK( nmi_callback ) { buggychl_state *state = (buggychl_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } @@ -1102,7 +1102,7 @@ static MACHINE_RESET( 40love ) static MACHINE_RESET( undoukai ) { buggychl_state *state = (buggychl_state *)machine->driver_data; - int i; + int i; MACHINE_RESET_CALL(common); diff --git a/src/mame/drivers/8080bw.c b/src/mame/drivers/8080bw.c index 3375a573e4b..6812a4e2282 100644 --- a/src/mame/drivers/8080bw.c +++ b/src/mame/drivers/8080bw.c @@ -2494,7 +2494,7 @@ ROM_START( invasionrza ) ROM_LOAD( "rz5-5.4k", 0x1400, 0x0400, CRC(8ec9eae2) SHA1(48d7a7dc61e0417ca4093e5c2a36efd96e359233) ) // 2 reads of the bad rom ROM_LOAD( "rz6-6.3k", 0x1800, 0x0400, BAD_DUMP CRC(c48df3ca) SHA1(d92064d171e099a45821c944324b993e39d894f7) ) - ROM_LOAD( "rz6-6.3ka", 0x1800, 0x0400, BAD_DUMP CRC(aa51b2c3) SHA1(bb30f3827a66ec3cb8436566f6b865995d702f76) ) + ROM_LOAD( "rz6-6.3ka", 0x1800, 0x0400, BAD_DUMP CRC(aa51b2c3) SHA1(bb30f3827a66ec3cb8436566f6b865995d702f76) ) ROM_LOAD( "rz7-7.2k", 0x1c00, 0x0400, CRC(27dbea48) SHA1(f0bf5d31424dc72ac2e6fa01c528365efff838d2) ) ROM_END diff --git a/src/mame/drivers/alpha68k.c b/src/mame/drivers/alpha68k.c index 53b4c1f8d15..08ecfea1859 100644 --- a/src/mame/drivers/alpha68k.c +++ b/src/mame/drivers/alpha68k.c @@ -346,14 +346,14 @@ static READ16_HANDLER( kyros_alpha_trigger_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int source = state->shared_ram[offset]; - switch (offset) + switch (offset) { case 0x22: /* Coin value */ state->shared_ram[0x22] = (source & 0xff00) | (state->credits & 0x00ff); return 0; case 0x29: /* Query microcontroller for coin insert */ state->trigstate++; - if ((input_port_read(space->machine, "IN2") & 0x3) == 3) + if ((input_port_read(space->machine, "IN2") & 0x3) == 3) state->latch = 0; if ((input_port_read(space->machine, "IN2") & 0x1) == 0 && !state->latch) { @@ -439,7 +439,7 @@ static READ16_HANDLER( alpha_II_trigger_r ) return 0; case 0x29: /* Query microcontroller for coin insert */ - if ((input_port_read(space->machine, "IN2") & 0x3) == 3) + if ((input_port_read(space->machine, "IN2") & 0x3) == 3) state->latch = 0; if ((input_port_read(space->machine, "IN2") & 0x1) == 0 && !state->latch) { @@ -532,7 +532,7 @@ static READ16_HANDLER( alpha_V_trigger_r ) state->shared_ram[0x22] = (source & 0xff00) | (state->credits & 0x00ff); return 0; case 0x29: /* Query microcontroller for coin insert */ - if ((input_port_read(space->machine, "IN2") & 0x3) == 3) + if ((input_port_read(space->machine, "IN2") & 0x3) == 3) state->latch = 0; if ((input_port_read(space->machine, "IN2") & 0x1) == 0 && !state->latch) { @@ -590,7 +590,7 @@ static READ16_HANDLER( alpha_V_trigger_r ) state->shared_ram[0x1f00] = (source & 0xff00) | input_port_read(space->machine, "IN4"); return 0; case 0x1f29: /* Query microcontroller for coin insert */ - if ((input_port_read(space->machine, "IN2") & 0x3) == 3) + if ((input_port_read(space->machine, "IN2") & 0x3) == 3) state->latch = 0; if ((input_port_read(space->machine, "IN2") & 0x1) == 0 && !state->latch) { @@ -3131,7 +3131,7 @@ static READ16_HANDLER( timesold_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; - if (cpu_get_pc(space->cpu) == 0x9ea2 && (ret & 0xff00) == 0) + if (cpu_get_pc(space->cpu) == 0x9ea2 && (ret & 0xff00) == 0) { cpu_spinuntil_int(space->cpu); return 0x100 | (ret & 0xff); @@ -3145,7 +3145,7 @@ static READ16_HANDLER( timesol1_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; - if (cpu_get_pc(space->cpu) == 0x9e20 && (ret & 0xff00) == 0) + if (cpu_get_pc(space->cpu) == 0x9e20 && (ret & 0xff00) == 0) { cpu_spinuntil_int(space->cpu); return 0x100 | (ret & 0xff); @@ -3159,7 +3159,7 @@ static READ16_HANDLER( btlfield_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; - if (cpu_get_pc(space->cpu) == 0x9e1c && (ret & 0xff00) == 0) + if (cpu_get_pc(space->cpu) == 0x9e1c && (ret & 0xff00) == 0) { cpu_spinuntil_int(space->cpu); return 0x100 | (ret & 0xff); @@ -3173,7 +3173,7 @@ static READ16_HANDLER( skysoldr_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; - if (cpu_get_pc(space->cpu) == 0x1f4e && (ret & 0xff00) == 0) + if (cpu_get_pc(space->cpu) == 0x1f4e && (ret & 0xff00) == 0) { cpu_spinuntil_int(space->cpu); return 0x100 | (ret & 0xff); @@ -3187,7 +3187,7 @@ static READ16_HANDLER( skyadvnt_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x4]; - if (cpu_get_pc(space->cpu) == 0x1f78 && (ret & 0xff00) == 0) + if (cpu_get_pc(space->cpu) == 0x1f78 && (ret & 0xff00) == 0) { cpu_spinuntil_int(space->cpu); return 0x100 | (ret & 0xff); @@ -3201,7 +3201,7 @@ static READ16_HANDLER( gangwars_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x103]; - if (cpu_get_pc(space->cpu) == 0xbbb6) + if (cpu_get_pc(space->cpu) == 0xbbb6) { cpu_spinuntil_int(space->cpu); return (ret + 2) & 0xff; @@ -3215,7 +3215,7 @@ static READ16_HANDLER( gangwarb_cycle_r ) alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; int ret = state->shared_ram[0x103]; - if (cpu_get_pc(space->cpu) == 0xbbca) + if (cpu_get_pc(space->cpu) == 0xbbca) { cpu_spinuntil_int(space->cpu); return (ret + 2) & 0xff; diff --git a/src/mame/drivers/amspdwy.c b/src/mame/drivers/amspdwy.c index d77fbadec0c..ee5118fd572 100644 --- a/src/mame/drivers/amspdwy.c +++ b/src/mame/drivers/amspdwy.c @@ -42,9 +42,9 @@ static UINT8 amspdwy_wheel_r( running_machine *machine, int index ) if (wheel != state->wheel_old[index]) { wheel = (wheel & 0x7fff) - (wheel & 0x8000); - if (wheel > state->wheel_old[index]) + if (wheel > state->wheel_old[index]) state->wheel_return[index] = ((+wheel) & 0xf) | 0x00; - else + else state->wheel_return[index] = ((-wheel) & 0xf) | 0x10; state->wheel_old[index] = wheel; diff --git a/src/mame/drivers/astrof.c b/src/mame/drivers/astrof.c index b139f39f613..d675d901010 100644 --- a/src/mame/drivers/astrof.c +++ b/src/mame/drivers/astrof.c @@ -248,9 +248,9 @@ static void tomahawk_get_pens( running_machine *machine, pen_t *pens ) for (i = 0; i < TOMAHAWK_NUM_PENS; i++) { - UINT8 data; + UINT8 data; UINT8 pen; - + /* a common wire hack to the pcb causes the prom halves to be inverted */ /* this results in e.g. astrof background being black */ switch (config) @@ -1269,7 +1269,7 @@ ROM_START( tomahawk ) ROM_REGION( 0x0020, "proms", 0 ) ROM_LOAD( "t777.clr", 0x0000, 0x0020, CRC(d6a528fd) SHA1(5fc08252a2d7c5405f601efbfb7d84bec328d733) ) - + // versions of this have also been seen using the standard Astro Fighter PROM, giving a blue submarine // in blue water, with pink / yellow borders. I think these are just unofficial conversions of Astro // Fighter without the PROM properly replaced tho. diff --git a/src/mame/drivers/atarig1.c b/src/mame/drivers/atarig1.c index 112e5aee622..ae215e2ed34 100644 --- a/src/mame/drivers/atarig1.c +++ b/src/mame/drivers/atarig1.c @@ -1073,7 +1073,7 @@ ROM_END static void init_g1_common(running_machine *machine, offs_t slapstic_base, int slapstic, int is_pitfight) { atarig1_state *state = (atarig1_state *)machine->driver_data; - + state->atarigen.eeprom_default = NULL; if (slapstic == -1) { diff --git a/src/mame/drivers/atarigt.c b/src/mame/drivers/atarigt.c index d413b719535..7277169b546 100644 --- a/src/mame/drivers/atarigt.c +++ b/src/mame/drivers/atarigt.c @@ -1241,7 +1241,7 @@ static WRITE32_HANDLER( tmek_pf_w ) static DRIVER_INIT( tmek ) { atarigt_state *state = (atarigt_state *)machine->driver_data; - + state->atarigen.eeprom_default = NULL; state->is_primrage = 0; diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index b404f08b6d2..e6f9638bdc0 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -211,7 +211,7 @@ static void scanline_update(const device_config *screen, int scanline) static DIRECT_UPDATE_HANDLER( atarisy2_direct_handler ) { atarisy2_state *state = (atarisy2_state *)space->machine->driver_data; - + /* make sure slapstic area looks like ROM */ if (address >= 0x8000 && address < 0x8200) { diff --git a/src/mame/drivers/bking.c b/src/mame/drivers/bking.c index e46d74ef789..99af0e8eea7 100644 --- a/src/mame/drivers/bking.c +++ b/src/mame/drivers/bking.c @@ -41,11 +41,11 @@ static WRITE8_HANDLER( bking_soundlatch_w ) int i, code = 0; for (i = 0;i < 8;i++) - if (data & (1 << i)) + if (data & (1 << i)) code |= 0x80 >> i; soundlatch_w(space, offset, code); - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); } @@ -395,7 +395,7 @@ GFXDECODE_END static WRITE8_DEVICE_HANDLER( port_b_w ) { /* don't know what this is... could be a filter */ - if (data != 0x00) + if (data != 0x00) logerror("port_b = %02x\n", data); } diff --git a/src/mame/drivers/buggychl.c b/src/mame/drivers/buggychl.c index 213a0b4428f..2d5eabc8f5b 100644 --- a/src/mame/drivers/buggychl.c +++ b/src/mame/drivers/buggychl.c @@ -99,9 +99,9 @@ static TIMER_CALLBACK( nmi_callback ) { buggychl_state *state = (buggychl_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c index f3b27577f4e..212bd39211c 100644 --- a/src/mame/drivers/coolridr.c +++ b/src/mame/drivers/coolridr.c @@ -1,19 +1,19 @@ /****************************************************************************************************** - System H1 (c) 1994 Sega + System H1 (c) 1994 Sega - preliminary driver by David Haywood, Angelo Salese and Tomasz Slanina - special thanks to Guru for references and HW advices + preliminary driver by David Haywood, Angelo Salese and Tomasz Slanina + special thanks to Guru for references and HW advices - TODO: - - DMA is still a bit of a mystery; - - video emulation is pratically non-existant; - - SCSP; - - Many SH-1 ports needs investigations; - - IRQ generation - - Understand & remove the hacks at the bottom; - - IC1/IC10 are currently unused, might contain sprite data / music data for the SCSP / chars for the - text tilemap/blitter; + TODO: + - DMA is still a bit of a mystery; + - video emulation is pratically non-existant; + - SCSP; + - Many SH-1 ports needs investigations; + - IRQ generation + - Understand & remove the hacks at the bottom; + - IC1/IC10 are currently unused, might contain sprite data / music data for the SCSP / chars for the + text tilemap/blitter; ======================================================================================================= @@ -339,7 +339,7 @@ static WRITE32_HANDLER(sysh1_ioga_w) } #endif /* -CMD = 03f4 PARAM = 0230 | ¦ +CMD = 03f4 PARAM = 0230 | ? CMD = ac90 PARAM = 0001 DATA = 00000000 CMD = ac90 PARAM = 0001 DATA = 00000059 CMD = ac90 PARAM = 0001 DATA = 00000000 @@ -353,7 +353,7 @@ CMD = ac90 PARAM = 0001 DATA = 01200050 CMD = ac90 PARAM = 0001 DATA = 00000000 CMD = ac90 PARAM = 0001 DATA = 03f40230 -CMD = 03f4 PARAM = 0170 | ¦ +CMD = 03f4 PARAM = 0170 | ? CMD = ac90 PARAM = 0001 DATA = 00000000 CMD = ac90 PARAM = 0001 DATA = 00000059 CMD = ac90 PARAM = 0001 DATA = 00000000 @@ -440,7 +440,7 @@ static WRITE32_HANDLER( sysh1_txt_blit_w ) memory_write_dword(space,(clear_vram),0x00000000); } //else - // printf("CMD = %04x PARAM = %04x DATA = %08x\n",cmd,param,data); + // printf("CMD = %04x PARAM = %04x DATA = %08x\n",cmd,param,data); break; } } @@ -654,7 +654,7 @@ static const gfx_layout test = #endif static GFXDECODE_START( coolridr ) -// GFXDECODE_ENTRY( "maincpu_data", 0, tiles8x8_layout, 0, 16 ) +// GFXDECODE_ENTRY( "maincpu_data", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx_data", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "gfx5", 0, tiles8x8_layout, 0, 16 ) GFXDECODE_ENTRY( "ram_gfx", 0, tiles8x8_layout, 0, 16 ) @@ -1009,12 +1009,12 @@ INPUT_PORTS_END static INTERRUPT_GEN( system_h1 ) { cpu_set_input_line(device, 4, HOLD_LINE); -/* switch(cpu_getiloops(device)) - { - case 0: break; +/* switch(cpu_getiloops(device)) + { + case 0: break; case 1:cpu_set_input_line(device, 6, HOLD_LINE); break; // case 2:cpu_set_input_line(device, 8, HOLD_LINE); break; - }*/ + }*/ } //IRQs 10,12 and 14 are valid on SH-1 instead @@ -1102,16 +1102,16 @@ ROM_START( coolridr ) ROM_LOAD32_WORD_SWAP( "mp17644.5", 0x1000002, 0x0200000, CRC(be2763c5) SHA1(1044b0a73e334337b0b9ac958df59480aedfb942) ) ROM_LOAD32_WORD_SWAP( "mp17649.10",0x1000000, 0x0200000, CRC(567fbc0a) SHA1(3999c99b26f13d97ac1c58de00a44049ee7775fd) ) -/* ROMX_LOAD( "mp17640.1", 0x0000000, 0x0200000, CRC(5ecd98c7) SHA1(22027c1e9e6195d27f29a5779695d8597f68809e), ROM_SKIP(9) ) - ROMX_LOAD( "mp17641.2", 0x0000001, 0x0200000, CRC(a59b0605) SHA1(c93f84fd58f1942b40b7a55058e02a18a3dec3af), ROM_SKIP(9) ) - ROMX_LOAD( "mp17642.3", 0x0000002, 0x0200000, CRC(5f8a1827) SHA1(23179d751777436f2a4f652132001d5e425d8cd5), ROM_SKIP(9) ) - ROMX_LOAD( "mp17643.4", 0x0000003, 0x0200000, CRC(44a05dd0) SHA1(32aa86f8761ec6ffceb63979c44828603c244e7d), ROM_SKIP(9) ) - ROMX_LOAD( "mp17644.5", 0x0000004, 0x0200000, CRC(be2763c5) SHA1(1044b0a73e334337b0b9ac958df59480aedfb942), ROM_SKIP(9) ) - ROMX_LOAD( "mp17645.6", 0x0000005, 0x0200000, CRC(00954173) SHA1(863f32565296448ef10992dc3c0480411eb2b193), ROM_SKIP(9) ) - ROMX_LOAD( "mp17646.7", 0x0000006, 0x0200000, CRC(7ae4d92e) SHA1(8a0eaa5dce112289ac5d16ad5dc7f5895e71e87b), ROM_SKIP(9) ) - ROMX_LOAD( "mp17647.8", 0x0000007, 0x0200000, CRC(082faee8) SHA1(c047b8475517f96f481c09471a77aa0d103631d6), ROM_SKIP(9) ) - ROMX_LOAD( "mp17648.9", 0x0000008, 0x0200000, CRC(0791802f) SHA1(acad55bbd22c7e955a729c8abed9509fc6f10927), ROM_SKIP(9) ) - ROMX_LOAD( "mp17649.10",0x0000009, 0x0200000, CRC(567fbc0a) SHA1(3999c99b26f13d97ac1c58de00a44049ee7775fd), ROM_SKIP(9) )*/ +/* ROMX_LOAD( "mp17640.1", 0x0000000, 0x0200000, CRC(5ecd98c7) SHA1(22027c1e9e6195d27f29a5779695d8597f68809e), ROM_SKIP(9) ) + ROMX_LOAD( "mp17641.2", 0x0000001, 0x0200000, CRC(a59b0605) SHA1(c93f84fd58f1942b40b7a55058e02a18a3dec3af), ROM_SKIP(9) ) + ROMX_LOAD( "mp17642.3", 0x0000002, 0x0200000, CRC(5f8a1827) SHA1(23179d751777436f2a4f652132001d5e425d8cd5), ROM_SKIP(9) ) + ROMX_LOAD( "mp17643.4", 0x0000003, 0x0200000, CRC(44a05dd0) SHA1(32aa86f8761ec6ffceb63979c44828603c244e7d), ROM_SKIP(9) ) + ROMX_LOAD( "mp17644.5", 0x0000004, 0x0200000, CRC(be2763c5) SHA1(1044b0a73e334337b0b9ac958df59480aedfb942), ROM_SKIP(9) ) + ROMX_LOAD( "mp17645.6", 0x0000005, 0x0200000, CRC(00954173) SHA1(863f32565296448ef10992dc3c0480411eb2b193), ROM_SKIP(9) ) + ROMX_LOAD( "mp17646.7", 0x0000006, 0x0200000, CRC(7ae4d92e) SHA1(8a0eaa5dce112289ac5d16ad5dc7f5895e71e87b), ROM_SKIP(9) ) + ROMX_LOAD( "mp17647.8", 0x0000007, 0x0200000, CRC(082faee8) SHA1(c047b8475517f96f481c09471a77aa0d103631d6), ROM_SKIP(9) ) + ROMX_LOAD( "mp17648.9", 0x0000008, 0x0200000, CRC(0791802f) SHA1(acad55bbd22c7e955a729c8abed9509fc6f10927), ROM_SKIP(9) ) + ROMX_LOAD( "mp17649.10",0x0000009, 0x0200000, CRC(567fbc0a) SHA1(3999c99b26f13d97ac1c58de00a44049ee7775fd), ROM_SKIP(9) )*/ ROM_END /*TODO: there must be an irq line with custom vector located somewhere that writes to here...*/ @@ -1135,7 +1135,7 @@ static READ32_HANDLER( coolridr_hack2_r ) static DRIVER_INIT( coolridr ) { -// memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x60d88a4, 0x060d88a7, 0, 0, coolridr_hack1_r ); +// memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x60d88a4, 0x060d88a7, 0, 0, coolridr_hack1_r ); memory_install_read32_handler(cputag_get_address_space(machine, "maincpu", ADDRESS_SPACE_PROGRAM), 0x60d8894, 0x060d8897, 0, 0, coolridr_hack2_r ); } diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 207dad6c0bb..27ec6495dd0 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -2174,7 +2174,7 @@ ROM_START( ffantasybl ) ROM_LOAD16_BYTE( "14.bin", 0x00000, 0x10000, CRC(bd42bc66) SHA1(d81a3d16ca282817f85372d1426470900a553b24) ) // 61.926270% ff-02-2.bin ROM_LOAD16_BYTE( "11.bin", 0x00001, 0x10000, CRC(4df38e4b) SHA1(e176afb7b63e2e1ac482662d152da2866884594e) ) // 55.798340% ff-01-2.bin ROM_LOAD16_BYTE( "13.bin", 0x20000, 0x10000, CRC(eecb6bed) SHA1(f5761bfc01ae207d3a321aa4ad510f6af8ad6094) ) // 86.532593% ew05 - ROM_LOAD16_BYTE( "10.bin", 0x20001, 0x10000, CRC(7cdcf418) SHA1(9653b6620dce70bd510fb63ba5c324dda581a412) ) // 85.887146% ew00 + ROM_LOAD16_BYTE( "10.bin", 0x20001, 0x10000, CRC(7cdcf418) SHA1(9653b6620dce70bd510fb63ba5c324dda581a412) ) // 85.887146% ew00 ROM_REGION( 0x10000, "audiocpu", 0 ) /* 6502 sound */ ROM_LOAD( "15.bin", 0x8000, 0x8000, CRC(9871b98d) SHA1(2b6c46bc2b10a28946d6ad8251e1a156a0b99947) ) @@ -2185,7 +2185,7 @@ ROM_START( ffantasybl ) ROM_REGION( 0x20000, "gfx1", 0 ) /* chars */ ROM_LOAD( "22.bin", 0x00000, 0x10000, CRC(686f72c1) SHA1(41d4fc1208d779f3428990a96586f6a555c28562) ) ROM_LOAD( "23.bin", 0x10000, 0x10000, CRC(28e69371) SHA1(32d57aabf948388825757ab0cfe87b6550a07a9d) ) // 94.793701% ev13 - + ROM_REGION( 0x20000, "gfx2", 0 ) /* tiles */ ROM_LOAD( "25.bin", 0x00000, 0x08000, CRC(6b80d7a3) SHA1(323162e7e0ce16f6244d8d98fdb2396ffef87e82) ) ROM_LOAD( "27.bin", 0x08000, 0x08000, CRC(78d3d764) SHA1(e8f77a23bd4f4d268bec7c0153fb957acd07cdee) ) @@ -2213,7 +2213,7 @@ ROM_START( ffantasybl ) ROM_REGION( 0x40000, "oki", 0 ) /* ADPCM samples */ ROM_LOAD( "30.bin", 0x0000, 0x10000, CRC(b606924d) SHA1(b759fcec10b333465cf5cd1b30987bf2d62186b2) ) ROM_END - + ROM_START( slyspy ) ROM_REGION( 0x60000, "maincpu", 0 ) /* 68000 code */ diff --git a/src/mame/drivers/dominob.c b/src/mame/drivers/dominob.c index 81c6401b957..dbb0c8a22b4 100644 --- a/src/mame/drivers/dominob.c +++ b/src/mame/drivers/dominob.c @@ -28,10 +28,10 @@ It's funny to see that this game, as 'arkanoid', does NOT allow you to enter "SEX" as initials (which will be replaced by "H !") ;) - + PCB Layout: - - + + |--------------------------------------| |UPC1241 U114 2016 | |DSW(8) VOL U113 | diff --git a/src/mame/drivers/expro02.c b/src/mame/drivers/expro02.c index f174a23ab06..d984918a931 100644 --- a/src/mame/drivers/expro02.c +++ b/src/mame/drivers/expro02.c @@ -649,7 +649,7 @@ ROM_END ROM_START( galsnewk ) /* EXPRO-02 PCB */ ROM_REGION( 0x40000, "maincpu", 0 ) /* 68000 code */ - ROM_LOAD16_BYTE( "pm110k.u87", 0x000000, 0x20000, CRC(babe6a71) SHA1(91a5fc5e93affd01f8c6d5a4851233edcf8746f0) ) + ROM_LOAD16_BYTE( "pm110k.u87", 0x000000, 0x20000, CRC(babe6a71) SHA1(91a5fc5e93affd01f8c6d5a4851233edcf8746f0) ) ROM_LOAD16_BYTE( "pm109k.u88", 0x000001, 0x20000, CRC(e486d98f) SHA1(9923f1dc69bd2746c06da6a5e518211391052259) ) ROM_REGION16_BE( 0x300000, "user1", 0 ) /* 68000 data */ diff --git a/src/mame/drivers/fromanc2.c b/src/mame/drivers/fromanc2.c index 17f5a51637c..094247754bb 100644 --- a/src/mame/drivers/fromanc2.c +++ b/src/mame/drivers/fromanc2.c @@ -59,7 +59,7 @@ static READ16_HANDLER( fromanc2_keymatrix_r ) fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; UINT16 ret; - switch (state->portselect) + switch (state->portselect) { case 0x01: ret = input_port_read(space->machine, "KEY0"); break; case 0x02: ret = input_port_read(space->machine, "KEY1"); break; @@ -99,7 +99,7 @@ static WRITE16_HANDLER( fromanc2_eeprom_w ) static WRITE16_HANDLER( fromancr_eeprom_w ) { - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { fromancr_gfxbank_w(space->machine, data & 0xfff8); input_port_write(space->machine, "EEPROMOUT", data, 0xff); diff --git a/src/mame/drivers/fromance.c b/src/mame/drivers/fromance.c index 27939d3543f..4bb1395a13b 100644 --- a/src/mame/drivers/fromance.c +++ b/src/mame/drivers/fromance.c @@ -82,9 +82,9 @@ static READ8_HANDLER( fromance_busycheck_main_r ) /* set a timer to force synchronization after the read */ timer_call_after_resynch(space->machine, NULL, 0, NULL); - if (!state->directionflag) + if (!state->directionflag) return 0x00; // standby - else + else return 0xff; // busy } @@ -93,9 +93,9 @@ static READ8_HANDLER( fromance_busycheck_sub_r ) { fromance_state *state = (fromance_state *)space->machine->driver_data; - if (state->directionflag) + if (state->directionflag) return 0xff; // standby - else + else return 0x00; // busy } diff --git a/src/mame/drivers/galaxia.c b/src/mame/drivers/galaxia.c index f8f83629dd3..4838468408b 100644 --- a/src/mame/drivers/galaxia.c +++ b/src/mame/drivers/galaxia.c @@ -37,7 +37,7 @@ static VIDEO_UPDATE( galaxia ) bitmap_t *s2636_0_bitmap; bitmap_t *s2636_1_bitmap; bitmap_t *s2636_2_bitmap; - + const device_config *s2636_0 = devtag_get_device(screen->machine, "s2636_0"); const device_config *s2636_1 = devtag_get_device(screen->machine, "s2636_1"); const device_config *s2636_2 = devtag_get_device(screen->machine, "s2636_2"); diff --git a/src/mame/drivers/galaxold.c b/src/mame/drivers/galaxold.c index ec25fceca8f..b8700fdfefd 100644 --- a/src/mame/drivers/galaxold.c +++ b/src/mame/drivers/galaxold.c @@ -3014,13 +3014,13 @@ The CPU has 'VIDEO STARS - V.S PRO - TEL: 03045 61541' on a sticky label on it. the cpu daughterboard is etched 'competitive video'. -The rom daughtercard may not have come from this precise pcb, -i think it was on a fullsize pcb according to the spacing of the riser pins. +The rom daughtercard may not have come from this precise pcb, +i think it was on a fullsize pcb according to the spacing of the riser pins. This daughterboard is also etched competitive video, and uses 4 2716's and 3 2732's. there are 8 rom sockets on this daughterboard, 7 are roms, and the final socket is actually a 6116 ram. -there is a small prom in the midle of the pcb inbetween the risers, +there is a small prom in the midle of the pcb inbetween the risers, with a circular red labelled saying 'k'. This might be a decryption prom or somethign? i dunno. there is a TBP18s03 PROM installed at 6L which i guess is the colour prom :) diff --git a/src/mame/drivers/gcpinbal.c b/src/mame/drivers/gcpinbal.c index f0cb661729b..a39d975f637 100644 --- a/src/mame/drivers/gcpinbal.c +++ b/src/mame/drivers/gcpinbal.c @@ -221,7 +221,7 @@ static void gcp_adpcm_int( const device_config *device ) state->adpcm_data = ((state->adpcm_trigger ? (ROM[state->adpcm_start] & 0x0f) : (ROM[state->adpcm_start] & 0xf0) >> 4)); msm5205_data_w(device, state->adpcm_data & 0xf); state->adpcm_trigger ^= 1; - if (state->adpcm_trigger == 0) + if (state->adpcm_trigger == 0) state->adpcm_start++; } } diff --git a/src/mame/drivers/ginganin.c b/src/mame/drivers/ginganin.c index 3d96b7f6b5d..dee1df55d73 100644 --- a/src/mame/drivers/ginganin.c +++ b/src/mame/drivers/ginganin.c @@ -308,7 +308,7 @@ static MACHINE_START( ginganin ) state->audiocpu = devtag_get_device(machine, "audiocpu"); - state_save_register_global(machine, state->layers_ctrl); + state_save_register_global(machine, state->layers_ctrl); state_save_register_global(machine, state->flipscreen); state_save_register_global(machine, state->MC6840_index0); state_save_register_global(machine, state->MC6840_register0); @@ -324,7 +324,7 @@ static MACHINE_RESET( ginganin ) { ginganin_state *state = (ginganin_state *)machine->driver_data; - state->layers_ctrl = 0; + state->layers_ctrl = 0; state->flipscreen = 0; state->MC6840_index0 = 0; state->MC6840_register0 = 0; diff --git a/src/mame/drivers/go2000.c b/src/mame/drivers/go2000.c index 0495b552480..7552eee8c35 100644 --- a/src/mame/drivers/go2000.c +++ b/src/mame/drivers/go2000.c @@ -40,7 +40,7 @@ struct _go2000_state /* memory pointers */ UINT16 * videoram; UINT16 * videoram2; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling /* devices */ const device_config *soundcpu; @@ -230,29 +230,29 @@ static VIDEO_UPDATE(go2000) case 0xc: dimx = 4; dimy = 32; y0 = 0x120; break; } - if (dimx == 4) - { - flipx = srcx & 2; - srcx &= ~2; + if (dimx == 4) + { + flipx = srcx & 2; + srcx &= ~2; } - else + else flipx = 0; x = (x & 0xff) - (x & 0x100); y = (y0 - (y & 0xff) - dimy * 8) & 0xff; - if (flipx) - { - tile_xstart = dimx - 1; - tile_xinc = -1; + if (flipx) + { + tile_xstart = dimx - 1; + tile_xinc = -1; } else - { - tile_xstart = 0; - tile_xinc = +1; + { + tile_xstart = 0; + tile_xinc = +1; } - tile_y = 0; + tile_y = 0; tile_yinc = +1; for (dy = 0; dy < dimy * 8; dy += 8) @@ -271,7 +271,7 @@ static VIDEO_UPDATE(go2000) int tile_flipx = tile & 0x4000; int tile_flipy = tile & 0x8000; - if (flipx) + if (flipx) tile_flipx = !tile_flipx; if (flip_screen_get(screen->machine)) diff --git a/src/mame/drivers/good.c b/src/mame/drivers/good.c index d8b24b16ede..fd848b446c1 100644 --- a/src/mame/drivers/good.c +++ b/src/mame/drivers/good.c @@ -42,7 +42,7 @@ struct _good_state UINT16 * bg_tilemapram; UINT16 * fg_tilemapram; UINT16 * sprites; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap *bg_tilemap,*fg_tilemap; diff --git a/src/mame/drivers/gstream.c b/src/mame/drivers/gstream.c index 55c3cfed707..79973aebc95 100644 --- a/src/mame/drivers/gstream.c +++ b/src/mame/drivers/gstream.c @@ -133,7 +133,7 @@ struct _gstream_state UINT32 * vram; UINT32 * workram; UINT32 * paletteram; -// UINT32 * nvram; // currently this uses generic nvram handling +// UINT32 * nvram; // currently this uses generic nvram handling /* video-related */ tilemap *tilemap1, *tilemap2, *tilemap3; @@ -216,40 +216,40 @@ static WRITE32_HANDLER( gstream_vram_w ) } } -static WRITE32_HANDLER( gstream_tilemap1_scrollx_w ) -{ +static WRITE32_HANDLER( gstream_tilemap1_scrollx_w ) +{ gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap1_scrollx = data; + state->tmap1_scrollx = data; } -static WRITE32_HANDLER( gstream_tilemap1_scrolly_w ) -{ +static WRITE32_HANDLER( gstream_tilemap1_scrolly_w ) +{ gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap1_scrolly = data; + state->tmap1_scrolly = data; } -static WRITE32_HANDLER( gstream_tilemap2_scrollx_w ) +static WRITE32_HANDLER( gstream_tilemap2_scrollx_w ) { gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap2_scrollx = data; + state->tmap2_scrollx = data; } -static WRITE32_HANDLER( gstream_tilemap2_scrolly_w ) -{ +static WRITE32_HANDLER( gstream_tilemap2_scrolly_w ) +{ gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap2_scrolly = data; + state->tmap2_scrolly = data; } -static WRITE32_HANDLER( gstream_tilemap3_scrollx_w ) -{ +static WRITE32_HANDLER( gstream_tilemap3_scrollx_w ) +{ gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap3_scrollx = data; + state->tmap3_scrollx = data; } -static WRITE32_HANDLER( gstream_tilemap3_scrolly_w ) -{ +static WRITE32_HANDLER( gstream_tilemap3_scrolly_w ) +{ gstream_state *state = (gstream_state *)space->machine->driver_data; - state->tmap3_scrolly = data; + state->tmap3_scrolly = data; } static ADDRESS_MAP_START( gstream_32bit_map, ADDRESS_SPACE_PROGRAM, 32 ) @@ -482,11 +482,11 @@ static VIDEO_UPDATE(gstream) //popmessage("(1) %08x %08x (2) %08x %08x (3) %08x %08x", state->tmap1_scrollx, state->tmap1_scrolly, state->tmap2_scrollx, state->tmap2_scrolly, state->tmap3_scrollx, state->tmap3_scrolly ); tilemap_set_scrollx(state->tilemap3, 0, state->tmap3_scrollx >> 16); - tilemap_set_scrolly(state->tilemap3, 0, state->tmap3_scrolly >> 16); + tilemap_set_scrolly(state->tilemap3, 0, state->tmap3_scrolly >> 16); tilemap_set_scrollx(state->tilemap1, 0, state->tmap1_scrollx >> 16); tilemap_set_scrolly(state->tilemap1, 0, state->tmap1_scrolly >> 16); - + tilemap_set_scrollx(state->tilemap2, 0, state->tmap2_scrollx >> 16); tilemap_set_scrolly(state->tilemap2, 0, state->tmap2_scrolly >> 16); diff --git a/src/mame/drivers/hnayayoi.c b/src/mame/drivers/hnayayoi.c index eba1bcbfe7b..325f22f4a46 100644 --- a/src/mame/drivers/hnayayoi.c +++ b/src/mame/drivers/hnayayoi.c @@ -48,7 +48,7 @@ static READ8_HANDLER( keyboard_0_r ) for (i = 0; i < 5; i++) { - if (~state->keyb & (1 << i)) + if (~state->keyb & (1 << i)) res &= input_port_read(space->machine, keynames[i]); } diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c index 1f42df0b456..6222503667f 100644 --- a/src/mame/drivers/hng64.c +++ b/src/mame/drivers/hng64.c @@ -1088,10 +1088,10 @@ static ADDRESS_MAP_START( hng_map, ADDRESS_SPACE_PROGRAM, 32 ) AM_RANGE(0x60200000, 0x603fffff) AM_READWRITE(hng64_soundram_r, hng64_soundram_w) // uploads the v53 sound program here, elsewhere on ss64-2 // These are sound ports of some sort -// AM_RANGE(0x68000000, 0x68000003) AM_WRITENOP // ?? -// AM_RANGE(0x68000004, 0x68000007) AM_READNOP // ?? -// AM_RANGE(0x68000008, 0x6800000b) AM_WRITENOP // ?? -// AM_RANGE(0x6f000000, 0x6f000003) AM_WRITENOP // halt / reset line for the sound CPU +// AM_RANGE(0x68000000, 0x68000003) AM_WRITENOP // ?? +// AM_RANGE(0x68000004, 0x68000007) AM_READNOP // ?? +// AM_RANGE(0x68000008, 0x6800000b) AM_WRITENOP // ?? +// AM_RANGE(0x6f000000, 0x6f000003) AM_WRITENOP // halt / reset line for the sound CPU // Communications AM_RANGE(0xc0000000, 0xc0000fff) AM_READWRITE(hng64_com_r, hng64_com_w) AM_BASE(&hng64_com_ram) diff --git a/src/mame/drivers/homedata.c b/src/mame/drivers/homedata.c index b17e032325f..4de5767c8e4 100644 --- a/src/mame/drivers/homedata.c +++ b/src/mame/drivers/homedata.c @@ -272,7 +272,7 @@ static READ8_HANDLER( mrokumei_keyboard_r ) */ res |= state->visible_page << 7; - if (state->vblank) + if (state->vblank) res |= 0x40; state->vblank = 0; @@ -384,7 +384,7 @@ static READ8_HANDLER( reikaids_io_r ) res |= BIT(state->upd7807_portc, 2) * 0x01; // bit 0 = upd7807 status res |= BIT(state->upd7807_portc, 6) * 0x02; // bit 1 = upd7807 data - if (state->vblank) + if (state->vblank) res |= 0x04; // bit 2 = vblank res |= state->visible_page * 0x08; // bit 3 = visible page @@ -442,7 +442,7 @@ static READ8_HANDLER( pteacher_io_r ) int res = (state->visible_page ^ 1) << 7; - if (!state->vblank) + if (!state->vblank) res |= 0x40; state->vblank = 0; diff --git a/src/mame/drivers/hotblock.c b/src/mame/drivers/hotblock.c index 3172fd85e0d..03d05a244a6 100644 --- a/src/mame/drivers/hotblock.c +++ b/src/mame/drivers/hotblock.c @@ -154,7 +154,7 @@ static VIDEO_UPDATE(hotblock) { for(x = 0; x < xxx; x++) { - if (state->port0 & 0x40) + if (state->port0 & 0x40) *BITMAP_ADDR16(bitmap, y, x) = state->vram[count]; count++; } diff --git a/src/mame/drivers/hyprduel.c b/src/mame/drivers/hyprduel.c index b1d723039ef..0556a3346a9 100644 --- a/src/mame/drivers/hyprduel.c +++ b/src/mame/drivers/hyprduel.c @@ -72,8 +72,8 @@ static INTERRUPT_GEN( hyprduel_interrupt ) cpu_set_input_line(device, 2, HOLD_LINE); /* the duration is a guess */ timer_set(device->machine, ATTOTIME_IN_USEC(2500), NULL, 0x20, vblank_end_callback); - } - else + } + else state->requested_int |= 0x12; /* hsync */ update_irq_state(device->machine); @@ -215,9 +215,9 @@ static READ16_HANDLER( hyprduel_bankedrom_r ) offset = offset * 2 + 0x10000 * (*state->rombank); - if (offset < len) + if (offset < len) return ((ROM[offset + 0] << 8) + ROM[offset + 1]); - else + else return 0xffff; } diff --git a/src/mame/drivers/imolagp.c b/src/mame/drivers/imolagp.c index 580e6396025..309d0f24c7b 100644 --- a/src/mame/drivers/imolagp.c +++ b/src/mame/drivers/imolagp.c @@ -150,7 +150,7 @@ static READ8_HANDLER( receive_data_r ) #endif static void initialize_colors( running_machine *machine ) -{ +{ /* optional runtime remapping of colors */ static const UINT8 color[0x10][3] = { /* wrong! need color-accurate screenshots to fix */ diff --git a/src/mame/drivers/inufuku.c b/src/mame/drivers/inufuku.c index 43577b8b66e..a41b185bcb9 100644 --- a/src/mame/drivers/inufuku.c +++ b/src/mame/drivers/inufuku.c @@ -84,10 +84,10 @@ TODO: static WRITE16_HANDLER( inufuku_soundcommand_w ) { inufuku_state *state = (inufuku_state *)space->machine->driver_data; - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) { /* hack... sound doesn't work otherwise */ - if (data == 0x08) + if (data == 0x08) return; state->pending_command = 1; diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index e2b3a1f1a48..35f041f68ea 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -121,7 +121,7 @@ WRITE8_HANDLER( jackal_rambank_w ) jackal_state *state = (jackal_state *)space->machine->driver_data; UINT8 *rgn = memory_region(space->machine, "master"); - if (data & 0x04) + if (data & 0x04) popmessage("jackal_rambank_w %02x", data); coin_counter_w(space->machine, 0, data & 0x01); diff --git a/src/mame/drivers/jailbrek.c b/src/mame/drivers/jailbrek.c index 47cf1f0bfdf..d333d852a7b 100644 --- a/src/mame/drivers/jailbrek.c +++ b/src/mame/drivers/jailbrek.c @@ -118,12 +118,12 @@ static INTERRUPT_GEN( jb_interrupt_nmi ) } -static READ8_DEVICE_HANDLER( jailbrek_speech_r ) +static READ8_DEVICE_HANDLER( jailbrek_speech_r ) { return (vlm5030_bsy(device) ? 1 : 0); } -static WRITE8_DEVICE_HANDLER( jailbrek_speech_w ) +static WRITE8_DEVICE_HANDLER( jailbrek_speech_w ) { /* bit 0 could be latch direction like in yiear */ vlm5030_st(device, (data >> 1) & 1); diff --git a/src/mame/drivers/jangou.c b/src/mame/drivers/jangou.c index 2e406b27907..1d45002130a 100644 --- a/src/mame/drivers/jangou.c +++ b/src/mame/drivers/jangou.c @@ -161,9 +161,9 @@ static UINT8 jangou_gfx_nibble( running_machine *machine, UINT16 niboffset ) static void plot_jangou_gfx_pixel( running_machine *machine, UINT8 pix, int x, int y ) { jangou_state *state = (jangou_state *)machine->driver_data; - if (y < 0 || y >= 512) + if (y < 0 || y >= 512) return; - if (x < 0 || x >= 512) + if (x < 0 || x >= 512) return; if (x & 1) @@ -184,7 +184,7 @@ static WRITE8_HANDLER( blitter_process_w ) int xcount, ycount; /* printf("%02x %02x %02x %02x %02x %02x\n", state->blit_data[0], state->blit_data[1], state->blit_data[2], - state->blit_data[3], state->blit_data[4], state->blit_data[5]); */ + state->blit_data[3], state->blit_data[4], state->blit_data[5]); */ w = (state->blit_data[4] & 0xff) + 1; h = (state->blit_data[5] & 0xff) + 1; src = ((state->blit_data[1] << 8)|(state->blit_data[0] << 0)); @@ -194,9 +194,9 @@ static WRITE8_HANDLER( blitter_process_w ) // lowest bit of src controls flipping / draw direction? flipx = (state->blit_data[0] & 1); - if (!flipx) + if (!flipx) src += (w * h) - 1; - else + else src -= (w * h) - 1; for (ycount = 0; ycount < h; ycount++) @@ -214,9 +214,9 @@ static WRITE8_HANDLER( blitter_process_w ) if ((dat & 0xff) != 0) plot_jangou_gfx_pixel(space->machine, dat, drawx, drawy); - if (!flipx) + if (!flipx) count--; - else + else count++; } } diff --git a/src/mame/drivers/jollyjgr.c b/src/mame/drivers/jollyjgr.c index b4ffed25057..4428565f4be 100644 --- a/src/mame/drivers/jollyjgr.c +++ b/src/mame/drivers/jollyjgr.c @@ -396,7 +396,7 @@ static VIDEO_UPDATE( jollyjgr ) else sy = 240 - sy; - if (offs < 3 * 4) + if (offs < 3 * 4) sy++; drawgfx_transpen(bitmap,cliprect,screen->machine->gfx[1], diff --git a/src/mame/drivers/jongkyo.c b/src/mame/drivers/jongkyo.c index 8760c38ca69..984eaba17e7 100644 --- a/src/mame/drivers/jongkyo.c +++ b/src/mame/drivers/jongkyo.c @@ -416,7 +416,7 @@ INPUT_PORTS_END /************************************* * - * Palette initialization and + * Palette initialization and * graphics definitions * *************************************/ diff --git a/src/mame/drivers/junofrst.c b/src/mame/drivers/junofrst.c index 831e6a2579e..b92a8891e04 100644 --- a/src/mame/drivers/junofrst.c +++ b/src/mame/drivers/junofrst.c @@ -122,9 +122,9 @@ static WRITE8_DEVICE_HANDLER( junofrst_portB_w ) { int C = 0; - if (data & 1) + if (data & 1) C += 47000; /* 47000pF = 0.047uF */ - if (data & 2) + if (data & 2) C += 220000; /* 220000pF = 0.22uF */ data >>= 2; diff --git a/src/mame/drivers/karnov.c b/src/mame/drivers/karnov.c index 8e3e4f1e1bb..b1b4e10ad60 100644 --- a/src/mame/drivers/karnov.c +++ b/src/mame/drivers/karnov.c @@ -69,9 +69,9 @@ static void karnov_i8751_w( running_machine *machine, int data ) state->i8751_return = 0x56a; if (data == 0x100 && state->microcontroller_id == KARNOV) /* USA version */ - state->i8751_return = 0x56b; + state->i8751_return = 0x56b; - if ((data & 0xf00) == 0x300) + if ((data & 0xf00) == 0x300) state->i8751_return = (data & 0xff) * 0x12; /* Player sprite mapping */ /* I'm not sure the ones marked ^ appear in the right order */ @@ -182,7 +182,7 @@ static void chelnov_i8751_w( running_machine *machine, int data ) if (data == 0x100 && state->microcontroller_id == CHELNOVW) /* World version */ state->i8751_return = 0x71c; - if (data >= 0x6000 && data < 0x8000) + if (data >= 0x6000 && data < 0x8000) state->i8751_return = 1; /* patched */ if ((data & 0xf000) == 0x1000) state->i8751_level = 1; /* Level 1 */ @@ -205,7 +205,7 @@ static void chelnov_i8751_w( running_machine *machine, int data ) else state->i8751_return = 5; } else /* Japan, World */ - { + { if (b < 3) state->i8751_return = 0; else if (b < 8) state->i8751_return = 1; else if (b < 0xc) state->i8751_return = 2; @@ -332,11 +332,11 @@ static WRITE16_HANDLER( karnov_control_w ) break; case 6: /* SECREQ (Interrupt & Data to i8751) */ - if (state->microcontroller_id == KARNOV || state->microcontroller_id == KARNOVJ) + if (state->microcontroller_id == KARNOV || state->microcontroller_id == KARNOVJ) karnov_i8751_w(space->machine, data); - if (state->microcontroller_id == CHELNOV || state->microcontroller_id == CHELNOVJ || state->microcontroller_id == CHELNOVW) + if (state->microcontroller_id == CHELNOV || state->microcontroller_id == CHELNOVJ || state->microcontroller_id == CHELNOVW) chelnov_i8751_w(space->machine, data); - if (state->microcontroller_id == WNDRPLNT) + if (state->microcontroller_id == WNDRPLNT) wndrplnt_i8751_w(space->machine, data); break; @@ -720,7 +720,7 @@ static INTERRUPT_GEN( karnov_interrupt ) karnov_state *state = (karnov_state *)device->machine->driver_data; /* Coin input to the i8751 generates an interrupt to the main cpu */ - if (input_port_read(device->machine, "FAKE") == state->coin_mask) + if (input_port_read(device->machine, "FAKE") == state->coin_mask) state->latch = 1; if (input_port_read(device->machine, "FAKE") != state->coin_mask && state->latch) @@ -790,7 +790,7 @@ static MACHINE_RESET( karnov ) state->i8751_coin_pending = 0; state->i8751_command_queue = 0; state->i8751_level = 0; -// state->latch = 0; +// state->latch = 0; state->flipscreen = 0; state->scroll[0] = 0; diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index b3ecb6a5d2c..29d4506dd10 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -207,7 +207,7 @@ static WRITE16_DEVICE_HANDLER( actionhw_snd_w ) kickgoal_state *state = (kickgoal_state *)device->machine->driver_data; logerror("%s: Writing %04x to Sound CPU - mask %04x\n",cpuexec_describe_context(device->machine),data,mem_mask); - if (!ACCESSING_BITS_0_7) + if (!ACCESSING_BITS_0_7) data >>= 8; switch (data) @@ -216,11 +216,11 @@ static WRITE16_DEVICE_HANDLER( actionhw_snd_w ) case 0xfd: okim6295_set_bank_base(device, (2 * 0x40000)); break; case 0xfe: okim6295_set_bank_base(device, (1 * 0x40000)); break; case 0xff: okim6295_set_bank_base(device, (3 * 0x40000)); break; - case 0x78: + case 0x78: okim6295_w(device, 0, data); state->snd_sam[0] = 00; state->snd_sam[1]= 00; state->snd_sam[2] = 00; state->snd_sam[3] = 00; break; - default: + default: if (state->snd_new) /* Play new sample */ { if ((data & 0x80) && (state->snd_sam[3] != state->snd_new)) @@ -333,14 +333,14 @@ static INTERRUPT_GEN( kickgoal_interrupt ) { state->m6295_bank += 0x01; state->m6295_bank &= 0x03; - if (state->m6295_bank == 0x03) + if (state->m6295_bank == 0x03) state->m6295_bank = 0x00; popmessage("Changing Bank to %02x", state->m6295_bank); okim6295_set_bank_base(state->adpcm, ((state->m6295_bank) * 0x40000)); - if (state->m6295_key_delay == 0xffff) + if (state->m6295_key_delay == 0xffff) state->m6295_key_delay = 0x00; - else + else state->m6295_key_delay = (0x30 * oki_time_base); } else @@ -352,14 +352,14 @@ static INTERRUPT_GEN( kickgoal_interrupt ) { state->m6295_bank -= 0x01; state->m6295_bank &= 0x03; - if (state->m6295_bank == 0x03) + if (state->m6295_bank == 0x03) state->m6295_bank = 0x02; popmessage("Changing Bank to %02x", state->m6295_bank); okim6295_set_bank_base(state->adpcm, ((state->m6295_bank) * 0x40000)); - if (state->m6295_key_delay == 0xffff) + if (state->m6295_key_delay == 0xffff) state->m6295_key_delay = 0x00; - else + else state->m6295_key_delay = (0x30 * oki_time_base); } else @@ -378,9 +378,9 @@ static INTERRUPT_GEN( kickgoal_interrupt ) if (state->m6295_comm == 0x70) { okim6295_set_bank_base(state->adpcm, (1 * 0x40000)); state->m6295_bank = 1; } popmessage("Sound test command %02x on Bank %02x", state->m6295_comm, state->m6295_bank); - if (state->m6295_key_delay == 0xffff) + if (state->m6295_key_delay == 0xffff) state->m6295_key_delay = 0x00; - else + else state->m6295_key_delay = (0x5d * oki_time_base); } else @@ -399,9 +399,9 @@ static INTERRUPT_GEN( kickgoal_interrupt ) if (state->m6295_comm == 0x76) { okim6295_set_bank_base(state->adpcm, (1 * 0x40000)); state->m6295_bank = 1; } popmessage("Sound test command %02x on Bank %02x", state->m6295_comm, state->m6295_bank); - if (state->m6295_key_delay == 0xffff) + if (state->m6295_key_delay == 0xffff) state->m6295_key_delay = 0x00; - else + else state->m6295_key_delay = (0x5d * oki_time_base); } else @@ -417,16 +417,16 @@ static INTERRUPT_GEN( kickgoal_interrupt ) popmessage("Playing sound %02x on Bank %02x", state->m6295_comm, state->m6295_bank); - if (state->m6295_key_delay == 0xffff) + if (state->m6295_key_delay == 0xffff) state->m6295_key_delay = 0x00; - else + else state->m6295_key_delay = (0x60 * oki_time_base); } else state->m6295_key_delay += (0x01 * oki_time_base); // logerror("Sending %02x to the sound CPU\n", state->m6295_comm); } - else + else state->m6295_key_delay = 0xffff; } diff --git a/src/mame/drivers/koikoi.c b/src/mame/drivers/koikoi.c index 2a0783bc528..44f3e5876a2 100644 --- a/src/mame/drivers/koikoi.c +++ b/src/mame/drivers/koikoi.c @@ -139,10 +139,10 @@ static READ8_DEVICE_HANDLER( input_r ) if (key) { - while (!(key & 1)) - { - key >>= 1; - keyval++; + while (!(key & 1)) + { + key >>= 1; + keyval++; } } diff --git a/src/mame/drivers/ksayakyu.c b/src/mame/drivers/ksayakyu.c index 40a9d51478d..3501164f198 100644 --- a/src/mame/drivers/ksayakyu.c +++ b/src/mame/drivers/ksayakyu.c @@ -173,17 +173,17 @@ INPUT_PORTS_END static WRITE8_DEVICE_HANDLER(dummy1_w) { -// printf("%02x 1\n", data); +// printf("%02x 1\n", data); } static WRITE8_DEVICE_HANDLER(dummy2_w) { -// printf("%02x 2\n", data); +// printf("%02x 2\n", data); } static WRITE8_DEVICE_HANDLER(dummy3_w) { -// printf("%02x 3\n", data); +// printf("%02x 3\n", data); } diff --git a/src/mame/drivers/kyugo.c b/src/mame/drivers/kyugo.c index e0b7b21a72a..c6fe680a994 100644 --- a/src/mame/drivers/kyugo.c +++ b/src/mame/drivers/kyugo.c @@ -1192,7 +1192,7 @@ on main PCB (CR208): on roms PCB (CR207): 7x M27256 (5,6,7,8,9,10,11) 3x PROM N82S129N -2x PROM DM74S288N (one is blank!) +2x PROM DM74S288N (one is blank!) the only real difference seems to be that you get less lives. @@ -1247,7 +1247,7 @@ ROM_START( skywolf3 ) //ROM_LOAD( "82s129-3.bin", 0x0200, 0x0100, CRC(6b0980bf) SHA1(6314f9e593f2d2a2f014f6eb82295cb3aa70cbd1)) ) /* blue (bad) - high bit of colour fixed to 0 */ ROM_LOAD( "82s129-2.bin", 0x0100, 0x0100, CRC(ec0923d3) SHA1(26f9eda4260a8b767893b8dea42819f192ef0b20) ) /* green */ ROM_LOAD( "82s129-3.bin", 0x0200, 0x0100, CRC(ade97052) SHA1(cc1b4cd57d7bc55ce44de6b89a322ff08eabb1a0) ) /* blue */ - ROM_LOAD( "74s288-2.bin", 0x0300, 0x0020, CRC(190a55ad) SHA1(de8a847bff8c343d69b853a215e6ee775ef2ef96) ) /* blank lookup prom */ + ROM_LOAD( "74s288-2.bin", 0x0300, 0x0020, CRC(190a55ad) SHA1(de8a847bff8c343d69b853a215e6ee775ef2ef96) ) /* blank lookup prom */ ROM_LOAD( "74s288-1.bin", 0x0320, 0x0020, CRC(5ddb2d15) SHA1(422663566ebc7ea8cbc3089d806b0868e006fe0c) ) /* timing? not used */ ROM_END diff --git a/src/mame/drivers/ladyfrog.c b/src/mame/drivers/ladyfrog.c index 1466768d4a1..99902d8a9cf 100644 --- a/src/mame/drivers/ladyfrog.c +++ b/src/mame/drivers/ladyfrog.c @@ -78,9 +78,9 @@ static TIMER_CALLBACK( nmi_callback ) { ladyfrog_state *state = (ladyfrog_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } @@ -405,4 +405,4 @@ ROM_END GAME( 1990, ladyfrog, 0, ladyfrog, ladyfrog, 0, ORIENTATION_SWAP_XY, "Mondial Games", "Lady Frog", GAME_SUPPORTS_SAVE ) // toucheme art style is similar to ladyfrog, so it's probably the same manufacturer -GAME( 19??, toucheme, 0, toucheme, toucheme, 0, ORIENTATION_SWAP_XY, "", "Touche Me", GAME_SUPPORTS_SAVE ) +GAME( 19??, toucheme, 0, toucheme, toucheme, 0, ORIENTATION_SWAP_XY, "", "Touche Me", GAME_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index ab6c7ef8fcf..ae150703c07 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -584,16 +584,16 @@ static const sn76477_interface laserbat_sn76477_interface = /* Cat'N Mouse sound ***********************************/ -static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0a ) -{ +static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0a ) +{ laserbat_state *laserbat = (laserbat_state *)device->machine->driver_data; - cpu_set_input_line(laserbat->audiocpu, INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); + cpu_set_input_line(laserbat->audiocpu, INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE); } -static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0b ) -{ +static WRITE_LINE_DEVICE_HANDLER( zaccaria_irq0b ) +{ laserbat_state *laserbat = (laserbat_state *)device->machine->driver_data; - cpu_set_input_line(laserbat->audiocpu, 0, state ? ASSERT_LINE : CLEAR_LINE); + cpu_set_input_line(laserbat->audiocpu, 0, state ? ASSERT_LINE : CLEAR_LINE); } static READ8_DEVICE_HANDLER( zaccaria_port0a_r ) diff --git a/src/mame/drivers/lastfght.c b/src/mame/drivers/lastfght.c index 435d60872c9..a1f98682c6d 100644 --- a/src/mame/drivers/lastfght.c +++ b/src/mame/drivers/lastfght.c @@ -71,7 +71,7 @@ struct _lastfght_state { /* memory pointers */ UINT8 * colorram; -// UINT8 * nvram; // currently this uses generic nvram handling +// UINT8 * nvram; // currently this uses generic nvram handling /* video-related */ bitmap_t *bitmap[2]; @@ -179,7 +179,7 @@ static WRITE16_HANDLER( lastfght_hi_w ) { lastfght_state *state = (lastfght_state *)space->machine->driver_data; - if (ACCESSING_BITS_8_15) + if (ACCESSING_BITS_8_15) logerror("%06x: 600000.b = %02x\n", cpu_get_pc(space->cpu), data >> 8); if (ACCESSING_BITS_0_7) { @@ -229,7 +229,7 @@ static WRITE16_HANDLER( lastfght_h_w ) state->h = state->hi | (data >> 8); //logerror("%06x: lastfght_h = %02x\n", cpu_get_pc(space->cpu), data >> 8); } - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) logerror("%06x: 80000d.b = %02x\n", cpu_get_pc(space->cpu), data); } @@ -336,7 +336,7 @@ static WRITE16_HANDLER( lastfght_blit_w ) } } } - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) logerror("%06x: 600007.b = %02x\n", cpu_get_pc(space->cpu), data); } @@ -345,7 +345,7 @@ static WRITE16_HANDLER( lastfght_dest_w ) { lastfght_state *state = (lastfght_state *)space->machine->driver_data; - if (ACCESSING_BITS_0_7) + if (ACCESSING_BITS_0_7) state->dest ^= 1; } @@ -394,7 +394,7 @@ static READ16_HANDLER( lastfght_sound_r ) static WRITE16_HANDLER( lastfght_sound_w ) { - if (ACCESSING_BITS_8_15) + if (ACCESSING_BITS_8_15) logerror("%06x: sound_w msb = %02x\n", cpu_get_pc(space->cpu), data >> 8); if (ACCESSING_BITS_0_7) logerror("%06x: sound_w lsb = %02x\n", cpu_get_pc(space->cpu), data); diff --git a/src/mame/drivers/lazercmd.c b/src/mame/drivers/lazercmd.c index cb06258ea66..ee5c16cfa9e 100644 --- a/src/mame/drivers/lazercmd.c +++ b/src/mame/drivers/lazercmd.c @@ -241,7 +241,7 @@ static INTERRUPT_GEN( lazercmd_timer ) { lazercmd_state *state = (lazercmd_state *)device->machine->driver_data; - if (++state->timer_count >= 64 * 128) + if (++state->timer_count >= 64 * 128) { state->timer_count = 0; state->sense_state ^= 1; @@ -379,7 +379,7 @@ static READ8_HANDLER( lazercmd_hardware_r ) data = input_port_read(space->machine, "IN2"); break; case 4: /* vertical scan counter */ - data = ((state->timer_count & 0x10) >> 1) | ((state->timer_count & 0x20) >> 3) + data = ((state->timer_count & 0x10) >> 1) | ((state->timer_count & 0x20) >> 3) | ((state->timer_count & 0x40) >> 5) | ((state->timer_count & 0x80) >> 7); break; case 5: /* vertical scan counter */ @@ -631,10 +631,10 @@ static MACHINE_DRIVER_START( lazercmd ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 672 kHz? */ -/* Main Clock is 8MHz divided by 12 - but memory and IO access is only possible - within the line and frame blanking period - thus requiring an extra loading of approx 3-5 */ +/* Main Clock is 8MHz divided by 12 + but memory and IO access is only possible + within the line and frame blanking period + thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(lazercmd_map) MDRV_CPU_IO_MAP(lazercmd_portmap) MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */ @@ -672,10 +672,10 @@ static MACHINE_DRIVER_START( medlanes ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */ -/* Main Clock is 8MHz divided by 12 - but memory and IO access is only possible - within the line and frame blanking period - thus requiring an extra loading of approx 3-5 */ +/* Main Clock is 8MHz divided by 12 + but memory and IO access is only possible + within the line and frame blanking period + thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(medlanes_map) MDRV_CPU_IO_MAP(lazercmd_portmap) MDRV_CPU_VBLANK_INT_HACK(lazercmd_timer, 128) /* 7680 Hz */ @@ -713,10 +713,10 @@ static MACHINE_DRIVER_START( bbonk ) /* basic machine hardware */ MDRV_CPU_ADD("maincpu", S2650,MASTER_CLOCK/12) /* 666 kHz */ -/* Main Clock is 8MHz divided by 12 - but memory and IO access is only possible - within the line and frame blanking period - thus requiring an extra loading of approx 3-5 */ +/* Main Clock is 8MHz divided by 12 + but memory and IO access is only possible + within the line and frame blanking period + thus requiring an extra loading of approx 3-5 */ MDRV_CPU_PROGRAM_MAP(bbonk_map) MDRV_CPU_IO_MAP(lazercmd_portmap) MDRV_CPU_VBLANK_INT_HACK(bbonk_timer, 128) /* 7680 Hz */ diff --git a/src/mame/drivers/lemmings.c b/src/mame/drivers/lemmings.c index b3d63334c47..06b46c49f81 100644 --- a/src/mame/drivers/lemmings.c +++ b/src/mame/drivers/lemmings.c @@ -27,14 +27,14 @@ static WRITE16_HANDLER( lemmings_control_w ) lemmings_state *state = (lemmings_state *)space->machine->driver_data; /* Offset==0 Pixel layer X scroll */ - if (offset == 4) + if (offset == 4) return; /* Watchdog or IRQ ack */ COMBINE_DATA(&state->control_data[offset]); } static READ16_HANDLER( lemmings_trackball_r ) { - switch (offset) + switch (offset) { case 0: return input_port_read(space->machine, "AN0"); case 1: return input_port_read(space->machine, "AN1"); @@ -47,7 +47,7 @@ static READ16_HANDLER( lemmings_trackball_r ) /* Same as Robocop 2 protection chip */ static READ16_HANDLER( lemmings_prot_r ) { - switch (offset << 1) + switch (offset << 1) { case 0x41a: return input_port_read(space->machine, "BUTTONS"); @@ -68,7 +68,7 @@ static WRITE16_HANDLER( lemmings_palette_24bit_w ) int r, g, b; COMBINE_DATA(&state->paletteram[offset]); - if (offset & 1) + if (offset & 1) offset--; b = (state->paletteram[offset] >> 0) & 0xff; diff --git a/src/mame/drivers/lwings.c b/src/mame/drivers/lwings.c index 2984608c081..9bc8c3acbfd 100644 --- a/src/mame/drivers/lwings.c +++ b/src/mame/drivers/lwings.c @@ -204,19 +204,19 @@ static int avengers_fetch_paldata( running_machine *machine ) int digit1 = pal_data[page * 256 * 2 + (30 - row * 2) * 16 + col]; int result; - if (digit0 >= 'A') - digit0 += 10 - 'A'; - else + if (digit0 >= 'A') + digit0 += 10 - 'A'; + else digit0 -= '0'; - if (digit1 >= 'A') - digit1 += 10 - 'A'; - else + if (digit1 >= 'A') + digit1 += 10 - 'A'; + else digit1 -= '0'; result = digit0 * 16 + digit1; - if ((state->palette_pen & 0x3f) != 0x3f) + if ((state->palette_pen & 0x3f) != 0x3f) state->palette_pen++; return result; diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index 911743479b2..778b4847619 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -963,10 +963,10 @@ static INPUT_PORTS_START( tron3 ) PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY -// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL -// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL -// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL -// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL +// PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL +// PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL +// PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL +// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL PORT_START("SSIO.IP3") /* DIPSW @ B3 */ PORT_DIPNAME( 0x01, 0x00, "Coin Meters" ) PORT_DIPLOCATION("SW1:1") @@ -982,14 +982,14 @@ static INPUT_PORTS_START( tron3 ) PORT_DIPUNUSED_DIPLOC( 0x10, 0x00, "SW1:5" ) PORT_DIPUNUSED_DIPLOC( 0x20, 0x00, "SW1:6" ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x00, "SW1:7" ) -// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL +// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL // According to the manual, SW1 is a bank of *10* switches (9 is unused and 10 is freeze) // Where are the values for the other two bits read? PORT_START("SSIO.IP4") /* J6 1-8 */ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) -// PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL +// PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_COCKTAIL PORT_START("SSIO.DIP") PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN ) diff --git a/src/mame/drivers/msisaac.c b/src/mame/drivers/msisaac.c index e200b7c4d17..32dc2756f41 100644 --- a/src/mame/drivers/msisaac.c +++ b/src/mame/drivers/msisaac.c @@ -24,9 +24,9 @@ TO DO: static TIMER_CALLBACK( nmi_callback ) { buggychl_state *state = (buggychl_state *)machine->driver_data; - if (state->sound_nmi_enable) + if (state->sound_nmi_enable) cpu_set_input_line(state->audiocpu, INPUT_LINE_NMI, PULSE_LINE); - else + else state->pending_nmi = 1; } diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 3e80dabf84e..22c00f3ca26 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -635,7 +635,7 @@ static WRITE8_DEVICE_HANDLER( mainlamps_w ) output_set_lamp_value(6, (data >> 6) & 1); /* HOLD 5 lamp */ output_set_lamp_value(7, (data >> 7) & 1); /* CANCEL lamp */ -// popmessage("lamps: %02x", data); +// popmessage("lamps: %02x", data); } static WRITE8_DEVICE_HANDLER( soundlamps_w ) @@ -1581,17 +1581,17 @@ ROM_END - CPU: 1x Z084004PSC (Frequency measured 2.3025MHz.) - - RAM: 4x 2114 + - RAM: 4x 2114 - I/O: 3x 8255 Peripeheral Interface Adapter. - Prg ROM: 2x 2732, U11,U16 - - Gfx ROM: 1x 2716 U27 Eprom + - Gfx ROM: 1x 2716 U27 Eprom - Sound: Discrete. - Crystal: 1x 18.432 MHz NOTE: PIN NO 5 LIFTED FROM CPU SOCKET (A15) PCB DOES NOT BOOT IF PIN IS PUT BACK IN SOCKET. - + PCB silksceened: PROLOGIC MADE IN (IRL) - 131191 @@ -1968,12 +1968,12 @@ ROM_END || | | 6116 | | || Z084004PS | | | | *| | | | | - *|____________________| | | | + *|____________________| | | | * J2 |______| | |__________________________________| - Discrete audio circuitry: SAME AS KIMBLE DIAGRAM + Discrete audio circuitry: SAME AS KIMBLE DIAGRAM EXCEPT FOR :R1 = 120 K ; Tolerance +/- 5% */ @@ -2132,7 +2132,7 @@ ROM_END 2) Press HOLD1 to reset meters, HOLD2 for readout, or follow the next steps to adjust percentage. - Press DEAL to exit. + Press DEAL to exit. 2) Keep pressed HI & LO buttons. 3) Press HOLD5 (readout) button. @@ -2157,33 +2157,33 @@ ROM_END ------------------------- Hardware Layout: - - - CPU: 1x Z8400AB1: ON CPU ADDON BOARD + + - CPU: 1x Z8400AB1: ON CPU ADDON BOARD - RAM: 2x 2114 VIDEO - RAM: 1x 6264 PROG: ON EXPANSION BOARD - I/O: 3x 8255 Peripeheral Interface Adapter. - Prg ROM: 1x 27C256: ON EXPANSION BOARD - - Prg ROM: 1x 27C128: ON EXPANSION BOARD - - Gfx ROM: 1x 2716 U27 Eprom + - Prg ROM: 1x 27C128: ON EXPANSION BOARD + - Gfx ROM: 1x 2716 U27 Eprom - Sound: Discrete. - - Crystal: 1x 18.432 MHz.ON CPU ADDON BOARD + - Crystal: 1x 18.432 MHz.ON CPU ADDON BOARD 1X PAL16R8 ON EXPANSION BOARD - + PCB silksceened: SCT 18-88 KIMBLE DOUBLE HI-LO CARD GAME - + PCB MARKED:SZY044 - + CHAR EPROM LABELED: "QUIZ CHAR II" PROG EPROM (256) LABELED: "M.B POKER ALT 1 2P/10P I" PROG EPROM (128) LABELED: "M.B POKER ALT 1 2P/10P II" - - + + Frequency measured 2.3025MHz. - - + + PCB Layout (Kimble Double HI-LO Z80): Edge Connector 36x2 ______________________________________________________________________________________________ | _________ _________ _____ ......... _________ | @@ -2233,9 +2233,9 @@ ROM_END | |____________________| U5 U4 U3 U2 U1 | | 1 U6 | |______________________________________________________________________________________________| - - PCB Layout EXPANSION BOARD (Kimble Double HI-LO 8080): + + PCB Layout EXPANSION BOARD (Kimble Double HI-LO 8080): EXPANSION BOARD Silksceened:SCT 34-88 __________________________________________________________________ @@ -2318,8 +2318,8 @@ ROM_END C1 = 10nK 63v C2 = 223J - C3 = 47nK 63v - + C3 = 47nK 63v + C4 = 10nK 63v C5 = 10nK 63v C6 = 100nK 100v @@ -2725,31 +2725,31 @@ ROM_END Hardware Layout (Kimble Double HI-LO 8080): - - - CPU: 1x INTEL P8080A + + - CPU: 1x INTEL P8080A - RAM: 2x 2114 VIDEO - RAM: 1x 6264 PROG: ON EXPANSION BOARD - I/O: 3x 8255 Peripeheral Interface Adapter. - Prg ROM: 1x 27C256: ON EXPANSION BOARD - - Gfx ROM: 1x 2716 U27 Eprom + - Gfx ROM: 1x 2716 U27 Eprom - Sound: Discrete. - Crystal: 1x 18.432 MHz. 1X PAL16R8 ON EXPANSION BOARD - + PCB silksceened: "SCT 41-88" "KIMBLE DOUBLE HI-LO" "CARD GAME" - + PCB MARKED:"VZY07" - + CHAR EPROM LABELED: "QUIZ CHAR II" PROG EPROM LABELED: "JPCS25611" - - + + Frequency measured = 2.040 MHz. - - + + PCB Layout (Kimble Double HI-LO 8080): Edge Connector 36x2 ______________________________________________________________________________________________ | _________ _________ _____ ......... _________ | @@ -2799,7 +2799,7 @@ ROM_END | |____________________| U5 U4 U3 U2 U1 | | U6 | |______________________________________________________________________________________________| - + PCB Layout EXPANSION BOARD (Kimble Double HI-LO 8080): @@ -3223,8 +3223,8 @@ ROM_END Unknown DPHL rev 1. - No extra info inside the zip. Just ROM dumps... - Maybe from SMS Manufacturing, since there are GFX tiles with the SMS logo. + No extra info inside the zip. Just ROM dumps... + Maybe from SMS Manufacturing, since there are GFX tiles with the SMS logo. */ @@ -3245,8 +3245,8 @@ ROM_END Unknown DPHL rev 2. - No extra info inside the zip. Just ROM dumps... - Maybe from SMS Manufacturing, since there are GFX tiles with the SMS logo. + No extra info inside the zip. Just ROM dumps... + Maybe from SMS Manufacturing, since there are GFX tiles with the SMS logo. */ diff --git a/src/mame/drivers/psikyo.c b/src/mame/drivers/psikyo.c index 110483d703d..dc6691ae088 100644 --- a/src/mame/drivers/psikyo.c +++ b/src/mame/drivers/psikyo.c @@ -407,7 +407,7 @@ static ADDRESS_MAP_START( psikyo_bootleg_map, ADDRESS_SPACE_PROGRAM, 32 ) // AM_RANGE(0xc00010, 0xc00013) AM_WRITE(psikyo_soundlatch_w) // Depends on board, see DRIVER_INIT AM_RANGE(0xC00018, 0xC0001b) AM_DEVREADWRITE("oki", s1945bl_oki_r, s1945bl_oki_w) - + AM_RANGE(0xfe0000, 0xffffff) AM_RAM // RAM ADDRESS_MAP_END @@ -1768,7 +1768,7 @@ ROM_START( s1945bl ) ROM_REGION( 0x040000, "spritelut", 0 ) /* */ ROM_LOAD16_BYTE( "27c010-b", 0x000000, 0x020000, CRC(e38d5ab7) SHA1(73a708ebc305cb6297efd3296da23c87898e805e) ) // u1.bin [even] IDENTICAL - ROM_LOAD16_BYTE( "27c010-a", 0x000001, 0x020000, CRC(cb8c65ec) SHA1(a55c5c5067b50a1243e7ba60fa1f9569bfed5de8) ) // u1.bin [odd] 99.999237% + ROM_LOAD16_BYTE( "27c010-a", 0x000001, 0x020000, CRC(cb8c65ec) SHA1(a55c5c5067b50a1243e7ba60fa1f9569bfed5de8) ) // u1.bin [odd] 99.999237% ROM_REGION( 0x080000, "unknown", 0 ) /* unknown - matches Semicom's Dream World */ ROM_LOAD( "27c512", 0x000000, 0x010000, CRC(0da8db45) SHA1(7d5bd71c5b0b28ff74c732edd7c662f46f2ab25b) ) diff --git a/src/mame/drivers/taito_l.c b/src/mame/drivers/taito_l.c index 927b873ce76..b28a6469f8c 100644 --- a/src/mame/drivers/taito_l.c +++ b/src/mame/drivers/taito_l.c @@ -2766,7 +2766,7 @@ PCB Layout Notes: Z80 - clock 6.802725MHz [27.2109/4] YM2203 - clocks 3.4013625 [27/2109/8] & 1.1337875 [27.2109/24] - VSync - 55.8268Hz \ possibly sync/PCB fault, had to adjust + VSync - 55.8268Hz \ possibly sync/PCB fault, had to adjust HSync - 14.7739kHz / h/v syncs on monitor to get a stable picture */ diff --git a/src/mame/drivers/tickee.c b/src/mame/drivers/tickee.c index dbcc1354a9e..65bbcb200a0 100644 --- a/src/mame/drivers/tickee.c +++ b/src/mame/drivers/tickee.c @@ -1,7 +1,7 @@ /*************************************************************************** Raster Elite Tickee Tickats hardware - + variations + + variations driver by Aaron Giles @@ -64,7 +64,7 @@ static TIMER_CALLBACK( trigger_gun_interrupt ) { int which = param & 1; int beamx = (video_screen_get_hpos(machine->primary_screen)/2)-58; - + /* once we're ready to fire, set the X coordinate and assert the line */ gunx[which] = beamx; @@ -294,7 +294,7 @@ static WRITE16_HANDLER( tickee_control_w ) /************************************* * - * Unknowns + * Unknowns * *************************************/ @@ -329,7 +329,7 @@ static WRITE16_HANDLER( rapidfir_control_w ) /************************************* * - * Sound + * Sound * *************************************/ @@ -340,19 +340,19 @@ static WRITE16_DEVICE_HANDLER( sound_bank_w ) case 0x2c: okim6295_set_bank_base(device, 0x00000); break; - + case 0x2d: okim6295_set_bank_base(device, 0x50000); break; - + case 0x1c: okim6295_set_bank_base(device, 0x80000); break; - + case 0x1d: okim6295_set_bank_base(device, 0xc0000); break; - + default: logerror("sound_bank_w %04X %04X\n", data, mem_mask); break; @@ -567,27 +567,27 @@ static INPUT_PORTS_START( rapidfir ) PORT_BIT( 0xffe0, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW0") - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown )) + PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Unknown )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0001, DEF_STR( On )) - PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown )) + PORT_DIPNAME( 0x0002, 0x0002, DEF_STR( Unknown )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0002, DEF_STR( On )) - PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown )) + PORT_DIPNAME( 0x0004, 0x0004, DEF_STR( Unknown )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0004, DEF_STR( On )) - PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown )) + PORT_DIPNAME( 0x0008, 0x0008, DEF_STR( Unknown )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0008, DEF_STR( On )) PORT_BIT( 0x0070, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown )) + PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Unknown )) PORT_DIPSETTING( 0x0000, DEF_STR( Off )) PORT_DIPSETTING( 0x0080, DEF_STR( On )) PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) PORT_START("DSW1") PORT_BIT( 0x003f, IP_ACTIVE_LOW, IPT_UNUSED ) - PORT_DIPNAME( 0x0040, 0x0000, "Reset NVRAM" ) + PORT_DIPNAME( 0x0040, 0x0000, "Reset NVRAM" ) PORT_DIPSETTING( 0x0000, DEF_STR( No )) PORT_DIPSETTING( 0x0040, DEF_STR( Yes )) PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -717,7 +717,7 @@ static MACHINE_DRIVER_START( rapidfir ) MDRV_CPU_ADD("maincpu", TMS34010, XTAL_50MHz) MDRV_CPU_CONFIG(rapidfir_tms_config) MDRV_CPU_PROGRAM_MAP(rapidfir_map) - + MDRV_MACHINE_RESET(rapidfir) MDRV_NVRAM_HANDLER(generic_1fill) @@ -728,7 +728,7 @@ static MACHINE_DRIVER_START( rapidfir ) MDRV_SCREEN_ADD("screen", RASTER) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_RGB32) MDRV_SCREEN_RAW_PARAMS(VIDEO_CLOCK/2, 444, 0, 320, 233, 0, 200) - + /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") @@ -878,7 +878,7 @@ BE 1V-0 VER3 PCB No: BE 1V-0 VER3: 7/30/98 (Sticker says PVG/SEMCO) CPU : TMS34010FNL-50 -SND : BS901 + CA5102 (YM2151 + YM3012), AD-65 (OKI M6295) +SND : BS901 + CA5102 (YM2151 + YM3012), AD-65 (OKI M6295) OSC : 50.000MHz, 3.5795MHz, 8.000MHz, 18.000MHz RAM : Toshiba TC528267J-70 (x 4, surface mounted) DIPs : 8 position (x2) @@ -898,7 +898,7 @@ ROMs : RF11.U2 27C040 \ RF10.U7 " | RF11.U8 " | RF11.U9 " | - DS1220Y.U504 *1 / + DS1220Y.U504 *1 / RF11.U507 27C040 \ RF11.U510 " / Grouped together, SND/OKI SAMPLES @@ -917,7 +917,7 @@ ROM_START( rapidfir ) /* Version 1.1, test menu shows "Build 239" */ ROM_LOAD16_BYTE( "rf10.u5", 0x200001, 0x80000, CRC(593b3df2) SHA1(301fa06031eff54fb2d9e08f80fc3c26e5c51da9) ) ROM_LOAD16_BYTE( "rf11.u2", 0x300000, 0x80000, CRC(ffa0c695) SHA1(bccdefe7cee15999c416fdcb16a65b1bc6e12d13) ) ROM_LOAD16_BYTE( "rf11.u3", 0x300001, 0x80000, CRC(ac63b863) SHA1(c9160aec6179d1f550279b80fd4c2a14ce94fdab) ) - + ROM_REGION( 0x100000, "oki", 0 ) ROM_LOAD( "rf11.507", 0x000000, 0x80000, CRC(899d1e15) SHA1(ca22b4ad714a5212bc9347eb3a5b660c02bad7e5) ) ROM_LOAD( "rf11.510", 0x080000, 0x80000, CRC(6209c8fe) SHA1(bfbd63445b4ac2d4253c4b5354e1058070290084) ) @@ -934,7 +934,7 @@ ROM_START( rapidfire ) /* Version 1.0, test menu shows "Build 236" */ ROM_LOAD16_BYTE( "rf10.u5", 0x200001, 0x80000, CRC(593b3df2) SHA1(301fa06031eff54fb2d9e08f80fc3c26e5c51da9) ) ROM_LOAD16_BYTE( "rf10.u2", 0x300000, 0x80000, CRC(5ef404dd) SHA1(cf060567822c4c02baf4b1948d6e50b480bfb7da) ) ROM_LOAD16_BYTE( "rf10.u3", 0x300001, 0x80000, CRC(d8d664db) SHA1(cd63fdc6fe4beb68ced57a2547f8302c1d2544dc) ) - + ROM_REGION( 0x100000, "oki", 0 ) ROM_LOAD( "rf10.507", 0x000000, 0x80000, CRC(7eab2af4) SHA1(bbb4b2b9f96add56c26f334a7242cdc81a64ce2d) ) ROM_LOAD( "rf10.510", 0x080000, 0x80000, CRC(ecd70be6) SHA1(5a26703e822776fecb3f6d729bf91e76db7a7141) ) diff --git a/src/mame/drivers/vsnes.c b/src/mame/drivers/vsnes.c index 9b4495a38c7..4af964173df 100644 --- a/src/mame/drivers/vsnes.c +++ b/src/mame/drivers/vsnes.c @@ -1913,7 +1913,7 @@ ROM_START( suprmriobl ) ROM_REGION( 0x4000,"gfx1", 0 ) /* PPU memory */ ROM_LOAD( "2.bin", 0x0000, 0x2000, CRC(42418d40) SHA1(22ab61589742cfa4cc6856f7205d7b4b8310bc4d) ) ROM_LOAD( "5.bin", 0x2000, 0x2000, CRC(15506b86) SHA1(69ecf7a3cc8bf719c1581ec7c0d68798817d416f) ) - + /* this set has some extra files compared to the above one, they probably exist on that pcb too tho */ ROM_REGION( 0x200,"proms", 0 ) ROM_LOAD( "prom6301.1", 0x000, 0x100, CRC(a31dc330) SHA1(b652003f7e252bac3bdb19412839c2f03af7f8b8) ) diff --git a/src/mame/drivers/wink.c b/src/mame/drivers/wink.c index 1eb9060f142..d8ec39124be 100644 --- a/src/mame/drivers/wink.c +++ b/src/mame/drivers/wink.c @@ -121,11 +121,11 @@ static WRITE8_HANDLER( prot_w ) static ADDRESS_MAP_START( wink_io, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) AM_RANGE(0x00, 0x1f) AM_RAM_WRITE(paletteram_xxxxBBBBRRRRGGGG_le_w) AM_BASE_GENERIC(paletteram) //0x10-0x1f is likely to be something else -// AM_RANGE(0x20, 0x20) AM_WRITENOP //??? seems unused.. +// AM_RANGE(0x20, 0x20) AM_WRITENOP //??? seems unused.. AM_RANGE(0x21, 0x21) AM_WRITE(player_mux_w) //??? no mux on the pcb. AM_RANGE(0x22, 0x22) AM_WRITE(tile_banking_w) -// AM_RANGE(0x23, 0x23) AM_WRITENOP //? -// AM_RANGE(0x24, 0x24) AM_WRITENOP //cab Knocker like in q-bert! +// AM_RANGE(0x23, 0x23) AM_WRITENOP //? +// AM_RANGE(0x24, 0x24) AM_WRITENOP //cab Knocker like in q-bert! AM_RANGE(0x25, 0x27) AM_WRITE(wink_coin_counter_w) AM_RANGE(0x40, 0x40) AM_WRITE(soundlatch_w) AM_RANGE(0x60, 0x60) AM_WRITE(sound_irq_w) @@ -133,7 +133,7 @@ static ADDRESS_MAP_START( wink_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0xa0, 0xa0) AM_READ(player_inputs_r) AM_RANGE(0xa4, 0xa4) AM_READ_PORT("DSW1") //dipswitch bank2 AM_RANGE(0xa8, 0xa8) AM_READ_PORT("DSW2") //dipswitch bank1 -// AM_RANGE(0xac, 0xac) AM_WRITENOP //protection - loads video xor unit (written only once at startup) +// AM_RANGE(0xac, 0xac) AM_WRITENOP //protection - loads video xor unit (written only once at startup) AM_RANGE(0xb0, 0xb0) AM_READ_PORT("DSW3") //unused inputs AM_RANGE(0xb4, 0xb4) AM_READ_PORT("DSW4") //dipswitch bank3 AM_RANGE(0xc0, 0xdf) AM_WRITE(prot_w) //load load protection-buffer from upper address bus diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c index a412b8c38e9..b74b241047d 100644 --- a/src/mame/drivers/yiear.c +++ b/src/mame/drivers/yiear.c @@ -57,9 +57,9 @@ The 6809 NMI is used for sound timing. static READ8_DEVICE_HANDLER( yiear_speech_r ) { - if (vlm5030_bsy(device)) + if (vlm5030_bsy(device)) return 1; - else + else return 0; } @@ -75,7 +75,7 @@ static INTERRUPT_GEN( yiear_nmi_interrupt ) trackfld_state *state = (trackfld_state *)device->machine->driver_data; /* can't use nmi_line_pulse() because interrupt_enable_w() effects it */ - if (state->yiear_nmi_enable) + if (state->yiear_nmi_enable) cpu_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE); } diff --git a/src/mame/drivers/yunsung8.c b/src/mame/drivers/yunsung8.c index 6f037eb9651..a358c2394cf 100644 --- a/src/mame/drivers/yunsung8.c +++ b/src/mame/drivers/yunsung8.c @@ -52,7 +52,7 @@ static WRITE8_HANDLER( yunsung8_bankswitch_w ) memory_set_bank(space->machine, "bank1", data & 0x07); - if (data & ~0x37) + if (data & ~0x37) logerror("CPU #0 - PC %04X: Bank %02X\n", cpu_get_pc(space->cpu), data); } @@ -101,7 +101,7 @@ static WRITE8_DEVICE_HANDLER( yunsung8_sound_bankswitch_w ) memory_set_bank(device->machine, "bank2", data & 0x07); - if (data != (data & (~0x27))) + if (data != (data & (~0x27))) logerror("%s: Bank %02X\n", cpuexec_describe_context(device->machine), data); } diff --git a/src/mame/includes/aerofgt.h b/src/mame/includes/aerofgt.h index b4d4b4722c9..c84bbdc2458 100644 --- a/src/mame/includes/aerofgt.h +++ b/src/mame/includes/aerofgt.h @@ -11,7 +11,7 @@ struct _aerofgt_state UINT16 * spriteram2; UINT16 * spriteram3; UINT16 * tx_tilemap_ram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram1_size; size_t spriteram2_size; size_t spriteram3_size; diff --git a/src/mame/includes/amspdwy.h b/src/mame/includes/amspdwy.h index 1de13bc66d4..ea99c601d6a 100644 --- a/src/mame/includes/amspdwy.h +++ b/src/mame/includes/amspdwy.h @@ -11,7 +11,7 @@ struct _amspdwy_state UINT8 * videoram; UINT8 * spriteram; UINT8 * colorram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/buggychl.h b/src/mame/includes/buggychl.h index e70b241081a..8d23a407c0d 100644 --- a/src/mame/includes/buggychl.h +++ b/src/mame/includes/buggychl.h @@ -1,5 +1,5 @@ /* - buggychl mcu emulation is also used by + buggychl mcu emulation is also used by 40love.c, bking.c and msisaac.c */ @@ -17,7 +17,7 @@ struct _buggychl_state UINT8 * scrollh; // buggychl UINT8 * charram; // buggychl UINT8 * video_ctrl; // 40love -// UINT8 * paletteram; // currently this uses generic palette handling (buggychl & msisaac) +// UINT8 * paletteram; // currently this uses generic palette handling (buggychl & msisaac) UINT8 * mcu_ram; // 40love (undokai) UINT8 * playfield_ram; // bking size_t videoram_size; diff --git a/src/mame/includes/cyberbal.h b/src/mame/includes/cyberbal.h index d2376c81155..7cfa837333f 100644 --- a/src/mame/includes/cyberbal.h +++ b/src/mame/includes/cyberbal.h @@ -10,7 +10,7 @@ typedef struct _cyberbal_state cyberbal_state; struct _cyberbal_state { atarigen_state atarigen; - + UINT16 * paletteram_0; UINT16 * paletteram_1; UINT16 current_slip[2]; diff --git a/src/mame/includes/fromance.h b/src/mame/includes/fromance.h index 93e67b6b0ef..09c42186e80 100644 --- a/src/mame/includes/fromance.h +++ b/src/mame/includes/fromance.h @@ -13,7 +13,7 @@ struct _fromance_state /* memory pointers (used by pipedrm) */ UINT8 * videoram; UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling size_t videoram_size; size_t spriteram_size; diff --git a/src/mame/includes/gaelco.h b/src/mame/includes/gaelco.h index 3d9ffc59487..8877d2d8ecc 100644 --- a/src/mame/includes/gaelco.h +++ b/src/mame/includes/gaelco.h @@ -12,7 +12,7 @@ struct _gaelco_state UINT16 * spriteram; UINT16 * vregs; UINT16 * screen; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap *tilemap[2]; diff --git a/src/mame/includes/galspnbl.h b/src/mame/includes/galspnbl.h index 6e2dfbfcbbd..e0a13cf8a6d 100644 --- a/src/mame/includes/galspnbl.h +++ b/src/mame/includes/galspnbl.h @@ -14,7 +14,7 @@ struct _galspnbl_state UINT16 * colorram; UINT16 * scroll; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* devices */ diff --git a/src/mame/includes/gcpinbal.h b/src/mame/includes/gcpinbal.h index ed62a208079..8c2bfd6083e 100644 --- a/src/mame/includes/gcpinbal.h +++ b/src/mame/includes/gcpinbal.h @@ -6,7 +6,7 @@ struct _gcpinbal_state UINT16 * tilemapram; UINT16 * ioc_ram; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/ginganin.h b/src/mame/includes/ginganin.h index e2e9e5dbdf9..8140acfddd6 100644 --- a/src/mame/includes/ginganin.h +++ b/src/mame/includes/ginganin.h @@ -12,7 +12,7 @@ struct _ginganin_state UINT16 * txtram; UINT16 * vregs; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/glass.h b/src/mame/includes/glass.h index 1fad5fb297a..c140b913303 100644 --- a/src/mame/includes/glass.h +++ b/src/mame/includes/glass.h @@ -11,7 +11,7 @@ struct _glass_state UINT16 * videoram; UINT16 * vregs; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap *pant[2]; diff --git a/src/mame/includes/gng.h b/src/mame/includes/gng.h index ac4d0b10734..9ac729ae5ce 100644 --- a/src/mame/includes/gng.h +++ b/src/mame/includes/gng.h @@ -10,9 +10,9 @@ struct _gng_state /* memory pointers */ UINT8 * bgvideoram; UINT8 * fgvideoram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling -// UINT8 * spriteram; // currently this uses generic buffered spriteram +// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram2; // currently this uses generic palette handling +// UINT8 * spriteram; // currently this uses generic buffered spriteram /* video-related */ tilemap *bg_tilemap, *fg_tilemap; diff --git a/src/mame/includes/goal92.h b/src/mame/includes/goal92.h index 79b585b89b8..85eb22fed6d 100644 --- a/src/mame/includes/goal92.h +++ b/src/mame/includes/goal92.h @@ -12,8 +12,8 @@ struct _goal92_state UINT16 * fg_data; UINT16 * tx_data; UINT16 * scrollram; -// UINT16 * paletteram; // this currently use generic palette handling -// UINT16 * spriteram; // this currently use generic buffered spriteram +// UINT16 * paletteram; // this currently use generic palette handling +// UINT16 * spriteram; // this currently use generic buffered spriteram /* video-related */ tilemap *bg_layer, *fg_layer, *tx_layer; diff --git a/src/mame/includes/gotcha.h b/src/mame/includes/gotcha.h index bdf5de564be..1babb9bdd45 100644 --- a/src/mame/includes/gotcha.h +++ b/src/mame/includes/gotcha.h @@ -11,7 +11,7 @@ struct _gotcha_state UINT16 * fgvideoram; UINT16 * bgvideoram; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/gumbo.h b/src/mame/includes/gumbo.h index d3ad27c65dd..a672e6a337f 100644 --- a/src/mame/includes/gumbo.h +++ b/src/mame/includes/gumbo.h @@ -10,7 +10,7 @@ struct _gumbo_state /* memory pointers */ UINT16 * bg_videoram; UINT16 * fg_videoram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap *bg_tilemap; diff --git a/src/mame/includes/himesiki.h b/src/mame/includes/himesiki.h index 24833b1145d..0f5ffef8b63 100644 --- a/src/mame/includes/himesiki.h +++ b/src/mame/includes/himesiki.h @@ -10,7 +10,7 @@ struct _himesiki_state /* memory pointers */ UINT8 * bg_ram; UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling /* video-related */ tilemap *bg_tilemap; diff --git a/src/mame/includes/inufuku.h b/src/mame/includes/inufuku.h index b317491d88e..c88942ee686 100644 --- a/src/mame/includes/inufuku.h +++ b/src/mame/includes/inufuku.h @@ -8,7 +8,7 @@ struct _inufuku_state UINT16 * tx_videoram; UINT16 * spriteram1; UINT16 * spriteram2; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram1_size; /* video-related */ diff --git a/src/mame/includes/jack.h b/src/mame/includes/jack.h index b94d3a36aa0..f66ee828e1e 100644 --- a/src/mame/includes/jack.h +++ b/src/mame/includes/jack.h @@ -11,7 +11,7 @@ struct _jack_state UINT8 * videoram; UINT8 * colorram; UINT8 * spriteram; -// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/jailbrek.h b/src/mame/includes/jailbrek.h index e7c9119bfce..2b30e7fca0d 100644 --- a/src/mame/includes/jailbrek.h +++ b/src/mame/includes/jailbrek.h @@ -1,6 +1,6 @@ /*************************************************************************** - Jailbreak + Jailbreak ***************************************************************************/ diff --git a/src/mame/includes/karnov.h b/src/mame/includes/karnov.h index 746718f07ff..5475cb75feb 100644 --- a/src/mame/includes/karnov.h +++ b/src/mame/includes/karnov.h @@ -11,7 +11,7 @@ struct _karnov_state UINT16 * videoram; UINT16 * ram; UINT16 * pf_data; -// UINT16 * spriteram; // currently this uses generic buffered spriteram +// UINT16 * spriteram; // currently this uses generic buffered spriteram /* video-related */ bitmap_t *bitmap_f; @@ -30,13 +30,13 @@ struct _karnov_state const device_config *audiocpu; }; -enum { - KARNOV = 0, - KARNOVJ, - CHELNOV, - CHELNOVJ, - CHELNOVW, - WNDRPLNT +enum { + KARNOV = 0, + KARNOVJ, + CHELNOV, + CHELNOVJ, + CHELNOVW, + WNDRPLNT }; diff --git a/src/mame/includes/kickgoal.h b/src/mame/includes/kickgoal.h index e8bccbaa7ed..89e3d346f7f 100644 --- a/src/mame/includes/kickgoal.h +++ b/src/mame/includes/kickgoal.h @@ -13,7 +13,7 @@ struct _kickgoal_state UINT16 * bg2ram; UINT16 * scrram; UINT16 * spriteram; -// UINT16 * paletteram; // currently this uses generic palette handling +// UINT16 * paletteram; // currently this uses generic palette handling size_t spriteram_size; /* video-related */ diff --git a/src/mame/includes/ladyfrog.h b/src/mame/includes/ladyfrog.h index 103d64a35e9..4698526dc1a 100644 --- a/src/mame/includes/ladyfrog.h +++ b/src/mame/includes/ladyfrog.h @@ -11,8 +11,8 @@ struct _ladyfrog_state UINT8 * videoram; UINT8 * spriteram; UINT8 * scrlram; -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling +// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram2; // currently this uses generic palette handling size_t videoram_size; /* video-related */ diff --git a/src/mame/includes/lastduel.h b/src/mame/includes/lastduel.h index 6a8379deac5..b850132b925 100644 --- a/src/mame/includes/lastduel.h +++ b/src/mame/includes/lastduel.h @@ -11,7 +11,7 @@ struct _lastduel_state UINT16 * vram; UINT16 * scroll1; UINT16 * scroll2; -// UINT16 * spriteram; // this currently uses generic buffered spriteram +// UINT16 * spriteram; // this currently uses generic buffered spriteram UINT16 * paletteram; /* video-related */ diff --git a/src/mame/includes/lemmings.h b/src/mame/includes/lemmings.h index 26edfbcc01f..0102218af8b 100644 --- a/src/mame/includes/lemmings.h +++ b/src/mame/includes/lemmings.h @@ -8,8 +8,8 @@ struct _lemmings_state UINT16 * vram_data; UINT16 * control_data; UINT16 * paletteram; -// UINT16 * spriteram; // this currently uses generic buffered spriteram -// UINT16 * spriteram2; // this currently uses generic buffered spriteram +// UINT16 * spriteram; // this currently uses generic buffered spriteram +// UINT16 * spriteram2; // this currently uses generic buffered spriteram /* video-related */ bitmap_t *bitmap0; diff --git a/src/mame/includes/lwings.h b/src/mame/includes/lwings.h index 0381fe2acee..12aea8b7b34 100644 --- a/src/mame/includes/lwings.h +++ b/src/mame/includes/lwings.h @@ -6,9 +6,9 @@ struct _lwings_state UINT8 * fgvideoram; UINT8 * bg1videoram; UINT8 * soundlatch2; -// UINT8 * spriteram; // currently this uses generic buffered spriteram -// UINT8 * paletteram; // currently this uses generic palette handling -// UINT8 * paletteram2; // currently this uses generic palette handling +// UINT8 * spriteram; // currently this uses generic buffered spriteram +// UINT8 * paletteram; // currently this uses generic palette handling +// UINT8 * paletteram2; // currently this uses generic palette handling /* video-related */ tilemap *fg_tilemap, *bg1_tilemap, *bg2_tilemap; diff --git a/src/mame/includes/timeplt.h b/src/mame/includes/timeplt.h index 4ebad0ce7d7..ef3ef4c0d9c 100644 --- a/src/mame/includes/timeplt.h +++ b/src/mame/includes/timeplt.h @@ -32,7 +32,7 @@ struct _timeplt_state UINT8 * radarattr; // jungler UINT8 * radarx; // jungler UINT8 * radary; // jungler -// UINT8 * namco_soundregs; // rallyx - these are dealt with in emu/sound/namco.c +// UINT8 * namco_soundregs; // rallyx - these are dealt with in emu/sound/namco.c size_t videoram_size; // tutankham, junofrst size_t spriteram_size; // rocnrope diff --git a/src/mame/includes/trackfld.h b/src/mame/includes/trackfld.h index 6280fc4d1ff..1306bf8b7ef 100644 --- a/src/mame/includes/trackfld.h +++ b/src/mame/includes/trackfld.h @@ -18,7 +18,7 @@ struct _trackfld_state UINT8 * scroll2; // trackfld UINT8 * spriteram; UINT8 * spriteram2; -// UINT8 * nvram; // currently this uses generic nvram handling (trackfld & hyperspt) +// UINT8 * nvram; // currently this uses generic nvram handling (trackfld & hyperspt) size_t spriteram_size; UINT8 * palettebank; // sbasketb UINT8 * spriteram_select; // sbasketb diff --git a/src/mame/includes/yunsung8.h b/src/mame/includes/yunsung8.h index 49c756dff9e..be5a1d70817 100644 --- a/src/mame/includes/yunsung8.h +++ b/src/mame/includes/yunsung8.h @@ -1,6 +1,6 @@ /************************************************************************* - Yun Sung 8 Bit Games + Yun Sung 8 Bit Games *************************************************************************/ diff --git a/src/mame/machine/buggychl.c b/src/mame/machine/buggychl.c index fd84d223be5..047df7eb485 100644 --- a/src/mame/machine/buggychl.c +++ b/src/mame/machine/buggychl.c @@ -66,7 +66,7 @@ WRITE8_HANDLER( buggychl_68705_port_b_w ) if ((state->ddr_b & 0x02) && (~data & 0x02) && (state->port_b_out & 0x02)) { state->port_a_in = state->from_main; - if (state->main_sent) + if (state->main_sent) cpu_set_input_line(state->mcu, 0, CLEAR_LINE); state->main_sent = 0; logerror("read command %02x from main cpu\n", state->port_a_in); @@ -101,9 +101,9 @@ READ8_HANDLER( buggychl_68705_port_c_r ) { buggychl_state *state = (buggychl_state *)space->machine->driver_data; state->port_c_in = 0; - if (state->main_sent) + if (state->main_sent) state->port_c_in |= 0x01; - if (!state->mcu_sent) + if (!state->mcu_sent) state->port_c_in |= 0x02; logerror("%04x: 68705 port C read %02x\n", cpu_get_pc(space->cpu), state->port_c_in); return (state->port_c_out & state->ddr_c) | (state->port_c_in & ~state->ddr_c); @@ -148,9 +148,9 @@ READ8_HANDLER( buggychl_mcu_status_r ) /* bit 0 = when 1, mcu is ready to receive data from main cpu */ /* bit 1 = when 1, mcu has sent data to the main cpu */ //logerror("%04x: mcu_status_r\n",cpu_get_pc(space->cpu)); - if (!state->main_sent) + if (!state->main_sent) res |= 0x01; - if (state->mcu_sent) + if (state->mcu_sent) res |= 0x02; return res; diff --git a/src/mame/machine/vsnes.c b/src/mame/machine/vsnes.c index 6e0a729fc71..b297a0d0ed9 100644 --- a/src/mame/machine/vsnes.c +++ b/src/mame/machine/vsnes.c @@ -282,7 +282,7 @@ MACHINE_RESET( vsdual ) MACHINE_START( vsnes ) { const address_space *ppu1_space = cpu_get_address_space(cputag_get_cpu(machine, "ppu1"), ADDRESS_SPACE_PROGRAM); - + /* establish nametable ram */ nt_ram[0] = auto_alloc_array(machine, UINT8, 0x1000); /* set mirroring */ diff --git a/src/mame/video/aerofgt.c b/src/mame/video/aerofgt.c index aff2d139a59..67bc7236f3f 100644 --- a/src/mame/video/aerofgt.c +++ b/src/mame/video/aerofgt.c @@ -371,18 +371,18 @@ static void aerofgt_draw_sprites( running_machine *machine, bitmap_t *bitmap, co { int sx, sy; - if (flipy) + if (flipy) sy = ((oy + zoomy * (ysize - y)/2 + 16) & 0x1ff) - 16; - else + else sy = ((oy + zoomy * y / 2 + 16) & 0x1ff) - 16; for (x = 0; x <= xsize; x++) { int code; - if (flipx) + if (flipx) sx = ((ox + zoomx * (xsize - x) / 2 + 16) & 0x1ff) - 16; - else + else sx = ((ox + zoomx * x / 2 + 16) & 0x1ff) - 16; if (map_start < 0x2000) @@ -418,15 +418,15 @@ static void turbofrc_draw_sprites( running_machine *machine, bitmap_t *bitmap, c // some other drivers still use this wrong table, they have to be upgraded // int zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; - if (!(state->spriteram3[attr_start + 2] & 0x0080)) + if (!(state->spriteram3[attr_start + 2] & 0x0080)) continue; pri = state->spriteram3[attr_start + 2] & 0x0010; - if ( chip_disabled_pri & !pri) + if ( chip_disabled_pri & !pri) continue; - if ((!chip_disabled_pri) & (pri >> 4)) + if ((!chip_disabled_pri) & (pri >> 4)) continue; ox = state->spriteram3[attr_start + 1] & 0x01ff; @@ -452,18 +452,18 @@ static void turbofrc_draw_sprites( running_machine *machine, bitmap_t *bitmap, c { int sx, sy; - if (flipy) + if (flipy) sy = ((oy + zoomy * (ysize - y)/2 + 16) & 0x1ff) - 16; - else + else sy = ((oy + zoomy * y / 2 + 16) & 0x1ff) - 16; for (x = 0; x <= xsize; x++) { int code; - if (flipx) + if (flipx) sx = ((ox + zoomx * (xsize - x) / 2 + 16) & 0x1ff) - 16; - else + else sx = ((ox + zoomx * x / 2 + 16) & 0x1ff) - 16; if (chip == 0) @@ -503,14 +503,14 @@ static void spinlbrk_draw_sprites( running_machine *machine, bitmap_t *bitmap, c // some other drivers still use this wrong table, they have to be upgraded // int zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; - if (!(state->spriteram3[attr_start + 2] & 0x0080)) + if (!(state->spriteram3[attr_start + 2] & 0x0080)) continue; pri = state->spriteram3[attr_start + 2] & 0x0010; - if ( chip_disabled_pri & !pri) + if ( chip_disabled_pri & !pri) continue; - if ((!chip_disabled_pri) & (pri >> 4)) + if ((!chip_disabled_pri) & (pri >> 4)) continue; ox = state->spriteram3[attr_start + 1] & 0x01ff; @@ -536,18 +536,18 @@ static void spinlbrk_draw_sprites( running_machine *machine, bitmap_t *bitmap, c { int sx, sy; - if (flipy) + if (flipy) sy = ((oy + zoomy * (ysize - y)/2 + 16) & 0x1ff) - 16; - else + else sy = ((oy + zoomy * y / 2 + 16) & 0x1ff) - 16; for (x = 0; x <= xsize; x++) { int code; - if (flipx) + if (flipx) sx = ((ox + zoomx * (xsize - x) / 2 + 16) & 0x1ff) - 16; - else + else sx = ((ox + zoomx * x / 2 + 16) & 0x1ff) - 16; if (chip == 0) @@ -589,14 +589,14 @@ static void aerfboo2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c // some other drivers still use this wrong table, they have to be upgraded // int zoomtable[16] = { 0,7,14,20,25,30,34,38,42,46,49,52,54,57,59,61 }; - if (!(state->spriteram3[attr_start + 2] & 0x0080)) + if (!(state->spriteram3[attr_start + 2] & 0x0080)) continue; pri = state->spriteram3[attr_start + 2] & 0x0010; - if ( chip_disabled_pri & !pri) + if ( chip_disabled_pri & !pri) continue; - if ((!chip_disabled_pri) & (pri >> 4)) + if ((!chip_disabled_pri) & (pri >> 4)) continue; ox = state->spriteram3[attr_start + 1] & 0x01ff; xsize = (state->spriteram3[attr_start + 2] & 0x0700) >> 8; @@ -621,18 +621,18 @@ static void aerfboo2_draw_sprites( running_machine *machine, bitmap_t *bitmap, c { int sx, sy; - if (flipy) + if (flipy) sy = ((oy + zoomy * (ysize - y)/2 + 16) & 0x1ff) - 16; - else + else sy = ((oy + zoomy * y / 2 + 16) & 0x1ff) - 16; for (x = 0; x <= xsize; x++) { int code; - if (flipx) + if (flipx) sx = ((ox + zoomx * (xsize - x) / 2 + 16) & 0x1ff) - 16; - else + else sx = ((ox + zoomx * x / 2 + 16) & 0x1ff) - 16; if (chip == 0) @@ -667,7 +667,7 @@ static void pspikesb_draw_sprites( running_machine *machine, bitmap_t *bitmap, c { int xpos, ypos, color, flipx, flipy, code; - if (state->spriteram3[i + 3 - 4] & 0x8000) + if (state->spriteram3[i + 3 - 4] & 0x8000) break; xpos = (state->spriteram3[i + 2] & 0x1ff) - 34; @@ -707,7 +707,7 @@ static void spikes91_draw_sprites( running_machine *machine, bitmap_t *bitmap, c code = state->spriteram3[i + 0] & 0x1fff; - if (!code) + if (!code) continue; xpos = (state->spriteram3[i + 2] & 0x01ff) - 16; @@ -758,7 +758,7 @@ static void aerfboot_draw_sprites( running_machine *machine, bitmap_t *bitmap, c pri = state->spriteram3[attr_start + 2] & 0x0010; code = state->spriteram3[attr_start + 3] & 0x1fff; - if (!(state->spriteram3[attr_start + 2] & 0x0040)) + if (!(state->spriteram3[attr_start + 2] & 0x0040)) code |= 0x2000; zoomx = 32 + zoomx; @@ -796,7 +796,7 @@ static void aerfboot_draw_sprites( running_machine *machine, bitmap_t *bitmap, c pri = state->spriteram3[attr_start + 2] & 0x0010; code = state->spriteram3[attr_start + 3] & 0x1fff; - if (!(state->spriteram3[attr_start + 2] & 0x0040)) + if (!(state->spriteram3[attr_start + 2] & 0x0040)) code |= 0x2000; zoomx = 32 + zoomx; diff --git a/src/mame/video/alpha68k.c b/src/mame/video/alpha68k.c index d4ba89189e1..a3640535bff 100644 --- a/src/mame/video/alpha68k.c +++ b/src/mame/video/alpha68k.c @@ -87,16 +87,16 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect mx = spriteram[offs + 2 + (j << 1)] << 1 | my >> 15; my = -my & 0x1ff; mx = ((mx + 0x100) & 0x1ff) - 0x100; - if (j == 0 && s == 0x7c0) + if (j == 0 && s == 0x7c0) my++; //ZT - if (state->flipscreen) + if (state->flipscreen) { mx = 240 - mx; my = 240 - my; } - for (i = 0; i < 0x40; i += 2) + for (i = 0; i < 0x40; i += 2) { tile = spriteram[offs + 1 + i + (0x800 * j) + 0x800]; color = spriteram[offs + i + (0x800 * j) + 0x800] & 0x7f; @@ -105,7 +105,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect fx = tile & 0x4000; tile &= 0x3fff; - if (state->flipscreen) + if (state->flipscreen) { if (fx) fx = 0; else fx = 1; if (fy) fy = 0; else fy = 1; @@ -172,7 +172,7 @@ VIDEO_UPDATE( alpha68k_II ) WRITE16_HANDLER( alpha68k_II_video_bank_w ) { alpha68k_state *state = (alpha68k_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x10: /* Reset */ state->bank_base = state->buffer_28 = state->buffer_60 = state->buffer_68 = 0; @@ -211,7 +211,7 @@ WRITE16_HANDLER( alpha68k_II_video_bank_w ) WRITE16_HANDLER( alpha68k_V_video_control_w ) { - switch (offset) + switch (offset) { case 0x08: /* Graphics flags? Not related to fix chars anyway */ case 0x0c: @@ -234,16 +234,16 @@ static void draw_sprites_V( running_machine *machine, bitmap_t *bitmap, const re mx = spriteram[offs + 2 + (j << 1)] << 1 | my >> 15; my = -my & 0x1ff; mx = ((mx + 0x100) & 0x1ff) - 0x100; - if (j == 0 && s == 0x7c0) + if (j == 0 && s == 0x7c0) my++; //ZT - if (state->flipscreen) + if (state->flipscreen) { mx = 240 - mx; my = 240 - my; } - for (i = 0; i < 0x40; i += 2) + for (i = 0; i < 0x40; i += 2) { tile = spriteram[offs + 1 + i + (0x800 * j) + 0x800]; color = spriteram[offs + i + (0x800 * j) + 0x800] & 0xff; @@ -251,10 +251,10 @@ static void draw_sprites_V( running_machine *machine, bitmap_t *bitmap, const re fx = tile & fx_mask; fy = tile & fy_mask; tile = tile & sprite_mask; - if (tile > 0x4fff) + if (tile > 0x4fff) continue; - if (state->flipscreen) + if (state->flipscreen) { if (fx) fx = 0; else fx = 1; if (fy) fy = 0; else fy = 1; @@ -294,11 +294,11 @@ VIDEO_UPDATE( alpha68k_V ) draw_sprites_V(screen->machine, bitmap, cliprect, 0, 0x07c0, 0x0800, 0, 0x8000, 0x7fff); draw_sprites_V(screen->machine, bitmap, cliprect, 1, 0x0000, 0x0800, 0, 0x8000, 0x7fff); //AT: *KLUDGE* fixes priest priority in level 1(could be a game bug) - if (spriteram[0x1bde] == 0x24 && (spriteram[0x1bdf] >> 8) == 0x3b) + if (spriteram[0x1bde] == 0x24 && (spriteram[0x1bdf] >> 8) == 0x3b) { draw_sprites_V(screen->machine, bitmap, cliprect, 2, 0x03c0, 0x0800, 0, 0x8000, 0x7fff); draw_sprites_V(screen->machine, bitmap, cliprect, 2, 0x0000, 0x03c0, 0, 0x8000, 0x7fff); - } + } else draw_sprites_V(screen->machine, bitmap, cliprect, 2, 0x0000, 0x0800, 0, 0x8000, 0x7fff); @@ -463,7 +463,7 @@ static void kyros_draw_sprites( running_machine *machine, bitmap_t *bitmap, cons my = -(mx >> 8) & 0xff; mx &= 0xff; - if (state->flipscreen) + if (state->flipscreen) my = 249 - my; for (i = 0; i < 0x20; i++) @@ -527,10 +527,10 @@ static void sstingry_draw_sprites( running_machine *machine, bitmap_t *bitmap, c mx = spriteram[offs + c]; my = -(mx >> 8) & 0xff; mx &= 0xff; - if (mx > 0xf8) + if (mx > 0xf8) mx -= 0x100; - if (state->flipscreen) + if (state->flipscreen) my = 249 - my; for (i = 0; i < 0x20; i++) diff --git a/src/mame/video/amspdwy.c b/src/mame/video/amspdwy.c index 88ddd76eff1..4f684728863 100644 --- a/src/mame/video/amspdwy.c +++ b/src/mame/video/amspdwy.c @@ -122,9 +122,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect if (flip_screen_get(machine)) { - x = max_x - x - 8; + x = max_x - x - 8; y = max_y - y - 8; - flipx = !flipx; + flipx = !flipx; flipy = !flipy; } diff --git a/src/mame/video/atarig42.c b/src/mame/video/atarig42.c index 0a1e1ad0539..3d3888228da 100644 --- a/src/mame/video/atarig42.c +++ b/src/mame/video/atarig42.c @@ -129,7 +129,7 @@ VIDEO_START( atarig42 ) WRITE16_HANDLER( atarig42_mo_control_w ) { atarig42_state *state = (atarig42_state *)space->machine->driver_data; - + logerror("MOCONT = %d (scan = %d)\n", data, video_screen_get_vpos(space->machine->primary_screen)); /* set the control value */ diff --git a/src/mame/video/buggychl.c b/src/mame/video/buggychl.c index 5475f3767a2..badc9465f19 100644 --- a/src/mame/video/buggychl.c +++ b/src/mame/video/buggychl.c @@ -103,9 +103,9 @@ static void draw_bg( running_machine *machine, bitmap_t *bitmap, const rectangle int sx = offs % 32; int sy = offs / 32; - if (flip_screen_x_get(machine)) + if (flip_screen_x_get(machine)) sx = 31 - sx; - if (flip_screen_y_get(machine)) + if (flip_screen_y_get(machine)) sy = 31 - sy; drawgfx_opaque(state->tmp_bitmap1, NULL, machine->gfx[0], @@ -145,9 +145,9 @@ static void draw_fg( running_machine *machine, bitmap_t *bitmap, const rectangle int code = state->videoram[offs]; - if (flipx) + if (flipx) sx = 31 - sx; - if (flipy) + if (flipy) sy = 31 - sy; drawgfx_transpen(bitmap,cliprect,machine->gfx[0], @@ -195,7 +195,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect charline = zoomy_rom[y] & 0x07; base_pos = zoomy_rom[y] & 0x38; - if (flipy) + if (flipy) base_pos ^= 0x38; px = 0; diff --git a/src/mame/video/fromanc2.c b/src/mame/video/fromanc2.c index df2b1509535..0a68942fa0c 100644 --- a/src/mame/video/fromanc2.c +++ b/src/mame/video/fromanc2.c @@ -189,7 +189,7 @@ WRITE16_HANDLER( fromanc2_videoram_3_w ) { fromanc2_dispvram_w(space->machine, o WRITE16_HANDLER( fromanc2_gfxreg_0_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0x000); break; case 0x01: state->scrolly[0][0] = -(data - 0x000); break; @@ -203,7 +203,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_0_w ) WRITE16_HANDLER( fromanc2_gfxreg_1_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[1][0] = -(data - 0x1be); break; case 0x01: state->scrolly[1][0] = -(data - 0x1ef); break; @@ -217,7 +217,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_1_w ) WRITE16_HANDLER( fromanc2_gfxreg_2_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][2] = -(data - 0x1c0); break; case 0x01: state->scrolly[0][2] = -(data - 0x1ef); break; @@ -231,7 +231,7 @@ WRITE16_HANDLER( fromanc2_gfxreg_2_w ) WRITE16_HANDLER( fromanc2_gfxreg_3_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[1][2] = -(data - 0x1bf); break; case 0x01: state->scrolly[1][2] = -(data - 0x1ef); break; @@ -285,7 +285,7 @@ WRITE16_HANDLER( fromancr_videoram_2_w ) { fromancr_vram_w(space->machine, offse WRITE16_HANDLER( fromancr_gfxreg_0_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0x1bf); break; case 0x01: state->scrolly[0][0] = -(data - 0x1ef); break; @@ -299,7 +299,7 @@ WRITE16_HANDLER( fromancr_gfxreg_0_w ) WRITE16_HANDLER( fromancr_gfxreg_1_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][1] = -(data - 0x000); break; case 0x01: state->scrolly[0][1] = -(data - 0x000); break; @@ -341,7 +341,7 @@ WRITE16_HANDLER( fromanc4_videoram_2_w ) { fromanc4_vram_w(space->machine, offse WRITE16_HANDLER( fromanc4_gfxreg_0_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][2] = -(data - 0xfbb); break; case 0x01: state->scrolly[0][2] = -(data - 0x1e4); break; @@ -360,7 +360,7 @@ WRITE16_HANDLER( fromanc4_gfxreg_0_w ) WRITE16_HANDLER( fromanc4_gfxreg_1_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][1] = -(data - 0xfba); break; case 0x01: state->scrolly[0][1] = -(data - 0x1e4); break; @@ -379,7 +379,7 @@ WRITE16_HANDLER( fromanc4_gfxreg_1_w ) WRITE16_HANDLER( fromanc4_gfxreg_2_w ) { fromanc2_state *state = (fromanc2_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->scrollx[0][0] = -(data - 0xfbb); break; case 0x01: state->scrolly[0][0] = -(data - 0x1e4); break; diff --git a/src/mame/video/fromance.c b/src/mame/video/fromance.c index 130412b60b3..83553723d27 100644 --- a/src/mame/video/fromance.c +++ b/src/mame/video/fromance.c @@ -341,9 +341,9 @@ static void draw_sprites( const device_config *screen, bitmap_t *bitmap, const r yzoom = 16 - zoomtable[yzoom] / 8; /* wrap around */ - if (x > visarea->max_x) + if (x > visarea->max_x) x -= 0x200; - if (y > visarea->max_y) + if (y > visarea->max_y) y -= 0x200; /* flip ? */ diff --git a/src/mame/video/gaelco.c b/src/mame/video/gaelco.c index 30e677078d7..98f6a5d0837 100644 --- a/src/mame/video/gaelco.c +++ b/src/mame/video/gaelco.c @@ -242,7 +242,7 @@ VIDEO_UPDATE( bigkarnk ) tilemap_draw(bitmap, cliprect, state->tilemap[0], TILEMAP_DRAW_LAYER0 | 2, 2); tilemap_draw(bitmap, cliprect, state->tilemap[1], TILEMAP_DRAW_LAYER1 | 1, 2); - tilemap_draw(bitmap, cliprect, state->tilemap[0], TILEMAP_DRAW_LAYER1 | 1, 2); + tilemap_draw(bitmap, cliprect, state->tilemap[0], TILEMAP_DRAW_LAYER1 | 1, 2); tilemap_draw(bitmap, cliprect, state->tilemap[1], TILEMAP_DRAW_LAYER0 | 1, 4); tilemap_draw(bitmap, cliprect, state->tilemap[0], TILEMAP_DRAW_LAYER0 | 1, 4); diff --git a/src/mame/video/galivan.c b/src/mame/video/galivan.c index ec930e11dd9..6d52b2fc6f0 100644 --- a/src/mame/video/galivan.c +++ b/src/mame/video/galivan.c @@ -297,11 +297,11 @@ WRITE8_HANDLER( ninjemak_gfxbank_w ) WRITE8_HANDLER( galivan_scrollx_w ) { galivan_state *state = (galivan_state *)space->machine->driver_data; - if (offset == 1) + if (offset == 1) { if (data & 0x80) state->write_layers = 1; - else if (state->write_layers) + else if (state->write_layers) { state->layers = data & 0x60; state->write_layers = 0; @@ -388,13 +388,13 @@ VIDEO_UPDATE( galivan ) else tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - if (state->layers & 0x20) + if (state->layers & 0x20) { tilemap_draw(bitmap, cliprect, state->tx_tilemap, 0, 0); tilemap_draw(bitmap, cliprect, state->tx_tilemap, 1, 0); draw_sprites(screen->machine, bitmap, cliprect); - } - else + } + else { draw_sprites(screen->machine, bitmap, cliprect); tilemap_draw(bitmap, cliprect, state->tx_tilemap, 0, 0); diff --git a/src/mame/video/gberet.c b/src/mame/video/gberet.c index bb0e4e24a02..0098eb4e146 100644 --- a/src/mame/video/gberet.c +++ b/src/mame/video/gberet.c @@ -185,7 +185,7 @@ WRITE8_HANDLER( gberetb_scroll_w ) gberet_state *state = (gberet_state *)space->machine->driver_data; int scroll = data; - if (offset) + if (offset) scroll |= 0x100; for (offset = 6; offset < 29; offset++) diff --git a/src/mame/video/ginganin.c b/src/mame/video/ginganin.c index a67f4161ab3..fbcd502354a 100644 --- a/src/mame/video/ginganin.c +++ b/src/mame/video/ginganin.c @@ -229,9 +229,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap,const recta if (state->flipscreen) { - x = 240 - x; + x = 240 - x; y = 240 - y; - flipx = !flipx; + flipx = !flipx; flipy = !flipy; } @@ -280,14 +280,14 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) if (layers_ctrl1 & 1) tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0); - else + else bitmap_fill(bitmap, cliprect, 0); - if (layers_ctrl1 & 2) + if (layers_ctrl1 & 2) tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); - if (layers_ctrl1 & 8) + if (layers_ctrl1 & 8) draw_sprites(screen->machine, bitmap, cliprect); - if (layers_ctrl1 & 4) + if (layers_ctrl1 & 4) tilemap_draw(bitmap, cliprect, state->tx_tilemap, 0, 0); return 0; diff --git a/src/mame/video/glass.c b/src/mame/video/glass.c index 55e71f7f032..cad163ea2bb 100644 --- a/src/mame/video/glass.c +++ b/src/mame/video/glass.c @@ -100,8 +100,8 @@ WRITE16_HANDLER( glass_blitter_w ) *BITMAP_ADDR16(state->screen_bitmap, j, i) = color & 0xff; } } - } - else + } + else bitmap_fill(state->screen_bitmap, 0, 0); } } diff --git a/src/mame/video/gotcha.c b/src/mame/video/gotcha.c index fe861a2bc8e..887c939dd15 100644 --- a/src/mame/video/gotcha.c +++ b/src/mame/video/gotcha.c @@ -21,16 +21,16 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int ti SET_TILE_INFO(0, code, (data >> 12) + color_offs, 0); } -static TILE_GET_INFO( fg_get_tile_info ) -{ +static TILE_GET_INFO( fg_get_tile_info ) +{ gotcha_state *state = (gotcha_state *)machine->driver_data; - get_tile_info(machine, tileinfo, tile_index, state->fgvideoram, 0); + get_tile_info(machine, tileinfo, tile_index, state->fgvideoram, 0); } -static TILE_GET_INFO( bg_get_tile_info ) -{ +static TILE_GET_INFO( bg_get_tile_info ) +{ gotcha_state *state = (gotcha_state *)machine->driver_data; - get_tile_info(machine, tileinfo, tile_index, state->bgvideoram, 16); + get_tile_info(machine, tileinfo, tile_index, state->bgvideoram, 16); } diff --git a/src/mame/video/gunsmoke.c b/src/mame/video/gunsmoke.c index 249d5344cba..5e423e436ce 100644 --- a/src/mame/video/gunsmoke.c +++ b/src/mame/video/gunsmoke.c @@ -157,7 +157,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int sx = spriteram[offs + 3] - ((attr & 0x20) << 3); int sy = spriteram[offs + 2]; - if (bank == 3) + if (bank == 3) bank += state->sprite3bank; code += 256 * bank; @@ -185,10 +185,10 @@ VIDEO_UPDATE( gunsmoke ) else bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); - if (state->objon) + if (state->objon) draw_sprites(screen->machine, bitmap, cliprect); - if (state->chon) + if (state->chon) tilemap_draw(bitmap, cliprect, state->fg_tilemap, 0, 0); return 0; diff --git a/src/mame/video/higemaru.c b/src/mame/video/higemaru.c index d831187dcfa..9d20a5b3358 100644 --- a/src/mame/video/higemaru.c +++ b/src/mame/video/higemaru.c @@ -76,7 +76,7 @@ PALETTE_INIT( higemaru ) WRITE8_HANDLER( higemaru_c800_w ) { higemaru_state *state = (higemaru_state *)space->machine->driver_data; - if (data & 0x7c) + if (data & 0x7c) logerror("c800 = %02x\n",data); /* bits 0 and 1 are coin counters */ diff --git a/src/mame/video/hng64.c b/src/mame/video/hng64.c index c2130a784d0..3e8e890a3fe 100644 --- a/src/mame/video/hng64.c +++ b/src/mame/video/hng64.c @@ -507,7 +507,7 @@ static void transition_control(bitmap_t *bitmap, const rectangle *cliprect) brigR = (INT32)( hng64_tcram[0x0000000a] & 0xff); brigG = (INT32)((hng64_tcram[0x0000000a] >> 8) & 0xff); brigB = (INT32)((hng64_tcram[0x0000000a] >> 16) & 0xff); - + for (i = cliprect->min_x; i < cliprect->max_x; i++) { for (j = cliprect->min_y; j < cliprect->max_y; j++) @@ -778,7 +778,7 @@ static void hng64_configure_blit_parameters(blit_parameters *blit, tilemap *tmap /* set the priority code and alpha */ //blit->tilemap_priority_code = priority | (priority_mask << 8) | (tmap->palette_offset << 16); // fixit blit->alpha = (flags & TILEMAP_DRAW_ALPHA_FLAG) ? (flags >> 24) : 0xff; - + blit->drawformat = drawformat; /* tile priority; unless otherwise specified, draw anything in layer 0 */ @@ -815,8 +815,8 @@ INLINE UINT32 alpha_additive_r32(UINT32 d, UINT32 s, UINT8 level) if (add & 0x01000000) d = (d & 0xff00ffff) | (0x00ff0000); else d = (d & 0xff00ffff) | (add & 0x00ff0000); add = (s & 0x000000ff) + (d & 0x000000ff); - if (add & 0x00000100) d = (d & 0xffffff00) | (0x000000ff); - else d = (d & 0xffffff00) | (add & 0x000000ff); + if (add & 0x00000100) d = (d & 0xffffff00) | (0x000000ff); + else d = (d & 0xffffff00) | (add & 0x000000ff); add = (s & 0x0000ff00) + (d & 0x0000ff00); if (add & 0x00010000) d = (d & 0xffff00ff) | (0x0000ff00); else d = (d & 0xffff00ff) | (add & 0x0000ff00); @@ -1031,7 +1031,7 @@ static void hng64_tilemap_draw_roz_primask(running_machine* machine, bitmap_t *d /* skip if disabled */ //if (!tmap->enable) - // return; + // return; profiler_mark_start(PROFILER_TILEMAP_DRAW_ROZ); /* configure the blit parameters */ @@ -1528,10 +1528,10 @@ VIDEO_UPDATE( hng64 ) { UINT32 *src = &colorBuffer3d[y * (cliprect->max_x-cliprect->min_x)]; UINT32 *dst = BITMAP_ADDR32(bitmap, y, cliprect->min_x); - + for (x = cliprect->min_x; x <= cliprect->max_x; x++) - { - if(*src & 0xff000000) + { + if(*src & 0xff000000) *dst = *src; dst++; @@ -1745,17 +1745,17 @@ static void draw3d(running_machine *machine, bitmap_t *bitmap, const rectangle * UINT32 address[4]; UINT32 megaOffset; float eyeCoords[4]; // objectCoords transformed by the modelViewMatrix - // float clipCoords[4]; // eyeCoords transformed by the projectionMatrix + // float clipCoords[4]; // eyeCoords transformed by the projectionMatrix float ndCoords[4]; // normalized device coordinates/clipCoordinates (x/w, y/w, z/w) float windowCoords[4]; // mapped ndCoordinates to screen space float cullRay[4]; // Debug... // mame_printf_debug("Element %.2d (%d) : %.8x %.8x %.8x %.8x %.8x %.8x %.8x %.8x\n", i/0x08, j, -// (UINT32)hng64_dls[j][i+0], (UINT32)hng64_dls[j][i+1], -// (UINT32)hng64_dls[j][i+2], (UINT32)hng64_dls[j][i+3], -// (UINT32)hng64_dls[j][i+4], (UINT32)hng64_dls[j][i+5], -// (UINT32)hng64_dls[j][i+6], (UINT32)hng64_dls[j][i+7]); +// (UINT32)hng64_dls[j][i+0], (UINT32)hng64_dls[j][i+1], +// (UINT32)hng64_dls[j][i+2], (UINT32)hng64_dls[j][i+3], +// (UINT32)hng64_dls[j][i+4], (UINT32)hng64_dls[j][i+5], +// (UINT32)hng64_dls[j][i+6], (UINT32)hng64_dls[j][i+7]); // Depending on what the initial flags are, do sumthin'... switch((workingList[i+0] & 0xffff0000) >> 16) @@ -2348,10 +2348,10 @@ static float uToF(UINT16 input) retVal = (float)((INT16)input) / 32768.0f; return retVal; -/* if ((INT16)input < 0) - retVal = (float)((INT16)input) / 32768.0f; - else - retVal = (float)((INT16)input) / 32767.0f; */ +/* if ((INT16)input < 0) + retVal = (float)((INT16)input) / 32768.0f; + else + retVal = (float)((INT16)input) / 32767.0f; */ } #ifdef UNUSED_FUNCTION @@ -2649,7 +2649,7 @@ INLINE void FillSmoothTexPCHorizontalLine(running_machine *machine, bitmap_t *Co UINT8 paletteEntry; float t_coord, s_coord; - if (Function >= 0) + if (Function >= 0) textureOffset = &gfx[Function * 1024 * 1024]; else textureOffset = 0x00; diff --git a/src/mame/video/holeland.c b/src/mame/video/holeland.c index 6350aa075f7..525a6b370e7 100644 --- a/src/mame/video/holeland.c +++ b/src/mame/video/holeland.c @@ -102,9 +102,9 @@ WRITE8_HANDLER( holeland_scroll_w ) WRITE8_HANDLER( holeland_flipscreen_w ) { - if (offset) + if (offset) flip_screen_y_set(space->machine, data); - else + else flip_screen_x_set(space->machine, data); } diff --git a/src/mame/video/homedata.c b/src/mame/video/homedata.c index 5a45a71a368..1b31cc29f94 100644 --- a/src/mame/video/homedata.c +++ b/src/mame/video/homedata.c @@ -104,7 +104,7 @@ static void mrokumei_handleblit( const address_space *space, int rom_base ) if (state->vreg[1] & 0x80) /* flip screen */ { dest_addr -= 2; - if (dest_addr < 0) + if (dest_addr < 0) goto finish; } else @@ -197,7 +197,7 @@ static void reikaids_handleblit( const address_space *space, int rom_base ) if (flipx) { - if ((base_addr & 0x4000) == 0) + if ((base_addr & 0x4000) == 0) dat |= 0x80; addr ^= 0x007c; } @@ -408,28 +408,28 @@ INLINE void mrokumei_info1( running_machine *machine, tile_data *tileinfo, int t SET_TILE_INFO( 1, code, color, state->flipscreen ); } -static TILE_GET_INFO( mrokumei_get_info0_0 ) -{ +static TILE_GET_INFO( mrokumei_get_info0_0 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - mrokumei_info0( machine, tileinfo, tile_index, 0, state->blitter_bank & 0x03 ); + mrokumei_info0( machine, tileinfo, tile_index, 0, state->blitter_bank & 0x03 ); } -static TILE_GET_INFO( mrokumei_get_info1_0 ) -{ +static TILE_GET_INFO( mrokumei_get_info1_0 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - mrokumei_info0( machine, tileinfo, tile_index, 1, state->blitter_bank & 0x03 ); + mrokumei_info0( machine, tileinfo, tile_index, 1, state->blitter_bank & 0x03 ); } -static TILE_GET_INFO( mrokumei_get_info0_1 ) -{ +static TILE_GET_INFO( mrokumei_get_info0_1 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - mrokumei_info1( machine, tileinfo, tile_index, 0, (state->blitter_bank & 0x38) >> 3 ); + mrokumei_info1( machine, tileinfo, tile_index, 0, (state->blitter_bank & 0x38) >> 3 ); } -static TILE_GET_INFO( mrokumei_get_info1_1 ) -{ +static TILE_GET_INFO( mrokumei_get_info1_1 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - mrokumei_info1( machine, tileinfo, tile_index, 1, (state->blitter_bank & 0x38) >> 3 ); + mrokumei_info1( machine, tileinfo, tile_index, 1, (state->blitter_bank & 0x38) >> 3 ); } @@ -455,52 +455,52 @@ INLINE void reikaids_info( running_machine *machine, tile_data *tileinfo, int ti * xxxx.x--- layer#0 * ----.-xxx layer#2 */ -static TILE_GET_INFO( reikaids_get_info0_0 ) -{ +static TILE_GET_INFO( reikaids_get_info0_0 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 0, 0, (state->gfx_bank[1] >> 3)); + reikaids_info(machine, tileinfo, tile_index, 0, 0, (state->gfx_bank[1] >> 3)); } -static TILE_GET_INFO( reikaids_get_info1_0 ) -{ +static TILE_GET_INFO( reikaids_get_info1_0 ) +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 1, 0, (state->gfx_bank[1] >> 3)); + reikaids_info(machine, tileinfo, tile_index, 1, 0, (state->gfx_bank[1] >> 3)); } static TILE_GET_INFO( reikaids_get_info0_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 0, 1, ((state->gfx_bank[0] & 0x78) >> 3)); + reikaids_info(machine, tileinfo, tile_index, 0, 1, ((state->gfx_bank[0] & 0x78) >> 3)); } static TILE_GET_INFO( reikaids_get_info1_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 1, 1, ((state->gfx_bank[0] & 0x78) >> 3)); + reikaids_info(machine, tileinfo, tile_index, 1, 1, ((state->gfx_bank[0] & 0x78) >> 3)); } static TILE_GET_INFO( reikaids_get_info0_2 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 0, 2, (state->gfx_bank[1] & 0x7)); + reikaids_info(machine, tileinfo, tile_index, 0, 2, (state->gfx_bank[1] & 0x7)); } static TILE_GET_INFO( reikaids_get_info1_2 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 1, 2, (state->gfx_bank[1] & 0x7)); + reikaids_info(machine, tileinfo, tile_index, 1, 2, (state->gfx_bank[1] & 0x7)); } static TILE_GET_INFO( reikaids_get_info0_3 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 0, 3, (state->gfx_bank[0] & 0x7)); + reikaids_info(machine, tileinfo, tile_index, 0, 3, (state->gfx_bank[0] & 0x7)); } static TILE_GET_INFO( reikaids_get_info1_3 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - reikaids_info(machine, tileinfo, tile_index, 1, 3, (state->gfx_bank[0] & 0x7)); + reikaids_info(machine, tileinfo, tile_index, 1, 3, (state->gfx_bank[0] & 0x7)); } @@ -516,27 +516,27 @@ INLINE void pteacher_info( running_machine *machine, tile_data *tileinfo, int ti } static TILE_GET_INFO( pteacher_get_info0_0 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - pteacher_info(machine, tileinfo, tile_index, 0, 0, state->gfx_bank[0] & 0x0f); + pteacher_info(machine, tileinfo, tile_index, 0, 0, state->gfx_bank[0] & 0x0f); } static TILE_GET_INFO( pteacher_get_info1_0 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - pteacher_info(machine, tileinfo, tile_index, 1, 0, state->gfx_bank[0] & 0x0f); + pteacher_info(machine, tileinfo, tile_index, 1, 0, state->gfx_bank[0] & 0x0f); } static TILE_GET_INFO( pteacher_get_info0_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - pteacher_info(machine, tileinfo, tile_index, 0, 1, state->gfx_bank[0] >> 4); + pteacher_info(machine, tileinfo, tile_index, 0, 1, state->gfx_bank[0] >> 4); } static TILE_GET_INFO( pteacher_get_info1_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - pteacher_info(machine, tileinfo, tile_index, 1, 1, state->gfx_bank[0] >> 4); + pteacher_info(machine, tileinfo, tile_index, 1, 1, state->gfx_bank[0] >> 4); } @@ -552,28 +552,28 @@ INLINE void lemnangl_info( running_machine *machine, tile_data *tileinfo, int ti } static TILE_GET_INFO( lemnangl_get_info0_0 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - lemnangl_info( machine, tileinfo, tile_index, 0, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); + lemnangl_info( machine, tileinfo, tile_index, 0, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); } static TILE_GET_INFO( lemnangl_get_info1_0 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - lemnangl_info( machine, tileinfo, tile_index, 1, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); + lemnangl_info( machine, tileinfo, tile_index, 1, 0, state->blitter_bank & 1, state->gfx_bank[0] & 0x0f ); } static TILE_GET_INFO( lemnangl_get_info0_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - lemnangl_info( machine, tileinfo, tile_index, 0, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); + lemnangl_info( machine, tileinfo, tile_index, 0, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); } static TILE_GET_INFO( lemnangl_get_info1_1 ) -{ +{ homedata_state *state = (homedata_state *)machine->driver_data; - lemnangl_info( machine, tileinfo, tile_index, 1, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); + lemnangl_info( machine, tileinfo, tile_index, 1, 1, (state->blitter_bank & 2) >> 1, state->gfx_bank[0] >> 4 ); } @@ -746,7 +746,7 @@ WRITE8_HANDLER( pteacher_blitter_bank_w ) WRITE8_HANDLER( mrokumei_blitter_start_w ) { homedata_state *state = (homedata_state *)space->machine->driver_data; - if (data & 0x80) + if (data & 0x80) mrokumei_handleblit(space, ((state->blitter_bank & 0x04) >> 2) * 0x10000); /* bit 0 = bank switch; used by hourouki to access the diff --git a/src/mame/video/hyprduel.c b/src/mame/video/hyprduel.c index ff5cc5ee7b3..25ae754dc36 100644 --- a/src/mame/video/hyprduel.c +++ b/src/mame/video/hyprduel.c @@ -246,9 +246,9 @@ INLINE void hyprduel_vram_w( running_machine *machine, offs_t offset, UINT16 dat /* Account for the window */ int col = (offset % BIG_NX) - ((state->window[layer * 2 + 1] / 8) % BIG_NX); int row = (offset / BIG_NX) - ((state->window[layer * 2 + 0] / 8) % BIG_NY); - if (col < -(BIG_NX-WIN_NX)) + if (col < -(BIG_NX-WIN_NX)) col += (BIG_NX-WIN_NX) + WIN_NX; - if (row < -(BIG_NY-WIN_NY)) + if (row < -(BIG_NY-WIN_NY)) row += (BIG_NY-WIN_NY) + WIN_NY; if ((col >= 0) && (col < WIN_NX) && (row >= 0) && (row < WIN_NY)) tilemap_mark_tile_dirty(state->bg_tilemap[layer], row * WIN_NX + col); @@ -257,40 +257,40 @@ INLINE void hyprduel_vram_w( running_machine *machine, offs_t offset, UINT16 dat -static TILE_GET_INFO( get_tile_info_0_8bit ) -{ +static TILE_GET_INFO( get_tile_info_0_8bit ) +{ hyprduel_state *state = (hyprduel_state *)machine->driver_data; - get_tile_info_8bit(machine, tileinfo, tile_index, 0, state->vram_0); + get_tile_info_8bit(machine, tileinfo, tile_index, 0, state->vram_0); } -static TILE_GET_INFO( get_tile_info_1_8bit ) -{ +static TILE_GET_INFO( get_tile_info_1_8bit ) +{ hyprduel_state *state = (hyprduel_state *)machine->driver_data; - get_tile_info_8bit(machine, tileinfo, tile_index, 1, state->vram_1); + get_tile_info_8bit(machine, tileinfo, tile_index, 1, state->vram_1); } -static TILE_GET_INFO( get_tile_info_2_8bit ) -{ +static TILE_GET_INFO( get_tile_info_2_8bit ) +{ hyprduel_state *state = (hyprduel_state *)machine->driver_data; - get_tile_info_8bit(machine, tileinfo, tile_index, 2, state->vram_2); + get_tile_info_8bit(machine, tileinfo, tile_index, 2, state->vram_2); } -WRITE16_HANDLER( hyprduel_vram_0_w ) -{ +WRITE16_HANDLER( hyprduel_vram_0_w ) +{ hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; - hyprduel_vram_w(space->machine, offset, data, mem_mask, 0, state->vram_0); + hyprduel_vram_w(space->machine, offset, data, mem_mask, 0, state->vram_0); } -WRITE16_HANDLER( hyprduel_vram_1_w ) -{ +WRITE16_HANDLER( hyprduel_vram_1_w ) +{ hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; - hyprduel_vram_w(space->machine, offset, data, mem_mask, 1, state->vram_1); + hyprduel_vram_w(space->machine, offset, data, mem_mask, 1, state->vram_1); } -WRITE16_HANDLER( hyprduel_vram_2_w ) -{ +WRITE16_HANDLER( hyprduel_vram_2_w ) +{ hyprduel_state *state = (hyprduel_state *)space->machine->driver_data; - hyprduel_vram_w(space->machine, offset, data, mem_mask, 2, state->vram_2); + hyprduel_vram_w(space->machine, offset, data, mem_mask, 2, state->vram_2); } @@ -718,7 +718,7 @@ VIDEO_UPDATE( hyprduel ) ---- ---- ---4 32-- ---- ---- ---- --1- ? Blank Screen ---- ---- ---- ---0 Flip Screen */ - if (screenctrl & 2) + if (screenctrl & 2) return 0; flip_screen_set(screen->machine, screenctrl & 1); @@ -730,9 +730,9 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) if (input_code_pressed(screen->machine, KEYCODE_E)) msk |= 0x04; if (input_code_pressed(screen->machine, KEYCODE_A)) msk |= 0x08; if (msk != 0) - { + { bitmap_fill(bitmap, cliprect,0); - layers_ctrl &= msk; + layers_ctrl &= msk; } popmessage("%x-%x-%x:%04x %04x %04x", diff --git a/src/mame/video/inufuku.c b/src/mame/video/inufuku.c index 4bae44732c2..f02d754a748 100644 --- a/src/mame/video/inufuku.c +++ b/src/mame/video/inufuku.c @@ -24,7 +24,7 @@ WRITE16_HANDLER( inufuku_palettereg_w ) { inufuku_state *state = (inufuku_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x02: state->bg_palettebank = (data & 0xf000) >> 12; tilemap_mark_all_tiles_dirty(state->bg_tilemap); @@ -38,7 +38,7 @@ WRITE16_HANDLER( inufuku_palettereg_w ) WRITE16_HANDLER( inufuku_scrollreg_w ) { inufuku_state *state = (inufuku_state *)space->machine->driver_data; - switch (offset) + switch (offset) { case 0x00: state->bg_scrollx = data + 1; break; case 0x01: state->bg_scrolly = data + 0; break; @@ -60,9 +60,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect inufuku_state *state = (inufuku_state *)machine->driver_data; int offs; - for (offs = (state->spriteram1_size / 16) - 1; offs >= 0; offs--) + for (offs = (state->spriteram1_size / 16) - 1; offs >= 0; offs--) { - if ((state->spriteram1[offs] & 0x8000) == 0x0000) + if ((state->spriteram1[offs] & 0x8000) == 0x0000) { int attr_start; int map_start; @@ -106,7 +106,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect priority = (state->spriteram1[attr_start + 2] & 0x3000) >> 12; map_start = (state->spriteram1[attr_start + 3] & 0x7fff) << 1; - switch (priority) + switch (priority) { default: case 0: priority_mask = 0x00; break; @@ -121,7 +121,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect zoomx = 32 - zoomx; zoomy = 32 - zoomy; - for (y = 0; y <= ysize; y++) + for (y = 0; y <= ysize; y++) { int sx, sy; @@ -130,7 +130,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect else sy = (oy + zoomy * y / 2 + 16) & 0x1ff; - for (x = 0; x <= xsize; x++) + for (x = 0; x <= xsize; x++) { int code; @@ -242,13 +242,13 @@ VIDEO_UPDATE( inufuku ) bitmap_fill(bitmap, cliprect, get_black_pen(screen->machine)); bitmap_fill(screen->machine->priority_bitmap, NULL, 0); - if (state->bg_raster) + if (state->bg_raster) { tilemap_set_scroll_rows(state->bg_tilemap, 512); - for (i = 0; i < 256; i++) + for (i = 0; i < 256; i++) tilemap_set_scrollx(state->bg_tilemap, (state->bg_scrolly + i) & 0x1ff, state->bg_rasterram[i]); } - else + else { tilemap_set_scroll_rows(state->bg_tilemap, 1); tilemap_set_scrollx(state->bg_tilemap, 0, state->bg_scrollx); diff --git a/src/mame/video/ironhors.c b/src/mame/video/ironhors.c index 91de94821b5..4b899672616 100644 --- a/src/mame/video/ironhors.c +++ b/src/mame/video/ironhors.c @@ -120,7 +120,7 @@ WRITE8_HANDLER( ironhors_palettebank_w ) /* bit 6 unknown - set after game over */ - if (data & 0x88) + if (data & 0x88) popmessage("ironhors_palettebank_w %02x",data); } diff --git a/src/mame/video/jackal.c b/src/mame/video/jackal.c index 5fd826c7b4e..df62c7e2af9 100644 --- a/src/mame/video/jackal.c +++ b/src/mame/video/jackal.c @@ -132,9 +132,9 @@ static void draw_sprites_region( running_machine *machine, bitmap_t *bitmap, con int flipy = attr & 0x40; int color = ((sn2 & 0xf0) >> 4); - if (attr & 0x01) + if (attr & 0x01) sx = sx - 256; - if (sy > 0xf0) + if (sy > 0xf0) sy = sy - 256; if (flip_screen_get(machine)) diff --git a/src/mame/video/kan_pand.c b/src/mame/video/kan_pand.c index 54e25ea5ce7..cdebe82ca5a 100644 --- a/src/mame/video/kan_pand.c +++ b/src/mame/video/kan_pand.c @@ -51,7 +51,7 @@ #include "video/kan_pand.h" typedef struct _kaneko_pandora_state kaneko_pandora_state; -struct _kaneko_pandora_state +struct _kaneko_pandora_state { const device_config *screen; UINT8 * spriteram; @@ -140,9 +140,9 @@ static void pandora_draw( const device_config *device, bitmap_t *bitmap, const r int flipy = (attr & 0x40) << 1; int tile = ((attr & 0x3f) << 8) + (pandora->spriteram[offs + 6] & 0xff); - if (tilecolour & 1) + if (tilecolour & 1) dx |= 0x100; - if (tilecolour & 2) + if (tilecolour & 2) dy |= 0x100; if (tilecolour & 4) @@ -176,9 +176,9 @@ static void pandora_draw( const device_config *device, bitmap_t *bitmap, const r sx &= 0x1ff; sy &= 0x1ff; - if (sx & 0x100) + if (sx & 0x100) sx -= 0x200; - if (sy & 0x100) + if (sy & 0x100) sy -= 0x200; drawgfx_transpen(bitmap,cliprect,device->machine->gfx[pandora->region], @@ -195,7 +195,7 @@ void pandora_eof( const device_config *device ) assert(pandora->spriteram != NULL); // the games can disable the clearing of the sprite bitmap, to leave sprite trails - if (pandora->clear_bitmap) + if (pandora->clear_bitmap) bitmap_fill(pandora->sprites_bitmap, video_screen_get_visible_area(pandora->screen), 0); pandora_draw(device, pandora->sprites_bitmap, video_screen_get_visible_area(pandora->screen)); diff --git a/src/mame/video/karnov.c b/src/mame/video/karnov.c index ba257caa201..5fe47c9f7b0 100644 --- a/src/mame/video/karnov.c +++ b/src/mame/video/karnov.c @@ -78,20 +78,20 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r int scrollx = state->scroll[0]; int scrolly = state->scroll[1]; - if (state->flipscreen) - fx = fy = 1; - else + if (state->flipscreen) + fx = fy = 1; + else fx = fy = 0; - mx = -1; + mx = -1; my = 0; - for (offs = 0; offs < 0x400; offs ++) + for (offs = 0; offs < 0x400; offs ++) { mx++; - if (mx == 32) + if (mx == 32) { - mx=0; + mx=0; my++; } @@ -106,12 +106,12 @@ static void draw_background( running_machine *machine, bitmap_t *bitmap, const r color, fx, fy, 16*mx,16*my); } - if (!state->flipscreen) + if (!state->flipscreen) { scrolly = -scrolly; scrollx = -scrollx; - } - else + } + else { scrolly = scrolly + 256; scrollx = scrollx + 256; @@ -126,12 +126,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect UINT16 *buffered_spriteram16 = machine->generic.buffered_spriteram.u16; int offs; - for (offs = 0; offs <0x800; offs += 4) + for (offs = 0; offs <0x800; offs += 4) { int x, y, sprite, sprite2, colour, fx, fy, extra; y = buffered_spriteram16[offs]; - if (!(y & 0x8000)) + if (!(y & 0x8000)) continue; y = y & 0x1ff; @@ -145,7 +145,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect fy = fx & 0x2; fx = fx & 0x4; - if (extra) + if (extra) y = y + 16; /* Convert the co-ords..*/ @@ -153,7 +153,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = (y + 16) % 0x200; x = 256 - x; y = 256 - y; - if (state->flipscreen) + if (state->flipscreen) { y = 240 - y; x = 240 - x; @@ -163,12 +163,12 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect } /* Y Flip determines order of multi-sprite */ - if (extra && fy) + if (extra && fy) { sprite2 = sprite; sprite++; } - else + else sprite2 = sprite + 1; drawgfx_transpen(bitmap,cliprect,machine->gfx[2], diff --git a/src/mame/video/kickgoal.c b/src/mame/video/kickgoal.c index 427a4e83044..18ba1c00204 100644 --- a/src/mame/video/kickgoal.c +++ b/src/mame/video/kickgoal.c @@ -107,7 +107,7 @@ static void kickgoal_draw_sprites( running_machine *machine, bitmap_t *bitmap,co int flipx = spriteram[offs + 1] & 0x0020; int color = spriteram[offs + 1] & 0x000f; - if (spriteram[offs + 0] & 0x0100) + if (spriteram[offs + 0] & 0x0100) break; ypos *= 2; diff --git a/src/mame/video/kingobox.c b/src/mame/video/kingobox.c index f05360454cc..4329a35a725 100644 --- a/src/mame/video/kingobox.c +++ b/src/mame/video/kingobox.c @@ -220,7 +220,7 @@ static void kingofb_draw_sprites(running_machine *machine, bitmap_t *bitmap, con /* the offset into spriteram seems scrambled */ roffs = BITSWAP16(offs,15,14,13,12,11,10,4,7,6,5,9,8,3,2,1,0) ^ 0x3c; - if (roffs & 0x200) + if (roffs & 0x200) roffs ^= 0x1c0; bank = (spriteram[roffs + 3] & 0x04) >> 2; diff --git a/src/mame/video/kncljoe.c b/src/mame/video/kncljoe.c index 36306ee50b3..3194aed7ad5 100644 --- a/src/mame/video/kncljoe.c +++ b/src/mame/video/kncljoe.c @@ -214,9 +214,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int flipy = !(attr & 0x80); int color = attr & 0x0f; - if (attr & 0x10) + if (attr & 0x10) code += 512; - if (attr & 0x20) + if (attr & 0x20) code += 256; if (state->flipscreen) @@ -227,7 +227,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect sy = 240 - sy; } - if (sx >= 256-8) + if (sx >= 256-8) sx -= 256; drawgfx_transpen(bitmap,&clip,gfx, diff --git a/src/mame/video/kyugo.c b/src/mame/video/kyugo.c index 78413a09354..31ed1f47d44 100644 --- a/src/mame/video/kyugo.c +++ b/src/mame/video/kyugo.c @@ -179,14 +179,14 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect offs = 2 * (n % 12) + 64 * (n / 12); sx = spriteram_area3[offs + 1] + 256 * (spriteram_area2[offs + 1] & 1); - if (sx > 320) + if (sx > 320) sx -= 512; sy = 255 - spriteram_area1[offs] + 2; - if (sy > 0xf0) + if (sy > 0xf0) sy -= 256; - if (state->flipscreen) + if (state->flipscreen) sy = 240 - sy; color = spriteram_area1[offs + 1] & 0x1f; diff --git a/src/mame/video/lastduel.c b/src/mame/video/lastduel.c index e81aa7bc21a..38da3ce37c6 100644 --- a/src/mame/video/lastduel.c +++ b/src/mame/video/lastduel.c @@ -226,7 +226,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect int offs; if (!state->sprite_pri_mask) - if (pri == 1) + if (pri == 1) return; /* only low priority sprites in lastduel */ for (offs = 0x400 - 4; offs >= 0; offs -= 4) @@ -236,9 +236,9 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect attr = buffered_spriteram16[offs + 1]; if (state->sprite_pri_mask) /* only madgear seems to have this */ { - if (pri == 1 && (attr & state->sprite_pri_mask)) + if (pri == 1 && (attr & state->sprite_pri_mask)) continue; - if (pri == 0 && !(attr & state->sprite_pri_mask)) + if (pri == 0 && !(attr & state->sprite_pri_mask)) continue; } diff --git a/src/mame/video/lemmings.c b/src/mame/video/lemmings.c index 73aac4240ca..526ebff1507 100644 --- a/src/mame/video/lemmings.c +++ b/src/mame/video/lemmings.c @@ -30,7 +30,7 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect y = spritedata[offs]; flash = y & 0x1000; - if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) + if (flash && (video_screen_get_frame_number(machine->primary_screen) & 1)) continue; x = spritedata[offs + 2]; @@ -180,9 +180,9 @@ VIDEO_UPDATE( lemmings ) draw_sprites(screen->machine, bitmap, cliprect, state->sprite_triple_buffer_1, 1, 0x0000); /* Pixel layer can be windowed in hardware (two player mode) */ - if ((state->control_data[6] & 2) == 0) + if ((state->control_data[6] & 2) == 0) copyscrollbitmap_trans(bitmap, state->bitmap0, 1, &x1, 1, &y, cliprect, 0x100); - else + else { rect.max_x = 159; rect.min_x = 0; diff --git a/src/mame/video/lwings.c b/src/mame/video/lwings.c index 2cb998a159b..c1118d8c1c1 100644 --- a/src/mame/video/lwings.c +++ b/src/mame/video/lwings.c @@ -197,7 +197,7 @@ static void lwings_draw_sprites( running_machine *machine, bitmap_t *bitmap, con sx = buffered_spriteram[offs + 3] - 0x100 * (buffered_spriteram[offs + 1] & 0x01); sy = buffered_spriteram[offs + 2]; - if (sy > 0xf8) + if (sy > 0xf8) sy -= 0x100; code = buffered_spriteram[offs] | (buffered_spriteram[offs + 1] & 0xc0) << 2; color = (buffered_spriteram[offs + 1] & 0x38) >> 3; @@ -234,7 +234,7 @@ static void trojan_draw_sprites( running_machine *machine, bitmap_t *bitmap, con sx = buffered_spriteram[offs + 3] - 0x100 * (buffered_spriteram[offs + 1] & 0x01); sy = buffered_spriteram[offs + 2]; - if (sy > 0xf8) + if (sy > 0xf8) sy -= 0x100; code = buffered_spriteram[offs] | ((buffered_spriteram[offs + 1] & 0x20) << 4) | diff --git a/src/mame/video/psikyo.c b/src/mame/video/psikyo.c index 96f142d03b3..65c3cd811c1 100644 --- a/src/mame/video/psikyo.c +++ b/src/mame/video/psikyo.c @@ -424,7 +424,7 @@ static void draw_sprites_bootleg(running_machine *machine, bitmap_t *bitmap, con int offs; -// UINT16 *spritelist = (UINT16 *)(machine->generic.spriteram.u32 + 0x1800/4); +// UINT16 *spritelist = (UINT16 *)(machine->generic.spriteram.u32 + 0x1800/4); UINT16 *spritelist = (UINT16 *)(spritebuf2 + 0x1800/4); UINT8 *TILES = memory_region(machine, "spritelut"); // Sprites LUT @@ -458,7 +458,7 @@ static void draw_sprites_bootleg(running_machine *machine, bitmap_t *bitmap, con sprite = spritelist[ BYTE_XOR_BE(offs) ]; sprite %= 0x300; -// source = &psikyo_bootleg_spritebuffer[ sprite*8/4 ]; +// source = &psikyo_bootleg_spritebuffer[ sprite*8/4 ]; source = &spritebuf2[ sprite*8/4 ]; /* Draw this sprite */ diff --git a/src/mame/video/rallyx.c b/src/mame/video/rallyx.c index 1276f68f72e..61503ea22d0 100644 --- a/src/mame/video/rallyx.c +++ b/src/mame/video/rallyx.c @@ -295,7 +295,7 @@ static void calculate_star_field( running_machine *machine ) bit1 = (~generator >> 17) & 1; bit2 = (generator >> 5) & 1; - if (bit1 ^ bit2) + if (bit1 ^ bit2) generator |= 1; if (((~generator >> 16) & 1) && (generator & 0xfe) == 0xfe) @@ -492,7 +492,7 @@ static void rallyx_draw_sprites( running_machine *machine, bitmap_t *bitmap, con int color = spriteram_2[offs + 1] & 0x3f; int flipx = spriteram[offs] & 1; int flipy = spriteram[offs] & 2; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) sx -= 2 * displacement; pdrawgfx_transmask(bitmap,cliprect,machine->gfx[1], @@ -540,7 +540,7 @@ static void rallyx_draw_bullets( running_machine *machine, bitmap_t *bitmap, con x = state->radarx[offs] + ((~state->radarattr[offs & 0x0f] & 0x01) << 8); y = 253 - state->radary[offs]; - if (flip_screen_get(machine)) + if (flip_screen_get(machine)) x -= 3; if (transpen) diff --git a/src/mame/video/yunsung8.c b/src/mame/video/yunsung8.c index 610230085f2..306cd06830f 100644 --- a/src/mame/video/yunsung8.c +++ b/src/mame/video/yunsung8.c @@ -52,14 +52,14 @@ READ8_HANDLER( yunsung8_videoram_r ) /* Bit 1 of the bankswitching register contols the c000-c7ff area (Palette). Bit 0 controls the c800-dfff area (Tiles) */ - if (offset < 0x0800) + if (offset < 0x0800) bank = state->videobank & 2; - else + else bank = state->videobank & 1; - if (bank) + if (bank) return state->videoram_0[offset]; - else + else return state->videoram_1[offset]; } @@ -74,9 +74,9 @@ WRITE8_HANDLER( yunsung8_videoram_w ) UINT8 *RAM; int color; - if (bank) + if (bank) RAM = state->videoram_0; - else + else RAM = state->videoram_1; RAM[offset] = data; @@ -90,17 +90,17 @@ WRITE8_HANDLER( yunsung8_videoram_w ) int tile; int bank = state->videobank & 1; - if (offset < 0x1000) + if (offset < 0x1000) tile = (offset - 0x0800); // c800-cfff: Banked Color RAM - else + else tile = (offset - 0x1000) / 2; // d000-dfff: Banked Tiles RAM - if (bank) + if (bank) { state->videoram_0[offset] = data; tilemap_mark_tile_dirty(state->tilemap_0, tile); } - else + else { state->videoram_1[offset] = data; tilemap_mark_tile_dirty(state->tilemap_1, tile); @@ -209,9 +209,9 @@ if (input_code_pressed(screen->machine, KEYCODE_Z)) } #endif - if (layers_ctrl & 1) + if (layers_ctrl & 1) tilemap_draw(bitmap, cliprect, state->tilemap_0, 0, 0); - else + else bitmap_fill(bitmap, cliprect, 0); if (layers_ctrl & 2) diff --git a/src/version.c b/src/version.c index 9578c883224..3dcf49f0a4b 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.135u2 ("__DATE__")"; +const char build_version[] = "0.135u3 ("__DATE__")"; -- cgit v1.2.3