summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-12-08 07:01:03 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-12-08 07:01:03 +0000
commit6bfc3413e47c0be1395a0d3f5e730c1b9da4f698 (patch)
treeed62b61caa6a5d7c6cd011fcdb71a6d9e7be159c
parent3fc2f946282ace1a5e06cb8e2dea5759d58be87f (diff)
Cleanups and version bump.mame0140u2
-rw-r--r--src/emu/cpu/m68000/m68kcpu.c28
-rw-r--r--src/emu/cpu/m68000/m68kmmu.h78
-rw-r--r--src/emu/cpu/v810/v810.c12
-rw-r--r--src/emu/machine/68681.c10
-rw-r--r--src/emu/machine/8237dma.c10
-rw-r--r--src/emu/machine/mc146818.c14
-rw-r--r--src/emu/video.c8
-rw-r--r--src/emu/video.h20
-rw-r--r--src/mame/drivers/bartop52.c16
-rw-r--r--src/mame/drivers/chihiro.c2
-rw-r--r--src/mame/drivers/cps1.c6
-rw-r--r--src/mame/drivers/goldnpkr.c2
-rw-r--r--src/mame/drivers/ilpag.c4
-rw-r--r--src/mame/drivers/mermaid.c4
-rw-r--r--src/mame/drivers/naomi.c276
-rw-r--r--src/mame/drivers/neoprint.c50
-rw-r--r--src/mame/drivers/pgm.c44
-rw-r--r--src/mame/drivers/taitosj.c2
-rw-r--r--src/mame/drivers/xtom3d.c4
-rw-r--r--src/mame/drivers/yiear.c2
-rw-r--r--src/mame/machine/pgmcrypt.c2
-rw-r--r--src/mame/mamedriv.c2
-rw-r--r--src/osd/sdl/sdlfile.c22
-rw-r--r--src/osd/sdl/sdlmain.c34
-rw-r--r--src/osd/sdl/sdlptty_macosx.c2
-rw-r--r--src/osd/sdl/sdlptty_unix.c2
-rw-r--r--src/osd/sdl/sdlsocket.c14
-rw-r--r--src/version.c2
28 files changed, 336 insertions, 336 deletions
diff --git a/src/emu/cpu/m68000/m68kcpu.c b/src/emu/cpu/m68000/m68kcpu.c
index 47318b40ffc..2415fa271bc 100644
--- a/src/emu/cpu/m68000/m68kcpu.c
+++ b/src/emu/cpu/m68000/m68kcpu.c
@@ -567,12 +567,12 @@ static CPU_TRANSLATE( m68k )
{
// FIXME: mmu_tmp_sr will be overwritten in pmmu_translate_addr_with_fc
UINT16 mmu_tmp_sr = m68k->mmu_tmp_sr;
-// UINT32 va=*address;
+// UINT32 va=*address;
*address = pmmu_translate_addr_with_fc(m68k, *address, 4, 1);
if ((m68k->mmu_tmp_sr & M68K_MMU_SR_INVALID) != 0) {
-// logerror("cpu_translate_m68k failed with mmu_sr=%04x va=%08x pa=%08x\n",m68k->mmu_tmp_sr,va ,*address);
+// logerror("cpu_translate_m68k failed with mmu_sr=%04x va=%08x pa=%08x\n",m68k->mmu_tmp_sr,va ,*address);
*address = 0;
}
@@ -633,8 +633,8 @@ static CPU_EXECUTE( m68k )
debugger_instruction_hook(device, REG_PC);
// FIXME: remove this
-// void apollo_debug_instruction(running_device *device);
-// apollo_debug_instruction(device);
+// void apollo_debug_instruction(running_device *device);
+// apollo_debug_instruction(device);
/* Record previous program counter */
REG_PPC = REG_PC;
@@ -672,12 +672,12 @@ static CPU_EXECUTE( m68k )
{
UINT32 sr;
-// const char * disassemble(m68ki_cpu_core *m68k, offs_t pc);
-// logerror(
-// "PMMU: pc=%08x sp=%08x va=%08x bus error: %s\n",
-// REG_PPC, REG_A[7], m68k->mmu_tmp_buserror_address,
-// (m68k->mmu_tmp_buserror_address == REG_PPC) ? "-"
-// : disassemble(m68k, REG_PPC));
+// const char * disassemble(m68ki_cpu_core *m68k, offs_t pc);
+// logerror(
+// "PMMU: pc=%08x sp=%08x va=%08x bus error: %s\n",
+// REG_PPC, REG_A[7], m68k->mmu_tmp_buserror_address,
+// (m68k->mmu_tmp_buserror_address == REG_PPC) ? "-"
+// : disassemble(m68k, REG_PPC));
m68k->mmu_tmp_buserror_occurred = 0;
@@ -686,8 +686,8 @@ static CPU_EXECUTE( m68k )
{
if (REG_DA[i] != tmp_dar[i])
{
-// logerror("PMMU: pc=%08x sp=%08x bus error: fixed %s[%d]: %08x -> %08x\n",
-// REG_PPC, REG_A[7], i < 8 ? "D" : "A", i & 7, REG_DA[i], tmp_dar[i]);
+// logerror("PMMU: pc=%08x sp=%08x bus error: fixed %s[%d]: %08x -> %08x\n",
+// REG_PPC, REG_A[7], i < 8 ? "D" : "A", i & 7, REG_DA[i], tmp_dar[i]);
REG_DA[i] = tmp_dar[i];
}
}
@@ -700,11 +700,11 @@ static CPU_EXECUTE( m68k )
{
/* Note: This is implemented for 68000 only! */
m68ki_stack_frame_buserr(m68k, sr);
- }
+ }
else if (m68k->mmu_tmp_buserror_address == REG_PPC)
{
m68ki_stack_frame_1010(m68k, sr, EXCEPTION_BUS_ERROR, REG_PPC, m68k->mmu_tmp_buserror_address);
- }
+ }
else
{
m68ki_stack_frame_1011(m68k, sr, EXCEPTION_BUS_ERROR, REG_PPC, m68k->mmu_tmp_buserror_address);
diff --git a/src/emu/cpu/m68000/m68kmmu.h b/src/emu/cpu/m68000/m68kmmu.h
index dc60651a890..741e8547871 100644
--- a/src/emu/cpu/m68000/m68kmmu.h
+++ b/src/emu/cpu/m68000/m68kmmu.h
@@ -110,10 +110,10 @@ void pmmu_atc_add(m68ki_cpu_core *m68k, UINT32 logical, UINT32 physical, int fc)
{
int i, found;
- // get page size (i.e. # of bits to ignore); is 10 for Apollo
- int ps = (m68k->mmu_tc >> 20) & 0xf;
- // Note: exact emulation would use (logical >> ps) << (ps-8)
- UINT32 atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24)| logical >> ps;
+ // get page size (i.e. # of bits to ignore); is 10 for Apollo
+ int ps = (m68k->mmu_tc >> 20) & 0xf;
+ // Note: exact emulation would use (logical >> ps) << (ps-8)
+ UINT32 atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24)| logical >> ps;
// first see if this is already in the cache
for (i = 0; i < MMU_ATC_ENTRIES; i++)
@@ -191,7 +191,7 @@ INLINE UINT32 get_dt2_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
// set used and modified
m68k->program->write_dword( tptr, tbl_entry | M68K_MMU_DF_USED | M68K_MMU_DF_MODIFIED);
}
- else if (!(tbl_entry & M68K_MMU_DF_USED))
+ else if (!(tbl_entry & M68K_MMU_DF_USED))
{
m68k->program->write_dword( tptr, tbl_entry | M68K_MMU_DF_USED);
}
@@ -214,7 +214,7 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
{
// set modified
m68k->program->write_dword( tptr, tbl_entry2 | M68K_MMU_DF_USED | M68K_MMU_DF_MODIFIED);
- }
+ }
else if (!(tbl_entry2 & M68K_MMU_DF_USED))
{
m68k->program->write_dword( tptr, tbl_entry2 | M68K_MMU_DF_USED);
@@ -236,8 +236,8 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
UINT32 atc_tag;
// int verbose = 0;
-// static UINT32 pmmu_access_count = 0;
-// static UINT32 pmmu_atc_count = 0;
+// static UINT32 pmmu_access_count = 0;
+// static UINT32 pmmu_atc_count = 0;
resolved = 0;
addr_out = addr_in;
@@ -255,19 +255,19 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
UINT32 address_mask = ((m68k->mmu_tt0 << 8) & 0xff000000) ^ 0xff000000;
if ((addr_in & address_mask) == address_base)
{
-// logerror("PMMU: pc=%x TT0 fc=%x addr_in=%08x address_mask=%08x address_base=%08x\n", m68k->ppc, fc, addr_in, address_mask, address_base);
+// logerror("PMMU: pc=%x TT0 fc=%x addr_in=%08x address_mask=%08x address_base=%08x\n", m68k->ppc, fc, addr_in, address_mask, address_base);
return addr_in;
}
}
-// if ((++pmmu_access_count % 10000000) == 0) {
-// logerror("pmmu_translate_addr_with_fc: atc usage = %d%%\n", pmmu_atc_count*100/pmmu_access_count);
-// pmmu_atc_count = pmmu_access_count = 0;
-// }
+// if ((++pmmu_access_count % 10000000) == 0) {
+// logerror("pmmu_translate_addr_with_fc: atc usage = %d%%\n", pmmu_atc_count*100/pmmu_access_count);
+// pmmu_atc_count = pmmu_access_count = 0;
+// }
- // get page size (i.e. # of bits to ignore); ps is 10 or 12 for Apollo, 8 otherwise
- ps = (m68k->mmu_tc >> 20) & 0xf;
- atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24) | addr_in >> ps;
+ // get page size (i.e. # of bits to ignore); ps is 10 or 12 for Apollo, 8 otherwise
+ ps = (m68k->mmu_tc >> 20) & 0xf;
+ atc_tag = M68K_MMU_ATC_VALID | ((fc &7) << 24) | addr_in >> ps;
// first see if this is already in the ATC
for (i = 0; i < MMU_ATC_ENTRIES; i++)
@@ -290,7 +290,7 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
}
addr_out = (m68k->mmu_atc_data[i]<<8) | (addr_in & ~(~0 << ps));
// logerror("ATC[%2d] hit: log %08x -> phys %08x pc=%08x fc=%d\n", i, addr_in, addr_out, REG_PPC, fc);
-// pmmu_atc_count++;
+// pmmu_atc_count++;
return addr_out;
}
}
@@ -308,14 +308,14 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
root_limit = m68k->mmu_crp_limit;
}
- // get initial shift (# of top bits to ignore)
- is = (m68k->mmu_tc >> 16) & 0xf;
- ps = (m68k->mmu_tc >> 20) & 0xf;
- abits = (m68k->mmu_tc >> 12) & 0xf;
- bbits = (m68k->mmu_tc >> 8) & 0xf;
- cbits = (m68k->mmu_tc >> 4) & 0xf;
+ // get initial shift (# of top bits to ignore)
+ is = (m68k->mmu_tc >> 16) & 0xf;
+ ps = (m68k->mmu_tc >> 20) & 0xf;
+ abits = (m68k->mmu_tc >> 12) & 0xf;
+ bbits = (m68k->mmu_tc >> 8) & 0xf;
+ cbits = (m68k->mmu_tc >> 4) & 0xf;
-// logerror("PMMU: tcr %08x limit %08x aptr %08x is %x abits %d bbits %d cbits %d\n", m68k->mmu_tc, root_limit, root_aptr, is, abits, bbits, cbits);
+// logerror("PMMU: tcr %08x limit %08x aptr %08x is %x abits %d bbits %d cbits %d\n", m68k->mmu_tc, root_limit, root_aptr, is, abits, bbits, cbits);
// get table A offset
tofs = (addr_in<<is)>>(32-abits);
@@ -330,7 +330,7 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
case M68K_MMU_DF_DT1: // page descriptor, will cause direct mapping
addr_out = tptr + addr_in;
-// logerror("PMMU: PC=%x root mode %d (addr_in %08x -> %08x)\n", m68k->ppc, M68K_MMU_DF_DT1, addr_in, addr_out);
+// logerror("PMMU: PC=%x root mode %d (addr_in %08x -> %08x)\n", m68k->ppc, M68K_MMU_DF_DT1, addr_in, addr_out);
return addr_out;
case M68K_MMU_DF_DT2: // valid 4 byte descriptors
@@ -504,11 +504,11 @@ INLINE UINT32 get_dt3_table_entry(m68ki_cpu_core *m68k, UINT32 tptr, UINT8 ptest
{
UINT32 addr_out = pmmu_translate_addr_with_fc(m68k, addr_in, m68k->mmu_tmp_fc, 0);
-// if (m68k->mmu_tmp_buserror_occurred > 0) {
-// logerror("PMMU: pc=%08x sp=%08x va=%08x pa=%08x - invalid Table mode for level=%d (buserror %d)\n",
-// REG_PPC, REG_A[7], addr_in, addr_out, m68k->mmu_tmp_sr & M68K_MMU_SR_LEVEL_3,
-// m68k->mmu_tmp_buserror_occurred);
-// }
+// if (m68k->mmu_tmp_buserror_occurred > 0) {
+// logerror("PMMU: pc=%08x sp=%08x va=%08x pa=%08x - invalid Table mode for level=%d (buserror %d)\n",
+// REG_PPC, REG_A[7], addr_in, addr_out, m68k->mmu_tmp_sr & M68K_MMU_SR_LEVEL_3,
+// m68k->mmu_tmp_buserror_occurred);
+// }
return addr_out;
}
@@ -599,8 +599,8 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k)
p_addr = pmmu_translate_addr_with_fc(m68k, v_addr, fc, 1);
m68k->mmu_sr = m68k->mmu_tmp_sr;
-// logerror("PMMU: pc=%08x sp=%08x va=%08x pa=%08x PTEST fc=%x level=%x mmu_sr=%04x\n",
-// m68k->ppc, REG_A[7], v_addr, p_addr, fc, (modes >> 10) & 0x07, m68k->mmu_sr);
+// logerror("PMMU: pc=%08x sp=%08x va=%08x pa=%08x PTEST fc=%x level=%x mmu_sr=%04x\n",
+// m68k->ppc, REG_A[7], v_addr, p_addr, fc, (modes >> 10) & 0x07, m68k->mmu_sr);
if (modes & 0x100)
{
@@ -621,25 +621,25 @@ void m68881_mmu_ops(m68ki_cpu_core *m68k)
{
case 0x02: // transparent translation register 0
WRITE_EA_32(m68k, ea, m68k->mmu_tt0);
-// logerror("PMMU: pc=%x PMOVE from mmu_tt0=%08x\n", m68k->ppc, m68k->mmu_tt0);
+// logerror("PMMU: pc=%x PMOVE from mmu_tt0=%08x\n", m68k->ppc, m68k->mmu_tt0);
break;
case 0x03: // transparent translation register 1
WRITE_EA_32(m68k, ea, m68k->mmu_tt1);
-// logerror("PMMU: pc=%x PMOVE from mmu_tt1=%08x\n", m68k->ppc, m68k->mmu_tt1);
+// logerror("PMMU: pc=%x PMOVE from mmu_tt1=%08x\n", m68k->ppc, m68k->mmu_tt1);
break;
case 0x10: // translation control register
WRITE_EA_32(m68k, ea, m68k->mmu_tc);
-// logerror("PMMU: pc=%x PMOVE from mmu_tc=%08x\n", m68k->ppc, m68k->mmu_tc);
+// logerror("PMMU: pc=%x PMOVE from mmu_tc=%08x\n", m68k->ppc, m68k->mmu_tc);
break;
case 0x12: // supervisor root pointer
WRITE_EA_64(m68k, ea, (UINT64)m68k->mmu_srp_limit<<32 | (UINT64)m68k->mmu_srp_aptr);
-// logerror("PMMU: pc=%x PMOVE from SRP limit = %08x, aptr = %08x\n", REG_PPC, m68k->mmu_srp_limit, m68k->mmu_srp_aptr);
+// logerror("PMMU: pc=%x PMOVE from SRP limit = %08x, aptr = %08x\n", REG_PPC, m68k->mmu_srp_limit, m68k->mmu_srp_aptr);
break;
case 0x13: // CPU root pointer
WRITE_EA_64(m68k, ea, (UINT64)m68k->mmu_crp_limit<<32 | (UINT64)m68k->mmu_crp_aptr);
-// logerror("PMMU: pc=%x PMOVE from CRP limit = %08x, aptr = %08x\n", REG_PPC, m68k->mmu_crp_limit, m68k->mmu_crp_aptr);
+// logerror("PMMU: pc=%x PMOVE from CRP limit = %08x, aptr = %08x\n", REG_PPC, m68k->mmu_crp_limit, m68k->mmu_crp_aptr);
break;
default:
@@ -699,7 +699,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);
@@ -710,7 +710,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);
diff --git a/src/emu/cpu/v810/v810.c b/src/emu/cpu/v810/v810.c
index 5f6a58813bf..161832b7dfa 100644
--- a/src/emu/cpu/v810/v810.c
+++ b/src/emu/cpu/v810/v810.c
@@ -36,7 +36,7 @@ struct _v810_state
direct_read_data *direct;
address_space *io;
UINT32 PPC;
- int icount;
+ int icount;
};
INLINE v810_state *get_safe_token(running_device *device)
@@ -1048,18 +1048,18 @@ static void take_interrupt(v810_state *cpustate)
{
cpustate->EIPC = cpustate->PC;
cpustate->EIPSW = cpustate->PSW;
-
+
cpustate->PC = 0xfffffe00 | (cpustate->irq_line << 4);
cpustate->ECR = 0xfe00 | (cpustate->irq_line << 4);
-
+
UINT8 num = cpustate->irq_line + 1;
if (num==0x10) num=0x0f;
-
+
cpustate->PSW &= 0xfff0ffff; // clear interrupt level
SET_EP(1);
- SET_ID(1);
+ SET_ID(1);
cpustate->PSW |= num << 16;
-
+
cpustate->icount-= clkIF;
}
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c
index a2e0daeb2bc..8f649081c3f 100644
--- a/src/emu/machine/68681.c
+++ b/src/emu/machine/68681.c
@@ -243,12 +243,12 @@ static TIMER_CALLBACK( duart_timer_callback )
duart68681->ISR |= INT_COUNTER_READY;
duart68681_update_interrupts(duart68681);
-// if ((duart68681->OPCR & 0x0c)== 0x04) {
-// duart68681->OPR ^= 0x08;
-// if (duart68681->duart_config->output_port_write)
-// duart68681->duart_config->output_port_write(duart68681->device, duart68681->OPR ^ 0xff);
+// if ((duart68681->OPCR & 0x0c)== 0x04) {
+// duart68681->OPR ^= 0x08;
+// if (duart68681->duart_config->output_port_write)
+// duart68681->duart_config->output_port_write(duart68681->device, duart68681->OPR ^ 0xff);
//
-// }
+// }
};
static void duart68681_write_MR(duart68681_state *duart68681, int ch, UINT8 data)
diff --git a/src/emu/machine/8237dma.c b/src/emu/machine/8237dma.c
index 9875d82bff6..f58a4f0ad35 100644
--- a/src/emu/machine/8237dma.c
+++ b/src/emu/machine/8237dma.c
@@ -448,9 +448,9 @@ void i8237_device::i8237_timerproc()
case DMA8237_S11: /* Output A8-A15 */
-// logerror("###### dma8237_timerproc %s: from %04x count=%x to %04x count=%x\n", tag(),
-// m_chan[0].m_address, m_chan[0].m_count,
-// m_chan[1].m_address, m_chan[1].m_count);
+// logerror("###### dma8237_timerproc %s: from %04x count=%x to %04x count=%x\n", tag(),
+// m_chan[0].m_address, m_chan[0].m_count,
+// m_chan[1].m_address, m_chan[1].m_count);
// FIXME: this will copy bytes correct, but not 16 bit words
m_temporary_data = devcb_call_read8(&m_in_memr_func, m_chan[0].m_address);
@@ -473,7 +473,7 @@ void i8237_device::i8237_timerproc()
m_status |= 3; // set TC for channel 0 and 1
m_drq &= ~3; // clear drq for channel 0 and 1
- // logerror("!!! dma8237_timerproc DMA8237_S11 %s: m_drq=%x m_command=%x\n", tag(), m_drq, m_command);
+ // logerror("!!! dma8237_timerproc DMA8237_S11 %s: m_drq=%x m_command=%x\n", tag(), m_drq, m_command);
}
break;
}
@@ -540,7 +540,7 @@ WRITE8_DEVICE_HANDLER_TRAMPOLINE(i8237, i8237_w)
{
offset &= 0x0F;
-// logerror("i8237_w: offset = %02x, data = %02x\n", offset, data );
+// logerror("i8237_w: offset = %02x, data = %02x\n", offset, data );
switch(offset) {
case 0:
diff --git a/src/emu/machine/mc146818.c b/src/emu/machine/mc146818.c
index d916d3ea0d4..5e6127111dc 100644
--- a/src/emu/machine/mc146818.c
+++ b/src/emu/machine/mc146818.c
@@ -394,9 +394,9 @@ void mc146818_device::set_base_datetime()
// temporary hack to go back 20 year (e.g. from 2010 -> 1990)
// current_time.year -= 20;
-// logerror("mc146818_set_base_datetime %02d/%02d/%02d %02d:%02d:%02d\n",
-// current_time.year % 100, current_time.month + 1, current_time.mday,
-// current_time.hour,current_time.minute, current_time.second);
+// logerror("mc146818_set_base_datetime %02d/%02d/%02d %02d:%02d:%02d\n",
+// current_time.year % 100, current_time.month + 1, current_time.mday,
+// current_time.hour,current_time.minute, current_time.second);
if (HOURS_24 || (current_time.hour < 12))
m_data[4] = dec_2_local(current_time.hour);
@@ -445,10 +445,10 @@ READ8_MEMBER( mc146818_device::read )
break;
case 0xc:
-// if(m_updated) /* the clock has been updated */
-// data = 0x10;
-// else
-// data = 0x00;
+// if(m_updated) /* the clock has been updated */
+// data = 0x10;
+// else
+// data = 0x00;
// the unused bits b0 ... b3 are always read as 0
data = m_data[m_index % MC146818_DATA_SIZE] & 0xf0;
// read 0x0c will clear all IRQ flags in register 0x0c
diff --git a/src/emu/video.c b/src/emu/video.c
index 17d106780e8..4cbbe45d0a3 100644
--- a/src/emu/video.c
+++ b/src/emu/video.c
@@ -210,8 +210,8 @@ void video_manager::set_frameskip(int frameskip)
//-------------------------------------------------
-// frame_update - handle frameskipping and UI,
-// plus updating the screen during normal
+// frame_update - handle frameskipping and UI,
+// plus updating the screen during normal
// operations
//-------------------------------------------------
@@ -280,7 +280,7 @@ void video_manager::frame_update(bool debug)
//-------------------------------------------------
-// speed_text - print the text to be displayed
+// speed_text - print the text to be displayed
// into a string buffer
//-------------------------------------------------
@@ -449,7 +449,7 @@ void video_manager::begin_recording(const char *name, movie_format format)
mame_printf_error("Error creating AVI: %s\n", avi_error_string(avierr));
}
}
-
+
// start up a MNG recording
else if (format == MF_MNG)
{
diff --git a/src/emu/video.h b/src/emu/video.h
index 9e7c188f32b..e55ab612e74 100644
--- a/src/emu/video.h
+++ b/src/emu/video.h
@@ -73,7 +73,7 @@ typedef struct _avi_file avi_file;
class video_manager
{
friend class screen_device;
-
+
public:
// movie format options
enum movie_format
@@ -84,7 +84,7 @@ public:
// construction/destruction
video_manager(running_machine &machine);
-
+
// getters
bool skip_this_frame() const { return m_skipping_this_frame; }
int speed_factor() const { return m_speed; }
@@ -99,17 +99,17 @@ public:
void set_throttled(bool throttled = true) { m_throttle = throttled; }
void set_fastforward(bool ffwd = true) { m_fastforward = ffwd; }
- // render a frame
+ // render a frame
void frame_update(bool debug = false);
-
+
// current speed helpers
astring &speed_text(astring &string);
double speed_percent() const { return m_speed_percent; }
- // snapshots
+ // snapshots
void save_snapshot(screen_device *screen, mame_file &file);
void save_active_screen_snapshots();
-
+
// movies
void begin_recording(const char *name, movie_format format = MF_AVI);
void end_recording();
@@ -121,12 +121,12 @@ private:
void exit();
static TIMER_CALLBACK( screenless_update_callback );
void postload();
-
+
// effective value helpers
int effective_autoframeskip() const;
int effective_frameskip() const;
bool effective_throttle() const;
-
+
// speed and throttling helpers
int original_speed_setting() const;
bool finish_screen_updates();
@@ -143,7 +143,7 @@ private:
// internal state
running_machine & m_machine; // reference to our machine
-
+
// screenless systems
emu_timer * m_screenless_frame_timer; // timer to signal VBLANK start
@@ -192,7 +192,7 @@ private:
attotime m_movie_frame_period; // period of a single movie frame
attotime m_movie_next_frame_time; // time of next frame
UINT32 m_movie_frame; // current movie frame number
-
+
static const UINT8 s_skiptable[FRAMESKIP_LEVELS][FRAMESKIP_LEVELS];
static const attoseconds_t SUBSECONDS_PER_SPEED_UPDATE = ATTOSECONDS_PER_SECOND / 4;
diff --git a/src/mame/drivers/bartop52.c b/src/mame/drivers/bartop52.c
index d9c66b53ecc..70b831aaa33 100644
--- a/src/mame/drivers/bartop52.c
+++ b/src/mame/drivers/bartop52.c
@@ -1,18 +1,18 @@
/*
Atari Bartop 5200 prototype system
- Driver by Mariusz Wojcieszek
+ Driver by Mariusz Wojcieszek
Based on Atari 400/800 MESS Driver by Juergen Buchmueller
- Hardware was based on Atari 5200 game console with additional coin and timer hardware.
- System was intented to run in barroms and taverns. Software was based on Atari 5200
- Realsports cartridges.
+ Hardware was based on Atari 5200 game console with additional coin and timer hardware.
+ System was intented to run in barroms and taverns. Software was based on Atari 5200
+ Realsports cartridges.
- Barrom Baseball is modified version of Realsports Baseball.
+ Barrom Baseball is modified version of Realsports Baseball.
- Coins and timer were handled by Bartop system bios. Since bios dump is not available,
- regular Atari 5200 bios is used and game is marked as not working. Game cart is also
- marked as bad dump as it is done in "console style", i.e. one file for all game data.
+ Coins and timer were handled by Bartop system bios. Since bios dump is not available,
+ regular Atari 5200 bios is used and game is marked as not working. Game cart is also
+ marked as bad dump as it is done in "console style", i.e. one file for all game data.
*/
#include "emu.h"
diff --git a/src/mame/drivers/chihiro.c b/src/mame/drivers/chihiro.c
index 553470844da..8225151be28 100644
--- a/src/mame/drivers/chihiro.c
+++ b/src/mame/drivers/chihiro.c
@@ -527,7 +527,7 @@ ROM_START( outr2st )
ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF) // number was not readable on pic, please fix if known
- ROM_LOAD( "317-0xxx-com.pic", 0x000000, 0x004000, CRC(f94cf26f) SHA1(dd4af2b52935c7b2d8cd196ec1a30c0ef0993322) )
+ ROM_LOAD( "317-0xxx-com.pic", 0x000000, 0x004000, CRC(f94cf26f) SHA1(dd4af2b52935c7b2d8cd196ec1a30c0ef0993322) )
ROM_END
ROM_START( crtaxihr )
diff --git a/src/mame/drivers/cps1.c b/src/mame/drivers/cps1.c
index 3ea02c75a11..d7a49ec3730 100644
--- a/src/mame/drivers/cps1.c
+++ b/src/mame/drivers/cps1.c
@@ -4387,7 +4387,7 @@ ROM_START( ffightu )
ROM_LOAD16_BYTE( "ff_36.11f", 0x00000, 0x20000, CRC(f9a5ce83) SHA1(0756ae576a1f6d5b8b22f8630dca40ef38567ea6) ) // in "30" socket
ROM_LOAD16_BYTE( "ff_42.11h", 0x00001, 0x20000, CRC(65f11215) SHA1(5045a467f3e228c02b4a355b52f58263ffa90113) ) // in "35" socket
ROM_LOAD16_BYTE( "ff_37.12f", 0x40000, 0x20000, CRC(e1033784) SHA1(38f44434c8befd623953ae23d6e5ff4e201d6627) ) // in "31" socket
- ROM_LOAD16_BYTE( "ff_43.12h", 0x40001, 0x20000, CRC(4ca65947) SHA1(74ffe00df96273770a24d9a46f13e53ea8812670) ) // in "36" socket /* seen the same pcb with FFU_43.12H */
+ ROM_LOAD16_BYTE( "ff_43.12h", 0x40001, 0x20000, CRC(4ca65947) SHA1(74ffe00df96273770a24d9a46f13e53ea8812670) ) // in "36" socket /* seen the same pcb with FFU_43.12H */
ROM_LOAD16_WORD_SWAP( "ff-32m.8h", 0x80000, 0x80000, CRC(c747696e) SHA1(d3362dadded31ccb7eaf71ef282d698d18edd722) )
ROM_REGION( 0x200000, "gfx", 0 )
@@ -4467,7 +4467,7 @@ ROM_START( ffightub )
ROMX_LOAD( "ff-3m.5a", 0x000006, 0x80000, CRC(52291cd2) SHA1(df5f3d3aa96a7a33ff22f2a31382942c4c4f1111) , ROM_GROUPWORD | ROM_SKIP(6) )
ROM_REGION( 0x18000, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
- ROM_LOAD( "ff_23.12b", 0x00000, 0x08000, CRC(b8367eb5) SHA1(ec3db29fdd6200e9a8f4f8073a7e34aef731354f) ) // == ff_09.12b /* label is FF_23, pcb verified */
+ ROM_LOAD( "ff_23.12b", 0x00000, 0x08000, CRC(b8367eb5) SHA1(ec3db29fdd6200e9a8f4f8073a7e34aef731354f) ) // == ff_09.12b /* label is FF_23, pcb verified */
ROM_CONTINUE( 0x10000, 0x08000 )
ROM_REGION( 0x40000, "oki", 0 ) /* Samples */
@@ -10110,7 +10110,7 @@ GAME( 1992, sf2yyc, sf2ce, cps1_12MHz, sf2hack, sf2hack, ROT0, "bo
GAME( 1992, sf2koryu, sf2ce, cps1_12MHz, sf2hack, sf2hack, ROT0, "bootleg", "Street Fighter II': Champion Edition (Xiang Long, Chinese bootleg)", GAME_SUPPORTS_SAVE ) // 811102 !!! - based on World version
GAME( 1992, sf2mdt, sf2ce, sf2mdt, sf2hack, sf2mdt, ROT0, "bootleg", "Street Fighter II': Magic Delta Turbo (bootleg)", GAME_NOT_WORKING | GAME_NO_SOUND | GAME_SUPPORTS_SAVE ) // 920313 - based on (heavily modified) World version
GAME( 1992, cworld2j, 0, cps1_12MHz, cworld2j, cps1, ROT0, "Capcom", "Adventure Quiz Capcom World 2 (Japan 920611)", GAME_SUPPORTS_SAVE )
-GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920714)", GAME_SUPPORTS_SAVE ) // "ETC" // 12MHz verified
+GAME( 1992, varth, 0, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920714)", GAME_SUPPORTS_SAVE ) // "ETC" // 12MHz verified
GAME( 1992, varthr1, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (World 920612)", GAME_SUPPORTS_SAVE ) // "ETC"
GAME( 1992, varthu, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom, distributed by Romstar", "Varth: Operation Thunderstorm (USA 920612)", GAME_SUPPORTS_SAVE )
GAME( 1992, varthj, varth, cps1_12MHz, varth, cps1, ROT270, "Capcom", "Varth: Operation Thunderstorm (Japan 920714)", GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index c5f66833261..c2abdbdefa2 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -3872,7 +3872,7 @@ ROM_END
or a successor thereof.
*****************************************************/
-
+
ROM_START( superdbl )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "sd6", 0x7000, 0x1000, CRC(3cf1ccb8) SHA1(c589ddf2e97abb9d95375d0964fd0aa6f7e2e468) )
diff --git a/src/mame/drivers/ilpag.c b/src/mame/drivers/ilpag.c
index 754902152a8..c1e4b237523 100644
--- a/src/mame/drivers/ilpag.c
+++ b/src/mame/drivers/ilpag.c
@@ -454,7 +454,7 @@ UINT16 *cjffruit_leds1, *cjffruit_leds2, *cjffruit_leds3;
static void show_leds()
{
#ifdef MAME_DEBUG
-// popmessage("led %02X %02x %02x", cjffruit_leds1[0]>>8, cjffruit_leds2[0]>>8, cjffruit_leds3[0]>>8);
+// popmessage("led %02X %02x %02x", cjffruit_leds1[0]>>8, cjffruit_leds2[0]>>8, cjffruit_leds3[0]>>8);
#endif
}
@@ -465,7 +465,7 @@ static WRITE16_HANDLER( cjffruit_leds1_w )
{
coin_counter_w(space->machine, 0, data & 0x0100); // coin in
set_led_status(space->machine, 0, data & 0x0200); // win???
-// 1 data & 0x0400 // win???
+// 1 data & 0x0400 // win???
set_led_status(space->machine, 2, data & 0x0800); // small
set_led_status(space->machine, 3, data & 0x1000); // big
set_led_status(space->machine, 4, data & 0x2000); // take
diff --git a/src/mame/drivers/mermaid.c b/src/mame/drivers/mermaid.c
index 3721712335c..4ee47a5d271 100644
--- a/src/mame/drivers/mermaid.c
+++ b/src/mame/drivers/mermaid.c
@@ -407,7 +407,7 @@ static void rougien_adpcm_int( running_device *device )
{
mermaid_state *state = device->machine->driver_data<mermaid_state>();
-// popmessage("%08x",state->adpcm_pos);
+// popmessage("%08x",state->adpcm_pos);
if (state->adpcm_pos >= state->adpcm_end || state->adpcm_idle)
{
@@ -426,7 +426,7 @@ static void rougien_adpcm_int( running_device *device )
{
state->adpcm_pos++;
//if ((ROM[state->adpcm_pos] & 0xff) == 0x70)
- // state->adpcm_idle = 1;
+ // state->adpcm_idle = 1;
}
}
}
diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c
index d3f3a157258..540c63cb3aa 100644
--- a/src/mame/drivers/naomi.c
+++ b/src/mame/drivers/naomi.c
@@ -3244,28 +3244,28 @@ ROM_START( samba2k )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-23600.ic22", 0x0000000, 0x400000, CRC(8b6fed00) SHA1(72842f266ad272e4c02be42a6529c2462fd8b63f) )
- ROM_LOAD( "mpr-23579.ic1", 0x0800000, 0x800000, CRC(ded76d71) SHA1(9187434587173f2fcc50af817222121703c253b7) )
- ROM_LOAD( "mpr-23580.ic2", 0x1000000, 0x800000, CRC(a9b29be1) SHA1(4f71b37b21623d87d805cb8d7b9da73bca1d22f3) )
- ROM_LOAD( "mpr-23581.ic3", 0x1800000, 0x800000, CRC(7c44d4c9) SHA1(a2c6e7392a2b52c1b5c0b133bb95fbe53736ca3e) )
- ROM_LOAD( "mpr-23582.ic4", 0x2000000, 0x800000, CRC(99b1af20) SHA1(598abe358d6c97a0ad6d68f5273cea1b96f73237) )
- ROM_LOAD( "mpr-23583.ic5", 0x2800000, 0x800000, CRC(7a81bbd1) SHA1(e36895d8964d1cdd3f316f0ec27356faa3d3f6e0) )
- ROM_LOAD( "mpr-23584.ic6", 0x3000000, 0x800000, CRC(e478b1df) SHA1(5b316feb618a0a61974c3fb5b4c5527873055a5b) )
- ROM_LOAD( "mpr-23585.ic7", 0x3800000, 0x800000, CRC(2f378c38) SHA1(881c6001c173c1ef8ddbb3ae15667e45fac11f96) )
- ROM_LOAD( "mpr-23586.ic8", 0x4000000, 0x800000, CRC(23bec2a7) SHA1(960a6613966bedf20c19454bbc5ec52d14c3f308) )
- ROM_LOAD( "mpr-23587.ic9", 0x4800000, 0x800000, CRC(f52a356b) SHA1(4e3783f5e8d02d09f474cc5ece457af5c4296508) )
- ROM_LOAD( "mpr-23588.ic10", 0x5000000, 0x800000, CRC(4bae020b) SHA1(e3750f87309c7ac9ab6fc504a9377971451ccb5a) )
- ROM_LOAD( "mpr-23589.ic11", 0x5800000, 0x800000, CRC(f6a09854) SHA1(d4ae9d7ddc349e353196cb145f732798a692e560) )
- ROM_LOAD( "mpr-23590.ic12s", 0x6000000, 0x800000, CRC(88e29d52) SHA1(42b66f13302772729920b9af546123c771ecec6b) )
- ROM_LOAD( "mpr-23591.ic13s", 0x6800000, 0x800000, CRC(8736d9b1) SHA1(d829d499dc147f0d14413554ff33187c7df9134f) )
- ROM_LOAD( "mpr-23592.ic14s", 0x7000000, 0x800000, CRC(c7dbeefd) SHA1(7b84d2f5532668936f60314fb3e112b1350bcc51) )
- ROM_LOAD( "mpr-23593.ic15s", 0x7800000, 0x800000, CRC(c8d63355) SHA1(64b06027ebbcfb72ead1d2041423ffd2fe4dcd97) )
- ROM_LOAD( "mpr-23594.ic16s", 0x8000000, 0x800000, CRC(30a04934) SHA1(5b3e5226b1eef9f2d9a64b89307380e2b347547e) )
- ROM_LOAD( "mpr-23595.ic17s", 0x8800000, 0x800000, CRC(1fea68ad) SHA1(d4615f6ea0b9ce6483cb688810ef7ae287aef082) )
- ROM_LOAD( "mpr-23596.ic18s", 0x9000000, 0x800000, CRC(2e57f934) SHA1(9231d3b881e210fa83dda8f03a1702166eb48750) )
- ROM_LOAD( "mpr-23597.ic19s", 0x9800000, 0x800000, CRC(fb50cfdb) SHA1(2e95407b1c8660ae8e85b2d06c13bdc474b93d6e) )
- ROM_LOAD( "mpr-23598.ic20s", 0xa000000, 0x800000, CRC(897c2304) SHA1(e21b68fd935092b5bd019e3087647e9612be1169) )
- ROM_LOAD( "mpr-23599.ic21s", 0xa800000, 0x800000, CRC(f2d1f73f) SHA1(40ac3ef9b1c3797e986fc4a0c593dd4e49df8892) )
+ ROM_LOAD( "epr-23600.ic22", 0x0000000, 0x400000, CRC(8b6fed00) SHA1(72842f266ad272e4c02be42a6529c2462fd8b63f) )
+ ROM_LOAD( "mpr-23579.ic1", 0x0800000, 0x800000, CRC(ded76d71) SHA1(9187434587173f2fcc50af817222121703c253b7) )
+ ROM_LOAD( "mpr-23580.ic2", 0x1000000, 0x800000, CRC(a9b29be1) SHA1(4f71b37b21623d87d805cb8d7b9da73bca1d22f3) )
+ ROM_LOAD( "mpr-23581.ic3", 0x1800000, 0x800000, CRC(7c44d4c9) SHA1(a2c6e7392a2b52c1b5c0b133bb95fbe53736ca3e) )
+ ROM_LOAD( "mpr-23582.ic4", 0x2000000, 0x800000, CRC(99b1af20) SHA1(598abe358d6c97a0ad6d68f5273cea1b96f73237) )
+ ROM_LOAD( "mpr-23583.ic5", 0x2800000, 0x800000, CRC(7a81bbd1) SHA1(e36895d8964d1cdd3f316f0ec27356faa3d3f6e0) )
+ ROM_LOAD( "mpr-23584.ic6", 0x3000000, 0x800000, CRC(e478b1df) SHA1(5b316feb618a0a61974c3fb5b4c5527873055a5b) )
+ ROM_LOAD( "mpr-23585.ic7", 0x3800000, 0x800000, CRC(2f378c38) SHA1(881c6001c173c1ef8ddbb3ae15667e45fac11f96) )
+ ROM_LOAD( "mpr-23586.ic8", 0x4000000, 0x800000, CRC(23bec2a7) SHA1(960a6613966bedf20c19454bbc5ec52d14c3f308) )
+ ROM_LOAD( "mpr-23587.ic9", 0x4800000, 0x800000, CRC(f52a356b) SHA1(4e3783f5e8d02d09f474cc5ece457af5c4296508) )
+ ROM_LOAD( "mpr-23588.ic10", 0x5000000, 0x800000, CRC(4bae020b) SHA1(e3750f87309c7ac9ab6fc504a9377971451ccb5a) )
+ ROM_LOAD( "mpr-23589.ic11", 0x5800000, 0x800000, CRC(f6a09854) SHA1(d4ae9d7ddc349e353196cb145f732798a692e560) )
+ ROM_LOAD( "mpr-23590.ic12s", 0x6000000, 0x800000, CRC(88e29d52) SHA1(42b66f13302772729920b9af546123c771ecec6b) )
+ ROM_LOAD( "mpr-23591.ic13s", 0x6800000, 0x800000, CRC(8736d9b1) SHA1(d829d499dc147f0d14413554ff33187c7df9134f) )
+ ROM_LOAD( "mpr-23592.ic14s", 0x7000000, 0x800000, CRC(c7dbeefd) SHA1(7b84d2f5532668936f60314fb3e112b1350bcc51) )
+ ROM_LOAD( "mpr-23593.ic15s", 0x7800000, 0x800000, CRC(c8d63355) SHA1(64b06027ebbcfb72ead1d2041423ffd2fe4dcd97) )
+ ROM_LOAD( "mpr-23594.ic16s", 0x8000000, 0x800000, CRC(30a04934) SHA1(5b3e5226b1eef9f2d9a64b89307380e2b347547e) )
+ ROM_LOAD( "mpr-23595.ic17s", 0x8800000, 0x800000, CRC(1fea68ad) SHA1(d4615f6ea0b9ce6483cb688810ef7ae287aef082) )
+ ROM_LOAD( "mpr-23596.ic18s", 0x9000000, 0x800000, CRC(2e57f934) SHA1(9231d3b881e210fa83dda8f03a1702166eb48750) )
+ ROM_LOAD( "mpr-23597.ic19s", 0x9800000, 0x800000, CRC(fb50cfdb) SHA1(2e95407b1c8660ae8e85b2d06c13bdc474b93d6e) )
+ ROM_LOAD( "mpr-23598.ic20s", 0xa000000, 0x800000, CRC(897c2304) SHA1(e21b68fd935092b5bd019e3087647e9612be1169) )
+ ROM_LOAD( "mpr-23599.ic21s", 0xa800000, 0x800000, CRC(f2d1f73f) SHA1(40ac3ef9b1c3797e986fc4a0c593dd4e49df8892) )
ROM_END
@@ -4108,12 +4108,12 @@ ROM_START( shootplm )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x2800000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-24148.ic11", 0x000000, 0x400000, CRC(d575f311) SHA1(7f45d897412fd75eda740a82320fce08331fa310) )
+ ROM_LOAD( "epr-24148.ic11", 0x000000, 0x400000, CRC(d575f311) SHA1(7f45d897412fd75eda740a82320fce08331fa310) )
ROM_RELOAD( 0x400000, 0x400000)
- ROM_LOAD32_WORD( "opr-24174.ic17s", 0x0800000, 0x800000, CRC(ccd6aec5) SHA1(a8105ce6986601d8673ffea41353fe399cf8557d) )
- ROM_LOAD32_WORD( "opr-24175.ic18", 0x0800002, 0x800000, CRC(e66e6345) SHA1(28a372168419c9352cb7fc5285bbd37bd37f3b71) )
- ROM_LOAD32_WORD( "opr-24176.ic19s", 0x1800000, 0x800000, CRC(1277bca8) SHA1(e1bd9d1a6f4170a9c29658f95e9e96caf4b0cb84) )
- ROM_LOAD32_WORD( "opr-24177.ic20", 0x1800002, 0x800000, CRC(122eac82) SHA1(2acf00686d682e0f354708fa597933a0d6de4a6f) )
+ ROM_LOAD32_WORD( "opr-24174.ic17s", 0x0800000, 0x800000, CRC(ccd6aec5) SHA1(a8105ce6986601d8673ffea41353fe399cf8557d) )
+ ROM_LOAD32_WORD( "opr-24175.ic18", 0x0800002, 0x800000, CRC(e66e6345) SHA1(28a372168419c9352cb7fc5285bbd37bd37f3b71) )
+ ROM_LOAD32_WORD( "opr-24176.ic19s", 0x1800000, 0x800000, CRC(1277bca8) SHA1(e1bd9d1a6f4170a9c29658f95e9e96caf4b0cb84) )
+ ROM_LOAD32_WORD( "opr-24177.ic20", 0x1800002, 0x800000, CRC(122eac82) SHA1(2acf00686d682e0f354708fa597933a0d6de4a6f) )
ROM_END
@@ -4513,19 +4513,19 @@ ROM_START( wldkicks )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "wk1-fl1.2d", 0x0400000, 0x0400000, CRC(f833a543) SHA1(328b64f2790bfd0b63168a8a3175227e083b995d) )
- ROM_LOAD( "wk1-fl2.2c", 0x0c00000, 0x0400000, CRC(20ee71b0) SHA1(074e0c531e8770b0efd6464193bce7a284a3c057) )
- ROM_LOAD( "wk1-ma2.4m", 0x1000000, 0x1000000, CRC(650590ec) SHA1(bb9d5d5df2321df24ee0fb9e8bf2757d5277f8ea) )
+ ROM_LOAD( "wk1-fl1.2d", 0x0400000, 0x0400000, CRC(f833a543) SHA1(328b64f2790bfd0b63168a8a3175227e083b995d) )
+ ROM_LOAD( "wk1-fl2.2c", 0x0c00000, 0x0400000, CRC(20ee71b0) SHA1(074e0c531e8770b0efd6464193bce7a284a3c057) )
+ ROM_LOAD( "wk1-ma2.4m", 0x1000000, 0x1000000, CRC(650590ec) SHA1(bb9d5d5df2321df24ee0fb9e8bf2757d5277f8ea) )
ROM_RELOAD( 0x800000, 0x400000)
- ROM_LOAD( "wk1-ma3.4l", 0x2000000, 0x1000000, CRC(3b340dc0) SHA1(2412e41d5bd74d1233fb91f8ce2276a318bfc53d) )
- ROM_LOAD( "wk1-ma4.4k", 0x3000000, 0x1000000, CRC(263fbb16) SHA1(b5d3a3d085f9623d70030ca3c49afb84e25549e3) )
- ROM_LOAD( "wk1-ma5.4j", 0x4000000, 0x1000000, CRC(9697db68) SHA1(7926e2acff0519403afcba9bdb5f68de28b06c79) )
- ROM_LOAD( "wk1-ma6.4h", 0x5000000, 0x1000000, CRC(65017db3) SHA1(a66cd73cdfc9355df63da781a46aa832889f583a) )
- ROM_LOAD( "wk1-ma7.4f", 0x6000000, 0x1000000, CRC(902eea85) SHA1(aa7964eb85b468d4fe112f9f0faaf2fa3f1aa96b) )
- ROM_LOAD( "wk1-ma8.4e", 0x7000000, 0x1000000, CRC(90e917ed) SHA1(53d32ce0ae2b05fa55a95b8697927045d07f4e8a) )
- ROM_LOAD( "wk1-ma9.4d", 0x8000000, 0x1000000, CRC(1d227a05) SHA1(9f816bcdf0279785e0b37ab2f3c5eb5912114dd5) )
- ROM_LOAD( "wk1-ma10.4c", 0x9000000, 0x1000000, CRC(29635a54) SHA1(a3109d0f8f271e2183316846df2a6a819f6a9b20) )
- ROM_LOAD( "wk1-ma11.4b", 0xa000000, 0x1000000, CRC(e96f312c) SHA1(0a92640277111aef5c6e9dab4218a8ae2196ce61) )
+ ROM_LOAD( "wk1-ma3.4l", 0x2000000, 0x1000000, CRC(3b340dc0) SHA1(2412e41d5bd74d1233fb91f8ce2276a318bfc53d) )
+ ROM_LOAD( "wk1-ma4.4k", 0x3000000, 0x1000000, CRC(263fbb16) SHA1(b5d3a3d085f9623d70030ca3c49afb84e25549e3) )
+ ROM_LOAD( "wk1-ma5.4j", 0x4000000, 0x1000000, CRC(9697db68) SHA1(7926e2acff0519403afcba9bdb5f68de28b06c79) )
+ ROM_LOAD( "wk1-ma6.4h", 0x5000000, 0x1000000, CRC(65017db3) SHA1(a66cd73cdfc9355df63da781a46aa832889f583a) )
+ ROM_LOAD( "wk1-ma7.4f", 0x6000000, 0x1000000, CRC(902eea85) SHA1(aa7964eb85b468d4fe112f9f0faaf2fa3f1aa96b) )
+ ROM_LOAD( "wk1-ma8.4e", 0x7000000, 0x1000000, CRC(90e917ed) SHA1(53d32ce0ae2b05fa55a95b8697927045d07f4e8a) )
+ ROM_LOAD( "wk1-ma9.4d", 0x8000000, 0x1000000, CRC(1d227a05) SHA1(9f816bcdf0279785e0b37ab2f3c5eb5912114dd5) )
+ ROM_LOAD( "wk1-ma10.4c", 0x9000000, 0x1000000, CRC(29635a54) SHA1(a3109d0f8f271e2183316846df2a6a819f6a9b20) )
+ ROM_LOAD( "wk1-ma11.4b", 0xa000000, 0x1000000, CRC(e96f312c) SHA1(0a92640277111aef5c6e9dab4218a8ae2196ce61) )
ROM_END
ROM_START( vtenis2c )
@@ -4669,24 +4669,24 @@ ROM_START( inunoos )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-22294a.ic22", 0x000000, 0x400000, CRC(bc3a1397) SHA1(73747f10ea034bd0fc952939c6c7576dab9640a6) )
-
- ROM_LOAD( "mpr-22278.ic1", 0x0800000, 0x800000, CRC(0afec6d7) SHA1(fad13f7c205d048006b48c1f262f272a9d653630) )
- ROM_LOAD( "mpr-22279.ic2", 0x1000000, 0x800000, CRC(80b4a397) SHA1(c7d41a48c327b8ae9fefb15149ad5341b86ff933) )
- ROM_LOAD( "mpr-22280.ic3", 0x1800000, 0x800000, CRC(a58fde28) SHA1(db271690131f093a329a457aa234659cbdba4ad1) )
- ROM_LOAD( "mpr-22281.ic4", 0x2000000, 0x800000, CRC(6fcc34f6) SHA1(28f4d69fdd4e151cf1d98303d5f7ac8ff6d4c141) )
- ROM_LOAD( "mpr-22282.ic5", 0x2800000, 0x800000, CRC(d5582d3e) SHA1(b21eda63314983fff7b88d2ad6ddcd8a2ef20e32) )
- ROM_LOAD( "mpr-22283.ic6", 0x3000000, 0x800000, CRC(24b9fa3b) SHA1(b85be6085c476c8683c6d9e9b72e6021385a376a) )
- ROM_LOAD( "mpr-22284.ic7", 0x3800000, 0x800000, CRC(bb80e02a) SHA1(73e7fda34295eb3b67ac04e46206a3a399b7b88a) )
- ROM_LOAD( "mpr-22285.ic8", 0x4000000, 0x800000, CRC(59e2e25b) SHA1(e32d59dca85f246781a411bd8d0bec8fabc3b26d) )
- ROM_LOAD( "mpr-22286.ic9", 0x4800000, 0x800000, CRC(41eac8af) SHA1(594efd94ea053229f0c807591b4f38643f0995c2) )
- ROM_LOAD( "mpr-22287.ic10", 0x5000000, 0x800000, CRC(811f6e65) SHA1(71448b91d2c68df119a767fc29692bbf115edb37) )
- ROM_LOAD( "mpr-22288.ic11", 0x5800000, 0x800000, CRC(ad1375e8) SHA1(17eeaad1becbf0ad0d68e10457c0d3dac9f168da) )
- ROM_LOAD( "mpr-22289.ic12", 0x6000000, 0x800000, CRC(7e7826c0) SHA1(6a13fb7471555732292ee8e4709ee191aee2528c) )
- ROM_LOAD( "mpr-22290.ic13", 0x6800000, 0x800000, CRC(38a192da) SHA1(501c25190af153d1364a90762c7994ac797a498d) )
- ROM_LOAD( "mpr-22291.ic14", 0x7000000, 0x800000, CRC(79ca1d44) SHA1(449509110a7e181e0e495fe3e1d21762b6e4ce08) )
- ROM_LOAD( "mpr-22292.ic15", 0x7800000, 0x800000, CRC(b85e13ef) SHA1(974f6b8f24efe79d72ea9d7a2cfccf479704243d) )
- ROM_LOAD( "mpr-22293.ic16", 0x8000000, 0x800000, CRC(b8493dbe) SHA1(b641417e1bda49341e7ff86340072d74e3330665) )
+ ROM_LOAD( "epr-22294a.ic22", 0x000000, 0x400000, CRC(bc3a1397) SHA1(73747f10ea034bd0fc952939c6c7576dab9640a6) )
+
+ ROM_LOAD( "mpr-22278.ic1", 0x0800000, 0x800000, CRC(0afec6d7) SHA1(fad13f7c205d048006b48c1f262f272a9d653630) )
+ ROM_LOAD( "mpr-22279.ic2", 0x1000000, 0x800000, CRC(80b4a397) SHA1(c7d41a48c327b8ae9fefb15149ad5341b86ff933) )
+ ROM_LOAD( "mpr-22280.ic3", 0x1800000, 0x800000, CRC(a58fde28) SHA1(db271690131f093a329a457aa234659cbdba4ad1) )
+ ROM_LOAD( "mpr-22281.ic4", 0x2000000, 0x800000, CRC(6fcc34f6) SHA1(28f4d69fdd4e151cf1d98303d5f7ac8ff6d4c141) )
+ ROM_LOAD( "mpr-22282.ic5", 0x2800000, 0x800000, CRC(d5582d3e) SHA1(b21eda63314983fff7b88d2ad6ddcd8a2ef20e32) )
+ ROM_LOAD( "mpr-22283.ic6", 0x3000000, 0x800000, CRC(24b9fa3b) SHA1(b85be6085c476c8683c6d9e9b72e6021385a376a) )
+ ROM_LOAD( "mpr-22284.ic7", 0x3800000, 0x800000, CRC(bb80e02a) SHA1(73e7fda34295eb3b67ac04e46206a3a399b7b88a) )
+ ROM_LOAD( "mpr-22285.ic8", 0x4000000, 0x800000, CRC(59e2e25b) SHA1(e32d59dca85f246781a411bd8d0bec8fabc3b26d) )
+ ROM_LOAD( "mpr-22286.ic9", 0x4800000, 0x800000, CRC(41eac8af) SHA1(594efd94ea053229f0c807591b4f38643f0995c2) )
+ ROM_LOAD( "mpr-22287.ic10", 0x5000000, 0x800000, CRC(811f6e65) SHA1(71448b91d2c68df119a767fc29692bbf115edb37) )
+ ROM_LOAD( "mpr-22288.ic11", 0x5800000, 0x800000, CRC(ad1375e8) SHA1(17eeaad1becbf0ad0d68e10457c0d3dac9f168da) )
+ ROM_LOAD( "mpr-22289.ic12", 0x6000000, 0x800000, CRC(7e7826c0) SHA1(6a13fb7471555732292ee8e4709ee191aee2528c) )
+ ROM_LOAD( "mpr-22290.ic13", 0x6800000, 0x800000, CRC(38a192da) SHA1(501c25190af153d1364a90762c7994ac797a498d) )
+ ROM_LOAD( "mpr-22291.ic14", 0x7000000, 0x800000, CRC(79ca1d44) SHA1(449509110a7e181e0e495fe3e1d21762b6e4ce08) )
+ ROM_LOAD( "mpr-22292.ic15", 0x7800000, 0x800000, CRC(b85e13ef) SHA1(974f6b8f24efe79d72ea9d7a2cfccf479704243d) )
+ ROM_LOAD( "mpr-22293.ic16", 0x8000000, 0x800000, CRC(b8493dbe) SHA1(b641417e1bda49341e7ff86340072d74e3330665) )
ROM_END
ROM_START( ringout )
@@ -4695,17 +4695,17 @@ ROM_START( ringout )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x5800000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-21779.ic22", 0x0000000, 0x400000, CRC(1d419767) SHA1(33065006ef437845abcf32a59e78f4bc202c4460) )
- ROM_LOAD( "mpr-21769.ic1", 0x0800000, 0x800000, CRC(493199fc) SHA1(189cd9a20c9207f0238e6d2e867f1479a476dfaa) )
- ROM_LOAD( "mpr-21770.ic2", 0x1000000, 0x800000, CRC(68173ace) SHA1(0869072915543dd5dfa6d3cdb95205521b4a3bf4) )
- ROM_LOAD( "mpr-21771.ic3", 0x1800000, 0x800000, CRC(41badfc3) SHA1(d4062bdbb994b8c18dac20948db9a9550f030865) )
- ROM_LOAD( "mpr-21772.ic4", 0x2000000, 0x800000, CRC(a8dfb537) SHA1(9f6c98ee23842b22fa3b701dad0a384a24a9bc6a) )
- ROM_LOAD( "mpr-21773.ic5", 0x2800000, 0x800000, CRC(3f1f5ed4) SHA1(a7d6e65fba9732efbd99e10a609f41dd03fd3bb8) )
- ROM_LOAD( "mpr-21774.ic6", 0x3000000, 0x800000, CRC(5a1114f0) SHA1(a45fc82bccb40e582f107b86403409651476180e) )
- ROM_LOAD( "mpr-21775.ic7", 0x3800000, 0x800000, CRC(5645a95c) SHA1(f0e97ff5b744972a1fa4e03e6d16a19ba20fb930) )
- ROM_LOAD( "mpr-21776.ic8", 0x4000000, 0x800000, CRC(22fc33dc) SHA1(922c41f7fb22b26037446bdfb4f9788a8e0c3e46) )
- ROM_LOAD( "mpr-21777.ic9", 0x4800000, 0x800000, CRC(6d22d29d) SHA1(382dcd62065437b34fe101144b1c047eb261f047) )
- ROM_LOAD( "mpr-21778.ic10", 0x5000000, 0x800000, CRC(c5308e61) SHA1(e51f8026351d5ffbda2a5bed39aeef543366febf) )
+ ROM_LOAD( "epr-21779.ic22", 0x0000000, 0x400000, CRC(1d419767) SHA1(33065006ef437845abcf32a59e78f4bc202c4460) )
+ ROM_LOAD( "mpr-21769.ic1", 0x0800000, 0x800000, CRC(493199fc) SHA1(189cd9a20c9207f0238e6d2e867f1479a476dfaa) )
+ ROM_LOAD( "mpr-21770.ic2", 0x1000000, 0x800000, CRC(68173ace) SHA1(0869072915543dd5dfa6d3cdb95205521b4a3bf4) )
+ ROM_LOAD( "mpr-21771.ic3", 0x1800000, 0x800000, CRC(41badfc3) SHA1(d4062bdbb994b8c18dac20948db9a9550f030865) )
+ ROM_LOAD( "mpr-21772.ic4", 0x2000000, 0x800000, CRC(a8dfb537) SHA1(9f6c98ee23842b22fa3b701dad0a384a24a9bc6a) )
+ ROM_LOAD( "mpr-21773.ic5", 0x2800000, 0x800000, CRC(3f1f5ed4) SHA1(a7d6e65fba9732efbd99e10a609f41dd03fd3bb8) )
+ ROM_LOAD( "mpr-21774.ic6", 0x3000000, 0x800000, CRC(5a1114f0) SHA1(a45fc82bccb40e582f107b86403409651476180e) )
+ ROM_LOAD( "mpr-21775.ic7", 0x3800000, 0x800000, CRC(5645a95c) SHA1(f0e97ff5b744972a1fa4e03e6d16a19ba20fb930) )
+ ROM_LOAD( "mpr-21776.ic8", 0x4000000, 0x800000, CRC(22fc33dc) SHA1(922c41f7fb22b26037446bdfb4f9788a8e0c3e46) )
+ ROM_LOAD( "mpr-21777.ic9", 0x4800000, 0x800000, CRC(6d22d29d) SHA1(382dcd62065437b34fe101144b1c047eb261f047) )
+ ROM_LOAD( "mpr-21778.ic10", 0x5000000, 0x800000, CRC(c5308e61) SHA1(e51f8026351d5ffbda2a5bed39aeef543366febf) )
ROM_END
ROM_START( vonot )
@@ -4714,21 +4714,21 @@ ROM_START( vonot )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x7000000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-23198.ic22", 0x0000000, 0x400000, CRC(9852eda2) SHA1(71ded8cbdf567afeff30bd593071ce3b7d84a260) )
- ROM_LOAD( "mpr-23185.ic1", 0x0800000, 0x800000, CRC(c4fc1d45) SHA1(cfeff71ac1cccf274f00731fe1ffc182fb85f7a6) )
- ROM_LOAD( "mpr-23186.ic2", 0x1000000, 0x800000, CRC(b17f9924) SHA1(a9aa9f10b76964042b337b25430acff072aaa7c7) )
- ROM_LOAD( "mpr-23187.ic3", 0x1800000, 0x800000, CRC(575f73e8) SHA1(fe6ffeab120ad788bd692b33eca1cf22db881ac3) )
- ROM_LOAD( "mpr-23188.ic4", 0x2000000, 0x800000, CRC(0004ef34) SHA1(926de996549421a5835f3c8c0895a07978519215) )
- ROM_LOAD( "mpr-23189.ic5", 0x2800000, 0x800000, CRC(554eea29) SHA1(c82c24270dee0dd7309b117e1632827ca314615d) )
- ROM_LOAD( "mpr-23190.ic6", 0x3000000, 0x800000, CRC(b74ae1c5) SHA1(003fadbaa03cf43757b686f316d1104d26ae9ce8) )
- ROM_LOAD( "mpr-23191.ic7", 0x3800000, 0x800000, CRC(9f2a88af) SHA1(b1caf9cbf026ee6d0f12ab66cddf120e7ba9884c) )
- ROM_LOAD( "mpr-23192.ic8", 0x4000000, 0x800000, CRC(83014196) SHA1(cc4801534e0f0e649fc3f368af4bd3ac01288732) )
- ROM_LOAD( "mpr-23193.ic9", 0x4800000, 0x800000, CRC(2fde8ecf) SHA1(6da95fb04f141f2c45564460c49834bb945fb1af) )
- ROM_LOAD( "mpr-23194.ic10", 0x5000000, 0x800000, CRC(92f045e5) SHA1(70f741e55a47682725c7d6dcdd0e60982187fc87) )
- ROM_LOAD( "mpr-23195.ic11", 0x5800000, 0x800000, CRC(9e708834) SHA1(2f454688ea5b8b041bbfffaa12047afad01d020f) )
- ROM_LOAD( "mpr-23196.ic12", 0x6000000, 0x800000, CRC(c86a5b9b) SHA1(4b8dda85003289e1464e12c3abf449bb8df20e3a) )
- ROM_LOAD( "mpr-23197.ic13", 0x6800000, 0x800000, CRC(5adea0bd) SHA1(f8614ba83d5f61556c3db1a1796a02ed2c51ce2a) )
-ROM_END
+ ROM_LOAD( "epr-23198.ic22", 0x0000000, 0x400000, CRC(9852eda2) SHA1(71ded8cbdf567afeff30bd593071ce3b7d84a260) )
+ ROM_LOAD( "mpr-23185.ic1", 0x0800000, 0x800000, CRC(c4fc1d45) SHA1(cfeff71ac1cccf274f00731fe1ffc182fb85f7a6) )
+ ROM_LOAD( "mpr-23186.ic2", 0x1000000, 0x800000, CRC(b17f9924) SHA1(a9aa9f10b76964042b337b25430acff072aaa7c7) )
+ ROM_LOAD( "mpr-23187.ic3", 0x1800000, 0x800000, CRC(575f73e8) SHA1(fe6ffeab120ad788bd692b33eca1cf22db881ac3) )
+ ROM_LOAD( "mpr-23188.ic4", 0x2000000, 0x800000, CRC(0004ef34) SHA1(926de996549421a5835f3c8c0895a07978519215) )
+ ROM_LOAD( "mpr-23189.ic5", 0x2800000, 0x800000, CRC(554eea29) SHA1(c82c24270dee0dd7309b117e1632827ca314615d) )
+ ROM_LOAD( "mpr-23190.ic6", 0x3000000, 0x800000, CRC(b74ae1c5) SHA1(003fadbaa03cf43757b686f316d1104d26ae9ce8) )
+ ROM_LOAD( "mpr-23191.ic7", 0x3800000, 0x800000, CRC(9f2a88af) SHA1(b1caf9cbf026ee6d0f12ab66cddf120e7ba9884c) )
+ ROM_LOAD( "mpr-23192.ic8", 0x4000000, 0x800000, CRC(83014196) SHA1(cc4801534e0f0e649fc3f368af4bd3ac01288732) )
+ ROM_LOAD( "mpr-23193.ic9", 0x4800000, 0x800000, CRC(2fde8ecf) SHA1(6da95fb04f141f2c45564460c49834bb945fb1af) )
+ ROM_LOAD( "mpr-23194.ic10", 0x5000000, 0x800000, CRC(92f045e5) SHA1(70f741e55a47682725c7d6dcdd0e60982187fc87) )
+ ROM_LOAD( "mpr-23195.ic11", 0x5800000, 0x800000, CRC(9e708834) SHA1(2f454688ea5b8b041bbfffaa12047afad01d020f) )
+ ROM_LOAD( "mpr-23196.ic12", 0x6000000, 0x800000, CRC(c86a5b9b) SHA1(4b8dda85003289e1464e12c3abf449bb8df20e3a) )
+ ROM_LOAD( "mpr-23197.ic13", 0x6800000, 0x800000, CRC(5adea0bd) SHA1(f8614ba83d5f61556c3db1a1796a02ed2c51ce2a) )
+ROM_END
ROM_START( derbyo2k )
ROM_REGION( 0x200000, "maincpu", 0)
@@ -4736,23 +4736,23 @@ ROM_START( derbyo2k )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0x8800000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-22284a.ic22", 0x0000000, 0x400000, CRC(1e8e067c) SHA1(c33d5f7b175828511f69a6489b4558aef1ac2517) )
- ROM_LOAD( "mpr-22223.ic1", 0x0800000, 0x800000, CRC(5159df22) SHA1(612c2d43f02952c7987cb08051933e406e601474) )
- ROM_LOAD( "mpr-22224.ic2", 0x1000000, 0x800000, CRC(ef8bc5a0) SHA1(ecb858788d9bb84cf25aaeef8d0bee3b7ae0233e) )
- ROM_LOAD( "mpr-22225.ic3", 0x1800000, 0x800000, CRC(80e0fdbd) SHA1(b111d469b8f3a7e68960cc7731ecfca4d24f4f32) )
- ROM_LOAD( "mpr-22226.ic4", 0x2000000, 0x800000, CRC(ea940bcf) SHA1(7dfa7f9101b8cd836920c7ebef095d1ec40c0bd3) )
- ROM_LOAD( "mpr-22227.ic5", 0x2800000, 0x800000, CRC(300ed93b) SHA1(a81e0ccef6d32a959beacf66f60a9cbda128c493) )
- ROM_LOAD( "mpr-22228.ic6", 0x3000000, 0x800000, CRC(3dd062c7) SHA1(5515c636d47b128479d7de7659fe2a2adae51fe4) )
- ROM_LOAD( "mpr-22229.ic7", 0x3800000, 0x800000, CRC(da624f37) SHA1(8b9bb8e572f969019aaa8100fd3549fb7f902f42) )
- ROM_LOAD( "mpr-22230.ic8", 0x4000000, 0x800000, CRC(5a806bb6) SHA1(0d9366d215f23e3f54b26eda960a7033f3ac033c) )
- ROM_LOAD( "mpr-22231.ic9", 0x4800000, 0x800000, CRC(c633d57d) SHA1(737b55f5a9d0b34dec1e4b2bef7bd14e9a9e1bed) )
- ROM_LOAD( "mpr-22232.ic10", 0x5000000, 0x800000, CRC(6f25a6dd) SHA1(d4f354f3143b9484b493cdd87c25b94bd6e7c09a) )
- ROM_LOAD( "mpr-22233.ic11", 0x5800000, 0x800000, CRC(cf3ac2df) SHA1(4d6dfa030ef8ec6343153afd4bdca51a51065bb4) )
- ROM_LOAD( "mpr-22234.ic12s", 0x6000000, 0x800000, CRC(d8c41648) SHA1(d465f4b841164da0738336e203c5bc6e1e799a76) )
- ROM_LOAD( "mpr-22235.ic13s", 0x6800000, 0x800000, CRC(f1dedac5) SHA1(9d4499cbafe80dd0b36be617de7994a96e1e9a01) )
- ROM_LOAD( "mpr-22236.ic14s", 0x7000000, 0x800000, CRC(85f54964) SHA1(4592232694de75e245d1c67f506c9b9d7b0af53a) )
- ROM_LOAD( "mpr-22237.ic15s", 0x7800000, 0x800000, CRC(718dd6bf) SHA1(6b71bb6970b582865f53d26e9579587fce86439e) )
- ROM_LOAD( "mpr-22238.ic16s", 0x8000000, 0x800000, CRC(fb3e55da) SHA1(d547ee5b47e6e6fec9e447460300c828fbff8f2e) )
+ ROM_LOAD( "epr-22284a.ic22", 0x0000000, 0x400000, CRC(1e8e067c) SHA1(c33d5f7b175828511f69a6489b4558aef1ac2517) )
+ ROM_LOAD( "mpr-22223.ic1", 0x0800000, 0x800000, CRC(5159df22) SHA1(612c2d43f02952c7987cb08051933e406e601474) )
+ ROM_LOAD( "mpr-22224.ic2", 0x1000000, 0x800000, CRC(ef8bc5a0) SHA1(ecb858788d9bb84cf25aaeef8d0bee3b7ae0233e) )
+ ROM_LOAD( "mpr-22225.ic3", 0x1800000, 0x800000, CRC(80e0fdbd) SHA1(b111d469b8f3a7e68960cc7731ecfca4d24f4f32) )
+ ROM_LOAD( "mpr-22226.ic4", 0x2000000, 0x800000, CRC(ea940bcf) SHA1(7dfa7f9101b8cd836920c7ebef095d1ec40c0bd3) )
+ ROM_LOAD( "mpr-22227.ic5", 0x2800000, 0x800000, CRC(300ed93b) SHA1(a81e0ccef6d32a959beacf66f60a9cbda128c493) )
+ ROM_LOAD( "mpr-22228.ic6", 0x3000000, 0x800000, CRC(3dd062c7) SHA1(5515c636d47b128479d7de7659fe2a2adae51fe4) )
+ ROM_LOAD( "mpr-22229.ic7", 0x3800000, 0x800000, CRC(da624f37) SHA1(8b9bb8e572f969019aaa8100fd3549fb7f902f42) )
+ ROM_LOAD( "mpr-22230.ic8", 0x4000000, 0x800000, CRC(5a806bb6) SHA1(0d9366d215f23e3f54b26eda960a7033f3ac033c) )
+ ROM_LOAD( "mpr-22231.ic9", 0x4800000, 0x800000, CRC(c633d57d) SHA1(737b55f5a9d0b34dec1e4b2bef7bd14e9a9e1bed) )
+ ROM_LOAD( "mpr-22232.ic10", 0x5000000, 0x800000, CRC(6f25a6dd) SHA1(d4f354f3143b9484b493cdd87c25b94bd6e7c09a) )
+ ROM_LOAD( "mpr-22233.ic11", 0x5800000, 0x800000, CRC(cf3ac2df) SHA1(4d6dfa030ef8ec6343153afd4bdca51a51065bb4) )
+ ROM_LOAD( "mpr-22234.ic12s", 0x6000000, 0x800000, CRC(d8c41648) SHA1(d465f4b841164da0738336e203c5bc6e1e799a76) )
+ ROM_LOAD( "mpr-22235.ic13s", 0x6800000, 0x800000, CRC(f1dedac5) SHA1(9d4499cbafe80dd0b36be617de7994a96e1e9a01) )
+ ROM_LOAD( "mpr-22236.ic14s", 0x7000000, 0x800000, CRC(85f54964) SHA1(4592232694de75e245d1c67f506c9b9d7b0af53a) )
+ ROM_LOAD( "mpr-22237.ic15s", 0x7800000, 0x800000, CRC(718dd6bf) SHA1(6b71bb6970b582865f53d26e9579587fce86439e) )
+ ROM_LOAD( "mpr-22238.ic16s", 0x8000000, 0x800000, CRC(fb3e55da) SHA1(d547ee5b47e6e6fec9e447460300c828fbff8f2e) )
ROM_END
@@ -4894,7 +4894,7 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega",
/* 0002C */ GAME( 1999, crzytaxi, naomi, naomi, naomi, naomi, ROT0, "Sega", "Crazy Taxi (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0003C */ GAME( 1999, zombrvn, naomi, naomi, naomi, naomi, ROT0, "Sega", "Zombie Revenge (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0007C */ GAME( 1999, ggram2, naomi, naomi, naomi, naomi, ROT0, "Sega", "Giant Gram (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-/* 00??C */ GAME( 1999, ringout, naomi, naomi, naomi, naomi, ROT0, "Sega", "Ringout 4x4", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+/* 00??C */ GAME( 1999, ringout, naomi, naomi, naomi, naomi, ROT0, "Sega", "Ringout 4x4", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0010C */ GAME( 1999, vs2_2k, naomi, naomi, naomi, naomi, ROT0, "Sega", "Virtua Striker 2 Ver. 2000 (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0011C */ GAME( 1999, toyfight, naomi, naomi, naomi, naomi, ROT0, "Sega", "Toy Fighter", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0012C */ GAME( 1999, smlg99, naomi, naomi, naomi, naomi, ROT0, "Sega", "Super Major League '99", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
@@ -4910,8 +4910,8 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega",
/* 0026C */ GAME( 2000, totd, naomi, naomi, naomi, naomi, ROT0, "Sega", "The Typing of the Dead (JPN, USA, EXP, KOR, AUS) (Rev A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0027C */ GAME( 2000, smarinef, naomi, naomi, naomi, naomi, ROT0, "Sega", "Sega Marine Fishing", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0030C */ GAME( 2000, qmegamis, naomi, naomi, naomi, qmegamis, ROT0, "Sega", "Quiz Ah Megamisama (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-/* 003?C */ GAME( 2000, vonot, naomi, naomi, naomi, naomi, ROT0, "Sega", "Virtual On Oratorio Tangram M.S.B.S. ver5.66 2000 Edition", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-/* 003?C */ GAME( 2000, derbyo2k, naomi, naomi, naomi, naomi, ROT0, "Sega", "Derby Owners Club 2000", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+/* 003?C */ GAME( 2000, vonot, naomi, naomi, naomi, naomi, ROT0, "Sega", "Virtual On Oratorio Tangram M.S.B.S. ver5.66 2000 Edition", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+/* 003?C */ GAME( 2000, derbyo2k, naomi, naomi, naomi, naomi, ROT0, "Sega", "Derby Owners Club 2000", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0035B */ GAME( 2000, sstrkfgt, naomi, naomi, naomi, naomi, ROT0, "Sega", "Sega Strike Fighter (Rev A)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0037C */ GAME( 2000, 18wheelr, naomi, naomi, naomi, naomi, ROT0, "Sega", "18 Wheeler (JPN)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0039C */ GAME( 2000, gram2000, naomi, naomi, naomi, gram2000, ROT0, "Sega", "Giant Gram 2000 (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
@@ -4922,7 +4922,7 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega",
/* 0044C */ GAME( 2001, csmash, naomi, naomi, naomi, naomi, ROT0, "Sega", "Cosmic Smash (JPN, USA, EXP, KOR, AUS) (Rev A)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0044C */ GAME( 2001, csmasho, csmash, naomi, naomi, naomi, ROT0, "Sega", "Cosmic Smash (JPN, USA, EXP, KOR, AUS) (original)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0064C */ GAME( 2001, wrungp, naomi, naomi, naomi, naomi, ROT0, "Sega", "Wave Runner GP", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-/* 00??C */ GAME( 2001, inunoos, naomi, naomi, naomi, naomi, ROT0, "Sega", "Inu no Osanpo", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+/* 00??C */ GAME( 2001, inunoos, naomi, naomi, naomi, naomi, ROT0, "Sega", "Inu no Osanpo", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0083C */ GAME( 2001, derbyoc2, naomi, naomi, naomi, naomi, ROT0, "Sega", "Derby Owners Club II (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0084C */ GAME( 2001, vtenis2c, naomi, naomi, naomi, naomi, ROT0, "Sega", "Power Smash 2 / Virtua Tennis 2 (cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0088C */ GAME( 2001, derbyocw, naomi, naomi, naomi, naomi, ROT0, "Sega", "Derby Owners Club World Edition (JPN, USA, EXP, KOR, AUS) (Rev C)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
@@ -5719,14 +5719,14 @@ Peripheral String 0000000
Product Number GDS-0016
Version V1.000
Release Date 20011017
-Manufacturer ID
+Manufacturer ID
TOC DISC
Track Start Sector End Sector Track Size
track01.bin 150 626 1121904
track02.raw 777 2909 5016816
track03.bin 45150 549299 1185760800
-
-*/
+
+*/
ROM_START( shaktamb )
NAOMIGD_BIOS
@@ -5738,7 +5738,7 @@ ROM_START( shaktamb )
ROM_REGION( 0x50, "picreturn", ROMREGION_ERASE)
ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
- ROM_LOAD( "317-0321-com.pic", 0x000000, 0x004000, CRC(81519e71) SHA1(a30d25f81c77384ed26faa67c942802f2f3d7817) )
+ ROM_LOAD( "317-0321-com.pic", 0x000000, 0x004000, CRC(81519e71) SHA1(a30d25f81c77384ed26faa67c942802f2f3d7817) )
ROM_END
ROM_START( sprtjam )
@@ -6295,28 +6295,28 @@ ROM_START( kingrt66 )
NAOMI_DEFAULT_EEPROM
ROM_REGION( 0xa800000, "user1", ROMREGION_ERASEFF)
- ROM_LOAD( "epr-23819.ic22", 0x0000000, 0x400000, CRC(92f11b29) SHA1(b33f7eefb849754cfe194be1d48d770ed77ff69a) )
+ ROM_LOAD( "epr-23819.ic22", 0x0000000, 0x400000, CRC(92f11b29) SHA1(b33f7eefb849754cfe194be1d48d770ed77ff69a) )
ROM_RELOAD( 0x400000, 0x400000)
- ROM_LOAD( "mpr-23799.ic1", 0x0800000, 0x800000, CRC(03da8f81) SHA1(01f9b33ffc485d8ccb2630c8cc1fcc0d90da171d) )
- ROM_LOAD( "mpr-23800.ic2", 0x1000000, 0x800000, CRC(1bbbf549) SHA1(0c5269f3e8a88298408bb612dc8da4d545ce329e) )
- ROM_LOAD( "mpr-23801.ic3", 0x1800000, 0x800000, CRC(6c81d0a9) SHA1(2301350098062e16afd6d4c13eeb1e46040d398f) )
- ROM_LOAD( "mpr-23802.ic4", 0x2000000, 0x800000, CRC(fe245803) SHA1(3b5c4d20c447ca02306a74914c027c9193d2bb48) )
- ROM_LOAD( "mpr-23803.ic5", 0x2800000, 0x800000, CRC(d8376c76) SHA1(62a64d0ff4b63a2de3b8668c0ca1d69d4cdac00e) )
- ROM_LOAD( "mpr-23804.ic6", 0x3000000, 0x800000, CRC(d184a4b3) SHA1(db00cf005da52b8add695ec89f8a81cf21fc9bad) )
- ROM_LOAD( "mpr-23805.ic7", 0x3800000, 0x800000, CRC(6e92fb39) SHA1(d992272e474424221c87bb71e269e10cbba1cac9) )
- ROM_LOAD( "mpr-23806.ic8", 0x4000000, 0x800000, CRC(fd4c128f) SHA1(7778920f59b8bc1e9718d685bfd556f73e5c3895) )
- ROM_LOAD( "mpr-23807.ic9", 0x4800000, 0x800000, CRC(5bcb3759) SHA1(57baa595eaee826ffadc17c885cb73174558feb1) )
- ROM_LOAD( "mpr-23808.ic10", 0x5000000, 0x800000, CRC(7d66c409) SHA1(fa8d08587ebcd70ec39237366c5de6948efce881) )
- ROM_LOAD( "mpr-23809.ic11", 0x5800000, 0x800000, CRC(322abecc) SHA1(476a751dc9849a5167e7e7e17e27987b96b1cb00) )
- ROM_LOAD( "mpr-23810.ic12", 0x6000000, 0x800000, CRC(a47fff36) SHA1(5c0088e140654b89749c5dd5d729c4799afc224e) )
- ROM_LOAD( "mpr-23811.ic13", 0x6800000, 0x800000, CRC(f502b666) SHA1(fa483f327cab15d10861efcbf6bdf4a2c5d0a763) )
- ROM_LOAD( "mpr-23812.ic14", 0x7000000, 0x800000, CRC(ed664a57) SHA1(54421ce642208fd1f14fbbe2e326d9c8da7c9944) )
- ROM_LOAD( "mpr-23813.ic15", 0x7800000, 0x800000, CRC(3f905393) SHA1(d63bbe8099b323ad4fd95401e0097b4c7151b44c) )
- ROM_LOAD( "mpr-23814.ic16", 0x8000000, 0x800000, CRC(80756e62) SHA1(9b2f14ed10775ee56f245c75ee23534c99db23d4) )
- ROM_LOAD( "mpr-23815.ic17", 0x8800000, 0x800000, CRC(7404e74e) SHA1(a427bf9f5e8338d34d1091de69460e374ddc6ee6) )
- ROM_LOAD( "mpr-23816.ic18", 0x9000000, 0x800000, CRC(58a7fbac) SHA1(7132e018e73e68a355f92fe26121da7c3c0c927a) )
- ROM_LOAD( "mpr-23817.ic19", 0x9800000, 0x800000, CRC(fd6fb2cf) SHA1(b2bf8a11d42141237db0254506ee73d9cef8b9d1) )
- ROM_LOAD( "mpr-23818.ic20", 0xa000000, 0x800000, CRC(be902c2b) SHA1(1f1aa6933da528bdcef45942a0caa33cb24e7ddd) )
+ ROM_LOAD( "mpr-23799.ic1", 0x0800000, 0x800000, CRC(03da8f81) SHA1(01f9b33ffc485d8ccb2630c8cc1fcc0d90da171d) )
+ ROM_LOAD( "mpr-23800.ic2", 0x1000000, 0x800000, CRC(1bbbf549) SHA1(0c5269f3e8a88298408bb612dc8da4d545ce329e) )
+ ROM_LOAD( "mpr-23801.ic3", 0x1800000, 0x800000, CRC(6c81d0a9) SHA1(2301350098062e16afd6d4c13eeb1e46040d398f) )
+ ROM_LOAD( "mpr-23802.ic4", 0x2000000, 0x800000, CRC(fe245803) SHA1(3b5c4d20c447ca02306a74914c027c9193d2bb48) )
+ ROM_LOAD( "mpr-23803.ic5", 0x2800000, 0x800000, CRC(d8376c76) SHA1(62a64d0ff4b63a2de3b8668c0ca1d69d4cdac00e) )
+ ROM_LOAD( "mpr-23804.ic6", 0x3000000, 0x800000, CRC(d184a4b3) SHA1(db00cf005da52b8add695ec89f8a81cf21fc9bad) )
+ ROM_LOAD( "mpr-23805.ic7", 0x3800000, 0x800000, CRC(6e92fb39) SHA1(d992272e474424221c87bb71e269e10cbba1cac9) )
+ ROM_LOAD( "mpr-23806.ic8", 0x4000000, 0x800000, CRC(fd4c128f) SHA1(7778920f59b8bc1e9718d685bfd556f73e5c3895) )
+ ROM_LOAD( "mpr-23807.ic9", 0x4800000, 0x800000, CRC(5bcb3759) SHA1(57baa595eaee826ffadc17c885cb73174558feb1) )
+ ROM_LOAD( "mpr-23808.ic10", 0x5000000, 0x800000, CRC(7d66c409) SHA1(fa8d08587ebcd70ec39237366c5de6948efce881) )
+ ROM_LOAD( "mpr-23809.ic11", 0x5800000, 0x800000, CRC(322abecc) SHA1(476a751dc9849a5167e7e7e17e27987b96b1cb00) )
+ ROM_LOAD( "mpr-23810.ic12", 0x6000000, 0x800000, CRC(a47fff36) SHA1(5c0088e140654b89749c5dd5d729c4799afc224e) )
+ ROM_LOAD( "mpr-23811.ic13", 0x6800000, 0x800000, CRC(f502b666) SHA1(fa483f327cab15d10861efcbf6bdf4a2c5d0a763) )
+ ROM_LOAD( "mpr-23812.ic14", 0x7000000, 0x800000, CRC(ed664a57) SHA1(54421ce642208fd1f14fbbe2e326d9c8da7c9944) )
+ ROM_LOAD( "mpr-23813.ic15", 0x7800000, 0x800000, CRC(3f905393) SHA1(d63bbe8099b323ad4fd95401e0097b4c7151b44c) )
+ ROM_LOAD( "mpr-23814.ic16", 0x8000000, 0x800000, CRC(80756e62) SHA1(9b2f14ed10775ee56f245c75ee23534c99db23d4) )
+ ROM_LOAD( "mpr-23815.ic17", 0x8800000, 0x800000, CRC(7404e74e) SHA1(a427bf9f5e8338d34d1091de69460e374ddc6ee6) )
+ ROM_LOAD( "mpr-23816.ic18", 0x9000000, 0x800000, CRC(58a7fbac) SHA1(7132e018e73e68a355f92fe26121da7c3c0c927a) )
+ ROM_LOAD( "mpr-23817.ic19", 0x9800000, 0x800000, CRC(fd6fb2cf) SHA1(b2bf8a11d42141237db0254506ee73d9cef8b9d1) )
+ ROM_LOAD( "mpr-23818.ic20", 0xa000000, 0x800000, CRC(be902c2b) SHA1(1f1aa6933da528bdcef45942a0caa33cb24e7ddd) )
ROM_END
/*
@@ -6636,7 +6636,7 @@ GAME( 2001, naomi2, 0, naomi, naomi, 0, ROT0, "Sega",
/* 0061C */ GAME( 2001, vstrik3cb,vstrik3c,naomi, naomi, 0, ROT0, "Sega", "Virtua Striker 3 (Cart, rev. B) (USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0080C */ GAME( 2001, vf4cart, naomi2, naomi, naomi, 0, ROT0, "Sega", "Virtua Fighter 4 (Cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0106C */ GAME( 2001, vf4evoct, naomi2, naomi, naomi, vf4evoct, ROT0, "Sega", "Virtua Fighter 4 Evolution (Cartridge)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
-/* 01??C */ GAME( 2002, kingrt66, naomi2, naomi, naomi, 0, ROT0, "Sega", "King of Route 66", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
+/* 01??C */ GAME( 2002, kingrt66, naomi2, naomi, naomi, 0, ROT0, "Sega", "King of Route 66", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* 0139C */ GAME( 2002, clubkrte, naomi2, naomi, naomi, 0, ROT0, "Sega", "Club Kart: European Session", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING )
/* GDS-xxxx (Sega first party games) */
@@ -7081,14 +7081,14 @@ ROM_START( dirtypig )
AW_BIOS
ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE)
- ROM_LOAD( "837-14695.u3", 0x0000000, 0x1000000, CRC(9fdd7d07) SHA1(56d580dda116823ea5dc5e1bd5154463a476866a) )
- ROM_LOAD( "837-14695.u1", 0x1000000, 0x1000000, CRC(a91d2fcb) SHA1(8414386c09ba36ea581c8161f6cf2a13cc5ae516) )
- ROM_LOAD( "837-14695.u2", 0x2000000, 0x1000000, CRC(4d82152f) SHA1(a448983d4e81eb6485b62f23a6c99d1112a20c21) )
- ROM_LOAD( "837-14695.u4", 0x3000000, 0x1000000, CRC(3342f237) SHA1(e617b0e1f8d8da9783c58ab98eb91de2363ec36f) )
- ROM_LOAD( "837-14695.u14", 0x4000000, 0x1000000, CRC(55470242) SHA1(789036189ae5488a9da565774bdf91b49cd8264e) )
- ROM_LOAD( "837-14695.u15", 0x5000000, 0x1000000, CRC(d239a549) SHA1(71f3c1c2ae2a9b6f09f30e7be3bb11ba111276ae) )
- ROM_LOAD( "837-14695.u16", 0x6000000, 0x1000000, CRC(730180a4) SHA1(017b82e2d2744695e3e521d35a8511ecc1c8ab43) )
- ROM_LOAD( "837-14695.u17", 0x7000000, 0x1000000, CRC(16bb5992) SHA1(18772587272aba1d50a48d384f472276c3b48d96) )
+ ROM_LOAD( "837-14695.u3", 0x0000000, 0x1000000, CRC(9fdd7d07) SHA1(56d580dda116823ea5dc5e1bd5154463a476866a) )
+ ROM_LOAD( "837-14695.u1", 0x1000000, 0x1000000, CRC(a91d2fcb) SHA1(8414386c09ba36ea581c8161f6cf2a13cc5ae516) )
+ ROM_LOAD( "837-14695.u2", 0x2000000, 0x1000000, CRC(4d82152f) SHA1(a448983d4e81eb6485b62f23a6c99d1112a20c21) )
+ ROM_LOAD( "837-14695.u4", 0x3000000, 0x1000000, CRC(3342f237) SHA1(e617b0e1f8d8da9783c58ab98eb91de2363ec36f) )
+ ROM_LOAD( "837-14695.u14", 0x4000000, 0x1000000, CRC(55470242) SHA1(789036189ae5488a9da565774bdf91b49cd8264e) )
+ ROM_LOAD( "837-14695.u15", 0x5000000, 0x1000000, CRC(d239a549) SHA1(71f3c1c2ae2a9b6f09f30e7be3bb11ba111276ae) )
+ ROM_LOAD( "837-14695.u16", 0x6000000, 0x1000000, CRC(730180a4) SHA1(017b82e2d2744695e3e521d35a8511ecc1c8ab43) )
+ ROM_LOAD( "837-14695.u17", 0x7000000, 0x1000000, CRC(16bb5992) SHA1(18772587272aba1d50a48d384f472276c3b48d96) )
ROM_END
/* Atomiswave */
diff --git a/src/mame/drivers/neoprint.c b/src/mame/drivers/neoprint.c
index edf7c90e252..1b2966a61d4 100644
--- a/src/mame/drivers/neoprint.c
+++ b/src/mame/drivers/neoprint.c
@@ -1,19 +1,19 @@
/*******************************************************************************************
- Neo Print (c) 1996 SNK
+ Neo Print (c) 1996 SNK
- preliminary driver by David Haywood & Angelo Salese
+ preliminary driver by David Haywood & Angelo Salese
- npcartv1 bp 1260 pc += 2
- 98best44 bp 1312 pc += 2
+ npcartv1 bp 1260 pc += 2
+ 98best44 bp 1312 pc += 2
- TODO:
- - implement remaining video features;
- - sound interface, needs full Neo-Geo conversion;
- - inputs are bare bones and needs extra work;
- - printer/camera devices;
- - lamps;
- - upd4990a returns 4 years less than expected?
+ TODO:
+ - implement remaining video features;
+ - sound interface, needs full Neo-Geo conversion;
+ - inputs are bare bones and needs extra work;
+ - printer/camera devices;
+ - lamps;
+ - upd4990a returns 4 years less than expected?
*******************************************************************************************/
@@ -89,7 +89,7 @@ VIDEO_UPDATE(neoprint)
static READ16_HANDLER( neoprint_calendar_r )
{
//if(cpu_get_pc(space->cpu) != 0x4b38 )//&& cpu_get_pc(space->cpu) != 0x5f86 && cpu_get_pc(space->cpu) != 0x5f90)
- // printf("%08x\n",cpu_get_pc(space->cpu));
+ // printf("%08x\n",cpu_get_pc(space->cpu));
return (upd4990a_databit_r(space->machine->device("upd4990a"), 0) << 15);
}
@@ -110,7 +110,7 @@ static READ8_HANDLER( neoprint_unk_r )
vblank = (space->machine->primary_screen->frame_number() & 0x1) ? 0x10 : 0x00;
//if(cpu_get_pc(space->cpu) != 0x1504 && cpu_get_pc(space->cpu) != 0x5f86 && cpu_get_pc(space->cpu) != 0x5f90)
- // printf("%08x\n",cpu_get_pc(space->cpu));
+ // printf("%08x\n",cpu_get_pc(space->cpu));
return vblank| 4 | 3;
}
@@ -200,10 +200,10 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( neoprint_audio_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x0000, 0x7fff) AM_ROM//AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_MAIN_BANK)
-// AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
-// AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
-// AM_RANGE(0xe000, 0xefff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 1)
-// AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 0)
+// AM_RANGE(0x8000, 0xbfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 3)
+// AM_RANGE(0xc000, 0xdfff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 2)
+// AM_RANGE(0xe000, 0xefff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 1)
+// AM_RANGE(0xf000, 0xf7ff) AM_ROMBANK(NEOGEO_BANK_AUDIO_CPU_CART_BANK + 0)
AM_RANGE(0xf800, 0xffff) AM_RAM
ADDRESS_MAP_END
@@ -219,13 +219,13 @@ static ADDRESS_MAP_START( neoprint_audio_io_map, ADDRESS_SPACE_IO, 8 )
/*AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READWRITE(audio_command_r, audio_cpu_clear_nmi_w);*/ /* may not and NMI clear */
AM_RANGE(0x00, 0x00) AM_MIRROR(0xff00) AM_READ(audio_command_r) AM_WRITENOP
AM_RANGE(0x04, 0x07) AM_MIRROR(0xff00) AM_DEVREADWRITE("ymsnd", ym2610_r, ym2610_w)
-// AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */
-// AM_RANGE(0x08, 0x08) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r)
-// AM_RANGE(0x09, 0x09) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r)
-// AM_RANGE(0x0a, 0x0a) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_c000_dfff_r)
-// AM_RANGE(0x0b, 0x0b) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_8000_bfff_r)
+// AM_RANGE(0x08, 0x08) AM_MIRROR(0xff00) /* write - NMI enable / acknowledge? (the data written doesn't matter) */
+// AM_RANGE(0x08, 0x08) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_f000_f7ff_r)
+// AM_RANGE(0x09, 0x09) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_e000_efff_r)
+// AM_RANGE(0x0a, 0x0a) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_c000_dfff_r)
+// AM_RANGE(0x0b, 0x0b) AM_MIRROR(0xfff0) AM_MASK(0xfff0) AM_READ(audio_cpu_bank_select_8000_bfff_r)
AM_RANGE(0x0c, 0x0c) AM_MIRROR(0xff00) AM_WRITE(audio_result_w)
-// AM_RANGE(0x18, 0x18) AM_MIRROR(0xff00) /* write - NMI disable? (the data written doesn't matter) */
+// AM_RANGE(0x18, 0x18) AM_MIRROR(0xff00) /* write - NMI disable? (the data written doesn't matter) */
ADDRESS_MAP_END
static INPUT_PORTS_START( neoprint )
@@ -395,7 +395,7 @@ MACHINE_CONFIG_END
ROM_START( npcartv1 )
ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_WORD_SWAP( "ep1.bin", 0x000000, 0x80000, CRC(18606198) SHA1(d968e09131c22769e22c7310aca1f02e739f38f1) )
-// ROM_RELOAD( 0x100000, 0x80000 ) /* checks the same string from above to be present there? Why? */
+// ROM_RELOAD( 0x100000, 0x80000 ) /* checks the same string from above to be present there? Why? */
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 program */
ROM_LOAD( "m1.bin", 0x00000, 0x20000, CRC(b2d38e12) SHA1(ab96c5d3d22eb71ed6e0a03f3ff5d4b23e72fad8) )
@@ -416,7 +416,7 @@ ROM_END
ROM_START( 98best44 )
ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF )
ROM_LOAD16_WORD_SWAP( "p060-ep1", 0x000000, 0x080000, CRC(d42e505d) SHA1(0ad6b0288f36c339832730a03e53cbc07dab4f82))
-// ROM_RELOAD( 0x100000, 0x80000 ) /* checks the same string from above to be present there? Why? */
+// ROM_RELOAD( 0x100000, 0x80000 ) /* checks the same string from above to be present there? Why? */
ROM_REGION( 0x20000, "audiocpu", 0 ) /* Z80 program */
ROM_LOAD( "pt004-m1", 0x00000, 0x20000, CRC(6d77cdaa) SHA1(f88a93b3085b18b6663b4e51fccaa41958aafae1) )
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 0f91f4af88a..1ccb3f0e396 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -704,10 +704,10 @@ static ADDRESS_MAP_START( cavepgm_mem, ADDRESS_SPACE_PROGRAM, 16)
AM_RANGE(0x700006, 0x700007) AM_WRITENOP // Watchdog?
-// AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) AM_SHARE("sram") /* Main Ram */
+// AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_MIRROR(0x0e0000) AM_BASE(&pgm_mainram) AM_SHARE("sram") /* Main Ram */
AM_RANGE(0x800000, 0x81ffff) AM_RAM AM_BASE(&pgm_mainram) AM_SHARE("sram") /* Main Ram */
/* 0x880000 - 0x89ffff seems to be protection related, maybe they just happen to access protection results
- via a mirror tho. */
+ via a mirror tho. */
AM_RANGE(0x900000, 0x907fff) AM_MIRROR(0x0f8000) AM_READWRITE(pgm_videoram_r, pgm_videoram_w) AM_BASE_MEMBER(pgm_state, videoram) /* IGS023 VIDEO CHIP */
AM_RANGE(0xa00000, 0xa011ff) AM_RAM_WRITE(paletteram16_xRRRRRGGGGGBBBBB_word_w) AM_BASE_GENERIC(paletteram)
@@ -1330,7 +1330,7 @@ static INTERRUPT_GEN( drgw_interrupt )
{
if (cpu_getiloops(device) == 0)
{
- //printf("vbl\n");
+ //printf("vbl\n");
cpu_set_input_line(device, 6, HOLD_LINE);
}
else
@@ -3986,7 +3986,7 @@ ROM_START( ket )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
ROM_LOAD( "text-1.u19", 0x400000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) )
@@ -4013,7 +4013,7 @@ ROM_START( keta )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
ROM_LOAD( "text-1.u19", 0x400000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) )
@@ -4040,7 +4040,7 @@ ROM_START( ketb )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
ROM_LOAD( "text-1.u19", 0x400000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) )
@@ -4067,7 +4067,7 @@ ROM_START( espgal )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
ROM_LOAD( "text-1.u19", 0x400000, 0x800000, NO_DUMP )
@@ -4077,7 +4077,7 @@ ROM_START( espgal )
ROM_LOAD( "image-2.u8", 0x0800000, 0x0800000, NO_DUMP )
ROM_REGION( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
- ROM_LOAD( "bitmap-1.u1", 0x0000000, 0x0800000, NO_DUMP )
+ ROM_LOAD( "bitmap-1.u1", 0x0000000, 0x0800000, NO_DUMP )
ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
@@ -4094,7 +4094,7 @@ ROM_START( ddp3 )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
ROM_LOAD( "t04401w064.u19",0x400000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) )
@@ -4122,7 +4122,7 @@ ROM_START( ddp3blk )
ROM_REGION32_LE( 0x400000, "user1", ROMREGION_ERASE00 )
/* no external protection rom */
-
+
ROM_REGION( 0xc00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
ROM_LOAD( "t04401w064.u19",0x400000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) )
@@ -4147,7 +4147,7 @@ ROM_END
ROM_START( orleg2 )
ROM_REGION( 0x800000, "maincpu", 0 ) /* 68000 Code */
ROM_LOAD16_WORD_SWAP( "xyj2_v104cn.u7", 0x000000, 0x800000, CRC(7c24a4f5) SHA1(3cd9f9264ef2aad0869afdf096e88eb8d74b2570) )
-
+
ROM_REGION( 0xc00000, "tiles", ROMREGION_ERASEFF ) /* 8x8 Text Tiles + 32x32 BG Tiles */
ROM_REGION( 0x1c00000, "sprcol", ROMREGION_ERASEFF ) /* Sprite Colour Data */
ROM_REGION( 0x1000000, "sprmask", ROMREGION_ERASEFF ) /* Sprite Masks + Colour Indexes */
@@ -4323,7 +4323,7 @@ static DRIVER_INIT( drgw2 )
}
static DRIVER_INIT( dw2v100x )
-{
+{
UINT16 *mem16 = (UINT16 *)memory_region(machine, "maincpu");
drgwld2_common_init(machine);
@@ -4408,7 +4408,7 @@ static DRIVER_INIT( pstar )
state_save_register_global(machine, state->pstar_b1);
state_save_register_global(machine, state->pstar_ce);
state_save_register_global_array(machine, state->pstar_ram);
-
+
}
static DRIVER_INIT( photoy2k )
@@ -5449,7 +5449,7 @@ static DRIVER_INIT( kovqhsgs )
please don't driver_data this, it's temporary code, and just
becomes and absolute pain to work with if bits of it end
up all over the place, and near impossible to read with state->
- before everything.
+ before everything.
*/
static UINT16 value0, value1, valuekey, ddp3lastcommand;
@@ -5483,14 +5483,14 @@ static WRITE16_HANDLER( ddp3_asic_w )
ddp3lastcommand = value1 & 0xff;
/* typical frame (ddp3) (all 3 games use only these commands? for the most part of levels espgal just issues 8e)
- vbl
- 145f28 command 67
- 145f70 command e5
- 145f28 command 67
- 145f70 command e5
- 1460c6 command 40
- 145ec0 command 8e
- */
+ vbl
+ 145f28 command 67
+ 145f70 command e5
+ 145f28 command 67
+ 145f70 command e5
+ 1460c6 command 40
+ 145ec0 command 8e
+ */
switch (ddp3lastcommand)
{
diff --git a/src/mame/drivers/taitosj.c b/src/mame/drivers/taitosj.c
index 5830a580a5f..ed8836e14f7 100644
--- a/src/mame/drivers/taitosj.c
+++ b/src/mame/drivers/taitosj.c
@@ -1972,7 +1972,7 @@ ROM_END
ROM_START( jungleby )
ROM_REGION( 0x12000, "maincpu", 0 )
ROM_LOAD( "j1.bin", 0x00000, 0x1000, CRC(6f2ac11f) SHA1(c6592d369449140ed4a8dffea76f4809e0f76f06) ) // modified copyright
- ROM_LOAD( "j2.bin", 0x01000, 0x1000, CRC(07cc9a21) SHA1(3fe35935e0a430ab0edc6a762623972fa37ea926) )
+ ROM_LOAD( "j2.bin", 0x01000, 0x1000, CRC(07cc9a21) SHA1(3fe35935e0a430ab0edc6a762623972fa37ea926) )
ROM_LOAD( "j3.bin", 0x02000, 0x1000, CRC(a20e5a48) SHA1(af961b671dc4c865d0181d08a70b902bb96f29d0) )
ROM_LOAD( "j4.bin", 0x03000, 0x1000, CRC(19ea7f83) SHA1(2399cc89f73811575c3f644d5c04ef13ceec6838) )
ROM_LOAD( "j5.bin", 0x04000, 0x1000, CRC(844365ea) SHA1(af34712620e4b784a5014283d3111048c5f81a56) )
diff --git a/src/mame/drivers/xtom3d.c b/src/mame/drivers/xtom3d.c
index 83bc26d1c60..e9e5e7ff2ed 100644
--- a/src/mame/drivers/xtom3d.c
+++ b/src/mame/drivers/xtom3d.c
@@ -7,7 +7,7 @@ Major components are....
MAIN BOARD
----------
- CPU: Intel Celeron (socket 370) 333MHz
+ CPU: Intel Celeron (socket 370) 333MHz
Chipset: Intel AGPset FW822443ZX, PCIset FW82371EB
RAM: Samsung KMM366S823CTS 8M x 64-bit SDRAM DIMM
Video: 3DFX 500-0013-04 PCB-mounted BGA
@@ -16,7 +16,7 @@ Chipset: Intel AGPset FW822443ZX, PCIset FW82371EB
BIOS: Atmel 29C010 flash ROM
Other: Holtek HT6542B i8042-based keyboard controller
3V coin battery
-
+
SOUND BOARD
-----------
A40MX04 QFP84 CPLD
diff --git a/src/mame/drivers/yiear.c b/src/mame/drivers/yiear.c
index c8e761c8d8b..4f0957e7aa9 100644
--- a/src/mame/drivers/yiear.c
+++ b/src/mame/drivers/yiear.c
@@ -161,7 +161,7 @@ static INPUT_PORTS_START( yiear )
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_CODE("NONE")
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
-
+
PORT_START("P2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c
index 31dfc3149d4..ee1844031c2 100644
--- a/src/mame/machine/pgmcrypt.c
+++ b/src/mame/machine/pgmcrypt.c
@@ -1033,7 +1033,7 @@ void pgm_py2k2_decrypt(running_machine *machine) // and ddpdoj/ddpdojbl
for(i=0; i<rom_size/2; i++)
{
UINT16 x = src[i];
-
+
if ((i & 0x040480) != 0x000080) x ^= 0x0001;
if ((i & 0x084008) == 0x084008) x ^= 0x0002;
if ((i & 0x000030) == 0x000010 && (i & 0x180000) != 0x080000) x ^= 0x0004;
diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c
index 2d25d7467cb..0d54cd113e6 100644
--- a/src/mame/mamedriv.c
+++ b/src/mame/mamedriv.c
@@ -4685,7 +4685,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11
DRIVER( shaktamb ) /* 2000.11 Shakatto Tambourine */
DRIVER( wwfroyal ) /* 2000.11 WWF Royal Rumble */
DRIVER( pjustic ) /* 2000.12 Moero Justice Gakuen */
- DRIVER( samba2k ) /* 2000.12 Samba de Amigo ver.2000 */
+ DRIVER( samba2k ) /* 2000.12 Samba de Amigo ver.2000 */
DRIVER( sprtjam ) /* 2000.12 Sports Jam */
/* 2000.12 Derby Owners Club 2000 ver.2 */
/* 2000.?? World Kicks New ver. */
diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c
index 0bf35e9d3cd..3326c474746 100644
--- a/src/osd/sdl/sdlfile.c
+++ b/src/osd/sdl/sdlfile.c
@@ -137,7 +137,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64
}
(*file)->type = SDLFILE_FILE;
-
+
// convert the path into something compatible
dst = (*file)->filename;
for (src = path; *src != 0; src++)
@@ -275,7 +275,7 @@ error:
file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
ssize_t result;
-
+
switch (file->type)
{
case SDLFILE_FILE:
@@ -299,15 +299,15 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, U
return FILERR_NONE;
break;
-
+
case SDLFILE_SOCKET:
return sdl_read_socket(file, buffer, offset, count, actual);
break;
-
+
case SDLFILE_PTTY:
return sdl_read_ptty(file, buffer, offset, count, actual);
break;
-
+
default:
return FILERR_FAILURE;
}
@@ -338,21 +338,21 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c
#else
#error Unknown SDL SUBARCH!
#endif
- return error_to_file_error(errno);
+ return error_to_file_error(errno);
if (actual != NULL)
*actual = result;
return FILERR_NONE;
break;
-
+
case SDLFILE_SOCKET:
return sdl_write_socket(file, buffer, offset, count, actual);
break;
-
+
case SDLFILE_PTTY:
return sdl_write_ptty(file, buffer, offset, count, actual);
break;
-
+
default:
return FILERR_FAILURE;
}
@@ -377,11 +377,11 @@ file_error osd_close(osd_file *file)
case SDLFILE_SOCKET:
return sdl_close_socket(file);
break;
-
+
case SDLFILE_PTTY:
return sdl_close_ptty(file);
break;
-
+
default:
return FILERR_FAILURE;
}
diff --git a/src/osd/sdl/sdlmain.c b/src/osd/sdl/sdlmain.c
index 651178db9ac..ce0c0725746 100644
--- a/src/osd/sdl/sdlmain.c
+++ b/src/osd/sdl/sdlmain.c
@@ -643,7 +643,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
CTFontRef ct_font = NULL;
CTFontDescriptorRef font_descriptor;
CGAffineTransform affine_transform = CGAffineTransformIdentity;
-
+
astring name(_name);
if (name == "default")
@@ -652,19 +652,19 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
}
font_name = CFStringCreateWithCString( NULL, _name, kCFStringEncodingUTF8 );
-
+
if( font_name != NULL )
{
font_descriptor = CTFontDescriptorCreateWithNameAndSize( font_name, POINT_SIZE );
-
+
if( font_descriptor != NULL )
{
ct_font = CTFontCreateWithFontDescriptor( font_descriptor, POINT_SIZE, &affine_transform );
-
+
CFRelease( font_descriptor );
}
}
-
+
CFRelease( font_name );
if (!ct_font)
@@ -678,7 +678,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
CFStringGetCString ( real_name, real_name_c_string, 255, kCFStringEncodingUTF8 );
mame_printf_verbose("Matching font: %s\n", real_name_c_string);
CFRelease( real_name );
-
+
CGFloat line_height = 0.0;
line_height += CTFontGetAscent(ct_font);
line_height += CTFontGetDescent(ct_font);
@@ -696,7 +696,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
void sdl_osd_interface::font_close(osd_font font)
{
CTFontRef ct_font = (CTFontRef)font;
-
+
if( ct_font != NULL )
{
CFRelease( ct_font );
@@ -720,7 +720,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
const CFIndex count = 1;
CGRect bounding_rect, success_rect;
CGContextRef context_ref;
-
+
if( chnum == ' ' )
{
uni_char = 'n';
@@ -743,7 +743,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
bitmap_width = ceilf(bounding_rect.size.width * EXTRA_WIDTH);
bitmap_width = bitmap_width == 0 ? 1 : bitmap_width;
-
+
bitmap_height = ceilf( (CTFontGetAscent(ct_font) + CTFontGetDescent(ct_font) + CTFontGetLeading(ct_font)) * EXTRA_HEIGHT);
xoffs = yoffs = 0;
@@ -752,14 +752,14 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
size_t bits_per_component;
CGColorSpaceRef color_space;
CGBitmapInfo bitmap_info = kCGBitmapByteOrder32Host | kCGImageAlphaPremultipliedFirst;
-
+
color_space = CGColorSpaceCreateDeviceRGB();
bits_per_component = 8;
bitmap = auto_alloc(&machine(), bitmap_t(bitmap_width, bitmap_height, BITMAP_FORMAT_ARGB32));
-
+
context_ref = CGBitmapContextCreate( bitmap->base, bitmap_width, bitmap_height, bits_per_component, bitmap->rowpixels*4, color_space, bitmap_info );
-
+
if( context_ref != NULL )
{
CGFontRef font_ref;
@@ -821,7 +821,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
config = FcConfigGetCurrent();
pat = FcPatternCreate();
os = FcObjectSetCreate();
- FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
+ FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
// try and get a font with the requested styles baked-in
if (bold)
@@ -869,7 +869,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
bakedstyles = true;
break;
}
- }
+ }
// didn't get a font above? try again with no baked-in styles
if (!font)
@@ -878,7 +878,7 @@ osd_font sdl_osd_interface::font_open(const char *_name, int &height)
FcFontSetDestroy(fontset);
pat = FcPatternCreate();
- FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
+ FcPatternAddString(pat, FC_FAMILY, (const FcChar8 *)name.cstr());
FcPatternAddString(pat, FC_STYLE, (const FcChar8 *)"Regular");
FcPatternAddString(pat, FC_FONTFORMAT, (const FcChar8 *)"TrueType");
fontset = FcFontList(config, pat, os);
@@ -966,7 +966,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
UINT16 ustr[16];
ttffont = (TTF_Font *)font;
-
+
memset(ustr,0,sizeof(ustr));
ustr[0] = (UINT16)chnum;
drawsurf = TTF_RenderUNICODE_Solid(ttffont, ustr, fcol);
@@ -982,7 +982,7 @@ bitmap_t *sdl_osd_interface::font_get_bitmap(osd_font font, unicode_char chnum,
{
UINT32 *dstrow = BITMAP_ADDR32(bitmap, y, 0);
UINT8 *srcrow = (UINT8 *)drawsurf->pixels;
-
+
srcrow += (y * drawsurf->pitch);
for (int x = 0; x < drawsurf->w; x++)
diff --git a/src/osd/sdl/sdlptty_macosx.c b/src/osd/sdl/sdlptty_macosx.c
index 91de069c231..93a70b3c3f5 100644
--- a/src/osd/sdl/sdlptty_macosx.c
+++ b/src/osd/sdl/sdlptty_macosx.c
@@ -62,7 +62,7 @@ file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 cou
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
if (result < 0)
diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c
index a54c9f5f139..cfb50bd9ab7 100644
--- a/src/osd/sdl/sdlptty_unix.c
+++ b/src/osd/sdl/sdlptty_unix.c
@@ -72,7 +72,7 @@ file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 cou
file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
if (result < 0)
diff --git a/src/osd/sdl/sdlsocket.c b/src/osd/sdl/sdlsocket.c
index 645a9a1e2cf..4d8fc591740 100644
--- a/src/osd/sdl/sdlsocket.c
+++ b/src/osd/sdl/sdlsocket.c
@@ -36,11 +36,11 @@ file_error sdl_open_socket(const char *path, UINT32 openflags, osd_file **file,
struct sockaddr_in sai;
int flag = 1;
int port;
-
+
sscanf( path+strlen(sdlfile_socket_identifier), ":%255[^:]:%d", hostname, &port );
-
+
printf("Connecting to server '%s' on port '%d'\n", hostname, port);
-
+
if (((*file)->handle = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{
return FILERR_ACCESS_DENIED;
@@ -62,9 +62,9 @@ file_error sdl_open_socket(const char *path, UINT32 openflags, osd_file **file,
{
return FILERR_ACCESS_DENIED;
}
-
+
*filesize = 0;
-#endif
+#endif
return FILERR_NONE;
}
@@ -111,7 +111,7 @@ file_error sdl_read_socket(osd_file *file, void *buffer, UINT64 offset, UINT32 c
file_error sdl_write_socket(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
{
#ifndef SDLMAME_WIN32
- UINT32 result;
+ UINT32 result;
result = write(file->handle, buffer, count);
@@ -133,6 +133,6 @@ file_error sdl_close_socket(osd_file *file)
#ifndef SDLMAME_WIN32
close(file->handle);
osd_free(file);
-#endif
+#endif
return FILERR_NONE;
}
diff --git a/src/version.c b/src/version.c
index 56c4c2b892e..5dcbb267462 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.140u1 ("__DATE__")";
+const char build_version[] = "0.140u2 ("__DATE__")";