summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-01-01 00:59:47 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-01-01 00:59:47 +0000
commit99a26bc3316bc342c9b46137e20707a1f28d2540 (patch)
tree36b68d7cf24d490cb3d557cdb4deed72b4cb4513
parent5db7b9e8a332fd90537f9b45ec7539e1b4031e98 (diff)
Cleanups and version bump.
-rw-r--r--src/emu/cpu/arm7/arm7.c14
-rw-r--r--src/emu/cpu/arm7/arm7core.c8
-rw-r--r--src/emu/cpu/arm7/arm7core.h8
-rw-r--r--src/emu/cpu/mb88xx/mb88xx.c2
-rw-r--r--src/emu/cpu/rsp/rsp.c14
-rw-r--r--src/emu/cpu/rsp/rspdrc.c72
-rw-r--r--src/emu/machine/s3c24xx.c6
-rw-r--r--src/emu/render.h2
-rw-r--r--src/emu/sound/ay8910.c14
-rw-r--r--src/emu/sound/es5506.c2
-rw-r--r--src/emu/sound/ics2115.c26
-rw-r--r--src/emu/sound/ics2115.h2
-rw-r--r--src/emu/sound/s14001a.h2
-rw-r--r--src/mame/drivers/blitz68k.c32
-rw-r--r--src/mame/drivers/centiped.c4
-rw-r--r--src/mame/drivers/cybertnk.c16
-rw-r--r--src/mame/drivers/dai3wksi.c4
-rw-r--r--src/mame/drivers/goldnpkr.c28
-rw-r--r--src/mame/drivers/igs011.c14
-rw-r--r--src/mame/drivers/pgm.c6
-rw-r--r--src/mame/drivers/relief.c2
-rw-r--r--src/mame/drivers/seta.c2
-rw-r--r--src/mame/drivers/spacefb.c12
-rw-r--r--src/mame/drivers/tumbleb.c2
-rw-r--r--src/mame/machine/seicop.c36
-rw-r--r--src/mame/video/armedf.c62
-rw-r--r--src/mame/video/n64.c16
-rw-r--r--src/mame/video/n64.h2
-rw-r--r--src/mame/video/rdptpipe.c4
-rw-r--r--src/mame/video/seta.c18
-rw-r--r--src/osd/sdl/osdsdl.h2
-rw-r--r--src/osd/sdl/sdl.mak4
-rw-r--r--src/version.c2
33 files changed, 220 insertions, 220 deletions
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c
index f6f7e608e35..14689dd3c69 100644
--- a/src/emu/cpu/arm7/arm7.c
+++ b/src/emu/cpu/arm7/arm7.c
@@ -167,11 +167,11 @@ INLINE UINT32 arm7_tlb_translate(arm_state *cpustate, UINT32 vaddr, int mode)
UINT32 pid = ((COPRO_FCSE_PID >> 25) & 0x7F);
if (pid > 0)
{
- //LOG( ( "ARM7: FCSE PID vaddr %08X -> %08X\n", vaddr, vaddr + (pid * (32 * 1024 * 1024))) );
- vaddr = vaddr + (((COPRO_FCSE_PID >> 25) & 0x7F) * (32 * 1024 * 1024));
- }
+ //LOG( ( "ARM7: FCSE PID vaddr %08X -> %08X\n", vaddr, vaddr + (pid * (32 * 1024 * 1024))) );
+ vaddr = vaddr + (((COPRO_FCSE_PID >> 25) & 0x7F) * (32 * 1024 * 1024));
+ }
}
-
+
desc_lvl1 = arm7_tlb_get_first_level_descriptor( cpustate, vaddr );
paddr = vaddr;
@@ -216,7 +216,7 @@ INLINE UINT32 arm7_tlb_translate(arm_state *cpustate, UINT32 vaddr, int mode)
}
else
{
- LOG( ( "domain %d permission = %d\n", domain, permission ) );
+ LOG( ( "domain %d permission = %d\n", domain, permission ) );
LOG( ( "ARM7: Coarse Table, Section Domain fault on virtual address, vaddr = %08x, domain = %08x, PC = %08x\n", vaddr, domain, R15 ) );
}
break;
@@ -230,7 +230,7 @@ INLINE UINT32 arm7_tlb_translate(arm_state *cpustate, UINT32 vaddr, int mode)
{
if (mode == ARM7_TLB_ABORT_D)
{
- LOG( ( "domain %d permission = %d\n", domain, permission ) );
+ LOG( ( "domain %d permission = %d\n", domain, permission ) );
LOG( ( "ARM7: Section Table, Section Domain fault on virtual address, vaddr = %08x, domain = %08x, PC = %08x\n", vaddr, domain, R15 ) );
COPRO_FAULT_STATUS = (9 << 0);
COPRO_FAULT_ADDRESS = vaddr;
@@ -238,7 +238,7 @@ INLINE UINT32 arm7_tlb_translate(arm_state *cpustate, UINT32 vaddr, int mode)
}
else if (mode == ARM7_TLB_ABORT_P)
{
- LOG( ( "domain %d permission = %d\n", domain, permission ) );
+ LOG( ( "domain %d permission = %d\n", domain, permission ) );
LOG( ( "ARM7: Section Table, Section Domain fault on virtual address, vaddr = %08x, domain = %08x, PC = %08x\n", vaddr, domain, R15 ) );
cpustate->pendingAbtP = 1;
}
diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c
index 8c0d73cdc80..f0c70b10091 100644
--- a/src/emu/cpu/arm7/arm7core.c
+++ b/src/emu/cpu/arm7/arm7core.c
@@ -649,7 +649,7 @@ static void arm7_check_irq_state(arm_state *cpustate)
// IRQ
if (cpustate->pendingIrq && (cpsr & I_MASK) == 0) {
SwitchMode(cpustate, eARM7_MODE_IRQ); /* Set IRQ mode so PC is saved to correct R14 bank */
- SET_REGISTER(cpustate, 14, pc - 4 + 4); /* save PC to R14 */
+ SET_REGISTER(cpustate, 14, pc - 4 + 4); /* save PC to R14 */
if (MODE32)
{
SET_REGISTER(cpustate, SPSR, cpsr); /* Save current CPSR */
@@ -1282,7 +1282,7 @@ static void HandleHalfWordDT(arm_state *cpustate, UINT32 insn)
}
}
}
-
+
}
}
@@ -1790,7 +1790,7 @@ static void HandleMemBlock(arm_state *cpustate, UINT32 insn)
else
{
UINT32 temp;
-// LOG(("LDM + S | R15 %08X CPSR %08X\n", R15, GET_CPSR));
+// LOG(("LDM + S | R15 %08X CPSR %08X\n", R15, GET_CPSR));
temp = (GET_CPSR & 0x0FFFFF20) | (R15 & 0xF0000000) /* N Z C V */ | ((R15 & 0x0C000000) >> (26 - 6)) /* I F */ | (R15 & 0x00000003) /* M1 M0 */;
SET_CPSR( temp);
SwitchMode(cpustate, temp & 3);
@@ -1843,7 +1843,7 @@ static void HandleMemBlock(arm_state *cpustate, UINT32 insn)
else
{
UINT32 temp;
-// LOG(("LDM + S | R15 %08X CPSR %08X\n", R15, GET_CPSR));
+// LOG(("LDM + S | R15 %08X CPSR %08X\n", R15, GET_CPSR));
temp = (GET_CPSR & 0x0FFFFF20) /* N Z C V I F M4 M3 M2 M1 M0 */ | (R15 & 0xF0000000) /* N Z C V */ | ((R15 & 0x0C000000) >> (26 - 6)) /* I F */ | (R15 & 0x00000003) /* M1 M0 */;
SET_CPSR( temp);
SwitchMode(cpustate, temp & 3);
diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h
index fd82bbbdffa..de7097c59da 100644
--- a/src/emu/cpu/arm7/arm7core.h
+++ b/src/emu/cpu/arm7/arm7core.h
@@ -137,13 +137,13 @@ enum
#define COPRO_CTRL_INTVEC_F 1
#define COPRO_CTRL_MASK 0x0000338f
-#define COPRO_DOMAIN_ACCESS_CONTROL cpustate->domainAccessControl
+#define COPRO_DOMAIN_ACCESS_CONTROL cpustate->domainAccessControl
-#define COPRO_FAULT_STATUS cpustate->faultStatus
+#define COPRO_FAULT_STATUS cpustate->faultStatus
-#define COPRO_FAULT_ADDRESS cpustate->faultAddress
+#define COPRO_FAULT_ADDRESS cpustate->faultAddress
-#define COPRO_FCSE_PID cpustate->fcsePID
+#define COPRO_FCSE_PID cpustate->fcsePID
/* Coprocessor Registers */
#define ARM7COPRO_REGS \
diff --git a/src/emu/cpu/mb88xx/mb88xx.c b/src/emu/cpu/mb88xx/mb88xx.c
index 41f6e66f433..e8c6bfe6858 100644
--- a/src/emu/cpu/mb88xx/mb88xx.c
+++ b/src/emu/cpu/mb88xx/mb88xx.c
@@ -310,7 +310,7 @@ static void update_pio( mb88_state *cpustate, int cycles )
cpustate->SI = ( cpustate->SI + 1 ) & 3;
/* the datasheet doesn't mention interrupt vectors but
- the Arabian MCU program expects the following */
+ the Arabian MCU program expects the following */
if (cpustate->pending_interrupt & cpustate->pio & INT_CAUSE_EXTERNAL)
{
/* if we have a live external source, call the irqcallback */
diff --git a/src/emu/cpu/rsp/rsp.c b/src/emu/cpu/rsp/rsp.c
index 47978d74cb7..1137105b1bd 100644
--- a/src/emu/cpu/rsp/rsp.c
+++ b/src/emu/cpu/rsp/rsp.c
@@ -1710,8 +1710,8 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
}
break;
}
- default: //fatalerror("RSP: VSAW: el = %d\n", EL);//потупим
- printf("RSP: VSAW: el = %d\n", EL);//мой код
+ default: //fatalerror("RSP: VSAW: el = %d\n", EL);//???????
+ printf("RSP: VSAW: el = %d\n", EL);//??? ???
exit(0);
}
break;
@@ -1810,7 +1810,7 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
int sel;
rsp->flag[1] = 0;
- for (i=0; i < 8; i++)//переписано мной
+ for (i=0; i < 8; i++)//?????????? ????
{
sel = VEC_EL_2(EL, i);
@@ -2151,7 +2151,7 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
}
else
{
- vres[i] = VREG_S(VS2REG, sel);//моё исправление
+ vres[i] = VREG_S(VS2REG, sel);//??? ???????????
}
ACCUM_L(i) = vres[i];
@@ -2292,7 +2292,7 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
@@ -2377,7 +2377,7 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
@@ -2493,7 +2493,7 @@ static void handle_vector_ops(rsp_state *rsp, UINT32 op)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
diff --git a/src/emu/cpu/rsp/rspdrc.c b/src/emu/cpu/rsp/rspdrc.c
index e381a422f5a..0c1c3a70b99 100644
--- a/src/emu/cpu/rsp/rspdrc.c
+++ b/src/emu/cpu/rsp/rspdrc.c
@@ -2539,7 +2539,7 @@ INLINE void cfunc_rsp_vne(void *param)
int sel;
rsp->flag[1] = 0;
- for (i=0; i < 8; i++)//переписано мной
+ for (i=0; i < 8; i++)//?????????? ????
{
sel = VEC_EL_2(EL, i);
@@ -2894,7 +2894,7 @@ INLINE void cfunc_rsp_vmrg(void *param)
}
else
{
- vres[i] = VREG_S(VS2REG, sel);//моё исправление
+ vres[i] = VREG_S(VS2REG, sel);//??? ???????????
}
ACCUM_L(i) = vres[i];
@@ -3056,7 +3056,7 @@ INLINE void cfunc_rsp_vrcp(void *param)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
@@ -3141,7 +3141,7 @@ INLINE void cfunc_rsp_vrcpl(void *param)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
@@ -3259,7 +3259,7 @@ INLINE void cfunc_rsp_vrsql(void *param)
{
for (i = 0; i < 32; i++)
{
- if (datainput & (1 << ((~i) & 0x1f)))//т.ж.что 31 - i
+ if (datainput & (1 << ((~i) & 0x1f)))//?.?.??? 31 - i
{
shifter = i;
break;
@@ -3677,11 +3677,11 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
{
if (size == 1)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(0)); // mov [arg2],0
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(0)); // mov [arg2],0
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
#ifdef LSB_FIRST
UML_XOR(block, IREG(0), IREG(0), IMM(3)); // xor i0,i0,3
#endif
@@ -3690,11 +3690,11 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
}
else if (size == 2)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(1)); // mov [arg2],1
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(1)); // mov [arg2],1
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
#ifdef LSB_FIRST
UML_TEST(block, IREG(0), IMM(1)); // test i0,1
UML_JMPc(block, IF_NZ, unaligned_case); // jnz <unaligned_case>
@@ -3719,11 +3719,11 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
}
else if (size == 4)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(2)); // mov [arg2],2
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(1)); // mov [arg1],i1
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(2)); // mov [arg2],2
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
#ifdef LSB_FIRST
UML_TEST(block, IREG(0), IMM(3)); // test i0,3
UML_JMPc(block, IF_NZ, unaligned_case); // jnz <unaligned_case>
@@ -3750,20 +3750,20 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
UML_MOV(block, MEM(&rsp->impstate->arg0), IREG(0)); // mov [arg0],i0
if (size == 1)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(3)); // mov [arg2],3
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(3)); // mov [arg2],3
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
#ifdef LSB_FIRST
UML_XOR(block, IREG(0), IREG(0), IMM(3)); // xor i0,i0,3
#endif
UML_AND(block, IREG(0), IREG(0), IMM(0x00000fff)); // and i0,i0,0xfff
UML_LOAD(block, IREG(0), rsp->impstate->dmem, IREG(0), BYTE); // load i0,dmem,i0,byte
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
}
else if (size == 2)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(4)); // mov [arg2],4
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(4)); // mov [arg2],4
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
#ifdef LSB_FIRST
UML_TEST(block, IREG(0), IMM(1)); // test i0,1
UML_JMPc(block, IF_NZ, unaligned_case); // jnz <unaligned_case>
@@ -3771,8 +3771,8 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
#endif
UML_AND(block, IREG(0), IREG(0), IMM(0x00000fff)); // and i0,i0,0xfff
UML_LOAD(block, IREG(0), rsp->impstate->dmem, IREG(0), WORD_x1); // load i0,dmem,i0,word_x1
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
UML_RET(block);
#ifdef LSB_FIRST
UML_LABEL(block, unaligned_case); // unaligned_case:
@@ -3783,21 +3783,21 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
UML_ADD(block, IREG(1), IREG(1), IMM(48)); // add i1,i1,48
UML_DROLAND(block, IREG(0), IREG(0), IREG(1), IMM(0xffff)); // droland i0,i0,i1,0xffff
#endif
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
}
else if (size == 4)
{
- //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(5)); // mov [arg2],5
- //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
+ //UML_MOV(block, MEM(&rsp->impstate->arg2), IMM(5)); // mov [arg2],5
+ //UML_MOV(block, MEM(&rsp->impstate->arg3), MEM(&rsp->pc)); // mov [arg3],pc
#ifdef LSB_FIRST
UML_TEST(block, IREG(0), IMM(3)); // test i0,3
UML_JMPc(block, IF_NZ, unaligned_case); // jnz <unaligned_case>
#endif
UML_AND(block, IREG(0), IREG(0), IMM(0x00000fff)); // and i0,i0,0xfff
UML_LOAD(block, IREG(0), rsp->impstate->dmem, IREG(0), DWORD_x1); // load i0,dmem,i0,dword_x1
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
UML_RET(block);
#ifdef LSB_FIRST
UML_LABEL(block, unaligned_case); // unaligned_case:
@@ -3807,8 +3807,8 @@ static void static_generate_memory_accessor(rsp_state *rsp, int size, int iswrit
UML_DLOAD(block, IREG(0), rsp->impstate->dmem, IREG(0), QWORD_x1); // dload i0,dmem,i0,qword_x1
UML_DROL(block, IREG(0), IREG(0), IREG(1)); // drol i0,i0,i1
#endif
- //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
- //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
+ //UML_MOV(block, MEM(&rsp->impstate->arg1), IREG(0)); // mov [arg1],i0
+ //UML_CALLC(block, cfunc_printf_debug, rsp); // callc cfunc_printf_debug
}
}
UML_RET(block);
diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c
index 757a35c02e5..c370c3a4397 100644
--- a/src/emu/machine/s3c24xx.c
+++ b/src/emu/machine/s3c24xx.c
@@ -2005,12 +2005,12 @@ static UINT16 s3c24xx_wdt_calc_current_count( device_t *device)
double timeleft, x1, x2;
UINT32 cnt;
timeleft = attotime_to_double( timer_timeleft( s3c24xx->wdt.timer));
-// printf( "timeleft %f freq %d cnt %d\n", timeleft, s3c24xx->wdt.freq, s3c24xx->wdt.cnt);
+// printf( "timeleft %f freq %d cnt %d\n", timeleft, s3c24xx->wdt.freq, s3c24xx->wdt.cnt);
x1 = 1 / ((double)s3c24xx->wdt.freq / s3c24xx->wdt.cnt);
x2 = x1 / timeleft;
-// printf( "x1 %f\n", x1);
+// printf( "x1 %f\n", x1);
cnt = s3c24xx->wdt.cnt / x2;
-// printf( "cnt %d\n", cnt);
+// printf( "cnt %d\n", cnt);
return cnt;
}
diff --git a/src/emu/render.h b/src/emu/render.h
index f8b6c7fcf4f..312977d9299 100644
--- a/src/emu/render.h
+++ b/src/emu/render.h
@@ -417,7 +417,7 @@ class render_texture
// reset before re-use
void reset(render_manager &manager, texture_scaler_func scaler = NULL, void *param = NULL);
-
+
// release resources when freed
void release();
diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c
index 53333096ede..4d3557d61ba 100644
--- a/src/emu/sound/ay8910.c
+++ b/src/emu/sound/ay8910.c
@@ -899,18 +899,18 @@ int ay8910_read_ym(void *chip)
logerror("%s: warning - read 8910 '%s' Port B\n",cpuexec_describe_context(psg->device->machine),psg->device->tag());
break;
}
-
+
/* Depending on chip type, unused bits in registers may or may not be accessible.
- Untested chips are assumed to regard them as 'ram'
- Tested and confirmed on hardware:
- - AY-3-8910: inaccessible bits (see masks below) read back as 0
- - YM2149: no anomaly
- */
+ Untested chips are assumed to regard them as 'ram'
+ Tested and confirmed on hardware:
+ - AY-3-8910: inaccessible bits (see masks below) read back as 0
+ - YM2149: no anomaly
+ */
if (chip_type == AY8910) {
const UINT8 mask[0x10]={
0xff,0x0f,0xff,0x0f,0xff,0x0f,0x1f,0xff,0x1f,0x1f,0x1f,0xff,0xff,0x0f,0xff,0xff
};
-
+
return psg->regs[r] & mask[r];
}
else return psg->regs[r];
diff --git a/src/emu/sound/es5506.c b/src/emu/sound/es5506.c
index b642b206ee5..c36a4f4af4e 100644
--- a/src/emu/sound/es5506.c
+++ b/src/emu/sound/es5506.c
@@ -1,5 +1,5 @@
/**********************************************************************************************
-
+
Ensoniq ES5505/6 driver
by Aaron Giles
diff --git a/src/emu/sound/ics2115.c b/src/emu/sound/ics2115.c
index 8ef525da8b4..8e21e9a5e67 100644
--- a/src/emu/sound/ics2115.c
+++ b/src/emu/sound/ics2115.c
@@ -287,14 +287,14 @@ stream_sample_t ics2115_device::get_sample(ics2115_voice& voice)
//no need for interpolation since it's around 1 note a cycle?
//if(voice.osc.fc >> 10)
// return sample1;
-
+
//linear interpolation as in US patent 6,246,774 B1, column 2 row 59
//LEN=1, BLEN=0, DIR=0, start+end interpolation
INT32 sample, diff;
UINT16 fract;
diff = sample2 - sample1;
fract = (voice.osc.acc >> 3) & 0x1ff;
-
+
sample = (((INT32)sample1 << 9) + diff * fract) >> 9;
//sample = sample1;
return sample;
@@ -331,7 +331,7 @@ int ics2115_device::fill_output(ics2115_voice& voice, stream_sample_t *outputs[2
UINT32 volume = (m_volume[volacc >> 4] * voice.state.ramp) >> 6;
UINT16 vleft = volume; //* (255 - voice.vol.pan) / 0x80];
UINT16 vright = volume; //* (voice.vol.pan + 1) / 0x80];
-
+
//From GUS doc:
//In general, it is necessary to remember that all voices are being summed in to the
//final output, even if they are not running. This means that whatever data value
@@ -344,7 +344,7 @@ int ics2115_device::fill_output(ics2115_voice& voice, stream_sample_t *outputs[2
}
else
sample = get_sample(voice);
-
+
//15-bit volume + (5-bit worth of 32 channel sum) + 16-bit samples = 4-bit extra
if (!m_vmode || voice.playing()) {
//if (voice.playing()) {
@@ -494,13 +494,13 @@ UINT16 ics2115_device::reg_read() {
/* DDP3 code (trap15's reversal) */
/* 0xA13's work:
- res = read() & 0xC3;
- if(!(res & 2)) res |= 1;
- e = d = res;
- */
+ res = read() & 0xC3;
+ if(!(res & 2)) res |= 1;
+ e = d = res;
+ */
/* 0xA4F's work:
- while(!(read() & 1))
- */
+ while(!(read() & 1))
+ */
case 0x0D: // [osc] Volume Envelope Control
//ret = v->Vol.Ctl | ((v->state & FLAG_STATE_VOLIRQ) ? 0x81 : 1);
// may expect |8 on voice irq with &40 == 0
@@ -659,7 +659,7 @@ void ics2115_device::reg_write(UINT8 data, bool msb) {
#ifdef ICS2115_ISOLATE
if(m_osc_select == ICS2115_ISOLATE)
#endif
- printf("<%d:oa:H[%d]=%x>", m_osc_select, msb, data);
+ printf("<%d:oa:H[%d]=%x>", m_osc_select, msb, data);
#endif
if(msb)
voice.osc.acc = (voice.osc.acc & 0x00ffffff) | (data << 24);
@@ -672,7 +672,7 @@ void ics2115_device::reg_write(UINT8 data, bool msb) {
#ifdef ICS2115_ISOLATE
if(m_osc_select == ICS2115_ISOLATE)
#endif
- printf("<%d:oa:L[%d]=%x>", m_osc_select, msb, data);
+ printf("<%d:oa:L[%d]=%x>", m_osc_select, msb, data);
#endif
if(msb)
voice.osc.acc = (voice.osc.acc & 0xffff00ff) | (data << 8);
@@ -702,7 +702,7 @@ void ics2115_device::reg_write(UINT8 data, bool msb) {
case 0x10: // [osc] Oscillator Control
//Could this be 2X9?
//[7 R | 6 M2 | 5 M1 | 4-2 Reserve | 1 - Timer 2 Strt | 0 - Timer 1 Strt]
-
+
if (msb) {
voice.osc.ctl = data;
if (!data)
diff --git a/src/emu/sound/ics2115.h b/src/emu/sound/ics2115.h
index 41f6683270b..79cd3fabf7f 100644
--- a/src/emu/sound/ics2115.h
+++ b/src/emu/sound/ics2115.h
@@ -45,7 +45,7 @@ struct ics2115_voice {
union {
struct {
UINT8 ulaw : 1;
- UINT8 stop : 1; //stops wave + vol envelope
+ UINT8 stop : 1; //stops wave + vol envelope
UINT8 eightbit : 1;
UINT8 loop : 1;
UINT8 loop_bidir : 1;
diff --git a/src/emu/sound/s14001a.h b/src/emu/sound/s14001a.h
index 92489f01daf..62ebfa22eaa 100644
--- a/src/emu/sound/s14001a.h
+++ b/src/emu/sound/s14001a.h
@@ -5,7 +5,7 @@
#include "devlegcy.h"
-int s14001a_bsy_r(device_t *device); /* read BUSY pin */
+int s14001a_bsy_r(device_t *device); /* read BUSY pin */
void s14001a_reg_w(device_t *device, int data); /* write to input latch */
void s14001a_rst_w(device_t *device, int data); /* write to RESET pin */
void s14001a_set_clock(device_t *device, int clock); /* set VSU-1000 clock */
diff --git a/src/mame/drivers/blitz68k.c b/src/mame/drivers/blitz68k.c
index 1271c6e6c1b..e8ace183b50 100644
--- a/src/mame/drivers/blitz68k.c
+++ b/src/mame/drivers/blitz68k.c
@@ -492,7 +492,7 @@ static WRITE8_HANDLER( blit_draw_w )
pen = blit_rom[src];
src++;
}
-
+
if (pen || !blit.trans)
{
if (pen <= 3)
@@ -768,7 +768,7 @@ static ADDRESS_MAP_START( bankroba_map, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE(0x900000, 0x900007) AM_WRITE8( paletteram_bt476_w, 0xff00 ) // RAMDAC
-// AM_RANGE(0x940000, 0x940001) AM_WRITE // lev 6
+// AM_RANGE(0x940000, 0x940001) AM_WRITE // lev 6
AM_RANGE(0x980000, 0x980001) AM_WRITE8(blit_flag0_w, 0xff00)
AM_RANGE(0x980002, 0x980003) AM_WRITE8(blit_flag1_w, 0xff00)
@@ -817,7 +817,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
@@ -951,7 +951,7 @@ static WRITE16_HANDLER( deucesw2_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
@@ -1151,10 +1151,10 @@ static WRITE16_HANDLER( hermit_leds2_w )
static READ16_HANDLER( hermit_track_r )
{
#ifdef MAME_DEBUG
-// popmessage("track %02x %02x", input_port_read(space->machine, "TRACK_X"), input_port_read(space->machine, "TRACK_Y"));
+// popmessage("track %02x %02x", input_port_read(space->machine, "TRACK_X"), input_port_read(space->machine, "TRACK_Y"));
#endif
- return
+ return
((0xf - ((input_port_read(space->machine, "TRACK_Y") + 0x7) & 0xf)) << 12) |
((0xf - ((input_port_read(space->machine, "TRACK_X") + 0x7) & 0xf)) << 8) ;
}
@@ -1777,7 +1777,7 @@ static MACHINE_CONFIG_START( bankrob, driver_device )
// MC68HC705C8P (MCU2)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1806,7 +1806,7 @@ static MACHINE_CONFIG_START( bankroba, driver_device )
// MC68HC705C8P (MCU)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1834,7 +1834,7 @@ static MACHINE_CONFIG_START( deucesw2, driver_device )
// MC68HC705C8P (MCU)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1864,7 +1864,7 @@ static MACHINE_CONFIG_START( dualgame, driver_device )
// MC68HC705C8P (MCU2)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1892,7 +1892,7 @@ static MACHINE_CONFIG_START( hermit, driver_device )
// MC68HC705C8P (MCU)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1925,7 +1925,7 @@ static MACHINE_CONFIG_START( maxidbl, driver_device )
// MC68HC705C8P (MCU3)
-// MCFG_NVRAM_ADD_0FILL("nvram")
+// MCFG_NVRAM_ADD_0FILL("nvram")
MCFG_SCREEN_ADD("screen", RASTER)
MCFG_SCREEN_REFRESH_RATE(60)
@@ -1986,7 +1986,7 @@ Other:
Jumpers for ROMs size
DSW4
3.6V Lithium battery
-
+
Sub Board --------------------
Unknown
@@ -2008,7 +2008,7 @@ ROM_START( bankrob )
ROM_LOAD16_BYTE( "unknown_label.u70", 0x00000, 0x80000, CRC(35225bf6) SHA1(cd3176ab43c0678c6b9a92b9fafea116babdd534) )
ROM_LOAD16_BYTE( "unknown_label.u54", 0x00001, 0x80000, CRC(c7c0c2d1) SHA1(3b3b6954fbded65418492374aaa94e3c60af69c5) )
-// ROM_REGION( 0x20000, "samples", 0 ) // 8 bit unsigned
+// ROM_REGION( 0x20000, "samples", 0 ) // 8 bit unsigned
ROM_REGION( 0x117, "plds", 0 )
ROM_LOAD( "palce16v8h.u10", 0x000, 0x117, NO_DUMP )
@@ -2054,7 +2054,7 @@ Other:
Jumpers for ROMs size
DSW4
3.6V Lithium battery
-
+
Sub Board --------------------
Unknown
@@ -2506,7 +2506,7 @@ Hopper Board -----------------
Model: HOP?
Code: ?
Copyright 1992, Blitz System Inc.
-
+
Other:
20 pin chip labelled "HOP-DEC"
2 x DSW4
diff --git a/src/mame/drivers/centiped.c b/src/mame/drivers/centiped.c
index 1d8d361415b..792533399f6 100644
--- a/src/mame/drivers/centiped.c
+++ b/src/mame/drivers/centiped.c
@@ -812,7 +812,7 @@ static ADDRESS_MAP_START( mazeinv_map, ADDRESS_SPACE_PROGRAM, 8 )
AM_RANGE(0x2500, 0x2502) AM_WRITE(coin_count_w)
AM_RANGE(0x2503, 0x2504) AM_WRITE(led_w)
AM_RANGE(0x2505, 0x2505) AM_WRITE(input_select_w)
- AM_RANGE(0x2506, 0x2506) AM_WRITE(centiped_flip_screen_w)
+ AM_RANGE(0x2506, 0x2506) AM_WRITE(centiped_flip_screen_w)
AM_RANGE(0x2580, 0x2583) AM_WRITE(mazeinv_input_select_w)
AM_RANGE(0x2600, 0x2600) AM_WRITE(irq_ack_w)
AM_RANGE(0x2680, 0x2680) AM_WRITE(watchdog_reset_w)
@@ -1312,7 +1312,7 @@ static INPUT_PORTS_START( mazeinv )
PORT_START("IN2")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("P1 Reverse")
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
- PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire")
+ PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Fire")
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_TILT ) // No Function?
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
diff --git a/src/mame/drivers/cybertnk.c b/src/mame/drivers/cybertnk.c
index 653c5205b83..497dff2bd9b 100644
--- a/src/mame/drivers/cybertnk.c
+++ b/src/mame/drivers/cybertnk.c
@@ -977,14 +977,14 @@ DRIVER_INIT( cybertnk )
{
/* make the gfx decode easier by swapping bits around */
/*
- UINT8* road_data;
- int i;
-
- road_data = machine->region("road_data")->base();
- for (i=0;i < 0x40000;i++)
- {
- road_data[i] = BITSWAP8(road_data[i],3,2,1,0,7,6,5,4);
- }
+ UINT8* road_data;
+ int i;
+
+ road_data = machine->region("road_data")->base();
+ for (i=0;i < 0x40000;i++)
+ {
+ road_data[i] = BITSWAP8(road_data[i],3,2,1,0,7,6,5,4);
+ }
*/
}
diff --git a/src/mame/drivers/dai3wksi.c b/src/mame/drivers/dai3wksi.c
index dc859dc5523..d009edefc43 100644
--- a/src/mame/drivers/dai3wksi.c
+++ b/src/mame/drivers/dai3wksi.c
@@ -294,7 +294,7 @@ static WRITE8_HANDLER( dai3wksi_audio_1_w )
static WRITE8_HANDLER( dai3wksi_audio_2_w )
{
-
+
dai3wksi_state *state = space->machine->driver_data<dai3wksi_state>();
device_t *ic77 = space->machine->device("ic77");
device_t *ic78 = space->machine->device("ic78");
@@ -661,4 +661,4 @@ ROM_END
*
*************************************/
-GAME( 1979, dai3wksi, 0, dai3wksi, dai3wksi, 0, ROT270, "Sun Electronics", "Dai San Wakusei Meteor (Japan)", GAME_WRONG_COLORS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE ) \ No newline at end of file
+GAME( 1979, dai3wksi, 0, dai3wksi, dai3wksi, 0, ROT270, "Sun Electronics", "Dai San Wakusei Meteor (Japan)", GAME_WRONG_COLORS | GAME_IMPERFECT_SOUND | GAME_SUPPORTS_SAVE )
diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c
index b525e1414dd..f12b25c32df 100644
--- a/src/mame/drivers/goldnpkr.c
+++ b/src/mame/drivers/goldnpkr.c
@@ -3038,9 +3038,9 @@ ROM_END
Nothing about them, except that they are running
on ICP-1 type boards.
-
+
It's a supossed Jack Potten's Poker upgrade.
-
+
*************************************************************/
ROM_START( ngold )
@@ -3056,7 +3056,7 @@ ROM_START( ngold )
ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */
ROM_LOAD( "2.5a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */
ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */
-
+
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
ROM_END
@@ -3074,7 +3074,7 @@ ROM_START( ngolda )
ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */
ROM_LOAD( "2.5a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */
ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */
-
+
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
ROM_END
@@ -3092,7 +3092,7 @@ ROM_START( ngoldb )
ROM_LOAD( "7.bin", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */
ROM_LOAD( "8.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */
ROM_LOAD( "9.bin", 0x1000, 0x0800, BAD_DUMP CRC(d5471775) SHA1(ce3953ef1a21db055f92a6eeb7a64ea32bb539da) ) /* cards deck gfx, bitplane3. need to be redumped */
-
+
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "n82s129n.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
ROM_END
@@ -4054,7 +4054,7 @@ ROM_END
There are french strings related to the game, so maybe is
a leftover, or maybe there is a unknown way to switch the
language.
-
+
*****************************************************/
@@ -4065,7 +4065,7 @@ ROM_START( silverga )
ROM_REGION( 0x3000, "gfx1", 0 )
ROM_FILL( 0x0000, 0x2000, 0 ) /* filling the R-G bitplanes */
- ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */
+ ROM_LOAD( "13", 0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) ) /* text layer */
ROM_REGION( 0x1800, "gfx2", 0 )
ROM_LOAD( "11", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) ) /* cards deck gfx, bitplane1 */
@@ -4083,7 +4083,7 @@ ROM_END
There are french strings related to the game into
the program ROM.
-
+
The dump lacks of 1 program ROM located at 17a.
(empty socket in the PCB picture)
@@ -4102,7 +4102,7 @@ ROM_START( pokerdub )
ROM_LOAD( "1.4a", 0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) ) /* cards deck gfx, bitplane1 */
ROM_LOAD( "2.6a", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) ) /* cards deck gfx, bitplane2 */
ROM_LOAD( "3.7a", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) ) /* cards deck gfx, bitplane3 */
-
+
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "s287.8c", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
ROM_END
@@ -4115,9 +4115,9 @@ ROM_END
This one is totally encrypted.
The PCB has a daughterboard coated with some plastic
or epoxy resin.
-
- Char ROM is identical to the Witch Card one.
-
+
+ Char ROM is identical to the Witch Card one.
+
*****************************************************/
ROM_START( pokerduc )
@@ -4232,10 +4232,10 @@ static DRIVER_INIT( flcnw )
/***********************************************
ICP1 Daughterboard encryption
-
+
The PCB has a daughterboard coated with some plastic
or epoxy resin.
-
+
pattern:
0000: FF FF FF FF FF FF FF FF | FB FB FB FB FB FB FB FB
diff --git a/src/mame/drivers/igs011.c b/src/mame/drivers/igs011.c
index bc2953090ee..050a8327aab 100644
--- a/src/mame/drivers/igs011.c
+++ b/src/mame/drivers/igs011.c
@@ -89,13 +89,13 @@ Notes:
// ASC trampolines
/*static READ8_DEVICE_HANDLER(igs011_ics2115_r)
{
- return downcast<ics2115_device *>(device)->read(offset);
- //return 0;
+ return downcast<ics2115_device *>(device)->read(offset);
+ //return 0;
}
static WRITE8_DEVICE_HANDLER(igs011_ics2115_w)
{
-// device<ics2115_device>("asc")->write(offset, data);
+// device<ics2115_device>("asc")->write(offset, data);
}*/
static UINT8 *layer[8];
@@ -2340,7 +2340,7 @@ static ADDRESS_MAP_START( vbowl, ADDRESS_SPACE_PROGRAM, 16 )
AM_RANGE( 0x300000, 0x3fffff ) AM_READWRITE( igs011_layers_r, igs011_layers_w )
AM_RANGE( 0x400000, 0x401fff ) AM_RAM_WRITE( igs011_palette ) AM_BASE_GENERIC( paletteram )
AM_RANGE( 0x520000, 0x520001 ) AM_READ_PORT( "COIN" )
-// AM_RANGE( 0x600000, 0x600007 ) AM_DEVREADWRITE( "ics", ics2115_word_r, ics2115_word_w )
+// AM_RANGE( 0x600000, 0x600007 ) AM_DEVREADWRITE( "ics", ics2115_word_r, ics2115_word_w )
AM_RANGE( 0x600000, 0x600007 ) AM_READWRITE( ics2115_word_r, ics2115_word_w )
AM_RANGE( 0x700000, 0x700003 ) AM_RAM AM_BASE( &vbowl_trackball )
AM_RANGE( 0x700004, 0x700005 ) AM_WRITE( vbowl_pen_hi_w )
@@ -3578,7 +3578,7 @@ static void sound_irq(device_t *device, int state)
}
/*static const ics2115_interface vbowl_ics2115_interface = {
- sound_irq
+ sound_irq
};*/
static INTERRUPT_GEN( vbowl_interrupt )
@@ -3602,9 +3602,9 @@ static MACHINE_CONFIG_DERIVED( vbowl, igs011_base )
// MCFG_GFXDECODE(igs011_hi)
MCFG_DEVICE_REMOVE("oki")
-// MCFG_SOUND_ADD("ics", ICS2115, 0)
+// MCFG_SOUND_ADD("ics", ICS2115, 0)
MCFG_ICS2115_ADD("ics", 0, sound_irq)
-// MCFG_SOUND_CONFIG(vbowl_ics2115_interface)
+// MCFG_SOUND_CONFIG(vbowl_ics2115_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index 86eaa58fb03..dbb9d7968c4 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -491,7 +491,7 @@ static void sound_irq( device_t *device, int level )
/*static const ics2115_interface pgm_ics2115_interface =
{
- sound_irq
+ sound_irq
};*/
@@ -1402,8 +1402,8 @@ static MACHINE_CONFIG_START( pgm, pgm_state )
/*sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_ICS2115_ADD("ics", 0, sound_irq)
-// MCFG_SOUND_ADD("ics", ICS2115, 0)
-// MCFG_SOUND_CONFIG(pgm_ics2115_interface)
+// MCFG_SOUND_ADD("ics", ICS2115, 0)
+// MCFG_SOUND_CONFIG(pgm_ics2115_interface)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 5.0)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/relief.c b/src/mame/drivers/relief.c
index 72177b2fcaf..06eff6c31e5 100644
--- a/src/mame/drivers/relief.c
+++ b/src/mame/drivers/relief.c
@@ -392,7 +392,7 @@ ROM_START( relief2 )
ROM_REGION( 0x1000, "eeprom", ROMREGION_ERASEFF )
/* todo */
-// ROM_LOAD( "relief_26apr-eeprom.bin", 0x0000, 0x1000, CRC(6cd70719) SHA1(1bbc52924931b68a546c85f689419200a4b6547b) )
+// ROM_LOAD( "relief_26apr-eeprom.bin", 0x0000, 0x1000, CRC(6cd70719) SHA1(1bbc52924931b68a546c85f689419200a4b6547b) )
ROM_REGION( 0x001000, "plds", 0 )
ROM_LOAD( "gal16v8a-136093-0002.15f", 0x0000, 0x0117, CRC(b111d5f2) SHA1(0fe5b4ca786e839e6927a485109d33fe31c737a2) )
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index 69f0dc5a2bf..1534aacb04a 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -6756,7 +6756,7 @@ GFXDECODE_END
***************************************************************************/
static GFXDECODE_START( usclssic )
- GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) // [0] Sprites
+ GFXDECODE_ENTRY( "gfx1", 0, layout_planes_2roms, 0, 32 ) // [0] Sprites
GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 512+64*32*0, 32 ) // [1] Layer 1
GFXDECODE_ENTRY( "gfx2", 0, layout_packed_6bits_3roms, 512+64*32*1, 32 ) // [2] Layer 1
GFXDECODE_END
diff --git a/src/mame/drivers/spacefb.c b/src/mame/drivers/spacefb.c
index 3ceff37b4c2..4c099081856 100644
--- a/src/mame/drivers/spacefb.c
+++ b/src/mame/drivers/spacefb.c
@@ -11,10 +11,10 @@
Known issues/to-do's:
* Bullet colors are incorrect. The schematics cannot be right, so
I am using pure red for now
-
- "MAME has the bullets and missiles as red, the real pcb shows them as
- yellow with red tinges, they are overal yellow/orange in appearance."
- (Andrew Welburn 24/12/10)
+
+ "MAME has the bullets and missiles as red, the real pcb shows them as
+ yellow with red tinges, they are overal yellow/orange in appearance."
+ (Andrew Welburn 24/12/10)
* Analog sounds
@@ -396,7 +396,7 @@ ROM_START( spacefb )
ROM_END
-// pcb is revision 03 and has roms with suffix 'e'
+// pcb is revision 03 and has roms with suffix 'e'
ROM_START( spacefbe )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "tst-c-e.5e", 0x0000, 0x0800, CRC(77dda05b) SHA1(b8a42632587260509ba023c7e05d252972f90363) ) // only 5e differs to above set, by 2 bytes.
@@ -422,7 +422,7 @@ ROM_START( spacefbe )
ROM_LOAD( "mb7051.3n", 0x0000, 0x0020, CRC(465d07af) SHA1(25e246f7674c25d05e5f6e68db88c15aaa10cee1) )
ROM_END
-// pcb is revision 04 and has roms with suffix 'u'
+// pcb is revision 04 and has roms with suffix 'u'
ROM_START( spacefbu )
ROM_REGION( 0x10000, "maincpu", 0 )
ROM_LOAD( "tst-c-u.5e", 0x0000, 0x0800, CRC(79c3527e) SHA1(5f2d9f3a8b573333e40e78222996f556ed6686ea) )
diff --git a/src/mame/drivers/tumbleb.c b/src/mame/drivers/tumbleb.c
index 3c702e41da3..6696fb30004 100644
--- a/src/mame/drivers/tumbleb.c
+++ b/src/mame/drivers/tumbleb.c
@@ -912,7 +912,7 @@ static WRITE8_HANDLER( prot_io_w )
UINT16 word = state->mainram[(protbase/2) + semicom_prot_offset];
word = (word & 0x00ff) | (data << 8);
state->mainram[(protbase/2) + semicom_prot_offset] = word;
-
+
break;
}
diff --git a/src/mame/machine/seicop.c b/src/mame/machine/seicop.c
index d034fff0b9e..5f28b94a8e9 100644
--- a/src/mame/machine/seicop.c
+++ b/src/mame/machine/seicop.c
@@ -2070,7 +2070,7 @@ static WRITE16_HANDLER( generic_cop_w )
/* another parameter (priority?) */
//case (0x002/2):
- // break;
+ // break;
case (0x00c/2): { cop_sprite_dma_size = cop_mcu_ram[offset]; break; }
case (0x010/2):
@@ -2227,7 +2227,7 @@ static WRITE16_HANDLER( generic_cop_w )
/* search the uploaded 'trigger' table for a matching trigger*/
/* note, I don't know what the 'mask' or 'value' tables are... probably important, might determine what actually gets executed! */
/* note: Zero Team triggers macro 0x904 instead of 0x905, Seibu Cup Soccer triggers 0xe30e instead of 0xe38e. I highly doubt that AT LEAST
- it isn't supposed to do anything, especially in the former case (it definitely NEED that sprites have an ark movement when they are knocked down). */
+ it isn't supposed to do anything, especially in the former case (it definitely NEED that sprites have an ark movement when they are knocked down). */
for (i=0;i<32;i++)
{
if ((cop_mcu_ram[offset] & 0xff00) == (copd2_table_4[i] & 0xff00))
@@ -2268,11 +2268,11 @@ static WRITE16_HANDLER( generic_cop_w )
cop_status &= 0x7fff;
/*
- endianess changes:
- dword no change
- word Add / Subtract two
- byte ?
- */
+ endianess changes:
+ dword no change
+ word Add / Subtract two
+ byte ?
+ */
/* "automatic" movement */
if(COP_CMD(0x188,0x282,0x082,0xb8e,0x98e,0x000,0x000,0x000,6,0xffeb))
@@ -2381,17 +2381,17 @@ static WRITE16_HANDLER( generic_cop_w )
}
/*
- collision detection:
+ collision detection:
- int dy_0 = space->read_dword(cop_register[0]+4);
- int dx_0 = space->read_dword(cop_register[0]+8);
- int dy_1 = space->read_dword(cop_register[1]+4);
- int dx_1 = space->read_dword(cop_register[1]+8);
- int hitbox_param1 = space->read_dword(cop_register[2]);
- int hitbox_param2 = space->read_dword(cop_register[3]);
+ int dy_0 = space->read_dword(cop_register[0]+4);
+ int dx_0 = space->read_dword(cop_register[0]+8);
+ int dy_1 = space->read_dword(cop_register[1]+4);
+ int dx_1 = space->read_dword(cop_register[1]+8);
+ int hitbox_param1 = space->read_dword(cop_register[2]);
+ int hitbox_param2 = space->read_dword(cop_register[3]);
- */
+ */
/* note: these four are bad! */
if(COP_CMD(0xb80,0xb82,0xb84,0xb86,0x000,0x000,0x000,0x000,0,0xffff))
@@ -2451,7 +2451,7 @@ static WRITE16_HANDLER( generic_cop_w )
//printf("4: %08x %08x\n",dx_0,dx_1);
//if((space->read_word(cop_register[3]) & 0xff00) == 0x0600)
-// popmessage("%04x %04x %04x %04x %04x %04x %08x %08x\n",space->read_word(cop_register[0]+4),space->read_word(cop_register[0]+8),space->read_word(cop_register[1]+4),space->read_word(cop_register[1]+8),space->read_word(cop_register[2]),space->read_word(cop_register[3]),cop_register[2],cop_register[3]);
+// popmessage("%04x %04x %04x %04x %04x %04x %08x %08x\n",space->read_word(cop_register[0]+4),space->read_word(cop_register[0]+8),space->read_word(cop_register[1]+4),space->read_word(cop_register[1]+8),space->read_word(cop_register[2]),space->read_word(cop_register[3]),cop_register[2],cop_register[3]);
popmessage("%08x %08x",cop_hit_val_x,cop_hit_val_y);
if(dx >= 0)
@@ -2536,7 +2536,7 @@ static WRITE16_HANDLER( generic_cop_w )
static UINT32 src,dst,size,i;
/*
- Apparently all of those are just different DMA channels, brightness effects are done thru a RAM table and the pal_brightness_val / mode
+ Apparently all of those are just different DMA channels, brightness effects are done thru a RAM table and the pal_brightness_val / mode
0x80 is used by Legionnaire
0x81 is used by SD Gundam and Godzilla
0x82 is used by Zero Team and X Se Dae
@@ -2645,7 +2645,7 @@ static WRITE16_HANDLER( generic_cop_w )
int i;
//if(cop_dma_dst[cop_dma_trigger] != 0x0000) // Invalid?
- // return;
+ // return;
address = (cop_dma_src[cop_dma_trigger] << 6);
length = ((cop_dma_size[cop_dma_trigger]+1) << 4);
diff --git a/src/mame/video/armedf.c b/src/mame/video/armedf.c
index 5e998f11463..a4ceeed668e 100644
--- a/src/mame/video/armedf.c
+++ b/src/mame/video/armedf.c
@@ -46,24 +46,24 @@ static TILE_GET_INFO( get_tx_tile_info )
static TILE_GET_INFO( get_legion_tx_tile_info )
{
armedf_state *state = machine->driver_data<armedf_state>();
-
+
int tile_number = state->text_videoram[tile_index] & 0xff;
-
+
if(tile_index<0x10) tile_number=0x20;
-
+
int attributes;
if (state->scroll_type == 1)
attributes = state->text_videoram[tile_index + 0x800] & 0xff;
else
attributes = state->text_videoram[tile_index + 0x400] & 0xff;
-
-
+
+
tileinfo->category = 0;
if((attributes & 0x3) == 3)
{
- tileinfo->category = 1;
+ tileinfo->category = 1;
}
SET_TILE_INFO(
@@ -291,41 +291,41 @@ static void draw_sprites( running_machine *machine, bitmap_t *bitmap, const rect
static void copy_textmap(running_machine *machine, int index)
{
/*
- (not simulated)
- 1st half of the MCU ROM contains various strings and
- gfx elements (copied by MCU to textram)
-
-
- (partially simulated)
- 2nd half of the MCu external ROM contains text tilemaps:
+ (not simulated)
+ 1st half of the MCU ROM contains various strings and
+ gfx elements (copied by MCU to textram)
- 4 - title screen
- 5 - bottom layer gfx, visible in later levels, during boss fight
- 6 - test mode screen (not hooked up)
- 7 - portraits (title)
- */
+ (partially simulated)
+ 2nd half of the MCu external ROM contains text tilemaps:
+
+ 4 - title screen
+ 5 - bottom layer gfx, visible in later levels, during boss fight
+ 6 - test mode screen (not hooked up)
+ 7 - portraits (title)
+
+ */
armedf_state *state = machine->driver_data<armedf_state>();
UINT8 * data = (UINT8 *)machine->region("gfx5")->base();
-
+
for(int i=0;i<0x400;++i)
{
if(i<0x10) continue;
int tile=data[0x800*index+i];
int bank=data[0x800*index+i+0x400]&3;
-
+
if( (tile|(bank<<8))!=0x20)
{
state->text_videoram[i]=tile;
state->text_videoram[i+0x400]=data[0x800*index+i+0x400];
}
-
+
}
-
+
tilemap_mark_all_tiles_dirty(state->tx_tilemap);
-
+
}
VIDEO_UPDATE( armedf )
@@ -358,7 +358,7 @@ VIDEO_UPDATE( armedf )
//logerror("MCU Change => %04x\n", state->mcu_mode);
}
}
-
+
switch (state->scroll_type)
{
case 0: /* terra force */
@@ -398,7 +398,7 @@ VIDEO_UPDATE( armedf )
bitmap_fill(bitmap, cliprect , 0xff);
-
+
if(state->scroll_type == 3 || state->scroll_type == 6) /* legion / legiono */
{
tilemap_draw(bitmap, cliprect, state->tx_tilemap, 1, 0);
@@ -440,13 +440,13 @@ VIDEO_UPDATE( armedf )
if (sprite_enable)
draw_sprites(screen->machine, bitmap, cliprect, 0);
-
+
if(state->scroll_type == 3) /* legion */
{
- static int oldmode=-1;
-
+ static int oldmode=-1;
+
int mode=state->text_videoram[1]&0xff;
-
+
if (mode != oldmode)
{
oldmode=mode;
@@ -458,9 +458,9 @@ VIDEO_UPDATE( armedf )
default: logerror("unknown mode %d\n", mode); break;
}
}
-
+
}
-
+
return 0;
}
diff --git a/src/mame/video/n64.c b/src/mame/video/n64.c
index ba6c3be03ac..748bfddf3f3 100644
--- a/src/mame/video/n64.c
+++ b/src/mame/video/n64.c
@@ -339,7 +339,7 @@ void Processor::TCDiv(INT32 ss, INT32 st, INT32 sw, INT32* sss, INT32* sst)
int outofbounds_t = tprod & tempmask;
if (shift == 0xe)//tc.c, 664
{
- *sss = sprod << 1;//sw, tw здесь не изменились
+ *sss = sprod << 1;//sw, tw ????? ?? ??????????
*sst = tprod << 1;
}
else
@@ -861,12 +861,12 @@ void Processor::lookup_cvmask_derivatives(UINT32 mask, UINT8* offx, UINT8* offy)
{
UINT32 index;
/*
- if (mask != (mask & 0xa5a5))//never happens
- stricterror("wrong cvmask computed: %x", mask);
- */
- index = compressed_cvmasks[mask];//согласно VTune, где-то на 50% быстрее, чем сжатие до 8 бит на месте в этой ф-ии
+ if (mask != (mask & 0xa5a5))//never happens
+ stricterror("wrong cvmask computed: %x", mask);
+ */
+ index = compressed_cvmasks[mask];//???????? VTune, ???-?? ?? 50% ???????, ??? ?????? ?? 8 ??? ?? ????? ? ???? ?-??
m_misc_state.m_curpixel_cvg = cvarray[index].cvg;
- m_misc_state.m_curpixel_cvbit = cvarray[index].cvbit;//бит mask15b: cv.c, bl.c
+ m_misc_state.m_curpixel_cvbit = cvarray[index].cvbit;//??? mask15b: cv.c, bl.c
*offx = cvarray[index].xoff;
*offy = cvarray[index].yoff;
}
@@ -2335,7 +2335,7 @@ void N64::RDP::Processor::CmdTexRect(UINT32 w1, UINT32 w2)
UINT32* ewdata = GetTempRectData();
ewdata[0] = (0x24 << 24) | ((0x80 | tilenum) << 16) | yl; // command, flipped, tile, yl
- ewdata[1] = (yl << 16) | yh; // ym, yh
+ ewdata[1] = (yl << 16) | yh; // ym, yh
ewdata[2] = (xlint << 16) | ((xl & 3) << 14); // xl, xl frac
ewdata[3] = 0; // dxldy, dxldy frac
ewdata[4] = (xhint << 16) | ((xh & 3) << 14); // xh, xh frac
@@ -2808,7 +2808,7 @@ void N64::RDP::Processor::CmdLoadTile(UINT32 w1, UINT32 w2)
int tline = tb + ((tile[tilenum].line << 3) * j);
int s = ((j + tl) * m_misc_state.m_ti_width) + sl;
- int xorval8 = ((j & 1) ? BYTE_XOR_DWORD_SWAP : BYTE_ADDR_XOR);//попроще,чем у Ziggy
+ int xorval8 = ((j & 1) ? BYTE_XOR_DWORD_SWAP : BYTE_ADDR_XOR);//???????,??? ? Ziggy
for (int i = 0; i < width; i++)
{
tc[((tline + i) ^ xorval8) & 0xfff] = RREADADDR8(src + s + i);
diff --git a/src/mame/video/n64.h b/src/mame/video/n64.h
index 214e2730582..96a3069b321 100644
--- a/src/mame/video/n64.h
+++ b/src/mame/video/n64.h
@@ -623,7 +623,7 @@ class Processor
UINT32* GetCommandData() { return m_cmd_data; }
UINT32* GetTempRectData() { return m_temp_rect_data; }
- void GetDitherValues(int x, int y, int* cdith, int* adith);
+ void GetDitherValues(int x, int y, int* cdith, int* adith);
int m_span_dr;
diff --git a/src/mame/video/rdptpipe.c b/src/mame/video/rdptpipe.c
index b0c25e83041..1d3fd16e5c9 100644
--- a/src/mame/video/rdptpipe.c
+++ b/src/mame/video/rdptpipe.c
@@ -127,7 +127,7 @@ void TexturePipe::ShiftCopy(INT32* S, INT32* T, UINT32 num)
Tile* tile = m_rdp->GetTiles();
*S = SIGN16(*S);
*T = SIGN16(*T);
- if (tile[num].shift_s < 11)//ф-я tcu_tile
+ if (tile[num].shift_s < 11)//?-? tcu_tile
{
*S >>= tile[num].shift_s;
}
@@ -922,7 +922,7 @@ UINT32 TexturePipe::Fetch(INT32 s, INT32 t, INT32 tilenum)
switch(tsize)
{
case PIXEL_SIZE_16BIT:
- {
+ {
UINT16 *tc = m_rdp->GetTMEM16();
int taddr = (tbase << 3) + s;
diff --git a/src/mame/video/seta.c b/src/mame/video/seta.c
index 193e2a4054a..b67bbf02124 100644
--- a/src/mame/video/seta.c
+++ b/src/mame/video/seta.c
@@ -353,7 +353,7 @@ Offset + 0x0: Scroll X
Offset + 0x2: Scroll Y
Offset + 0x4:
fedc ba98 7654 3210 -
- ---- ---- ---4 ---- Tilemap color mode switch (used in blandia and the other games using 6bpp graphics)
+ ---- ---- ---4 ---- Tilemap color mode switch (used in blandia and the other games using 6bpp graphics)
---- ---- ---- 3--- Tilemap Select (There Are 2 Tilemaps Per Layer)
---- ---- ---- -21- 0 (1 only in eightfrc, when flip is on!)
---- ---- ---- ---0 ?
@@ -383,7 +383,7 @@ INLINE void get_tile_info( running_machine *machine, tile_data *tileinfo, int ti
UINT16 *vctrl = (layer == 0) ? state->vctrl_0 : state->vctrl_2;
UINT16 code = vram[ tile_index ];
UINT16 attr = vram[ tile_index + 0x800 ];
-
+
if(machine->gfx[gfx + ((vctrl[ 4/2 ] & 0x10) >> state->color_mode_shift)] != NULL)
{
gfx += (vctrl[ 4/2 ] & 0x10) >> state->color_mode_shift;
@@ -493,7 +493,7 @@ VIDEO_START( seta_1_layer )
16,16, 64,32 );
state->color_mode_shift = 4;
-
+
tilemap_set_transparent_pen(state->tilemap_0, 0);
tilemap_set_transparent_pen(state->tilemap_1, 0);
}
@@ -555,7 +555,7 @@ VIDEO_START( oisipuzl_2_layers )
***************************************************************************/
-/* 2 layers, 6 bit deep.
+/* 2 layers, 6 bit deep.
The game can select to repeat every 16 colors to fill the 64 colors for the 6bpp gfx
or to use the first 64 colors of the palette regardless of the color code!
@@ -569,7 +569,7 @@ PALETTE_INIT( blandia )
for (color = 0; color < 0x20; color++)
for (pen = 0; pen < 0x40; pen++)
- {
+ {
// layer 2-3
colortable_entry_set_value(machine->colortable, 0x0200 + ((color << 6) | pen), 0x200 + ((color << 4) | (pen & 0x0f)));
colortable_entry_set_value(machine->colortable, 0x1200 + ((color << 6) | pen), 0x200 + pen);
@@ -596,7 +596,7 @@ PALETTE_INIT( gundhara )
{
colortable_entry_set_value(machine->colortable, 0x0200 + ((color << 6) | pen), 0x400 + pen); // untested
colortable_entry_set_value(machine->colortable, 0x1200 + ((color << 6) | pen), 0x400 + ((((color & ~3) << 4) + pen) & 0x1ff));
-
+
colortable_entry_set_value(machine->colortable, 0x0a00 + ((color << 6) | pen), 0x200 + pen); // untested
colortable_entry_set_value(machine->colortable, 0x1a00 + ((color << 6) | pen), 0x200 + ((((color & ~3) << 4) + pen) & 0x1ff));
}
@@ -617,7 +617,7 @@ PALETTE_INIT( jjsquawk )
{
colortable_entry_set_value(machine->colortable, 0x0200 + ((color << 6) | pen), 0x400 + pen); // untested
colortable_entry_set_value(machine->colortable, 0x1200 + ((color << 6) | pen), 0x400 + ((((color & ~3) << 4) + pen) & 0x1ff));
-
+
colortable_entry_set_value(machine->colortable, 0x0a00 + ((color << 6) | pen), 0x200 + pen); // untested
colortable_entry_set_value(machine->colortable, 0x1a00 + ((color << 6) | pen), 0x200 + ((((color & ~3) << 4) + pen) & 0x1ff));
}
@@ -935,8 +935,8 @@ static VIDEO_UPDATE( seta_layers )
const rectangle &visarea = screen->visible_area();
int vis_dimy = visarea.max_y - visarea.min_y + 1;
-
-
+
+
// check tilemaps color modes
if(state->current_tilemap_mode[0] != (state->vctrl_0[ 4/2 ] & 0x10))
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index 8dcc3743008..314fdcd430b 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -10,7 +10,7 @@
// set this to 0 if compiling against a "hg update 4464"
// checkout of SDL 1.3
-#define SDL13_POST_HG4464 (1)
+#define SDL13_POST_HG4464 (1)
//============================================================
// System dependent defines
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index ae32d96cc5a..f227e61f630 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -353,9 +353,9 @@ LIBS += -lm `sdl-config --libs`
else
# The commented out statements document what sdl-config returns when build from svn.
# sdl-config --libs on ubuntu returns "-L/usr/lib -lSDL" which is not what we really
-# want in a multi-version SDL environment. Should the svn sdl-config at some point
+# want in a multi-version SDL environment. Should the svn sdl-config at some point
# return the same output, we need the commented out section again.
-
+
#INCPATH += -I$(SDL_INSTALL_ROOT)/include
#CCOMFLAGS += -D_GNU_SOURCE=1
#LIBS += -lm -L$(SDL_INSTALL_ROOT)/lib -Wl,-rpath,$(SDL_INSTALL_ROOT)/lib -lSDL
diff --git a/src/version.c b/src/version.c
index 5b4e366480b..011e9e3407b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -10,4 +10,4 @@
***************************************************************************/
extern const char build_version[];
-const char build_version[] = "0.140u3 ("__DATE__")";
+const char build_version[] = "0.141 ("__DATE__")";