diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/emu/cpu/m68000/m68kmmu.h index b4837730e20..97dc968f68f 100644 --- a/src/emu/cpu/m68000/m68kmmu.h +++ b/src/emu/cpu/m68000/m68kmmu.h @@ -1,6 +1,6 @@ /* m68kmmu.h - PMMU implementation for 68851/68030/68040 - HMMU implementation for 68020 (II and LC variants) + HMMU implementation for 68020 (II and LC variants) By R. Belmont @@ -81,7 +81,7 @@ void pmmu_atc_add(m68ki_cpu_core *m68k, UINT32 logical, UINT32 physical) // if tag bits and function code match, don't add if (((m68k->mmu_atc_tag[i] & 0xffffff) == (logical>>8)) && (((m68k->mmu_atc_tag[i]>>24) & 7) == curfc)) { - return; + return; } } @@ -108,7 +108,7 @@ void pmmu_atc_add(m68ki_cpu_core *m68k, UINT32 logical, UINT32 physical) } // add the entry -// logerror("ATC[%d] add: log %08x -> phys %08x\n", found, logical, physical); +// logerror("ATC[%d] add: log %08x -> phys %08x\n", found, logical, physical); m68k->mmu_atc_tag[found] = (logical>>8) | (curfc<<24) | 0x80000000; m68k->mmu_atc_data[found] = (physical>>8); } @@ -128,7 +128,7 @@ void pmmu_atc_flush(m68ki_cpu_core *m68k) } m68k->mmu_atc_rr = 0; -} +} /* pmmu_translate_addr: perform 68851/68030-style PMMU address translation @@ -139,7 +139,7 @@ INLINE UINT32 pmmu_translate_addr(m68ki_cpu_core *m68k, UINT32 addr_in) UINT32 root_aptr, root_limit, tofs, is, abits, bbits, cbits; UINT32 resolved, tptr, shift; int curfc, i; -// int verbose = 0; +// int verbose = 0; resolved = 0; addr_out = addr_in; @@ -154,12 +154,12 @@ INLINE UINT32 pmmu_translate_addr(m68ki_cpu_core *m68k, UINT32 addr_in) if (((m68k->mmu_atc_tag[i] & 0xffffff) == (addr_in>>8)) && (((m68k->mmu_atc_tag[i]>>24) & 7) == curfc)) { addr_out = (m68k->mmu_atc_data[i]<<8) | (addr_in & 0xff); -// logerror("ATC[%d] hit: log %08x -> phys %08x\n", i, addr_in, addr_out); +// logerror("ATC[%d] hit: log %08x -> phys %08x\n", i, addr_in, addr_out); return addr_out; } } -// if (addr_in == 0x5fa04c) verbose = 1; +// if (addr_in == 0x5fa04c) verbose = 1; // if SRP is enabled and we're in supervisor mode, use it if ((m68k->mmu_tc & 0x02000000) && (m68ki_get_sr(m68k) & 0x2000)) @@ -196,10 +196,10 @@ INLINE UINT32 pmmu_translate_addr(m68ki_cpu_core *m68k, UINT32 addr_in) case 2: // valid 4 byte descriptors tofs *= 4; -// if (verbose) logerror("PMMU: reading table A entry at %08x\n", tofs + (root_aptr & 0xfffffffc)); +// if (verbose) logerror("PMMU: reading table A entry at %08x\n", tofs + (root_aptr & 0xfffffffc)); tbl_entry = m68k->program->read_dword(tofs + (root_aptr & 0xfffffffc)); tamode = tbl_entry & 3; -// if (verbose) logerror("PMMU: addr %08x entry %08x mode %x tofs %x\n", addr_in, tbl_entry, tamode, tofs); +// if (verbose) logerror("PMMU: addr %08x entry %08x mode %x tofs %x\n", addr_in, tbl_entry, tamode, tofs); break; case 3: // valid 8 byte descriptors @@ -356,7 +356,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) ptmp = pmmu_translate_addr(m68k, ltmp); } -// logerror("680x0: PLOADing ATC with logical %08x => phys %08x\n", ltmp, ptmp); +// logerror("680x0: PLOADing ATC with logical %08x => phys %08x\n", ltmp, ptmp); pmmu_atc_add(m68k, ltmp, ptmp); return; @@ -419,7 +419,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) { case 0: { - UINT32 temp = READ_EA_32(m68k, ea); + UINT32 temp = READ_EA_32(m68k, ea); if (((modes>>10) & 7) == 2) { @@ -441,17 +441,17 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) { case 0: // translation control register m68k->mmu_tc = READ_EA_32(m68k, ea); -// logerror("PMMU: TC = %08x\n", m68k->mmu_tc); +// logerror("PMMU: TC = %08x\n", m68k->mmu_tc); if (m68k->mmu_tc & 0x80000000) { m68k->pmmu_enabled = 1; -// logerror("PMMU enabled\n"); +// logerror("PMMU enabled\n"); } else { m68k->pmmu_enabled = 0; -// logerror("PMMU disabled\n"); +// logerror("PMMU disabled\n"); } if (!(modes & 0x100)) // flush ATC on moves to TC, SRP, CRP with FD bit clear @@ -464,7 +464,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) temp64 = READ_EA_64(m68k, ea); m68k->mmu_srp_limit = (temp64>>32) & 0xffffffff; m68k->mmu_srp_aptr = temp64 & 0xffffffff; -// logerror("PMMU: SRP limit = %08x aptr = %08x\n", m68k->mmu_srp_limit, m68k->mmu_srp_aptr); +// logerror("PMMU: SRP limit = %08x aptr = %08x\n", m68k->mmu_srp_limit, m68k->mmu_srp_aptr); if (!(modes & 0x100)) { pmmu_atc_flush(m68k); @@ -475,7 +475,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) temp64 = READ_EA_64(m68k, ea); m68k->mmu_crp_limit = (temp64>>32) & 0xffffffff; m68k->mmu_crp_aptr = temp64 & 0xffffffff; -// logerror("PMMU: CRP limit = %08x aptr = %08x\n", m68k->mmu_crp_limit, m68k->mmu_crp_aptr); +// logerror("PMMU: CRP limit = %08x aptr = %08x\n", m68k->mmu_crp_limit, m68k->mmu_crp_aptr); if (!(modes & 0x100)) { pmmu_atc_flush(m68k); @@ -490,7 +490,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) case 3: // MMU status { - UINT32 temp = READ_EA_32(m68k, ea); + UINT32 temp = READ_EA_32(m68k, ea); logerror("680x0: unsupported PMOVE %x to MMU status, PC %x\n", temp, m68k->pc); } break; @@ -512,7 +512,7 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k) default: logerror("680x0: unknown PMOVE mode %x (modes %04x) (PC %x)\n", (modes>>13) & 0x7, modes, m68k->pc); break; - + } } break; diff --git a/src/emu/cpu/sh2/sh2comn.c b/src/emu/cpu/sh2/sh2comn.c index 6de05307a10..b1069c21637 100644 --- a/src/emu/cpu/sh2/sh2comn.c +++ b/src/emu/cpu/sh2/sh2comn.c @@ -135,7 +135,7 @@ static TIMER_CALLBACK( sh2_timer_callback ) } -/* +/* We have to do DMA on a timer (or at least, in chunks) due to the way some systems use it. The 32x is a difficult case, they set the SOURCE of the DMA to a FIFO buffer, which at most can have 8 words in it. Attempting to do an 'instant DMA' in this scenario is impossible @@ -147,12 +147,12 @@ static TIMER_CALLBACK( sh2_timer_callback ) a) with a high frequency timer (more accurate, but a large performance hit) or - + b) in the CPU_EXECUTE loop we're currently doing a) - + b) causes problems with ST-V games */ @@ -163,17 +163,17 @@ void sh2_notify_dma_data_available(running_device *device) { sh2_state *sh2 = GET_SH2(device); //printf("call notify\n"); - + for (int dma=0;dma<2;dma++) { //printf("sh2->dma_timer_active[dma] %04x\n",sh2->dma_timer_active[dma]); - + if (sh2->dma_timer_active[dma]==2) // 2 = stalled { - // printf("resuming stalled dma\n"); + // printf("resuming stalled dma\n"); sh2->dma_timer_active[dma]=1; timer_adjust_oneshot(sh2->dma_current_active_timer[dma], attotime_zero, dma); - } + } } } @@ -210,7 +210,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) if (sh2->dma_callback_fifo_data_available) { int available = sh2->dma_callback_fifo_data_available(tempsrc, tempdst, 0, sh2->active_dma_size[dma]); - + if (!available) { //printf("dma stalled\n"); @@ -218,12 +218,12 @@ void sh2_do_dma(sh2_state *sh2, int dma) return; } } - + #ifdef USE_TIMER_FOR_DMA //schedule next DMA callback timer_adjust_oneshot(sh2->dma_current_active_timer[dma], sh2->device->cycles_to_attotime(2), dma); #endif - + dmadata = sh2->program->read_byte(tempsrc); if (sh2->dma_callback_kludge) dmadata = sh2->dma_callback_kludge(tempsrc, tempdst, dmadata, sh2->active_dma_size[dma]); @@ -258,7 +258,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) if (sh2->dma_callback_fifo_data_available) { int available = sh2->dma_callback_fifo_data_available(tempsrc, tempdst, 0, sh2->active_dma_size[dma]); - + if (!available) { //printf("dma stalled\n"); @@ -286,7 +286,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) sh2->active_dma_src[dma] += 2; if(sh2->active_dma_incd[dma] == 1) sh2->active_dma_dst[dma] += 2; - + sh2->active_dma_count[dma] --; } break; @@ -305,7 +305,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) if (sh2->dma_callback_fifo_data_available) { int available = sh2->dma_callback_fifo_data_available(tempsrc, tempdst, 0, sh2->active_dma_size[dma]); - + if (!available) { //printf("dma stalled\n"); @@ -350,7 +350,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) if (sh2->dma_callback_fifo_data_available) { int available = sh2->dma_callback_fifo_data_available(tempsrc, tempdst, 0, sh2->active_dma_size[dma]); - + if (!available) { //printf("dma stalled\n"); @@ -386,7 +386,7 @@ void sh2_do_dma(sh2_state *sh2, int dma) sh2->active_dma_src[dma] += 16; if(sh2->active_dma_incd[dma] == 1) sh2->active_dma_dst[dma] += 16; - + sh2->active_dma_count[dma]-=4; } break; @@ -394,15 +394,15 @@ void sh2_do_dma(sh2_state *sh2, int dma) } else // the dma is complete { - // int dma = param & 1; - // sh2_state *sh2 = (sh2_state *)ptr; + // int dma = param & 1; + // sh2_state *sh2 = (sh2_state *)ptr; // fever soccer uses cycle-stealing mode, resume the CPU now DMA has finished if (sh2->active_dma_steal[dma]) { sh2->device->resume(SUSPEND_REASON_HALT ); } - + LOG(("SH2.%s: DMA %d complete\n", sh2->device->tag(), dma)); sh2->m[0x63+4*dma] |= 2; @@ -432,7 +432,7 @@ static void sh2_dmac_check(sh2_state *sh2, int dma) sh2->active_dma_incs[dma] = (sh2->m[0x63+4*dma] >> 12) & 3; sh2->active_dma_size[dma] = (sh2->m[0x63+4*dma] >> 10) & 3; sh2->active_dma_steal[dma] = (sh2->m[0x63+4*dma] &0x10); - + if(sh2->active_dma_incd[dma] == 3 || sh2->active_dma_incs[dma] == 3) { logerror("SH2: DMA: bad increment values (%d, %d, %d, %04x)\n", sh2->active_dma_incd[dma], sh2->active_dma_incs[dma], sh2->active_dma_size[dma], sh2->m[0x63+4*dma]); @@ -457,7 +457,7 @@ static void sh2_dmac_check(sh2_state *sh2, int dma) break; case 1: sh2->active_dma_src[dma] &= ~1; - sh2->active_dma_dst[dma] &= ~1; + sh2->active_dma_dst[dma] &= ~1; break; case 2: sh2->active_dma_src[dma] &= ~3; @@ -469,20 +469,20 @@ static void sh2_dmac_check(sh2_state *sh2, int dma) sh2->active_dma_count[dma] &= ~3; break; } - - - + + + #ifdef USE_TIMER_FOR_DMA // start DMA timer - + // fever soccer uses cycle-stealing mode, requiring the CPU to be halted if (sh2->active_dma_steal[dma]) { //printf("cycle stealing DMA\n"); sh2->device->suspend(SUSPEND_REASON_HALT, 1 ); } - + timer_adjust_oneshot(sh2->dma_current_active_timer[dma], sh2->device->cycles_to_attotime(2), dma); #endif @@ -495,7 +495,7 @@ static void sh2_dmac_check(sh2_state *sh2, int dma) logerror("SH2: DMA %d cancelled in-flight\n", dma); //timer_adjust_oneshot(sh2->dma_complete_timer[dma], attotime_never, 0); timer_adjust_oneshot(sh2->dma_current_active_timer[dma], attotime_never, 0); - + sh2->dma_timer_active[dma] = 0; } } diff --git a/src/emu/cpu/sh2/sh2comn.h b/src/emu/cpu/sh2/sh2comn.h index 6094b84559e..411144ba31a 100644 --- a/src/emu/cpu/sh2/sh2comn.h +++ b/src/emu/cpu/sh2/sh2comn.h @@ -142,8 +142,8 @@ typedef struct int active_dma_incd[2]; int active_dma_size[2]; int active_dma_steal[2]; - UINT32 active_dma_src[2]; - UINT32 active_dma_dst[2]; + UINT32 active_dma_src[2]; + UINT32 active_dma_dst[2]; UINT32 active_dma_count[2]; int is_slave, cpu_type; diff --git a/src/emu/debugger.c b/src/emu/debugger.c index 8a125e18748..1572b5db6ea 100644 --- a/src/emu/debugger.c +++ b/src/emu/debugger.c @@ -90,7 +90,7 @@ void debugger_init(running_machine *machine) /* listen in on the errorlog */ machine->add_logerror_callback(debug_errorlog_write_line); - + /* initialize osd debugger features */ osd_init_debugger(machine); } diff --git a/src/emu/emualloc.c b/src/emu/emualloc.c index 0baa78ae1c2..c9734a36c9c 100644 --- a/src/emu/emualloc.c +++ b/src/emu/emualloc.c @@ -236,7 +236,7 @@ void resource_pool::add(resource_pool_item &item) int hashval = reinterpret_cast(item.m_ptr) % k_hash_prime; item.m_next = m_hash[hashval]; m_hash[hashval] = &item; - + // fetch the ID of this item's pointer; some implementations put hidden data // before, so if we don't find it, check 4 bytes ahead memory_entry *entry = memory_entry::find(item.m_ptr); @@ -244,13 +244,13 @@ void resource_pool::add(resource_pool_item &item) entry = memory_entry::find(reinterpret_cast(item.m_ptr) - sizeof(size_t)); assert(entry != NULL); item.m_id = entry->m_id; - + // find the entry to insert after resource_pool_item *insert_after; for (insert_after = m_ordered_tail; insert_after != NULL; insert_after = insert_after->m_ordered_prev) if (insert_after->m_id < item.m_id) break; - + // insert into the appropriate spot if (insert_after != NULL) { diff --git a/src/emu/emucore.h b/src/emu/emucore.h index b579972d2df..417739dc391 100644 --- a/src/emu/emucore.h +++ b/src/emu/emucore.h @@ -390,7 +390,7 @@ public: m_count++; return object; } - + void prepend_list(simple_list &list) { int count = list.count(); @@ -475,7 +475,7 @@ public: detach(object); pool_free(m_pool, &object); } - + T *find(int index) const { for (T *cur = m_head; cur != NULL; cur = cur->m_next) @@ -483,7 +483,7 @@ public: return cur; return NULL; } - + int indexof(const T &object) const { int index = 0; @@ -517,7 +517,7 @@ public: result = m_pool.add_object(new T); return result; } - + void reclaim(T *item) { if (item != NULL) m_freelist.append(*item); } void reclaim(T &item) { m_freelist.append(item); } void reclaim_all(simple_list &list) { m_freelist.append_list(list); } diff --git a/src/emu/info.c b/src/emu/info.c index e4ce467a35b..0e150bc7951 100644 --- a/src/emu/info.c +++ b/src/emu/info.c @@ -630,7 +630,7 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin /* only output sampleof if different from the game name */ if (cursampname[0] == '*' && strcmp(cursampname + 1, game->name) != 0) fprintf(out, " sampleof=\"%s\"", xml_normalize_string(cursampname + 1)); - + /* must stop here, as there can only be one attribute of the same name */ return; } diff --git a/src/emu/machine.h b/src/emu/machine.h index d2d1f85a799..fb01cdb434a 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -384,7 +384,7 @@ public: // regions region_info *region_alloc(const char *name, UINT32 length, UINT32 flags); void region_free(const char *name); - + // managers render_manager &render() const { assert(m_render != NULL); return *m_render; } debug_view_manager &debug_view() const { assert(m_debug_view != NULL); return *m_debug_view; } diff --git a/src/emu/machine/er2055.c b/src/emu/machine/er2055.c index 459da35427d..674d81b8e59 100644 --- a/src/emu/machine/er2055.c +++ b/src/emu/machine/er2055.c @@ -132,7 +132,7 @@ void er2055_device::device_start() state_save_register_device_item(this, 0, m_control_state); state_save_register_device_item(this, 0, m_address); state_save_register_device_item(this, 0, m_data); - + m_control_state = 0; } @@ -214,7 +214,7 @@ void er2055_device::set_control(UINT8 cs1, UINT8 cs2, UINT8 c1, UINT8 c2, UINT8 // if not selected, or if change from previous, we're done if ((m_control_state & (CS1 | CS2)) != (CS1 | CS2) || m_control_state == oldstate) return; - + // something changed, see what it is based on what mode we're in switch (m_control_state & (C1 | C2)) { @@ -230,7 +230,7 @@ void er2055_device::set_control(UINT8 cs1, UINT8 cs2, UINT8 c1, UINT8 c2, UINT8 m_addrspace[0]->write_byte(m_address, 0xff); //printf("Erase %02X\n", m_address); break; - + // read mode case C1: if ((oldstate & CK) != 0 && (m_control_state & CK) == 0) diff --git a/src/emu/machine/er2055.h b/src/emu/machine/er2055.h index 036b20e7110..f274f14acbc 100644 --- a/src/emu/machine/er2055.h +++ b/src/emu/machine/er2055.h @@ -99,7 +99,7 @@ public: UINT8 data() const { return m_data; } void set_address(UINT8 address) { m_address = address & 0x3f; } void set_data(UINT8 data) { m_data = data; } - + // control lines -- all lines are specified as active-high (even CS2) void set_control(UINT8 cs1, UINT8 cs2, UINT8 c1, UINT8 c2, UINT8 ck); @@ -122,7 +122,7 @@ protected: // internal state const er2055_device_config &m_config; - + UINT8 m_control_state; UINT8 m_address; UINT8 m_data; diff --git a/src/emu/machine/x2212.c b/src/emu/machine/x2212.c index c40873ce5f0..fa014afff87 100644 --- a/src/emu/machine/x2212.c +++ b/src/emu/machine/x2212.c @@ -112,7 +112,7 @@ void x2212_device::device_start() { state_save_register_device_item(this, 0, m_store); state_save_register_device_item(this, 0, m_array_recall); - + m_sram = m_addrspace[0]; m_e2prom = m_addrspace[1]; } @@ -173,7 +173,7 @@ void x2212_device::nvram_write(mame_file &file) // auto-save causes an implicit store prior to exiting (writing) if (m_config.m_auto_save) store(); - + UINT8 buffer[SIZE_DATA]; for (int byte = 0; byte < SIZE_DATA; byte++) buffer[byte] = m_e2prom->read_byte(byte); @@ -187,7 +187,7 @@ void x2212_device::nvram_write(mame_file &file) //************************************************************************** //------------------------------------------------- -// store - store data from live RAM into the +// store - store data from live RAM into the // EEPROM //------------------------------------------------- @@ -199,7 +199,7 @@ void x2212_device::store() //------------------------------------------------- -// recall - fetch data from the EEPROM into live +// recall - fetch data from the EEPROM into live // RAM //------------------------------------------------- diff --git a/src/emu/machine/x2212.h b/src/emu/machine/x2212.h index 3e0b1934d55..e5ad95bacc0 100644 --- a/src/emu/machine/x2212.h +++ b/src/emu/machine/x2212.h @@ -101,12 +101,12 @@ protected: // internal state const x2212_device_config &m_config; - + address_space * m_sram; address_space * m_e2prom; - bool m_store; - bool m_array_recall; + bool m_store; + bool m_array_recall; }; diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 8ddd7cb95bd..44e49bc854c 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -12,7 +12,7 @@ - Only memory to memory is tested! TODO: - - reset command (C3) is handled improperly + - reset command (C3) is handled improperly - rewrite to match documentation - implement missing features - implement more asserts @@ -663,7 +663,7 @@ void z80dma_device::write(UINT8 data) if (m_num_follow == 0) { m_reset_pointer = 0; - + if ((data & 0x87) == 0) // WR2 { WR2 = data; diff --git a/src/emu/memory.c b/src/emu/memory.c index 88949890a38..095241d0236 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -4371,7 +4371,7 @@ void handler_entry::configure_subunits(UINT64 handlermask, int handlerbits) { UINT64 unitmask = ((UINT64)1 << handlerbits) - 1; assert(handlermask != 0); - + // set the inverse mask m_invsubmask = ~handlermask; diff --git a/src/emu/render.c b/src/emu/render.c index a3a74f3c723..7dec7d8e745 100644 --- a/src/emu/render.c +++ b/src/emu/render.c @@ -210,7 +210,7 @@ inline int get_layer_and_blendmode(const layout_view &view, int index, int &blen // backdrop (add) + screens (add) + bezels (alpha) // else render: // screens (add) + overlays (RGB multiply) + backdrop (add) + bezels (alpha) - + if (view.itemlist[ITEM_LAYER_BACKDROP] != NULL && view.itemlist[ITEM_LAYER_BACKDROP]->next != NULL && view.itemlist[ITEM_LAYER_OVERLAY] == NULL) layer_order = layer_order_alternate; @@ -334,8 +334,8 @@ void render_primitive_list::release_all() //------------------------------------------------- -// append_or_return - append a primitive to the -// end of the list, or return it to the free +// append_or_return - append a primitive to the +// end of the list, or return it to the free // list, based on a flag //------------------------------------------------- @@ -450,7 +450,7 @@ void render_texture::set_bitmap(bitmap_t *bitmap, const rectangle *sbounds, int //------------------------------------------------- -// hq_scale - generic high quality resampling +// hq_scale - generic high quality resampling // scaler //------------------------------------------------- @@ -726,7 +726,7 @@ render_container::~render_container() //------------------------------------------------- -// set_overlay - set the overlay bitmap for the +// set_overlay - set the overlay bitmap for the // container //------------------------------------------------- @@ -746,7 +746,7 @@ void render_container::set_overlay(bitmap_t *bitmap) //------------------------------------------------- -// set_user_settings - set the current user +// set_user_settings - set the current user // settings for a container //------------------------------------------------- @@ -838,15 +838,15 @@ const rgb_t *render_container::bcg_lookup_table(int texformat, palette_t *palett case TEXFORMAT_PALETTE16: case TEXFORMAT_PALETTEA16: return (palette != NULL && palette == palette_client_get_palette(m_palclient)) ? m_bcglookup : NULL; - + case TEXFORMAT_RGB15: return m_bcglookup32; - + case TEXFORMAT_RGB32: case TEXFORMAT_ARGB32: case TEXFORMAT_YUY16: return m_bcglookup256; - + default: return NULL; } @@ -878,7 +878,7 @@ void render_container::overlay_scale(bitmap_t &dest, const bitmap_t &source, con //------------------------------------------------- -// add_generic - add a generic item to a +// add_generic - add a generic item to a // container //------------------------------------------------- @@ -907,7 +907,7 @@ render_container::item &render_container::add_generic(UINT8 type, float x0, floa //------------------------------------------------- -// recompute_lookups - recompute the lookup table +// recompute_lookups - recompute the lookup table // for the render container //------------------------------------------------- @@ -953,7 +953,7 @@ void render_container::recompute_lookups() //------------------------------------------------- -// update_palette - update any dirty palette +// update_palette - update any dirty palette // entries //------------------------------------------------- @@ -1118,7 +1118,7 @@ int render_target::index() const //------------------------------------------------- -// set_bounds - set the bounds and pixel aspect +// set_bounds - set the bounds and pixel aspect // of a target //------------------------------------------------- @@ -1134,7 +1134,7 @@ void render_target::set_bounds(INT32 width, INT32 height, float pixel_aspect) //------------------------------------------------- -// set_layer_config - set the layer config of a +// set_layer_config - set the layer config of a // target //------------------------------------------------- @@ -1146,7 +1146,7 @@ void render_target::set_layer_config(int layerconfig) //------------------------------------------------- -// set_view - dynamically change the view for +// set_view - dynamically change the view for // a target //------------------------------------------------- @@ -1162,7 +1162,7 @@ void render_target::set_view(int viewindex) //------------------------------------------------- -// set_max_texture_size - set the upper bound on +// set_max_texture_size - set the upper bound on // the texture size //------------------------------------------------- @@ -1198,8 +1198,8 @@ UINT32 render_target::view_screens(int viewindex) //------------------------------------------------- -// compute_visible_area - compute the visible -// area for the given target with the current +// compute_visible_area - compute the visible +// area for the given target with the current // layout and proposed new parameters //------------------------------------------------- @@ -1244,9 +1244,9 @@ void render_target::compute_visible_area(INT32 target_width, INT32 target_height //------------------------------------------------- -// compute_minimum_size - compute the "minimum" -// size of a target, which is the smallest bounds -// that will ensure at least 1 target pixel per +// compute_minimum_size - compute the "minimum" +// size of a target, which is the smallest bounds +// that will ensure at least 1 target pixel per // source pixel for all included screens //------------------------------------------------- @@ -1314,7 +1314,7 @@ void render_target::compute_minimum_size(INT32 &minwidth, INT32 &minheight) //------------------------------------------------- -// get_primitives - return a list of primitives +// get_primitives - return a list of primitives // for a given render target //------------------------------------------------- @@ -1461,8 +1461,8 @@ render_primitive_list &render_target::get_primitives() //------------------------------------------------- -// map_point_container - attempts to map a point -// on the specified render_target to the +// map_point_container - attempts to map a point +// on the specified render_target to the // specified container, if possible //------------------------------------------------- @@ -1474,8 +1474,8 @@ bool render_target::map_point_container(INT32 target_x, INT32 target_y, render_c //------------------------------------------------- -// map_point_input - attempts to map a point on -// the specified render_target to the specified +// map_point_input - attempts to map a point on +// the specified render_target to the specified // container, if possible //------------------------------------------------- @@ -1505,7 +1505,7 @@ void render_target::invalidate_all(void *refptr) for (int listnum = 0; listnum < ARRAY_LENGTH(m_primlist); listnum++) { render_primitive_list &list = m_primlist[listnum]; - + // if we have a reference to this object, release our list list.acquire_lock(); if (list.has_reference(refptr)) @@ -1777,7 +1777,7 @@ void render_target::add_container_primitives(render_primitive_list &list, const prim->color = container_xform.color; width = render_round_nearest(prim->bounds.x1) - render_round_nearest(prim->bounds.x0); height = render_round_nearest(prim->bounds.y1) - render_round_nearest(prim->bounds.y0); - + bool got_scaled = container.overlay()->get_scaled( (container_xform.orientation & ORIENTATION_SWAP_XY) ? height : width, (container_xform.orientation & ORIENTATION_SWAP_XY) ? width : height, prim->texture, list); @@ -1852,7 +1852,7 @@ void render_target::add_element_primitives(render_primitive_list &list, const ob //------------------------------------------------- -// map_point_internal - internal logic for +// map_point_internal - internal logic for // mapping points //------------------------------------------------- @@ -1918,7 +1918,7 @@ bool render_target::map_point_internal(INT32 target_x, INT32 target_y, render_co //------------------------------------------------- -// view_name - return the name of the indexed +// view_name - return the name of the indexed // view, or NULL if it doesn't exist //------------------------------------------------- @@ -2025,7 +2025,7 @@ void render_target::config_load(xml_data_node &targetnode) //------------------------------------------------- // config_save - save our configuration, or -// return false if we are the same as the default +// return false if we are the same as the default //------------------------------------------------- bool render_target::config_save(xml_data_node &targetnode) @@ -2066,7 +2066,7 @@ bool render_target::config_save(xml_data_node &targetnode) xml_set_attribute_int(&targetnode, "rotate", rotate); changed = true; } - + return changed; } @@ -2325,7 +2325,7 @@ void render_target::add_clear_and_optimize_primitive_list(render_primitive_list prim->color.a = 1.0f; break; } - + default: throw emu_fatalerror("Unexpected primitive type"); } @@ -2357,7 +2357,7 @@ render_manager::render_manager(running_machine &machine) { // register callbacks config_register(&machine, "video", config_load_static, config_save_static); - + // create one container per screen for (screen_device *screen = screen_first(machine); screen != NULL; screen = screen_next(screen)) container_alloc(screen); @@ -2397,7 +2397,7 @@ bool render_manager::is_live(screen_device &screen) const //------------------------------------------------- -// max_update_rate - return the smallest maximum +// max_update_rate - return the smallest maximum // update rate across all targets //------------------------------------------------- @@ -2455,7 +2455,7 @@ render_target *render_manager::target_by_index(int index) const //------------------------------------------------- -// ui_aspect - return the aspect ratio for UI +// ui_aspect - return the aspect ratio for UI // fonts //------------------------------------------------- @@ -2525,7 +2525,7 @@ void render_manager::texture_free(render_texture *texture) //------------------------------------------------- -// invalidate_all - remove all refs to a +// invalidate_all - remove all refs to a // particular reference pointer //------------------------------------------------- @@ -2611,7 +2611,7 @@ void render_manager::config_load(int config_type, xml_data_node *parentnode) // fetch current settings container->get_user_settings(settings); - + // fetch color controls settings.m_brightness = xml_get_attribute_float(screennode, "brightness", settings.m_brightness); settings.m_contrast = xml_get_attribute_float(screennode, "contrast", settings.m_contrast); diff --git a/src/emu/render.h b/src/emu/render.h index 7f15e8fffb0..5f298951ba7 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -36,28 +36,28 @@ POSSIBILITY OF SUCH DAMAGE. **************************************************************************** - + Theory of operation ------------------- - + A render "target" is described by 5 parameters: - + - width = width, in pixels - height = height, in pixels - bpp = depth, in bits per pixel - orientation = orientation of the target - pixel_aspect = aspect ratio of the pixels - + Width, height, and bpp are self-explanatory. The remaining parameters need some additional explanation. - + Regarding orientation, there are three orientations that need to be dealt with: target orientation, UI orientation, and game orientation. In the current model, the UI orientation tracks the target orientation so that the UI is (in theory) facing the correct direction. The game orientation is specified by the game driver and indicates how the game and artwork are rotated. - + Regarding pixel_aspect, this is the aspect ratio of the individual pixels, not the aspect ratio of the screen. You can determine this by dividing the aspect ratio of the screen by the aspect ratio of the @@ -66,10 +66,10 @@ square. That same screen displaying 1280x1024 would have a pixel aspect ratio of (4/3)/(1280/1024) = 1.06666, meaning the pixels are slightly wider than they are tall. - + Artwork is always assumed to be a 1.0 pixel aspect ratio. The game screens themselves can be variable aspect ratios. - + ***************************************************************************/ #ifndef __RENDER_H__ @@ -114,13 +114,13 @@ const UINT8 RENDER_CREATE_HIDDEN = 0x04; // don't make this target visible // layer config masks -const UINT8 LAYER_CONFIG_ENABLE_BACKDROP = 0x01; // enable backdrop layers +const UINT8 LAYER_CONFIG_ENABLE_BACKDROP = 0x01; // enable backdrop layers const UINT8 LAYER_CONFIG_ENABLE_OVERLAY = 0x02; // enable overlay layers const UINT8 LAYER_CONFIG_ENABLE_BEZEL = 0x04; // enable bezel layers const UINT8 LAYER_CONFIG_ZOOM_TO_SCREEN = 0x08; // zoom to screen area by default -const UINT8 LAYER_CONFIG_ENABLE_SCREEN_OVERLAY = 0x10; // enable screen overlays +const UINT8 LAYER_CONFIG_ENABLE_SCREEN_OVERLAY = 0x10; // enable screen overlays -const UINT8 LAYER_CONFIG_DEFAULT = (LAYER_CONFIG_ENABLE_BACKDROP | +const UINT8 LAYER_CONFIG_DEFAULT = (LAYER_CONFIG_ENABLE_BACKDROP | LAYER_CONFIG_ENABLE_OVERLAY | LAYER_CONFIG_ENABLE_BEZEL | LAYER_CONFIG_ENABLE_SCREEN_OVERLAY); @@ -249,7 +249,7 @@ struct render_texinfo class render_primitive { friend class simple_list; - + public: // render primitive types enum primitive_type @@ -261,7 +261,7 @@ public: // getters render_primitive *next() const { return m_next; } - + // reset to prepare for re-use void reset(); @@ -295,10 +295,10 @@ public: // getters render_primitive *first() const { return m_primlist.first(); } - // lock management + // lock management void acquire_lock() { osd_lock_acquire(m_lock); } void release_lock() { osd_lock_release(m_lock); } - + // reference management void add_reference(void *refptr); bool has_reference(void *refptr) const; @@ -320,13 +320,13 @@ private: }; // internal state - simple_list m_primlist; // list of primitives - simple_list m_reflist; // list of references + simple_list m_primlist; // list of primitives + simple_list m_reflist; // list of references fixed_allocator m_primitive_allocator;// allocator for primitives - fixed_allocator m_reference_allocator; // allocator for references + fixed_allocator m_reference_allocator; // allocator for references - osd_lock * m_lock; // lock to protect list accesses + osd_lock * m_lock; // lock to protect list accesses }; @@ -344,10 +344,10 @@ class render_texture // construction/destruction render_texture(); ~render_texture(); - + // reset before re-use void reset(render_manager &manager, texture_scaler_func scaler = NULL, void *param = NULL); - + public: // getters int format() const { return m_format; } @@ -397,7 +397,7 @@ class render_container friend class simple_list; friend class render_manager; friend class render_target; - + // construction/destruction render_container(render_manager &manager, screen_device *screen = NULL); ~render_container(); @@ -408,7 +408,7 @@ public: { // construction/destruction user_settings(); - + // public state int m_orientation; // orientation float m_brightness; // brightness @@ -459,7 +459,7 @@ private: { friend class render_container; friend class simple_list; - + public: // getters item *next() const { return m_next; } @@ -495,8 +495,8 @@ private: // internal state render_container * m_next; // the next container in the list render_manager & m_manager; // reference back to the owning manager - simple_list m_itemlist; // head of the item list - fixed_allocator m_item_allocator; // free container items + simple_list m_itemlist; // head of the item list + fixed_allocator m_item_allocator; // free container items screen_device * m_screen; // the screen device user_settings m_user; // user settings bitmap_t * m_overlaybitmap; // overlay bitmap @@ -540,7 +540,7 @@ public: bool zoom_to_screen() const { return (m_layerconfig & LAYER_CONFIG_ZOOM_TO_SCREEN) != 0; } bool is_ui_target() const; int index() const; - + // setters void set_bounds(INT32 width, INT32 height, float pixel_aspect = 0); void set_max_update_rate(float updates_per_second) { m_max_refresh = updates_per_second; } @@ -608,7 +608,7 @@ private: layout_view * m_curview; // current view layout_file * m_filelist; // list of layout files UINT32 m_flags; // creation flags - render_primitive_list m_primlist[NUM_PRIMLISTS]; // list of primitives + render_primitive_list m_primlist[NUM_PRIMLISTS]; // list of primitives int m_listindex; // index of next primlist to use INT32 m_width; // width in pixels INT32 m_height; // height in pixels @@ -622,9 +622,9 @@ private: int m_base_layerconfig; // the layer configuration at the time of first frame int m_maxtexwidth; // maximum width of a texture int m_maxtexheight; // maximum height of a texture - simple_list m_debug_containers; // list of debug containers - INT32 m_clear_extent_count; // number of clear extents - INT32 m_clear_extents[MAX_CLEAR_EXTENTS]; // array of clear extents + simple_list m_debug_containers; // list of debug containers + INT32 m_clear_extent_count; // number of clear extents + INT32 m_clear_extents[MAX_CLEAR_EXTENTS]; // array of clear extents }; @@ -634,36 +634,36 @@ private: class render_manager { friend class render_target; - + public: // construction/destruction render_manager(running_machine &machine); ~render_manager(); - + // getters running_machine &machine() const { return m_machine; } - + // global queries bool is_live(screen_device &screen) const; float max_update_rate() const; - + // targets render_target *target_alloc(const char *layoutfile = NULL, UINT32 flags = 0); void target_free(render_target *target); render_target *first_target() const { return m_targetlist.first(); } render_target *target_by_index(int index) const; - + // UI targets render_target &ui_target() const { assert(m_ui_target != NULL); return *m_ui_target; } void set_ui_target(render_target &target) { m_ui_target = ⌖ } float ui_aspect(); - + // screen containers render_container *container_for_screen(screen_device *screen); - + // UI containers render_container &ui_container() const { assert(m_ui_container != NULL); return *m_ui_container; } - + // textures render_texture *texture_alloc(texture_scaler_func scaler = NULL, void *param = NULL); void texture_free(render_texture *texture); @@ -686,16 +686,16 @@ private: running_machine & m_machine; // reference back to the machine // array of live targets - simple_list m_targetlist; // list of targets + simple_list m_targetlist; // list of targets render_target * m_ui_target; // current UI target - + // texture lists UINT32 m_live_textures; // number of live textures fixed_allocator m_texture_allocator;// texture allocator // containers for the UI and for screens render_container * m_ui_container; // UI container - simple_list m_screen_container_list; // list of containers for the screen + simple_list m_screen_container_list; // list of containers for the screen }; diff --git a/src/emu/rendersw.c b/src/emu/rendersw.c index 459f878c669..31b3a6163af 100644 --- a/src/emu/rendersw.c +++ b/src/emu/rendersw.c @@ -2351,7 +2351,7 @@ static void FUNC_PREFIX(draw_primitives)(const render_primitive_list &primlist, else FUNC_PREFIX(setup_and_draw_textured_quad)(prim, dstdata, width, height, pitch); break; - + default: throw emu_fatalerror("Unexpected render_primitive type"); } diff --git a/src/emu/sound.c b/src/emu/sound.c index 64209213d4f..bc4a322054b 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -407,8 +407,8 @@ static TIMER_CALLBACK( sound_update ) /* play the result */ if (finalmix_offset > 0) { - if (!global->nosound_mode) - osd_update_audio_stream(machine, finalmix, finalmix_offset / 2); + if (!global->nosound_mode) + osd_update_audio_stream(machine, finalmix, finalmix_offset / 2); video_avi_add_sound(machine, finalmix, finalmix_offset / 2); if (global->wavfile != NULL) wav_add_data_16(global->wavfile, finalmix, finalmix_offset); diff --git a/src/emu/sound/asc.c b/src/emu/sound/asc.c index ead09e83ef0..e16d100e362 100644 --- a/src/emu/sound/asc.c +++ b/src/emu/sound/asc.c @@ -4,7 +4,7 @@ Apple Sound Chip (ASC) 344S0063 Enhanced Apple Sound Chip (EASC) 343S1063 - + Emulation by R. Belmont Registers: @@ -179,11 +179,11 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out case 1: // FIFO mode if ((m_fifo_a_rdptr == 0) && (!m_fifo_a_wrhalf[0])) { - halt = 1; + halt = 1; } else if ((m_fifo_a_rdptr == 0x200) && (!m_fifo_a_wrhalf[1])) { - halt = 1; + halt = 1; } for (i = 0; i < samples; i++) @@ -203,7 +203,7 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out smpll = (INT8)m_fifo_a[m_fifo_a_rdptr++]^0x80; smplr = (INT8)m_fifo_b[m_fifo_b_rdptr++]^0x80; - + if ((m_fifo_a_rdptr == 0x200) || (m_fifo_a_rdptr == 0x400)) { m_regs[R_FIFOSTAT-0x800] |= 1; // fifo A half-empty @@ -231,7 +231,7 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out if (halt) { -// m_regs[R_MODE-0x800] = 0; +// m_regs[R_MODE-0x800] = 0; } break; @@ -242,7 +242,7 @@ void asc_device::stream_generate(stream_sample_t **inputs, stream_sample_t **out INT8 smpl; mixL = mixR = 0; - + // update channel pointers for (ch = 0; ch < 4; ch++) { @@ -277,7 +277,7 @@ UINT8 asc_device::read(UINT16 offset) { UINT8 rv; -// printf("ASC: read at %x\n", offset); +// printf("ASC: read at %x\n", offset); // not sure what actually happens when the CPU reads the FIFO... if (offset < 0x400) @@ -409,7 +409,7 @@ UINT8 asc_device::read(UINT16 offset) void asc_device::write(UINT16 offset, UINT8 data) { -// printf("ASC: write %02x to %x\n", data, offset); +// printf("ASC: write %02x to %x\n", data, offset); if (offset < 0x400) { @@ -475,7 +475,7 @@ void asc_device::write(UINT16 offset, UINT8 data) } else { -// printf("ASC: %02x to %x (was %x)\n", data, offset, m_regs[offset-0x800]); +// printf("ASC: %02x to %x (was %x)\n", data, offset, m_regs[offset-0x800]); stream_update(m_stream); switch (offset) @@ -491,10 +491,10 @@ void asc_device::write(UINT16 offset, UINT8 data) break; case R_WTCONTROL: -// printf("One-shot wavetable %02x\n", data); +// printf("One-shot wavetable %02x\n", data); break; - case 0x811: + case 0x811: m_phase[0] &= 0x00ffff; m_phase[0] |= data<<16; break; @@ -509,7 +509,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_phase[0] |= data; break; - case 0x815: + case 0x815: m_incr[0] &= 0x00ffff; m_incr[0] |= data<<16; break; @@ -524,7 +524,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_incr[0] |= data; break; - case 0x819: + case 0x819: m_phase[1] &= 0x00ffff; m_phase[1] |= data<<16; break; @@ -539,7 +539,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_phase[1] |= data; break; - case 0x81d: + case 0x81d: m_incr[1] &= 0x00ffff; m_incr[1] |= data<<16; break; @@ -554,7 +554,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_incr[1] |= data; break; - case 0x821: + case 0x821: m_phase[2] &= 0x00ffff; m_phase[2] |= data<<16; break; @@ -569,7 +569,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_phase[2] |= data; break; - case 0x825: + case 0x825: m_incr[2] &= 0x00ffff; m_incr[2] |= data<<16; break; @@ -584,7 +584,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_incr[2] |= data; break; - case 0x829: + case 0x829: m_phase[3] &= 0x00ffff; m_phase[3] |= data<<16; break; @@ -599,7 +599,7 @@ void asc_device::write(UINT16 offset, UINT8 data) m_phase[3] |= data; break; - case 0x82d: + case 0x82d: m_incr[3] &= 0x00ffff; m_incr[3] |= data<<16; break; diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 1b05f1629d9..dc2eacbc3f0 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -3043,7 +3043,7 @@ static void menu_video_options(running_machine *machine, ui_menu *menu, void *pa changed = TRUE; } break; - + case VIDEO_ITEM_OVERLAYS: if (event->iptkey == IPT_UI_LEFT || event->iptkey == IPT_UI_RIGHT) { @@ -3051,7 +3051,7 @@ static void menu_video_options(running_machine *machine, ui_menu *menu, void *pa changed = TRUE; } break; - + case VIDEO_ITEM_BEZELS: if (event->iptkey == IPT_UI_LEFT || event->iptkey == IPT_UI_RIGHT) { @@ -3059,7 +3059,7 @@ static void menu_video_options(running_machine *machine, ui_menu *menu, void *pa changed = TRUE; } break; - + case VIDEO_ITEM_ZOOM: if (event->iptkey == IPT_UI_LEFT || event->iptkey == IPT_UI_RIGHT) { diff --git a/src/emu/video/v9938.c b/src/emu/video/v9938.c index 8c3939a04f5..9ad0a6b7615 100644 --- a/src/emu/video/v9938.c +++ b/src/emu/video/v9938.c @@ -587,7 +587,7 @@ void v9938_reset (int which) // TODO: SR3-S6 do not yet store the information about the sprite collision vdp->statReg[4] = 0xfe; - vdp->statReg[6] = 0xfc; + vdp->statReg[6] = 0xfc; } static void v9938_check_int (running_machine *machine) diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index ac290dd14dd..9ac3931781e 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -1057,7 +1057,7 @@ static const pia6821_interface victory_pia1_intf = static DEVICE_START( victory_sound ) { exidy_sound_state *state = get_safe_token(device); - + state_save_register_device_item(device, 0, state->victory_sound_response_ack_clk); DEVICE_START_CALL(venture_common_sh_start); diff --git a/src/mame/drivers/ampoker2.c b/src/mame/drivers/ampoker2.c index 18cf066da57..72c0ff5b2d3 100644 --- a/src/mame/drivers/ampoker2.c +++ b/src/mame/drivers/ampoker2.c @@ -125,7 +125,7 @@ If you win some credits, you'll be on troubles due to unemulated hopper. Just discharge the credits one by one pressing quickly the door switch (O) If you want to play without the hopper issues, just leave the door open (O). In this mode, - the game is playable but doesn't contabilize in the meters. + the game is playable but doesn't contabilize in the meters. ********************************************************************************* @@ -1429,7 +1429,7 @@ static DRIVER_INIT( piccolop ) { /* The protection is based on a stuck bit at RAM offset $C416. - + 1382: 41 ld b,c 1383: 80 add a,b 1384: 00 nop ------\ diff --git a/src/mame/drivers/avt.c b/src/mame/drivers/avt.c index 43f7a60812a..c70e6734863 100644 --- a/src/mame/drivers/avt.c +++ b/src/mame/drivers/avt.c @@ -48,9 +48,9 @@ The code has a timer that takes a couple of minutes to boot into the game. This is completely normal and expected. - - + + ************ SYMBOLS ************ INTRODUCTION @@ -204,7 +204,7 @@ Symbols front panel layout: - .------. .------. .------. .------. .------. + .------. .------. .------. .------. .------. | UP | | UP | | UP | | UP | | UP | .-------. | 1 | | 2 | | 3 | | 4 | | 5 | .------. | START | '------' '------' '------' '------' '------' | PLAY | @@ -222,7 +222,7 @@ Pin # Description -------------------- - 01 +12V DC + 01 +12V DC 02 +5V DC 03 N/C 04 GND @@ -360,8 +360,8 @@ '-----------'----'----'----'----'----'----'----'----'----'----'----'----'----'----'----'----' Being.... - - + + 7654 3210 ---- ---x Unknown (intensity?). ---- --x- Red. @@ -486,12 +486,12 @@ static PALETTE_INIT( avt ) intenmin = 0xe0; intenmax = 0xff; - + i = ((j & 0x7) << 4) | ((j & 0x78) >> 3); - + /* intensity component */ -// inten = 1 - (color_prom[i] & 0x01); +// inten = 1 - (color_prom[i] & 0x01); inten = (color_prom[i] & 0x01); /* red component */ @@ -522,7 +522,7 @@ static PALETTE_INIT( avt ) //static WRITE8_HANDLER( debug_w ) //{ -// popmessage("written : %02X", data); +// popmessage("written : %02X", data); //} @@ -541,12 +541,12 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( avt_portmap, ADDRESS_SPACE_IO, 8 ) ADDRESS_MAP_GLOBAL_MASK(0xff) -// AM_RANGE(0x00, 0x03) unk, maybe IO -// AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") -// AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") -// AM_RANGE(0x08, 0x0b) unk, maybe IO -// AM_RANGE(0x08, 0x08) AM_READ_PORT("IN2") -// AM_RANGE(0x09, 0x09) AM_READ_PORT("IN3") +// AM_RANGE(0x00, 0x03) unk, maybe IO +// AM_RANGE(0x00, 0x00) AM_READ_PORT("IN0") +// AM_RANGE(0x01, 0x01) AM_READ_PORT("IN1") +// AM_RANGE(0x08, 0x0b) unk, maybe IO +// AM_RANGE(0x08, 0x08) AM_READ_PORT("IN2") +// AM_RANGE(0x09, 0x09) AM_READ_PORT("IN3") AM_RANGE(0x21, 0x21) AM_DEVWRITE("aysnd", ay8910_data_w) /* AY8910 data */ AM_RANGE(0x23, 0x23) AM_DEVWRITE("aysnd", ay8910_address_w) /* AY8910 control */ AM_RANGE(0x28, 0x28) AM_DEVWRITE("crtc", mc6845_address_w) @@ -802,7 +802,7 @@ static MACHINE_CONFIG_START( avt, driver_device ) MDRV_CPU_ADD("maincpu", Z80, CPU_CLOCK) /* guess */ MDRV_CPU_PROGRAM_MAP(avt_map) MDRV_CPU_IO_MAP(avt_portmap) -// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) +// MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) @@ -884,8 +884,8 @@ ROM_START( avtnfl ) ROM_LOAD( "u40-14.33", 0x4000, 0x2000, CRC(205910dd) SHA1(37fee06926e4dcd89ec6390b4914a852f12a9e25) ) /* GFX from Symbols for debugging purposes. - Original graphics are missing. - */ + Original graphics are missing. + */ ROM_REGION( 0x6000, "gfx1", 0 ) ROM_LOAD( "avtnfl.blu", 0x0000, 0x2000, BAD_DUMP CRC(ee07339b) SHA1(260ac4739c90efa60597bf815d12fb96cf5391ed) ) ROM_LOAD( "avtnfl.grn", 0x2000, 0x2000, BAD_DUMP CRC(1df023ac) SHA1(1919ddb835d525fd1843326de939af74693fc88a) ) diff --git a/src/mame/drivers/cloud9.c b/src/mame/drivers/cloud9.c index e1fc3ec6806..edf8d8f4996 100644 --- a/src/mame/drivers/cloud9.c +++ b/src/mame/drivers/cloud9.c @@ -435,7 +435,7 @@ static MACHINE_CONFIG_START( cloud9, cloud9_state ) MDRV_MACHINE_START(cloud9) MDRV_MACHINE_RESET(cloud9) MDRV_WATCHDOG_VBLANK_INIT(8) - + MDRV_X2212_ADD_AUTOSAVE("nvram") /* video hardware */ diff --git a/src/mame/drivers/csplayh5.c b/src/mame/drivers/csplayh5.c index 7550f5f228c..df561e5cf0d 100644 --- a/src/mame/drivers/csplayh5.c +++ b/src/mame/drivers/csplayh5.c @@ -1,14 +1,14 @@ /*************************************************************************** - 'High Rate DVD' HW (c) 1998 Nichibutsu + 'High Rate DVD' HW (c) 1998 Nichibutsu - preliminary driver by Angelo Salese + preliminary driver by Angelo Salese - TODO: - - fix h8 CPU core bugs, it trips various unhandled opcodes - - Implement DVD routing and YUV decoding; - - V9958 timings are screwed, some places have missing gfxs. - - game timings seem busted either, could be due of missing DVD hook-up + TODO: + - fix h8 CPU core bugs, it trips various unhandled opcodes + - Implement DVD routing and YUV decoding; + - V9958 timings are screwed, some places have missing gfxs. + - game timings seem busted either, could be due of missing DVD hook-up ***************************************************************************/ diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 579f2d9a104..cb37617c891 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -846,18 +846,18 @@ static WRITE8_DEVICE_HANDLER( mux_port_w ) /* Demuxing ay8910 data/address from Falcon board, PIA portA out */ int wcfalcon_flag = 0; - + static WRITE8_DEVICE_HANDLER( wcfalcon_snd_w ) { if (wcfalcon_flag == 0) { ay8910_data_address_w(device->machine->device("ay8910"), 0, data); -// logerror("sound address: %02x %02x\n", data, wcfalcon_flag); +// logerror("sound address: %02x %02x\n", data, wcfalcon_flag); } else { ay8910_data_address_w(device->machine->device("ay8910"), 1, data); -// logerror("sound data: %02x %02x\n", data, wcfalcon_flag); +// logerror("sound data: %02x %02x\n", data, wcfalcon_flag); } wcfalcon_flag = wcfalcon_flag ^ 1; @@ -1003,7 +1003,7 @@ static ADDRESS_MAP_START( witchcrd_falcon_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wildcard_map, ADDRESS_SPACE_PROGRAM, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0x7fff) +// ADDRESS_MAP_GLOBAL_MASK(0x7fff) AM_RANGE(0x0000, 0x07ff) AM_RAM AM_SHARE("nvram") /* battery backed RAM */ AM_RANGE(0x0800, 0x0800) AM_DEVWRITE("crtc", mc6845_address_w) AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE("crtc", mc6845_register_r, mc6845_register_w) @@ -1038,7 +1038,7 @@ static ADDRESS_MAP_START( wildcrdb_map, ADDRESS_SPACE_PROGRAM, 8 ) ADDRESS_MAP_END static ADDRESS_MAP_START( wildcrdb_mcu_map, ADDRESS_SPACE_PROGRAM, 8 ) -// ADDRESS_MAP_GLOBAL_MASK(0x3fff) +// ADDRESS_MAP_GLOBAL_MASK(0x3fff) AM_RANGE(0x0000, 0x0fff) AM_ROM AM_RANGE(0x1000, 0x2fff) AM_RAM ADDRESS_MAP_END @@ -2640,9 +2640,9 @@ static MACHINE_CONFIG_DERIVED( wildcard, goldnpkr_base ) MDRV_PIA6821_MODIFY("pia0", pottnpkr_pia0_intf) /* video hardware */ -// MDRV_GFXDECODE(wildcard) +// MDRV_GFXDECODE(wildcard) MDRV_PALETTE_INIT(witchcrd) -// MDRV_VIDEO_START(wildcard) +// MDRV_VIDEO_START(wildcard) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") @@ -2666,9 +2666,9 @@ static MACHINE_CONFIG_DERIVED( wildcrdb, goldnpkr_base ) MDRV_PIA6821_MODIFY("pia1", wcfalcon_pia1_intf) /* video hardware */ -// MDRV_GFXDECODE(wildcard) +// MDRV_GFXDECODE(wildcard) MDRV_PALETTE_INIT(witchcrd) -// MDRV_VIDEO_START(wildcard) +// MDRV_VIDEO_START(wildcard) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") @@ -3081,7 +3081,7 @@ ROM_START( witchcdg ) ROM_COPY( "gfx2", 0x2800, 0x2000, 0x0800 ) /* srctag, srcoffs, offset, length */ ROM_REGION( 0x0100, "proms", 0 ) -// ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ +// ROM_LOAD( "82s129.7d", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */ ROM_LOAD( "tbp24s10n.d2", 0x0000, 0x0100, BAD_DUMP CRC(3db3b9e0) SHA1(c956493d5d754665d214b416e6a473d73c22716c) ) ROM_END @@ -3532,8 +3532,8 @@ ROM_END /********************************************* Falcons Wild - Wild Card 1991. - 1992-1992 TVG D-6310 GRUENBERG. - (bootleg in real Bonanza hardware). + 1992-1992 TVG D-6310 GRUENBERG. + (bootleg in real Bonanza hardware). dm74s287n.7d FIXED BITS (0000xxxx) fw1.2a BADADDR x-xxxxxxxxxxx @@ -3613,7 +3613,7 @@ ROM_END ROM_START( falcnwldb ) ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Falcon original */ -// ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) +// ROM_LOAD( "nosticker.12a", 0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) ) ROM_LOAD( "4.b6", 0x3000, 0x1000, CRC(88684a8f) SHA1(5ffa0808b502e93ddcb8f13929008aec2836a773) ) ROM_LOAD( "5.b8", 0x4000, 0x1000, CRC(aa5de05c) SHA1(98559b35c7c31a41b1818a6e60ec82f43a5d1b4a) ) ROM_LOAD( "6-syncmod.b9", 0x5000, 0x1000, CRC(21cfa807) SHA1(ff908a5a43b3736494127539d6485648d8be1a9a) ) // ok diff --git a/src/mame/drivers/hitme.c b/src/mame/drivers/hitme.c index 8000e95f56a..622d24538be 100644 --- a/src/mame/drivers/hitme.c +++ b/src/mame/drivers/hitme.c @@ -542,28 +542,28 @@ INPUT_PORTS_END /* Hit me by Ramtek -Etched in copper on board HIT ME by RAMTEK Made in U.S.A - ASSY 550596 D D was as sticker - SER 957 957 was a sticker +Etched in copper on board HIT ME by RAMTEK Made in U.S.A + ASSY 550596 D D was as sticker + SER 957 957 was a sticker -Etched in copper on back FAB 550595-C +Etched in copper on back FAB 550595-C -.b7 stamped 15347 7625 - HM2-0 +.b7 stamped 15347 7625 + HM2-0 -.c7 IM5605 handwritten HM-2-2 +.c7 IM5605 handwritten HM-2-2 -.d7 stamped 15349 7625 - HM1-4 +.d7 stamped 15349 7625 + HM1-4 -.e7 stamped 15350 7625 - HM1-6 +.e7 stamped 15350 7625 + HM1-6 -.f7 stamped 15351 7625 - HM2-8 +.f7 stamped 15351 7625 + HM2-8 -.h7 IM560? handwritten HM0-CG hard to read +.h7 IM560? handwritten HM0-CG hard to read All chips we read as 82s141 - guessed becuase of 24 pin pinout and 512x8 rom according to mame */ diff --git a/src/mame/drivers/hornet.c b/src/mame/drivers/hornet.c index 21d5663a7b7..6c8a6f184bd 100644 --- a/src/mame/drivers/hornet.c +++ b/src/mame/drivers/hornet.c @@ -847,7 +847,7 @@ static MACHINE_START( hornet ) state_save_register_global(machine, led_reg1); state_save_register_global_pointer(machine, jvs_sdata, 1024); state_save_register_global(machine, jvs_sdata_ptr); - + sound_irq_timer = timer_alloc(machine, irq_off, 0); } diff --git a/src/mame/drivers/megadriv.c b/src/mame/drivers/megadriv.c index fbe24b0a2f5..71c54178f8f 100644 --- a/src/mame/drivers/megadriv.c +++ b/src/mame/drivers/megadriv.c @@ -2681,7 +2681,7 @@ static READ16_HANDLER( _32x_dreq_common_r ) current_fifo_read_pos++; - // printf("reading FIFO!\n"); + // printf("reading FIFO!\n"); if (current_fifo_readblock == fifo_block_a && !fifo_block_a_full) printf("Fifo block a isn't filled!\n"); @@ -2741,7 +2741,7 @@ static WRITE16_HANDLER( _32x_dreq_common_w ) dreq_src_addr[offset&1] = ((offset&1) == 0) ? (data & 0xff) : (data & 0xfffe); //if((dreq_src_addr[0]<<16)|dreq_src_addr[1]) - // printf("DREQ set SRC = %08x\n",(dreq_src_addr[0]<<16)|dreq_src_addr[1]); + // printf("DREQ set SRC = %08x\n",(dreq_src_addr[0]<<16)|dreq_src_addr[1]); break; @@ -2756,7 +2756,7 @@ static WRITE16_HANDLER( _32x_dreq_common_w ) dreq_dst_addr[offset&1] = ((offset&1) == 0) ? (data & 0xff) : (data & 0xffff); //if((dreq_dst_addr[0]<<16)|dreq_dst_addr[1]) - // printf("DREQ set DST = %08x\n",(dreq_dst_addr[0]<<16)|dreq_dst_addr[1]); + // printf("DREQ set DST = %08x\n",(dreq_dst_addr[0]<<16)|dreq_dst_addr[1]); break; @@ -2769,8 +2769,8 @@ static WRITE16_HANDLER( _32x_dreq_common_w ) dreq_size = data & 0xfffc; - // if(dreq_size) - // printf("DREQ set SIZE = %04x\n",dreq_size); + // if(dreq_size) + // printf("DREQ set SIZE = %04x\n",dreq_size); break; @@ -3208,7 +3208,7 @@ static READ16_HANDLER( _32x_common_vdp_regs_r ) -// printf("_32x_68k_a15180_r (a15180) %04x\n",mem_mask); +// printf("_32x_68k_a15180_r (a15180) %04x\n",mem_mask); // read needs authorization too I think, undefined behavior otherwise switch (offset) @@ -3382,7 +3382,7 @@ static WRITE16_HANDLER( _32x_common_vdp_regs_w ) case 0x0a/2: // bit 0 is the framebuffer select, change is delayed until vblank; - // _32x_a1518a_reg = (_32x_a1518a_reg & 0xfffe); + // _32x_a1518a_reg = (_32x_a1518a_reg & 0xfffe); if (ACCESSING_BITS_0_7) { _32x_fb_swap = data & 1; @@ -3979,7 +3979,7 @@ static WRITE16_HANDLER( scd_a12002_memory_mode_w ) static READ16_HANDLER( segacd_sub_memory_mode_r ) { return (segacd_ram_writeprotect_bits << 8) | - /*(segacd_4meg_prgbank << 6) | */ + /*(segacd_4meg_prgbank << 6) | */ (segacd_memory_priority_mode << 3) | (segacd_ram_mode << 2) | ((segacd_maincpu_has_ram_access^1) << 1) | @@ -4309,7 +4309,7 @@ static WRITE16_HANDLER( segacd_main_dataram_part1_w ) static READ16_HANDLER( scd_hint_vector_r ) { -// printf("read HINT offset %d\n", offset); +// printf("read HINT offset %d\n", offset); switch (offset&1) { @@ -4360,13 +4360,13 @@ static TIMER_CALLBACK( segacd_gfx_conversion_timer_callback ) /* static const gfx_layout sega_8x8_layout = { - 8,8, - SEGACD_NUM_TILES16, - 4, - { 0,1,2,3 }, - { 8,12,0,4,24,28,16,20 }, - { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, - 8*32 + 8,8, + SEGACD_NUM_TILES16, + 4, + { 0,1,2,3 }, + { 8,12,0,4,24,28,16,20 }, + { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 }, + 8*32 }; */ @@ -4421,8 +4421,8 @@ static const gfx_layout sega_8x8_layout = #define _32x32_SEQUENCE_2 \ { 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32, \ - 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32, \ - 16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32, \ + 8*32, 9*32, 10*32, 11*32, 12*32, 13*32, 14*32, 15*32, \ + 16*32,17*32,18*32,19*32,20*32,21*32,22*32,23*32, \ 24*32,25*32, 26*32, 27*32, 28*32, 29*32, 30*32, 31*32}, \ #define _32x32_SEQUENCE_2_FLIP \ @@ -4693,9 +4693,9 @@ void segacd_init_main_cpu( running_machine* machine ) /* as a temporary measure we use the MAME tilemaps, this is hideously inefficient as we have to mark the active one as dirty before each operation due to the RAM based tiles. For the larger tilemaps this means we have to re-render a 4096x4096 - bitmap to the tilemap cache on each blit operation just to copy the few needed tiles out of it, needless to say, this is SLOW. - Eventually the tilemaps will be replaced with a get_pixel function which will perform all the needed lookups on a per-pixel - basis instead of re-rendering the whole thing */ + bitmap to the tilemap cache on each blit operation just to copy the few needed tiles out of it, needless to say, this is SLOW. + Eventually the tilemaps will be replaced with a get_pixel function which will perform all the needed lookups on a per-pixel + basis instead of re-rendering the whole thing */ segacd_stampmap[0] = tilemap_create(machine, get_stampmap_16x16_1x1_tile_info, tilemap_scan_rows, 16, 16, 16, 16); segacd_stampmap[1] = tilemap_create(machine, get_stampmap_32x32_1x1_tile_info, tilemap_scan_rows, 32, 32, 8, 8); segacd_stampmap[2] = tilemap_create(machine, get_stampmap_16x16_16x16_tile_info, tilemap_scan_rows, 16, 16, 256, 256); // 128kb! @@ -4963,10 +4963,10 @@ static void segacd_cdd_get_status(running_machine *machine) // ... /*segacd_cdd.status = 0; - segacd_cdd.minute = 0; - segacd_cdd.seconds = 0; - segacd_cdd.frame = 0; - segacd_cdd.ext = 0;*/ + segacd_cdd.minute = 0; + segacd_cdd.seconds = 0; + segacd_cdd.frame = 0; + segacd_cdd.ext = 0;*/ cdd_hock_irq(machine,1); } @@ -5270,21 +5270,21 @@ static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8004 ,0xff8005) AM_READWRITE(segacd_cdc_mode_address_r, segacd_cdc_mode_address_w) AM_RANGE(0xff8006 ,0xff8007) AM_READWRITE(segacd_cdc_data_r, segacd_cdc_data_w) -// AM_RANGE(0xff8008, 0xff8009) // CDC Host Data -// AM_RANGE(0xff800a, 0xff800b) // CDC DMA Address -// AM_RANGE(0xff800c, 0xff800d) // Stopwatch timer +// AM_RANGE(0xff8008, 0xff8009) // CDC Host Data +// AM_RANGE(0xff800a, 0xff800b) // CDC DMA Address +// AM_RANGE(0xff800c, 0xff800d) // Stopwatch timer AM_RANGE(0xff800e ,0xff800f) AM_READWRITE(segacd_comms_flags_r, segacd_comms_flags_subcpu_w) AM_RANGE(0xff8010 ,0xff801f) AM_READWRITE(segacd_comms_sub_part1_r, segacd_comms_sub_part1_w) AM_RANGE(0xff8020 ,0xff802f) AM_READWRITE(segacd_comms_sub_part2_r, segacd_comms_sub_part2_w) -// AM_RANGE(0xff8030, 0xff8031) // Timer W/INT3 +// AM_RANGE(0xff8030, 0xff8031) // Timer W/INT3 AM_RANGE(0xff8032, 0xff8033) AM_READWRITE(segacd_irq_mask_r,segacd_irq_mask_w) AM_RANGE(0xff8034, 0xff8035) AM_NOP // CD Fader AM_RANGE(0xff8036, 0xff8037) AM_READWRITE(segacd_cdd_ctrl_r,segacd_cdd_ctrl_w) AM_RANGE(0xff8038, 0xff8041) AM_READ8(segacd_cdd_rx_r,0xffff) AM_RANGE(0xff8042, 0xff804b) AM_WRITE8(segacd_cdd_tx_w,0xffff) -// AM_RANGE(0xff804c, 0xff804d) // Font Color -// AM_RANGE(0xff804e, 0xff804f) // Font bit -// AM_RANGE(0xff8050, 0xff8057) // Font data (read only) +// AM_RANGE(0xff804c, 0xff804d) // Font Color +// AM_RANGE(0xff804e, 0xff804f) // Font bit +// AM_RANGE(0xff8050, 0xff8057) // Font data (read only) AM_RANGE(0xff8058, 0xff8059) AM_READWRITE(segacd_stampsize_r, segacd_stampsize_w) // Stamp size AM_RANGE(0xff805a, 0xff805b) AM_READWRITE(segacd_stampmap_base_address_r, segacd_stampmap_base_address_w) // Stamp map base address AM_RANGE(0xff805c, 0xff805d) AM_READWRITE(segacd_imagebuffer_vcell_size_r, segacd_imagebuffer_vcell_size_w)// Image buffer V cell size @@ -5293,10 +5293,10 @@ static ADDRESS_MAP_START( segacd_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xff8062, 0xff8063) AM_READWRITE(segacd_imagebuffer_hdot_size_r, segacd_imagebuffer_hdot_size_w) // Image buffer H dot size AM_RANGE(0xff8064, 0xff8065) AM_READWRITE(segacd_imagebuffer_vdot_size_r, segacd_imagebuffer_vdot_size_w ) // Image buffer V dot size AM_RANGE(0xff8066, 0xff8067) AM_WRITE(segacd_trace_vector_base_address_w)// Trace vector base address -// AM_RANGE(0xff8068, 0xff8069) // Subcode address +// AM_RANGE(0xff8068, 0xff8069) // Subcode address -// AM_RANGE(0xff8100, 0xff817f) // Subcode buffer area -// AM_RANGE(0xff8180, 0xff81ff) // mirror of subcode buffer area +// AM_RANGE(0xff8100, 0xff817f) // Subcode buffer area +// AM_RANGE(0xff8180, 0xff81ff) // mirror of subcode buffer area ADDRESS_MAP_END diff --git a/src/mame/drivers/mirage.c b/src/mame/drivers/mirage.c index 1b49884b0ef..358bce60deb 100644 --- a/src/mame/drivers/mirage.c +++ b/src/mame/drivers/mirage.c @@ -52,9 +52,9 @@ public: /* memory pointers */ UINT16 * pf1_rowscroll; UINT16 * pf2_rowscroll; -// UINT16 * spriteram; +// UINT16 * spriteram; // UINT16 * paletteram; // currently this uses generic palette handling (in deco16ic.c) -// size_t spriteram_size; +// size_t spriteram_size; /* misc */ UINT8 mux_data; diff --git a/src/mame/drivers/moo.c b/src/mame/drivers/moo.c index 388065a413b..3c27f273c98 100644 --- a/src/mame/drivers/moo.c +++ b/src/mame/drivers/moo.c @@ -447,7 +447,7 @@ static MACHINE_START( moo ) state_save_register_global_array(machine, state->layer_colorbase); state_save_register_global_array(machine, state->layerpri); state_save_register_global_array(machine, state->protram); - + state->dmaend_timer = timer_alloc(machine, dmaend_callback, 0); } diff --git a/src/mame/drivers/namcos2.c b/src/mame/drivers/namcos2.c index 4dd0666745c..f21f221cb8a 100644 --- a/src/mame/drivers/namcos2.c +++ b/src/mame/drivers/namcos2.c @@ -3071,7 +3071,7 @@ ROM_START( finalap3jc ) ROM_REGION( 0x010000, "mcu", 0 ) /* M37450S2FP I/O MCU */ /* The M37450 is unemulated so we're using the C65/6805 program instead. - This particular M37450 variant has no internal ROM. */ + This particular M37450 variant has no internal ROM. */ ROM_LOAD( "sys2mcpu.bin", 0x000000, 0x002000, CRC(a342a97e) SHA1(2c420d34dba21e409bf78ddca710fc7de65a6642) ) ROM_LOAD( "sys2_c68.3f", 0x008000, 0x008000, CRC(ca64550a) SHA1(38d1ad1b1287cadef0c999aff9357927315f8e6b) ) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index 539ca10cb0b..998a2b5ac3b 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -1134,7 +1134,7 @@ Notes: Metal Slug 6 * Premier Eleven Sushi Bar - The King Of Fighters XI * + The King Of Fighters XI * Sega Clay Challenge * Sega Bass Fishing Challenge * @@ -4518,13 +4518,13 @@ ROM_START( wrungp ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0x6800000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr-24059.ic22", 0x0000000, 0x400000, CRC(f82c00b5) SHA1(e885a46b2d3d52d9222d9ce038766858a2046ea1) ) - ROM_LOAD( "mpr-23719.ic1", 0x0800000, 0x1000000, CRC(b9fb79df) SHA1(1568320c25118f4ee5c508dcca4e4496ff23c067) ) - ROM_LOAD( "mpr-23720.ic2", 0x1800000, 0x1000000, CRC(d3f19874) SHA1(cde22c56dac233f5407d2e3ac8e6ea4f8681d0bf) ) - ROM_LOAD( "mpr-23721.ic3", 0x2800000, 0x1000000, CRC(f599a52e) SHA1(ca0edc2e9496f218117cef7d71bf1761bed8d4ac) ) - ROM_LOAD( "mpr-23722.ic4", 0x3800000, 0x1000000, CRC(e08a6a36) SHA1(ef37d8c7bc9d5055008d522825ef3e80e27745c2) ) - ROM_LOAD( "mpr-23723.ic5", 0x4800000, 0x1000000, CRC(651610eb) SHA1(4dfe4f876a5440bd1034f41a4d76e1d6bd3e0e32) ) - ROM_LOAD( "mpr-23724.ic6", 0x5800000, 0x1000000, CRC(c633c45a) SHA1(23b45140f965428d33e2424b0574715c0b952d05) ) + ROM_LOAD( "epr-24059.ic22", 0x0000000, 0x400000, CRC(f82c00b5) SHA1(e885a46b2d3d52d9222d9ce038766858a2046ea1) ) + ROM_LOAD( "mpr-23719.ic1", 0x0800000, 0x1000000, CRC(b9fb79df) SHA1(1568320c25118f4ee5c508dcca4e4496ff23c067) ) + ROM_LOAD( "mpr-23720.ic2", 0x1800000, 0x1000000, CRC(d3f19874) SHA1(cde22c56dac233f5407d2e3ac8e6ea4f8681d0bf) ) + ROM_LOAD( "mpr-23721.ic3", 0x2800000, 0x1000000, CRC(f599a52e) SHA1(ca0edc2e9496f218117cef7d71bf1761bed8d4ac) ) + ROM_LOAD( "mpr-23722.ic4", 0x3800000, 0x1000000, CRC(e08a6a36) SHA1(ef37d8c7bc9d5055008d522825ef3e80e27745c2) ) + ROM_LOAD( "mpr-23723.ic5", 0x4800000, 0x1000000, CRC(651610eb) SHA1(4dfe4f876a5440bd1034f41a4d76e1d6bd3e0e32) ) + ROM_LOAD( "mpr-23724.ic6", 0x5800000, 0x1000000, CRC(c633c45a) SHA1(23b45140f965428d33e2424b0574715c0b952d05) ) ROM_END ROM_START( gundmct ) @@ -4533,18 +4533,18 @@ ROM_START( gundmct ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23638.ic22", 0x0000000, 0x0400000, CRC(03e8600d) SHA1(bf9bb6ed03a5744c91c2c4038be764408dd85234) ) + ROM_LOAD( "epr-23638.ic22", 0x0000000, 0x0400000, CRC(03e8600d) SHA1(bf9bb6ed03a5744c91c2c4038be764408dd85234) ) ROM_RELOAD( 0x400000, 0x400000) - ROM_LOAD( "mpr-23628.ic1", 0x0800000, 0x1000000, CRC(8668ba2f) SHA1(cedc67e6ce267a8c99ced4728f891bcae01cce24) ) - ROM_LOAD( "mpr-23629.ic2", 0x1800000, 0x1000000, CRC(b60f3048) SHA1(e575547e00b93129b1da49c61fc2a56706e8f362) ) - ROM_LOAD( "mpr-23630.ic3", 0x2800000, 0x1000000, CRC(0b47643f) SHA1(3cc4e51ca85ecdd04fe7c91e3b877dd5e6c0e67e) ) - ROM_LOAD( "mpr-23631.ic4", 0x3800000, 0x1000000, CRC(dbd863c9) SHA1(0c5d3b76a56902861e9a9595c0997f3726583cda) ) - ROM_LOAD( "mpr-23632.ic5", 0x4800000, 0x1000000, CRC(8c008562) SHA1(3fd696fadafd012b312a1407345c1ce1cd41ca45) ) - ROM_LOAD( "mpr-23633.ic6", 0x5800000, 0x1000000, CRC(ca104486) SHA1(05e6d1f9481a13189739671620a96a41af91433e) ) - ROM_LOAD( "mpr-23634.ic7", 0x6800000, 0x1000000, CRC(32bf6938) SHA1(f7bc0bed0a26c6d964c147fa78c666fd830730cf) ) - ROM_LOAD( "mpr-23635.ic8", 0x7800000, 0x1000000, CRC(f9279277) SHA1(823ae02a754ca8a8effdb957ccc6726765fc29b8) ) - ROM_LOAD( "mpr-23636.ic9", 0x8800000, 0x1000000, CRC(57199e9f) SHA1(73a6f20ee7b3133ed4c6286e477e2ff9757106bd) ) - ROM_LOAD( "mpr-23637.ic10", 0x9800000, 0x1000000, CRC(737b5dff) SHA1(0a405b711ffb096a3e6d52ececed73a5f93ebf02) ) + ROM_LOAD( "mpr-23628.ic1", 0x0800000, 0x1000000, CRC(8668ba2f) SHA1(cedc67e6ce267a8c99ced4728f891bcae01cce24) ) + ROM_LOAD( "mpr-23629.ic2", 0x1800000, 0x1000000, CRC(b60f3048) SHA1(e575547e00b93129b1da49c61fc2a56706e8f362) ) + ROM_LOAD( "mpr-23630.ic3", 0x2800000, 0x1000000, CRC(0b47643f) SHA1(3cc4e51ca85ecdd04fe7c91e3b877dd5e6c0e67e) ) + ROM_LOAD( "mpr-23631.ic4", 0x3800000, 0x1000000, CRC(dbd863c9) SHA1(0c5d3b76a56902861e9a9595c0997f3726583cda) ) + ROM_LOAD( "mpr-23632.ic5", 0x4800000, 0x1000000, CRC(8c008562) SHA1(3fd696fadafd012b312a1407345c1ce1cd41ca45) ) + ROM_LOAD( "mpr-23633.ic6", 0x5800000, 0x1000000, CRC(ca104486) SHA1(05e6d1f9481a13189739671620a96a41af91433e) ) + ROM_LOAD( "mpr-23634.ic7", 0x6800000, 0x1000000, CRC(32bf6938) SHA1(f7bc0bed0a26c6d964c147fa78c666fd830730cf) ) + ROM_LOAD( "mpr-23635.ic8", 0x7800000, 0x1000000, CRC(f9279277) SHA1(823ae02a754ca8a8effdb957ccc6726765fc29b8) ) + ROM_LOAD( "mpr-23636.ic9", 0x8800000, 0x1000000, CRC(57199e9f) SHA1(73a6f20ee7b3133ed4c6286e477e2ff9757106bd) ) + ROM_LOAD( "mpr-23637.ic10", 0x9800000, 0x1000000, CRC(737b5dff) SHA1(0a405b711ffb096a3e6d52ececed73a5f93ebf02) ) ROM_END ROM_START( puyoda ) @@ -4553,28 +4553,28 @@ ROM_START( puyoda ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr-22206.ic22", 0x0000000, 0x400000, CRC(3882dd01) SHA1(9c287b531d0adfd9ecb10d5bf71a7b0f17454c21) ) + ROM_LOAD( "epr-22206.ic22", 0x0000000, 0x400000, CRC(3882dd01) SHA1(9c287b531d0adfd9ecb10d5bf71a7b0f17454c21) ) ROM_RELOAD( 0x400000, 0x400000) - ROM_LOAD( "mpr-22186.ic1", 0x0800000, 0x800000, CRC(30b1a1d6) SHA1(73914c53a030b496e854b4c1fa454153bb025217) ) - ROM_LOAD( "mpr-22187.ic2", 0x1000000, 0x800000, CRC(0eae60e5) SHA1(c695c07000310089aa79b525fbe36015c5526165) ) - ROM_LOAD( "mpr-22188.ic3", 0x1800000, 0x800000, CRC(2e651f16) SHA1(b4ef7a90ade379cb3f7d4c64faedb25032465c25) ) - ROM_LOAD( "mpr-22189.ic4", 0x2000000, 0x800000, CRC(69ec44fc) SHA1(052e5e14ce433cddfae4a8b9b7c179c6266e9c1c) ) - ROM_LOAD( "mpr-22190.ic5", 0x2800000, 0x800000, CRC(d86bef21) SHA1(8c822438cf81023d83985d6800e7e3884f5c6a55) ) - ROM_LOAD( "mpr-22191.ic6", 0x3000000, 0x800000, CRC(b52364cd) SHA1(cc1ca522e6d0085a9bdf286e88aacb2041669daf) ) - ROM_LOAD( "mpr-22192.ic7", 0x3800000, 0x800000, CRC(08f09148) SHA1(c6a248199823f281cb9a9ac8080ebcae331d7e6f) ) - ROM_LOAD( "mpr-22193.ic8", 0x4000000, 0x800000, CRC(be5f58a8) SHA1(0d9f61182878540596909b2559158e03ffbd75c8) ) - ROM_LOAD( "mpr-22194.ic9", 0x4800000, 0x800000, CRC(2d0370fd) SHA1(f52587d6c2c06e2d872375f4ab0f0a9e11e932c3) ) - ROM_LOAD( "mpr-22195.ic10", 0x5000000, 0x800000, CRC(ccc8bb28) SHA1(d4769c9c8e4c1cdda53f8cb08b57f77c58d27c6f) ) - ROM_LOAD( "mpr-22196.ic11", 0x5800000, 0x800000, CRC(d65aa87b) SHA1(97f519a9c5b6bc6fc08e856d8c09fb69fad2bb04) ) - ROM_LOAD( "mpr-22197.ic12", 0x6000000, 0x800000, CRC(2c79608e) SHA1(01a09398c4f18e9368fddaca6b0ba520b07ca962) ) - ROM_LOAD( "mpr-22198.ic13", 0x6800000, 0x800000, CRC(b5373909) SHA1(6ff02c52a41da3d61e3f45b70fbcfddd4315fdfb) ) - ROM_LOAD( "mpr-22199.ic14", 0x7000000, 0x800000, CRC(4ba34fd9) SHA1(b681efb05df4f38349e96f98f38442db9db1f83a) ) - ROM_LOAD( "mpr-22200.ic15", 0x7800000, 0x800000, CRC(eb3d4a5e) SHA1(747bea94d224d1753e3dea27319d16fbca706459) ) - ROM_LOAD( "mpr-22201.ic16", 0x8000000, 0x800000, CRC(dce19598) SHA1(0081fbb74731f0b639a742fd4e2f5685ffe6887a) ) - ROM_LOAD( "mpr-22202.ic17", 0x8800000, 0x800000, CRC(f3ac92a6) SHA1(6583a3f3d1659d00dcffc98c6d3391f1aac03338) ) - ROM_LOAD( "mpr-22203.ic18", 0x9000000, 0x800000, CRC(881d6316) SHA1(c7a26404759afac346c63e39b35bf408f1a897a6) ) - ROM_LOAD( "mpr-22204.ic19", 0x9800000, 0x800000, CRC(2c5e5140) SHA1(7887fc19459dc85ca78256e0c50c762eea001e51) ) - ROM_LOAD( "mpr-22205.ic20", 0xa000000, 0x800000, CRC(7d523ae5) SHA1(7495082b7e83b6ee8f47660baba4c604d8ba2ff1) ) + ROM_LOAD( "mpr-22186.ic1", 0x0800000, 0x800000, CRC(30b1a1d6) SHA1(73914c53a030b496e854b4c1fa454153bb025217) ) + ROM_LOAD( "mpr-22187.ic2", 0x1000000, 0x800000, CRC(0eae60e5) SHA1(c695c07000310089aa79b525fbe36015c5526165) ) + ROM_LOAD( "mpr-22188.ic3", 0x1800000, 0x800000, CRC(2e651f16) SHA1(b4ef7a90ade379cb3f7d4c64faedb25032465c25) ) + ROM_LOAD( "mpr-22189.ic4", 0x2000000, 0x800000, CRC(69ec44fc) SHA1(052e5e14ce433cddfae4a8b9b7c179c6266e9c1c) ) + ROM_LOAD( "mpr-22190.ic5", 0x2800000, 0x800000, CRC(d86bef21) SHA1(8c822438cf81023d83985d6800e7e3884f5c6a55) ) + ROM_LOAD( "mpr-22191.ic6", 0x3000000, 0x800000, CRC(b52364cd) SHA1(cc1ca522e6d0085a9bdf286e88aacb2041669daf) ) + ROM_LOAD( "mpr-22192.ic7", 0x3800000, 0x800000, CRC(08f09148) SHA1(c6a248199823f281cb9a9ac8080ebcae331d7e6f) ) + ROM_LOAD( "mpr-22193.ic8", 0x4000000, 0x800000, CRC(be5f58a8) SHA1(0d9f61182878540596909b2559158e03ffbd75c8) ) + ROM_LOAD( "mpr-22194.ic9", 0x4800000, 0x800000, CRC(2d0370fd) SHA1(f52587d6c2c06e2d872375f4ab0f0a9e11e932c3) ) + ROM_LOAD( "mpr-22195.ic10", 0x5000000, 0x800000, CRC(ccc8bb28) SHA1(d4769c9c8e4c1cdda53f8cb08b57f77c58d27c6f) ) + ROM_LOAD( "mpr-22196.ic11", 0x5800000, 0x800000, CRC(d65aa87b) SHA1(97f519a9c5b6bc6fc08e856d8c09fb69fad2bb04) ) + ROM_LOAD( "mpr-22197.ic12", 0x6000000, 0x800000, CRC(2c79608e) SHA1(01a09398c4f18e9368fddaca6b0ba520b07ca962) ) + ROM_LOAD( "mpr-22198.ic13", 0x6800000, 0x800000, CRC(b5373909) SHA1(6ff02c52a41da3d61e3f45b70fbcfddd4315fdfb) ) + ROM_LOAD( "mpr-22199.ic14", 0x7000000, 0x800000, CRC(4ba34fd9) SHA1(b681efb05df4f38349e96f98f38442db9db1f83a) ) + ROM_LOAD( "mpr-22200.ic15", 0x7800000, 0x800000, CRC(eb3d4a5e) SHA1(747bea94d224d1753e3dea27319d16fbca706459) ) + ROM_LOAD( "mpr-22201.ic16", 0x8000000, 0x800000, CRC(dce19598) SHA1(0081fbb74731f0b639a742fd4e2f5685ffe6887a) ) + ROM_LOAD( "mpr-22202.ic17", 0x8800000, 0x800000, CRC(f3ac92a6) SHA1(6583a3f3d1659d00dcffc98c6d3391f1aac03338) ) + ROM_LOAD( "mpr-22203.ic18", 0x9000000, 0x800000, CRC(881d6316) SHA1(c7a26404759afac346c63e39b35bf408f1a897a6) ) + ROM_LOAD( "mpr-22204.ic19", 0x9800000, 0x800000, CRC(2c5e5140) SHA1(7887fc19459dc85ca78256e0c50c762eea001e51) ) + ROM_LOAD( "mpr-22205.ic20", 0xa000000, 0x800000, CRC(7d523ae5) SHA1(7495082b7e83b6ee8f47660baba4c604d8ba2ff1) ) ROM_END /* GD-ROM titles - a PIC supplies a decryption key @@ -6004,16 +6004,16 @@ ROM_START( vstrik3c ) ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) ROM_LOAD("epr-23663.ic22", 0x0000000, 0x0400000, CRC(7007fec7) SHA1(523168f0b218d0bd5c815d65bf0caba2c8468c9d) ) - ROM_LOAD( "mpr-23652.ic1", 0x0800000, 0x1000000, CRC(992758a2) SHA1(5e2a25c520c1795128e5026fc00d355c24852ded) ) - ROM_LOAD( "mpr-23653.ic2", 0x1800000, 0x1000000, CRC(e210e932) SHA1(2f6f0a31c3e98b21f1ff3af1680e50b3535b130f) ) - ROM_LOAD( "mpr-23654.ic3", 0x2800000, 0x1000000, CRC(91335971) SHA1(fc7599b836fb7995dd7da940e64b08b3c09cb180) ) - ROM_LOAD( "mpr-23655.ic4", 0x3800000, 0x1000000, CRC(1afe03b2) SHA1(43446188cc4a939663212159ea24eeed50de27e2) ) - ROM_LOAD( "mpr-23656.ic5", 0x4800000, 0x1000000, CRC(5e5fca1c) SHA1(e29d6b7d24acb5e0210ad9ba6f7f6ebca7ea3bf5) ) - ROM_LOAD( "mpr-23657.ic6", 0x5800000, 0x1000000, CRC(d97602bf) SHA1(1e79daa7acc787f3f6e55b8d92e4489db8861794) ) - ROM_LOAD( "mpr-23658.ic7", 0x6800000, 0x1000000, CRC(c912eacb) SHA1(715401264657a770eaa6165c7db6d588a493f745) ) - ROM_LOAD( "mpr-23659.ic8", 0x7800000, 0x1000000, CRC(db87ff9a) SHA1(9759b0885fa9d443f62129e062f631bcf46846d2) ) - ROM_LOAD( "mpr-23660.ic9", 0x8800000, 0x1000000, CRC(e49e65f5) SHA1(a46cea1c482211048aef375de8324273f6b06f27) ) - ROM_LOAD( "mpr-23661.ic10", 0x9800000, 0x1000000, CRC(7d44dc74) SHA1(cfd6253eab3c1a039629b4873946c9dbc7ed6872) ) + ROM_LOAD( "mpr-23652.ic1", 0x0800000, 0x1000000, CRC(992758a2) SHA1(5e2a25c520c1795128e5026fc00d355c24852ded) ) + ROM_LOAD( "mpr-23653.ic2", 0x1800000, 0x1000000, CRC(e210e932) SHA1(2f6f0a31c3e98b21f1ff3af1680e50b3535b130f) ) + ROM_LOAD( "mpr-23654.ic3", 0x2800000, 0x1000000, CRC(91335971) SHA1(fc7599b836fb7995dd7da940e64b08b3c09cb180) ) + ROM_LOAD( "mpr-23655.ic4", 0x3800000, 0x1000000, CRC(1afe03b2) SHA1(43446188cc4a939663212159ea24eeed50de27e2) ) + ROM_LOAD( "mpr-23656.ic5", 0x4800000, 0x1000000, CRC(5e5fca1c) SHA1(e29d6b7d24acb5e0210ad9ba6f7f6ebca7ea3bf5) ) + ROM_LOAD( "mpr-23657.ic6", 0x5800000, 0x1000000, CRC(d97602bf) SHA1(1e79daa7acc787f3f6e55b8d92e4489db8861794) ) + ROM_LOAD( "mpr-23658.ic7", 0x6800000, 0x1000000, CRC(c912eacb) SHA1(715401264657a770eaa6165c7db6d588a493f745) ) + ROM_LOAD( "mpr-23659.ic8", 0x7800000, 0x1000000, CRC(db87ff9a) SHA1(9759b0885fa9d443f62129e062f631bcf46846d2) ) + ROM_LOAD( "mpr-23660.ic9", 0x8800000, 0x1000000, CRC(e49e65f5) SHA1(a46cea1c482211048aef375de8324273f6b06f27) ) + ROM_LOAD( "mpr-23661.ic10", 0x9800000, 0x1000000, CRC(7d44dc74) SHA1(cfd6253eab3c1a039629b4873946c9dbc7ed6872) ) ROM_LOAD( "mpr-23662.ic11", 0xa800000, 0x0800000, CRC(d6ef7d68) SHA1(4ee396af6c5caf4c5af6e9ad0e03a7ac2c5039f4) ) ROM_END @@ -6022,17 +6022,17 @@ ROM_START( vstrik3cb ) NAOMI_DEFAULT_EEPROM ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr-23663b.ic22",0x0000000, 0x0400000, CRC(15733e44) SHA1(5040c518279283b76da6d9f75bb0a48953146ca9) ) - ROM_LOAD( "mpr-23652.ic1", 0x0800000, 0x1000000, CRC(992758a2) SHA1(5e2a25c520c1795128e5026fc00d355c24852ded) ) - ROM_LOAD( "mpr-23653.ic2", 0x1800000, 0x1000000, CRC(e210e932) SHA1(2f6f0a31c3e98b21f1ff3af1680e50b3535b130f) ) - ROM_LOAD( "mpr-23654.ic3", 0x2800000, 0x1000000, CRC(91335971) SHA1(fc7599b836fb7995dd7da940e64b08b3c09cb180) ) - ROM_LOAD( "mpr-23655.ic4", 0x3800000, 0x1000000, CRC(1afe03b2) SHA1(43446188cc4a939663212159ea24eeed50de27e2) ) - ROM_LOAD( "mpr-23656.ic5", 0x4800000, 0x1000000, CRC(5e5fca1c) SHA1(e29d6b7d24acb5e0210ad9ba6f7f6ebca7ea3bf5) ) - ROM_LOAD( "mpr-23657.ic6", 0x5800000, 0x1000000, CRC(d97602bf) SHA1(1e79daa7acc787f3f6e55b8d92e4489db8861794) ) - ROM_LOAD( "mpr-23658.ic7", 0x6800000, 0x1000000, CRC(c912eacb) SHA1(715401264657a770eaa6165c7db6d588a493f745) ) - ROM_LOAD( "mpr-23659.ic8", 0x7800000, 0x1000000, CRC(db87ff9a) SHA1(9759b0885fa9d443f62129e062f631bcf46846d2) ) - ROM_LOAD( "mpr-23660.ic9", 0x8800000, 0x1000000, CRC(e49e65f5) SHA1(a46cea1c482211048aef375de8324273f6b06f27) ) - ROM_LOAD( "mpr-23661.ic10", 0x9800000, 0x1000000, CRC(7d44dc74) SHA1(cfd6253eab3c1a039629b4873946c9dbc7ed6872) ) + ROM_LOAD( "epr-23663b.ic22",0x0000000, 0x0400000, CRC(15733e44) SHA1(5040c518279283b76da6d9f75bb0a48953146ca9) ) + ROM_LOAD( "mpr-23652.ic1", 0x0800000, 0x1000000, CRC(992758a2) SHA1(5e2a25c520c1795128e5026fc00d355c24852ded) ) + ROM_LOAD( "mpr-23653.ic2", 0x1800000, 0x1000000, CRC(e210e932) SHA1(2f6f0a31c3e98b21f1ff3af1680e50b3535b130f) ) + ROM_LOAD( "mpr-23654.ic3", 0x2800000, 0x1000000, CRC(91335971) SHA1(fc7599b836fb7995dd7da940e64b08b3c09cb180) ) + ROM_LOAD( "mpr-23655.ic4", 0x3800000, 0x1000000, CRC(1afe03b2) SHA1(43446188cc4a939663212159ea24eeed50de27e2) ) + ROM_LOAD( "mpr-23656.ic5", 0x4800000, 0x1000000, CRC(5e5fca1c) SHA1(e29d6b7d24acb5e0210ad9ba6f7f6ebca7ea3bf5) ) + ROM_LOAD( "mpr-23657.ic6", 0x5800000, 0x1000000, CRC(d97602bf) SHA1(1e79daa7acc787f3f6e55b8d92e4489db8861794) ) + ROM_LOAD( "mpr-23658.ic7", 0x6800000, 0x1000000, CRC(c912eacb) SHA1(715401264657a770eaa6165c7db6d588a493f745) ) + ROM_LOAD( "mpr-23659.ic8", 0x7800000, 0x1000000, CRC(db87ff9a) SHA1(9759b0885fa9d443f62129e062f631bcf46846d2) ) + ROM_LOAD( "mpr-23660.ic9", 0x8800000, 0x1000000, CRC(e49e65f5) SHA1(a46cea1c482211048aef375de8324273f6b06f27) ) + ROM_LOAD( "mpr-23661.ic10", 0x9800000, 0x1000000, CRC(7d44dc74) SHA1(cfd6253eab3c1a039629b4873946c9dbc7ed6872) ) ROM_LOAD( "mpr-23662.ic11", 0xa800000, 0x0800000, CRC(d6ef7d68) SHA1(4ee396af6c5caf4c5af6e9ad0e03a7ac2c5039f4) ) ROM_END @@ -6794,14 +6794,14 @@ ROM_START( ftspeed ) AW_BIOS ROM_REGION( 0x9000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax1701p01.ic18", 0x0000000, 0x0800000, CRC(480cade7) SHA1(487d4b27d7e5196d8321c5a80175ec7b1b32c1e8) ) - ROM_LOAD( "ax1701m01.ic11", 0x1000000, 0x1000000, CRC(7dcdc784) SHA1(5eeef9a760a0b090ed5aad8b7bdee2baa69a088b) ) - ROM_LOAD( "ax1702m01.ic12", 0x2000000, 0x1000000, CRC(06c9bf85) SHA1(636262dca7140397436646754fb204b97aa08ce9) ) - ROM_LOAD( "ax1703m01.ic13", 0x3000000, 0x1000000, CRC(8f8e0224) SHA1(2a9a17ed726913c00bf1c6a94bdd4fb32e800868) ) - ROM_LOAD( "ax1704m01.ic14", 0x4000000, 0x1000000, CRC(fbb4bb16) SHA1(b582680a880166c5bbdd2ad77b7903fedf9b01ad) ) - ROM_LOAD( "ax1705m01.ic15", 0x5000000, 0x1000000, CRC(d9e69723) SHA1(22ed4dab76320a286b66215607bda5adf21304d1) ) - ROM_LOAD( "ax1706m01.ic16", 0x6000000, 0x1000000, CRC(804b2eb2) SHA1(fcca02a5a8c09eb16548255115fb105c9c49c4e0) ) -ROM_END + ROM_LOAD( "ax1701p01.ic18", 0x0000000, 0x0800000, CRC(480cade7) SHA1(487d4b27d7e5196d8321c5a80175ec7b1b32c1e8) ) + ROM_LOAD( "ax1701m01.ic11", 0x1000000, 0x1000000, CRC(7dcdc784) SHA1(5eeef9a760a0b090ed5aad8b7bdee2baa69a088b) ) + ROM_LOAD( "ax1702m01.ic12", 0x2000000, 0x1000000, CRC(06c9bf85) SHA1(636262dca7140397436646754fb204b97aa08ce9) ) + ROM_LOAD( "ax1703m01.ic13", 0x3000000, 0x1000000, CRC(8f8e0224) SHA1(2a9a17ed726913c00bf1c6a94bdd4fb32e800868) ) + ROM_LOAD( "ax1704m01.ic14", 0x4000000, 0x1000000, CRC(fbb4bb16) SHA1(b582680a880166c5bbdd2ad77b7903fedf9b01ad) ) + ROM_LOAD( "ax1705m01.ic15", 0x5000000, 0x1000000, CRC(d9e69723) SHA1(22ed4dab76320a286b66215607bda5adf21304d1) ) + ROM_LOAD( "ax1706m01.ic16", 0x6000000, 0x1000000, CRC(804b2eb2) SHA1(fcca02a5a8c09eb16548255115fb105c9c49c4e0) ) +ROM_END /* Atomiswave */ GAME( 2001, awbios, 0, aw, aw, atomiswave, ROT0, "Sammy", "Atomiswave Bios", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING|GAME_IS_BIOS_ROOT ) @@ -6814,7 +6814,7 @@ GAME( 2003, ggisuka, awbios, aw, aw, ggisuka, ROT0, "Sammy / Arc Syste GAME( 2004, rumblef, awbios, aw, aw, rumblef, ROT0, "Sammy / Dimps", "The Rumble Fish", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 2004, rangrmsn, awbios, aw, aw, rangrmsn, ROT0, "Sammy", "Ranger Mission", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2004, salmankt, awbios, aw, aw, salmankt, ROT0, "Sammy", "Salary Man Kintarou", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2004, ftspeed, awbios, aw, aw, ftspeed, ROT0, "Sammy", "Faster Than Speed", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +GAME( 2004, ftspeed, awbios, aw, aw, ftspeed, ROT0, "Sammy", "Faster Than Speed", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2004, kov7sprt, awbios, aw, aw, kov7sprt, ROT0, "Sammy / IGS", "Knights of Valour - The Seven Spirits", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 2005, vfurlong, awbios, aw, aw, vfurlong, ROT0, "Sammy", "Net Select Keiba Victory Furlong", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2005, ngbc, awbios, aw, aw, ngbc, ROT0, "Sammy / SNK Playmore", "Neo-Geo Battle Coliseum", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) diff --git a/src/mame/drivers/nsmpoker.c b/src/mame/drivers/nsmpoker.c index f1f1c591f30..e132f6203af 100644 --- a/src/mame/drivers/nsmpoker.c +++ b/src/mame/drivers/nsmpoker.c @@ -95,10 +95,10 @@ static TILE_GET_INFO( get_bg_tile_info ) ---- ---- color code. ---- ---- seems unused. */ -// int attr = colorram[tile_index]; +// int attr = colorram[tile_index]; int code = videoram[tile_index]; -// int bank = (attr & 0x08) >> 3; -// int color = (attr & 0x03); +// int bank = (attr & 0x08) >> 3; +// int color = (attr & 0x03); SET_TILE_INFO( 0 /* bank */, code, 0 /* color */, 0); } @@ -134,7 +134,7 @@ static INTERRUPT_GEN( nsmpoker_interrupt ) //static WRITE8_HANDLER( debug_w ) //{ -// popmessage("written : %02X", data); +// popmessage("written : %02X", data); //} static READ8_HANDLER( debug_r ) @@ -406,14 +406,14 @@ MACHINE_CONFIG_END *************************/ ROM_START( nsmpoker ) -// ROM_REGION( 0x10000, "maincpu", 0 ) -// ROM_LOAD( "113_277.6e", 0x0000, 0x2000, CRC(247ad554) SHA1(5cfdfb95920d7e89e3e485a06d0099191e8d41a0) ) +// ROM_REGION( 0x10000, "maincpu", 0 ) +// ROM_LOAD( "113_277.6e", 0x0000, 0x2000, CRC(247ad554) SHA1(5cfdfb95920d7e89e3e485a06d0099191e8d41a0) ) -// ROM_REGION( 0x8000, "gfx1", 0 ) -// ROM_LOAD( "113_278.6g", 0x0000, 0x2000, CRC(08eb7305) SHA1(4e555aa481c6b4476b71909ddabf405dd6f767ed) ) -// ROM_LOAD( "113_279.5g", 0x2000, 0x2000, CRC(ac6ab327) SHA1(1012dc581b2be7df5e079ace44a721d17d21366a) ) -// ROM_LOAD( "113_280.3g", 0x4000, 0x2000, CRC(9b9be79d) SHA1(8301e74c4869d04eba680d156de9edaadd7ff83b) ) -// ROM_LOAD( "113_281.2g", 0x6000, 0x2000, CRC(4b9b448a) SHA1(3ca1f5714cf5535d2ea1e7e03bca456c89af222c) ) +// ROM_REGION( 0x8000, "gfx1", 0 ) +// ROM_LOAD( "113_278.6g", 0x0000, 0x2000, CRC(08eb7305) SHA1(4e555aa481c6b4476b71909ddabf405dd6f767ed) ) +// ROM_LOAD( "113_279.5g", 0x2000, 0x2000, CRC(ac6ab327) SHA1(1012dc581b2be7df5e079ace44a721d17d21366a) ) +// ROM_LOAD( "113_280.3g", 0x4000, 0x2000, CRC(9b9be79d) SHA1(8301e74c4869d04eba680d156de9edaadd7ff83b) ) +// ROM_LOAD( "113_281.2g", 0x6000, 0x2000, CRC(4b9b448a) SHA1(3ca1f5714cf5535d2ea1e7e03bca456c89af222c) ) ROM_REGION( 0x10000, "maincpu", 0 ) ROM_LOAD( "113_277.6e", 0x0000, 0x2000, CRC(247ad554) SHA1(5cfdfb95920d7e89e3e485a06d0099191e8d41a0) ) diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c index 55b85b7bde7..542c18341bf 100644 --- a/src/mame/drivers/pgm.c +++ b/src/mame/drivers/pgm.c @@ -5144,7 +5144,7 @@ static DRIVER_INIT( kovlsqh2 ) { pgm_decode_kovqhsgs2_program(machine); pgm_decode_kovlsqh2_tiles(machine); - + pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0000000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0800000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1000000); @@ -5153,17 +5153,17 @@ static DRIVER_INIT( kovlsqh2 ) pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2800000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0000000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0800000); - + pgm_decode_kovlsqh2_samples(machine); pgm_basic_init(machine); - kovsh_latch_init(machine); + kovsh_latch_init(machine); } static DRIVER_INIT( kovqhsgs ) { pgm_decode_kovqhsgs_program(machine); pgm_decode_kovlsqh2_tiles(machine); - + pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0000000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x0800000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x1000000); @@ -5172,11 +5172,11 @@ static DRIVER_INIT( kovqhsgs ) pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprcol") + 0x2800000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0000000); pgm_decode_kovlsqh2_sprites(machine, memory_region(machine, "sprmask") + 0x0800000); - + pgm_decode_kovlsqh2_samples(machine); - + pgm_basic_init(machine); - kovsh_latch_init(machine); + kovsh_latch_init(machine); } diff --git a/src/mame/drivers/polepos.c b/src/mame/drivers/polepos.c index 8b59298a94e..1ce6d44bc07 100644 --- a/src/mame/drivers/polepos.c +++ b/src/mame/drivers/polepos.c @@ -494,8 +494,8 @@ static ADDRESS_MAP_START( z80_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xa000, 0xa000) AM_MIRROR(0x0cff) AM_READ(polepos_ready_r) /* READY */ AM_RANGE(0xa000, 0xa007) AM_MIRROR(0x0cf8) AM_WRITE(polepos_latch_w) /* misc latches */ AM_RANGE(0xa100, 0xa100) AM_MIRROR(0x0cff) AM_WRITE(watchdog_reset_w) /* Watchdog */ - AM_RANGE(0xa200, 0xa200) AM_MIRROR(0x0cff) AM_DEVWRITE("polepos", polepos_engine_sound_lsb_w) /* Car Sound ( Lower Nibble ) */ - AM_RANGE(0xa300, 0xa300) AM_MIRROR(0x0cff) AM_DEVWRITE("polepos", polepos_engine_sound_msb_w) /* Car Sound ( Upper Nibble ) */ + AM_RANGE(0xa200, 0xa200) AM_MIRROR(0x0cff) AM_DEVWRITE("polepos", polepos_engine_sound_lsb_w) /* Car Sound ( Lower Nibble ) */ + AM_RANGE(0xa300, 0xa300) AM_MIRROR(0x0cff) AM_DEVWRITE("polepos", polepos_engine_sound_msb_w) /* Car Sound ( Upper Nibble ) */ ADDRESS_MAP_END static ADDRESS_MAP_START( z80_io, ADDRESS_SPACE_IO, 8 ) diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c index 775291ffe19..75cb4b2b193 100644 --- a/src/mame/drivers/puckpkmn.c +++ b/src/mame/drivers/puckpkmn.c @@ -314,11 +314,11 @@ Notes: TA-06S - custom chip (QFP128) TK-20K - custom chip, probably the CPU (QFP100). Clock unknown. M6295 - clock 1.000MHz [4/4] - + 4x 1Mx8 flashROMs (B*.U59) are mounted onto a DIP42 carrier board to make a 32MBit EPROM equivalent. It appears to contain graphics plus the main program. ROM A.U3 contains samples for the M6295. - + */ ROM_START( puckpkmna ) /* Puckman Pockimon (c)2000 IBS Co. Ltd */ diff --git a/src/mame/drivers/raiden2.c b/src/mame/drivers/raiden2.c index 834c9c2fca6..29747c8476e 100644 --- a/src/mame/drivers/raiden2.c +++ b/src/mame/drivers/raiden2.c @@ -221,7 +221,7 @@ WRITE16_MEMBER(raiden2_state::cop_dma_size_w) WRITE16_MEMBER(raiden2_state::cop_dma_trigger_w) { - // logerror("COP DMA mode=%x adr=%x size=%x vals=%x %x %x\n", cop_dma_mode, cop_dma_adr, cop_dma_size, cop_dma_v1, cop_dma_v2, cop_dma_v3); + // logerror("COP DMA mode=%x adr=%x size=%x vals=%x %x %x\n", cop_dma_mode, cop_dma_adr, cop_dma_size, cop_dma_v1, cop_dma_v2, cop_dma_v3); switch(cop_dma_mode) { case 0x14: { @@ -238,7 +238,7 @@ WRITE16_MEMBER(raiden2_state::cop_dma_trigger_w) WRITE16_MEMBER(raiden2_state::cop_itoa_low_w) { cop_itoa = (cop_itoa & ~UINT32(mem_mask)) | (data & mem_mask); - + int digits = cop_itoa_digit_count; UINT32 val = cop_itoa; @@ -375,9 +375,9 @@ WRITE16_MEMBER(raiden2_state::cop_cmd_w) } } -// case 0x6ca: -// logerror("select bank %d %04x\n", (data >> 15) & 1, data); -// memory_set_bank(space.machine, "bank1", (data >> 15) & 1); +// case 0x6ca: +// logerror("select bank %d %04x\n", (data >> 15) & 1, data); +// memory_set_bank(space.machine, "bank1", (data >> 15) & 1); static void combine32(UINT32 *val, int offset, UINT16 data, UINT16 mem_mask) diff --git a/src/mame/drivers/segaorun.c b/src/mame/drivers/segaorun.c index fc3d81275fa..b3bcd7b4af7 100644 --- a/src/mame/drivers/segaorun.c +++ b/src/mame/drivers/segaorun.c @@ -415,7 +415,7 @@ static void outrun_generic_init(running_machine *machine) state->soundcpu = machine->device("soundcpu"); state->subcpu = machine->device("sub"); state->ppi8255 = machine->device("ppi8255"); - + nvram_device *nvram = machine->device("nvram"); if (nvram != NULL) nvram->set_base(workram, 0x8000); diff --git a/src/mame/drivers/segas16b.c b/src/mame/drivers/segas16b.c index 7a3d27845a1..c386f7043f1 100644 --- a/src/mame/drivers/segas16b.c +++ b/src/mame/drivers/segas16b.c @@ -6788,7 +6788,7 @@ static WRITE16_HANDLER( isgsm_data_w ) case 0x60: data = BITSWAP8(data,5,4,3,2,1,0,7,6); break; case 0x80: data = BITSWAP8(data,4,3,2,1,0,7,6,5); break; case 0xa0: data = BITSWAP8(data,3,2,1,0,7,6,5,4); break; - case 0xc0: data = BITSWAP8(data,2,1,0,7,6,5,4,3); break; + case 0xc0: data = BITSWAP8(data,2,1,0,7,6,5,4,3); break; case 0xe0: data = BITSWAP8(data,1,0,7,6,5,4,3,2); break; } } @@ -6873,7 +6873,7 @@ static WRITE16_HANDLER( isgsm_data_w ) case 0x60: byte = BITSWAP8(byte,5,4,3,2,1,0,7,6); break; case 0x80: byte = BITSWAP8(byte,4,3,2,1,0,7,6,5); break; case 0xa0: byte = BITSWAP8(byte,3,2,1,0,7,6,5,4); break; - case 0xc0: byte = BITSWAP8(byte,2,1,0,7,6,5,4,3); break; + case 0xc0: byte = BITSWAP8(byte,2,1,0,7,6,5,4,3); break; case 0xe0: byte = BITSWAP8(byte,1,0,7,6,5,4,3,2); break; } } @@ -7213,7 +7213,7 @@ DRIVER_INIT( tetrbx ) { temp[i^0x2A6E6] = BITSWAP16(rom[i], 4, 0, 12, 5, 7, 3, 1, 14, - 10, 11, 9,6, + 10, 11, 9,6, 15, 2, 13, 8 ); } diff --git a/src/mame/drivers/segas18.c b/src/mame/drivers/segas18.c index 585d1d5b9b6..23e54d61ca9 100644 --- a/src/mame/drivers/segas18.c +++ b/src/mame/drivers/segas18.c @@ -179,7 +179,7 @@ static void system18_generic_init(running_machine *machine, int _rom_board) state->maincpu = machine->device("maincpu"); state->soundcpu = machine->device("soundcpu"); state->mcu = machine->device("mcu"); - + machine->device("nvram")->set_base(workram, 0x4000); state_save_register_global(machine, state->mcu_data); diff --git a/src/mame/drivers/subsino.c b/src/mame/drivers/subsino.c index aa4a89e765b..9532b7e1e84 100644 --- a/src/mame/drivers/subsino.c +++ b/src/mame/drivers/subsino.c @@ -3425,12 +3425,12 @@ ROM_END Magic Train ----------- - Board silkscreened: "SUBSINO" (logo), "CS186P012". Stickered "1056439". + Board silkscreened: "SUBSINO" (logo), "CS186P012". Stickered "1056439". CPU: 1x Hitachi HD647180X0CP6 - 6D1R (Subsino - SS9600) (U23). SND: 1x U6295 (OKI compatible) (U25). - 1x TDA1519A (PHILIPS, 22W BTL or 2x 11W stereo car radio power amplifier (U34). + 1x TDA1519A (PHILIPS, 22W BTL or 2x 11W stereo car radio power amplifier (U34). NVRAM: 1x SANYO LC36256AML (SMD) (U16). VRAM: 2x UMC UM62256E-70LL (U7-U8, next to gfx ROMs). diff --git a/src/mame/drivers/tomcat.c b/src/mame/drivers/tomcat.c index 1b609ef5fe4..b441ec421ad 100644 --- a/src/mame/drivers/tomcat.c +++ b/src/mame/drivers/tomcat.c @@ -380,7 +380,7 @@ static MACHINE_CONFIG_START( tomcat, driver_device ) MDRV_CPU_PROGRAM_MAP( sound_map) MDRV_RIOT6532_ADD("riot", XTAL_14_31818MHz / 8, tomcat_riot6532_intf) - + MDRV_QUANTUM_TIME(HZ(4000)) MDRV_MACHINE_START(tomcat) diff --git a/src/mame/drivers/vicdual.c b/src/mame/drivers/vicdual.c index 99bc89e45a5..d35d2f68ef3 100644 --- a/src/mame/drivers/vicdual.c +++ b/src/mame/drivers/vicdual.c @@ -3195,9 +3195,9 @@ ROM_END Star Raker Notes from dumper: -There is a mainboard and a small board. The main board is a normal VIC board and is from a working cab we own. -From an op we got a box with a similar board plus a small board which I assumed belongs to it, -but I have no idea what its purpose is. Its not the soundboard and its not included in our working Star Raker cab. +There is a mainboard and a small board. The main board is a normal VIC board and is from a working cab we own. +From an op we got a box with a similar board plus a small board which I assumed belongs to it, +but I have no idea what its purpose is. Its not the soundboard and its not included in our working Star Raker cab. So maybe it belongs to a different game, but I had it dumped anyway. */ diff --git a/src/mame/drivers/vpoker.c b/src/mame/drivers/vpoker.c index 4fcf3a01861..790412d3bfe 100644 --- a/src/mame/drivers/vpoker.c +++ b/src/mame/drivers/vpoker.c @@ -83,26 +83,26 @@ mm74c920J/mmc6551j-9 x2 .1 is closest to the connector .7 is closest to the cpu -Etched in copper on top by .1 eprom 6000 +Etched in copper on top by .1 eprom 6000 -.1 2732 handwritten sticker GJOK1 -.2 2732 handwritten sticker GJOK2 -.3 2732 handwritten sticker BJOK1 -.4 2732 handwritten sticker BJOK2 -.5 2732 handwritten sticker RJOK1 -.6 2732 handwritten sticker RJOK2 -.7 2764 handwritten sticker 688C +.1 2732 handwritten sticker GJOK1 +.2 2732 handwritten sticker GJOK2 +.3 2732 handwritten sticker BJOK1 +.4 2732 handwritten sticker BJOK2 +.5 2732 handwritten sticker RJOK1 +.6 2732 handwritten sticker RJOK2 +.7 2764 handwritten sticker 688C 4 Mhz crystal 6809 MC6840P -nmc6514-9 x2 -nm23114 x2 +nmc6514-9 x2 +nm23114 x2 -16 pin chip marked 74166F 7745 - SA2889-0697 - stamped ETC +16 pin chip marked 74166F 7745 + SA2889-0697 + stamped ETC **************************************************************************************************************/ @@ -662,7 +662,7 @@ static MACHINE_CONFIG_START( vpoker, vpoker_state ) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(512, 256) MDRV_SCREEN_VISIBLE_AREA(0*8, 480-1, 0*8, 240-1) -// MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 256-1) +// MDRV_SCREEN_VISIBLE_AREA(0*8, 512-1, 0*8, 256-1) MDRV_GFXDECODE(vpoker) MDRV_PALETTE_LENGTH(8) MDRV_PALETTE_INIT(vpoker) diff --git a/src/mame/includes/liberatr.h b/src/mame/includes/liberatr.h index d3d72af8dde..2b73dc073d3 100644 --- a/src/mame/includes/liberatr.h +++ b/src/mame/includes/liberatr.h @@ -33,9 +33,9 @@ public: protected: struct planet; - + virtual void machine_start(); - + virtual void video_start(); virtual bool video_update(screen_device &screen, bitmap_t &bitmap, const rectangle &cliprect); @@ -51,9 +51,9 @@ protected: required_shared_ptr m_ycoord; required_shared_ptr m_bitmapram; required_shared_ptr m_colorram; - - UINT8 m_trackball_offset; - UINT8 m_ctrld; + + UINT8 m_trackball_offset; + UINT8 m_ctrld; UINT8 m_videoram[0x10000]; // The following structure describes the (up to 32) line segments @@ -64,7 +64,7 @@ protected: { UINT8 segment_count; // the number of segments on this line UINT8 max_x; // the maximum value of x_array for this line - UINT8 color_array[32]; // the color values + UINT8 color_array[32]; // the color values UINT8 x_array[32]; // and maximum x values for each segment }; diff --git a/src/mame/includes/moo.h b/src/mame/includes/moo.h index fb4c656d948..e6d40762deb 100644 --- a/src/mame/includes/moo.h +++ b/src/mame/includes/moo.h @@ -33,7 +33,7 @@ public: running_device *k053251; running_device *k056832; running_device *k054338; - + emu_timer *dmaend_timer; }; diff --git a/src/mame/includes/mustache.h b/src/mame/includes/mustache.h index a308b6e8156..cb2b30a9c18 100644 --- a/src/mame/includes/mustache.h +++ b/src/mame/includes/mustache.h @@ -5,7 +5,7 @@ public: : driver_device(machine, config) { } UINT8 *videoram; - + emu_timer *clear_irq_timer; }; diff --git a/src/mame/includes/raiden2.h b/src/mame/includes/raiden2.h index 2ad5d539928..f45cad8ee1f 100644 --- a/src/mame/includes/raiden2.h +++ b/src/mame/includes/raiden2.h @@ -72,7 +72,7 @@ public: UINT16 cop_func_mask[0x100/8]; /* function mask (?) */ UINT16 cop_program[0x100]; /* program "code" */ UINT16 cop_latch_addr, cop_latch_trigger, cop_latch_value, cop_latch_mask; - + void draw_sprites(running_machine *machine, bitmap_t *bitmap, const rectangle *cliprect ,int pri_mask ); }; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 7c78aacb038..9382d51bb9e 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -1596,7 +1596,7 @@ WRITE8_MEMBER( atarigen_state::earom_w ) { // remember the value written m_earom_data = data; - + // output latch only enabled if control bit 2 is set if (m_earom_control & 4) m_earom->set_data(m_earom_data); @@ -1610,7 +1610,7 @@ WRITE8_MEMBER( atarigen_state::earom_control_w ) { // remember the control state m_earom_control = data; - + // ensure ouput data is put on data lines prior to updating controls if (m_earom_control & 4) m_earom->set_data(m_earom_data); diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h index e6f84cf9d47..f1c84f340cc 100644 --- a/src/mame/machine/atarigen.h +++ b/src/mame/machine/atarigen.h @@ -113,8 +113,8 @@ public: // vector and early raster EAROM interface optional_device m_earom; - UINT8 m_earom_data; - UINT8 m_earom_control; + UINT8 m_earom_data; + UINT8 m_earom_control; optional_shared_ptr eeprom; optional_shared_size eeprom_size; diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 48043f1f8be..c56af31f802 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -4690,7 +4690,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( gunsur2 ) /* 2001.07 Gun Survivor 2: Bio Hazard Code Veronica */ DRIVER( starseek ) /* 2001.07 Dokidoki Idol Star Seeker */ DRIVER( cvs2gd ) /* 2001.08 Capcom vs. SNK 2 */ - DRIVER( wrungp ) /* 2001.08 Wave Runner GP */ + DRIVER( wrungp ) /* 2001.08 Wave Runner GP */ DRIVER( gundmxgd ) /* 2001.09 Kidou Senshi Gundam Renpou vs. Zeon DX */ /* 2001.09 Alien Front */ DRIVER( hmgeo ) /* 2001.09 Heavy Metal Geo Matrix */ @@ -8534,10 +8534,10 @@ Other Sun games DRIVER( kov100 ) /* (c) 1999 */ DRIVER( kovsh ) /* (c) 1999 */ DRIVER( kovsh103 ) /* (c) 1999 */ - DRIVER( kovqhsgs ) /* bootleg */ - DRIVER( kovlsqh2 ) /* bootleg */ - DRIVER( kovlsjb ) /* bootleg */ - DRIVER( kovlsjba ) /* bootleg */ + DRIVER( kovqhsgs ) /* bootleg */ + DRIVER( kovlsqh2 ) /* bootleg */ + DRIVER( kovlsjb ) /* bootleg */ + DRIVER( kovlsjba ) /* bootleg */ DRIVER( photoy2k ) /* (c) 1999 */ DRIVER( photoy2k102 ) /* (c) 1999 */ DRIVER( photoy2k104 ) /* (c) 1999 */ diff --git a/src/osd/sdl/debugwin.c b/src/osd/sdl/debugwin.c index 71f3eef1654..61802218b5f 100644 --- a/src/osd/sdl/debugwin.c +++ b/src/osd/sdl/debugwin.c @@ -78,15 +78,15 @@ struct _win_i { struct windowState { - windowState() : type(0), - sizeX(-1), sizeY(-1), + windowState() : type(0), + sizeX(-1), sizeY(-1), positionX(-1), positionY(-1) { } ~windowState() { } - + void loadFromXmlDataNode(xml_data_node* wnode) { if (!wnode) return; - + type = xml_get_attribute_int(wnode, "type", type); sizeX = xml_get_attribute_int(wnode, "size_x", sizeX); @@ -493,7 +493,7 @@ static void configuration_load(running_machine *machine, int config_type, xml_da return; /* configuration load */ - int i = 0; + int i = 0; for (wnode = xml_get_sibling(parentnode->child, "window"); wnode != NULL; wnode = xml_get_sibling(wnode->next, "window")) { windowStateArray[i].loadFromXmlDataNode(wnode); @@ -571,13 +571,13 @@ void osd_wait_for_debugger(running_device *device, int firststop) gtk_window_resize(GTK_WINDOW(win_list->win), windowStateArray[i].sizeX, windowStateArray[i].sizeY); } } - + // Respawn and reposition every other window for (int i = 0; i < windowStateCount; i++) { - if (!windowStateArray[i].type || windowStateArray[i].type == WIN_TYPE_MAIN) + if (!windowStateArray[i].type || windowStateArray[i].type == WIN_TYPE_MAIN) continue; - + switch (windowStateArray[i].type) { case WIN_TYPE_MEMORY: memorywin_new(device->machine); break; @@ -585,7 +585,7 @@ void osd_wait_for_debugger(running_device *device, int firststop) case WIN_TYPE_LOG: logwin_new(device->machine); break; default: break; } - + gtk_window_move(GTK_WINDOW(win_list->win), windowStateArray[i].positionX, windowStateArray[i].positionY); gtk_window_resize(GTK_WINDOW(win_list->win), windowStateArray[i].sizeX, windowStateArray[i].sizeY); } diff --git a/src/osd/sdl/drawogl.c b/src/osd/sdl/drawogl.c index bacdee32324..74f8861bde1 100644 --- a/src/osd/sdl/drawogl.c +++ b/src/osd/sdl/drawogl.c @@ -1531,7 +1531,7 @@ static int drawogl_window_draw(sdl_window_info *window, UINT32 dc, int update) texture=NULL; } break; - + default: throw emu_fatalerror("Unexpected render_primitive type"); } diff --git a/src/osd/windows/drawd3d.c b/src/osd/windows/drawd3d.c index 320ff3d2cd6..45d6853b5a8 100644 --- a/src/osd/windows/drawd3d.c +++ b/src/osd/windows/drawd3d.c @@ -668,7 +668,7 @@ mtlog_add("drawd3d_window_draw: primitive loop begin"); case render_primitive::QUAD: draw_quad(d3d, prim); break; - + default: throw emu_fatalerror("Unexpected render_primitive type"); } diff --git a/src/version.c b/src/version.c index ea92c818bea..666f37cd3a1 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.139u3 ("__DATE__")"; +const char build_version[] = "0.139u4 ("__DATE__")";