diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-06-25 08:21:41 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-06-25 08:21:41 +0000 |
commit | c8e552b3dfd8ee2a928be922b760dc55281a120b (patch) | |
tree | 80d6726da38d84fb7217b3e53ec31ddcc91f057c | |
parent | e692918b34b127e3be7ef00fd470c90ff8adb3ca (diff) |
Cleanups and version bump.mame0132u2
-rw-r--r-- | src/emu/cpu/mc68hc11/hc11ops.c | 48 | ||||
-rw-r--r-- | src/emu/cpu/mc68hc11/hc11ops.h | 90 | ||||
-rw-r--r-- | src/mame/drivers/cubocd32.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/hitpoker.c | 10 | ||||
-rw-r--r-- | src/mame/drivers/kaneko16.c | 130 | ||||
-rw-r--r-- | src/mame/drivers/mlanding.c | 14 | ||||
-rw-r--r-- | src/mame/drivers/pachifev.c | 2 | ||||
-rw-r--r-- | src/mame/includes/amiga.h | 2 | ||||
-rw-r--r-- | src/mame/machine/kaneko16.c | 46 | ||||
-rw-r--r-- | src/mame/machine/konamigx.c | 4 | ||||
-rw-r--r-- | src/mame/video/amigaaga.c | 8 | ||||
-rw-r--r-- | src/mame/video/kaneko16.c | 2 | ||||
-rw-r--r-- | src/mame/video/liberate.c | 2 | ||||
-rw-r--r-- | src/mame/video/psikyosh.c | 2 | ||||
-rw-r--r-- | src/mame/video/stvvdp2.c | 2 | ||||
-rw-r--r-- | src/mame/video/taito_f3.c | 2 | ||||
-rw-r--r-- | src/mame/video/tatsumi.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
18 files changed, 185 insertions, 185 deletions
diff --git a/src/emu/cpu/mc68hc11/hc11ops.c b/src/emu/cpu/mc68hc11/hc11ops.c index c484034ff56..56ee70af433 100644 --- a/src/emu/cpu/mc68hc11/hc11ops.c +++ b/src/emu/cpu/mc68hc11/hc11ops.c @@ -1250,7 +1250,7 @@ static void HC11OP(cmpb_indy)(hc11_state *cpustate) } -/* COMA , 0x43 */ +/* COMA , 0x43 */ static void HC11OP(coma)(hc11_state *cpustate) { UINT16 r = 0xff - REG_A; @@ -1263,7 +1263,7 @@ static void HC11OP(coma)(hc11_state *cpustate) } -/* COMB , 0x53 */ +/* COMB , 0x53 */ static void HC11OP(comb)(hc11_state *cpustate) { UINT16 r = 0xff - REG_B; @@ -2656,7 +2656,7 @@ static void HC11OP(sba)(hc11_state *cpustate) { UINT16 r = REG_A - REG_B; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, REG_B, REG_A); @@ -2673,7 +2673,7 @@ static void HC11OP(sbca_imm)(hc11_state *cpustate) UINT8 i = FETCH(cpustate); UINT16 r = (REG_A - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_A); +// SET_H(r, i-c, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_A); @@ -2690,7 +2690,7 @@ static void HC11OP(sbca_indx)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->ix + offset); UINT16 r = (REG_A - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_A); +// SET_H(r, i-c, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_A); @@ -2707,7 +2707,7 @@ static void HC11OP(sbca_indy)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->iy + offset); UINT16 r = (REG_A - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_A); +// SET_H(r, i-c, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_A); @@ -2723,7 +2723,7 @@ static void HC11OP(sbcb_imm)(hc11_state *cpustate) UINT8 i = FETCH(cpustate); UINT16 r = (REG_B - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_B); +// SET_H(r, i-c, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_B); @@ -2740,7 +2740,7 @@ static void HC11OP(sbcb_indx)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->ix + offset); UINT16 r = (REG_B - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_B); +// SET_H(r, i-c, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_B); @@ -2757,7 +2757,7 @@ static void HC11OP(sbcb_indy)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->iy + offset); UINT16 r = (REG_B - i) - c; CLEAR_NZVC(cpustate); -// SET_H(r, i-c, REG_B); +// SET_H(r, i-c, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i-c, REG_B); @@ -3030,7 +3030,7 @@ static void HC11OP(suba_imm)(hc11_state *cpustate) UINT8 i = FETCH(cpustate); UINT16 r = REG_A - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_A); @@ -3047,7 +3047,7 @@ static void HC11OP(suba_dir)(hc11_state *cpustate) UINT8 i = READ8(cpustate, d); UINT16 r = REG_A - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_A); @@ -3064,7 +3064,7 @@ static void HC11OP(suba_ext)(hc11_state *cpustate) UINT8 i = READ8(cpustate, adr); UINT16 r = REG_A - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_A); @@ -3081,7 +3081,7 @@ static void HC11OP(suba_indx)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->ix + adr); UINT16 r = REG_A - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_A); @@ -3098,7 +3098,7 @@ static void HC11OP(suba_indy)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->iy + adr); UINT16 r = REG_A - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_A); +// SET_H(r, i, REG_A); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_A); @@ -3114,7 +3114,7 @@ static void HC11OP(subb_imm)(hc11_state *cpustate) UINT8 i = FETCH(cpustate); UINT16 r = REG_B - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_B); +// SET_H(r, i, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_B); @@ -3131,7 +3131,7 @@ static void HC11OP(subb_dir)(hc11_state *cpustate) UINT8 i = READ8(cpustate, d); UINT16 r = REG_B - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_B); +// SET_H(r, i, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_B); @@ -3148,7 +3148,7 @@ static void HC11OP(subb_ext)(hc11_state *cpustate) UINT8 i = READ8(cpustate, adr); UINT16 r = REG_B - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_B); +// SET_H(r, i, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_B); @@ -3165,7 +3165,7 @@ static void HC11OP(subb_indx)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->ix + adr); UINT16 r = REG_B - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_B); +// SET_H(r, i, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_B); @@ -3181,7 +3181,7 @@ static void HC11OP(subb_indy)(hc11_state *cpustate) UINT8 i = READ8(cpustate, cpustate->iy + adr); UINT16 r = REG_B - i; CLEAR_NZVC(cpustate); -// SET_H(r, i, REG_B); +// SET_H(r, i, REG_B); SET_N8(r); SET_Z8(r); SET_V_SUB8(r, i, REG_B); @@ -3282,12 +3282,12 @@ static void HC11OP(tba)(hc11_state *cpustate) /* TEST 0x00 */ static void HC11OP(test)(hc11_state *cpustate) { -// if(cpustate->test_mode) +// if(cpustate->test_mode) SET_PC(cpustate, cpustate->ppc); // Note: docs says "incremented" but the behaviour makes me think that's actually "decremented". -// else -// { -// TODO: execute an illegal opcode exception here (NMI) -// } +// else +// { +// TODO: execute an illegal opcode exception here (NMI) +// } CYCLES(cpustate, 1); } diff --git a/src/emu/cpu/mc68hc11/hc11ops.h b/src/emu/cpu/mc68hc11/hc11ops.h index 68acf514b4b..e6a94d00de1 100644 --- a/src/emu/cpu/mc68hc11/hc11ops.h +++ b/src/emu/cpu/mc68hc11/hc11ops.h @@ -49,22 +49,22 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0x18, 0xe4, HC11OP(andb_indy) }, { 0, 0x48, HC11OP(asla) }, { 0, 0x58, HC11OP(aslb) }, -// { 0, 0x78, HC11OP(asl_ext) }, -// { 0, 0x68, HC11OP(asl_indx) }, -// { 0x18, 0x68, HC11OP(asl_indy) }, -// { 0, 0x47, HC11OP(asra) }, -// { 0, 0x57, HC11OP(asrb) }, -// { 0, 0x77, HC11OP(asr_ext) }, -// { 0, 0x67, HC11OP(asr_indx) }, -// { 0x18, 0x67, HC11OP(asr_indy) }, +// { 0, 0x78, HC11OP(asl_ext) }, +// { 0, 0x68, HC11OP(asl_indx) }, +// { 0x18, 0x68, HC11OP(asl_indy) }, +// { 0, 0x47, HC11OP(asra) }, +// { 0, 0x57, HC11OP(asrb) }, +// { 0, 0x77, HC11OP(asr_ext) }, +// { 0, 0x67, HC11OP(asr_indx) }, +// { 0x18, 0x67, HC11OP(asr_indy) }, { 0, 0x24, HC11OP(bcc) }, -// { 0, 0x15, HC11OP(bclr_dir) }, +// { 0, 0x15, HC11OP(bclr_dir) }, { 0, 0x1d, HC11OP(bclr_indx) }, -// { 0x18, 0x1d, HC11OP(bclr_indy) }, +// { 0x18, 0x1d, HC11OP(bclr_indy) }, { 0, 0x25, HC11OP(bcs) }, { 0, 0x27, HC11OP(beq) }, -// { 0, 0x2c, HC11OP(bge) }, -// { 0, 0x2e, HC11OP(bgt) }, +// { 0, 0x2c, HC11OP(bge) }, +// { 0, 0x2e, HC11OP(bgt) }, { 0, 0x22, HC11OP(bhi) }, { 0, 0x85, HC11OP(bita_imm) }, { 0, 0x95, HC11OP(bita_dir) }, @@ -78,21 +78,21 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0x18, 0xe5, HC11OP(bitb_indy) }, { 0, 0x2f, HC11OP(ble) }, { 0, 0x23, HC11OP(bls) }, -// { 0, 0x2d, HC11OP(blt) }, +// { 0, 0x2d, HC11OP(blt) }, { 0, 0x2b, HC11OP(bmi) }, { 0, 0x26, HC11OP(bne) }, { 0, 0x2a, HC11OP(bpl) }, { 0, 0x20, HC11OP(bra) }, { 0, 0x13, HC11OP(brclr_dir) }, { 0, 0x1f, HC11OP(brclr_indx) }, -// { 0x18, 0x1f, HC11OP(brclr_indy) }, +// { 0x18, 0x1f, HC11OP(brclr_indy) }, { 0, 0x21, HC11OP(brn) }, { 0, 0x12, HC11OP(brset_dir) }, { 0, 0x1e, HC11OP(brset_indx) }, -// { 0x18, 0x1e, HC11OP(brset_indy) }, -// { 0, 0x14, HC11OP(bset_dir) }, +// { 0x18, 0x1e, HC11OP(brset_indy) }, +// { 0, 0x14, HC11OP(bset_dir) }, { 0, 0x1c, HC11OP(bset_indx) }, -// { 0x18, 0x1c, HC11OP(bset_indy) }, +// { 0x18, 0x1c, HC11OP(bset_indy) }, { 0, 0x8d, HC11OP(bsr) }, { 0, 0x28, HC11OP(bvc) }, { 0, 0x29, HC11OP(bvs) }, @@ -117,9 +117,9 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0x18, 0xe1, HC11OP(cmpb_indy) }, { 0, 0x43, HC11OP(coma) }, { 0, 0x53, HC11OP(comb) }, -// { 0, 0x73, HC11OP(com_ext) }, -// { 0, 0x63, HC11OP(com_indx) }, -// { 0x18, 0x63, HC11OP(com_indy) }, +// { 0, 0x73, HC11OP(com_ext) }, +// { 0, 0x63, HC11OP(com_indx) }, +// { 0x18, 0x63, HC11OP(com_indy) }, { 0x1a, 0x83, HC11OP(cpd_imm) }, { 0x1a, 0x93, HC11OP(cpd_dir) }, { 0x1a, 0xb3, HC11OP(cpd_ext) }, @@ -135,13 +135,13 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0x18, 0xbc, HC11OP(cpy_ext) }, { 0x1a, 0xac, HC11OP(cpy_indx) }, { 0x18, 0xac, HC11OP(cpy_indy) }, -// { 0, 0x19, HC11OP(daa) }, +// { 0, 0x19, HC11OP(daa) }, { 0, 0x4a, HC11OP(deca) }, { 0, 0x5a, HC11OP(decb) }, { 0, 0x7a, HC11OP(dec_ext) }, { 0, 0x6a, HC11OP(dec_indx) }, { 0x18, 0x6a, HC11OP(dec_indy) }, -// { 0, 0x34, HC11OP(des) }, +// { 0, 0x34, HC11OP(des) }, { 0, 0x09, HC11OP(dex) }, { 0x18, 0x09, HC11OP(dey) }, { 0, 0x88, HC11OP(eora_imm) }, @@ -154,14 +154,14 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0, 0xf8, HC11OP(eorb_ext) }, { 0, 0xe8, HC11OP(eorb_indx) }, { 0x18, 0xe8, HC11OP(eorb_indy) }, -// { 0, 0x03, HC11OP(fdiv) }, +// { 0, 0x03, HC11OP(fdiv) }, { 0, 0x02, HC11OP(idiv) }, { 0, 0x4c, HC11OP(inca) }, { 0, 0x5c, HC11OP(incb) }, { 0, 0x7c, HC11OP(inc_ext) }, { 0, 0x6c, HC11OP(inc_indx) }, { 0x18, 0x6c, HC11OP(inc_indy) }, -// { 0, 0x31, HC11OP(ins) }, +// { 0, 0x31, HC11OP(ins) }, { 0, 0x08, HC11OP(inx) }, { 0x18, 0x08, HC11OP(iny) }, { 0, 0x7e, HC11OP(jmp_ext) }, @@ -204,9 +204,9 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0, 0x05, HC11OP(lsld) }, { 0, 0x44, HC11OP(lsra) }, { 0, 0x54, HC11OP(lsrb) }, -// { 0, 0x74, HC11OP(lsr_ext) }, -// { 0, 0x64, HC11OP(lsr_indx) }, -// { 0x18, 0x64, HC11OP(lsr_indy) }, +// { 0, 0x74, HC11OP(lsr_ext) }, +// { 0, 0x64, HC11OP(lsr_indx) }, +// { 0x18, 0x64, HC11OP(lsr_indy) }, { 0, 0x04, HC11OP(lsrd) }, { 0, 0x3d, HC11OP(mul) }, { 0, 0x40, HC11OP(nega) }, @@ -235,25 +235,25 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0x18, 0x38, HC11OP(puly) }, { 0, 0x49, HC11OP(rola) }, { 0, 0x59, HC11OP(rolb) }, -// { 0, 0x79, HC11OP(rol_ext) }, -// { 0, 0x69, HC11OP(rol_indx) }, -// { 0x18, 0x69, HC11OP(rol_indy) }, +// { 0, 0x79, HC11OP(rol_ext) }, +// { 0, 0x69, HC11OP(rol_indx) }, +// { 0x18, 0x69, HC11OP(rol_indy) }, { 0, 0x46, HC11OP(rora) }, { 0, 0x56, HC11OP(rorb) }, -// { 0, 0x76, HC11OP(ror_ext) }, -// { 0, 0x66, HC11OP(ror_indx) }, -// { 0x18, 0x66, HC11OP(ror_indy) }, +// { 0, 0x76, HC11OP(ror_ext) }, +// { 0, 0x66, HC11OP(ror_indx) }, +// { 0x18, 0x66, HC11OP(ror_indy) }, { 0, 0x3b, HC11OP(rti) }, { 0, 0x39, HC11OP(rts) }, { 0, 0x10, HC11OP(sba) }, { 0, 0x82, HC11OP(sbca_imm) }, -// { 0, 0x92, HC11OP(sbca_dir) }, -// { 0, 0xb2, HC11OP(sbca_ext) }, +// { 0, 0x92, HC11OP(sbca_dir) }, +// { 0, 0xb2, HC11OP(sbca_ext) }, { 0, 0xa2, HC11OP(sbca_indx) }, { 0x18, 0xa2, HC11OP(sbca_indy) }, { 0, 0xc2, HC11OP(sbcb_imm) }, -// { 0, 0xd2, HC11OP(sbcb_dir) }, -// { 0, 0xf2, HC11OP(sbcb_ext) }, +// { 0, 0xd2, HC11OP(sbcb_dir) }, +// { 0, 0xf2, HC11OP(sbcb_ext) }, { 0, 0xe2, HC11OP(sbcb_indx) }, { 0x18, 0xe2, HC11OP(sbcb_indy) }, { 0, 0x0d, HC11OP(sec) }, @@ -271,15 +271,15 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0, 0xfd, HC11OP(std_ext) }, { 0, 0xed, HC11OP(std_indx) }, { 0x18, 0xed, HC11OP(std_indy) }, -// { 0, 0x9f, HC11OP(sts_dir) }, -// { 0, 0xbf, HC11OP(sts_ext) }, -// { 0, 0xaf, HC11OP(sts_indx) }, -// { 0x18, 0xaf, HC11OP(sts_indy) }, -// { 0, 0xdf, HC11OP(stx_dir) }, +// { 0, 0x9f, HC11OP(sts_dir) }, +// { 0, 0xbf, HC11OP(sts_ext) }, +// { 0, 0xaf, HC11OP(sts_indx) }, +// { 0x18, 0xaf, HC11OP(sts_indy) }, +// { 0, 0xdf, HC11OP(stx_dir) }, { 0, 0xff, HC11OP(stx_ext) }, { 0, 0xef, HC11OP(stx_indx) }, { 0xcd, 0xef, HC11OP(stx_indy) }, -// { 0x18, 0xdf, HC11OP(sty_dir) }, +// { 0x18, 0xdf, HC11OP(sty_dir) }, { 0x18, 0xff, HC11OP(sty_ext) }, { 0x1a, 0xef, HC11OP(sty_indx) }, { 0x18, 0xef, HC11OP(sty_indy) }, @@ -295,8 +295,8 @@ static const hc11_opcode_list_struct hc11_opcode_list[] = { 0, 0xe0, HC11OP(subb_indx) }, { 0x18, 0xe0, HC11OP(subb_indy) }, { 0, 0x83, HC11OP(subd_imm) }, -// { 0, 0x93, HC11OP(subd_dir) }, -// { 0, 0xb3, HC11OP(subd_ext) }, +// { 0, 0x93, HC11OP(subd_dir) }, +// { 0, 0xb3, HC11OP(subd_ext) }, { 0, 0xa3, HC11OP(subd_indx) }, { 0x18, 0xa3, HC11OP(subd_indy) }, { 0, 0x3f, HC11OP(swi) }, diff --git a/src/mame/drivers/cubocd32.c b/src/mame/drivers/cubocd32.c index cd3aa8f9486..2219940ed72 100644 --- a/src/mame/drivers/cubocd32.c +++ b/src/mame/drivers/cubocd32.c @@ -130,7 +130,7 @@ routines : - 04d1da : coin verification - Candy Puzzle + Candy Puzzle settings (A5=0x059ac0) : diff --git a/src/mame/drivers/hitpoker.c b/src/mame/drivers/hitpoker.c index 315a36eddbc..47390869f34 100644 --- a/src/mame/drivers/hitpoker.c +++ b/src/mame/drivers/hitpoker.c @@ -97,9 +97,9 @@ static READ8_HANDLER( hitpoker_vram_r ) static WRITE8_HANDLER( hitpoker_vram_w ) { -// UINT8 *ROM = memory_region(space->machine, "maincpu"); +// UINT8 *ROM = memory_region(space->machine, "maincpu"); -// if(hitpoker_sys_regs[0x00] & 0x10) +// if(hitpoker_sys_regs[0x00] & 0x10) videoram[offset] = data; } @@ -181,7 +181,7 @@ static READ8_HANDLER( eeprom_r ) static READ8_HANDLER( hitpoker_pic_r ) { -// logerror("R\n"); +// logerror("R\n"); if(offset == 0) { @@ -201,7 +201,7 @@ static WRITE8_HANDLER( hitpoker_pic_w ) { if(offset == 0) hitpoker_pic_data = (data & 0xff);// | (data & 0x40) ? 0x80 : 0x00; -// logerror("%02x W\n",data); +// logerror("%02x W\n",data); hitpoker_sys_regs[offset] = data; } @@ -228,7 +228,7 @@ static ADDRESS_MAP_START( hitpoker_map, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0xbe81, 0xbe81) AM_DEVWRITE("crtc", mc6845_register_w) AM_RANGE(0xbe90, 0xbe91) AM_DEVREADWRITE("ay", ay8910_r,ay8910_address_data_w) AM_RANGE(0xbea0, 0xbea0) AM_READ_PORT("VBLANK") //probably other bits as well -// AM_RANGE(0xbe00, 0xbeff) AM_READ(test_r) +// AM_RANGE(0xbe00, 0xbeff) AM_READ(test_r) AM_RANGE(0xc000, 0xdfff) AM_READWRITE(hitpoker_cram_r,hitpoker_cram_w) AM_RANGE(0xe000, 0xefff) AM_READWRITE(hitpoker_paletteram_r,hitpoker_paletteram_w) AM_RANGE(0x0000, 0xbdff) AM_ROM diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index bacbf246706..615d7d25de0 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1979,7 +1979,7 @@ static INTERRUPT_GEN( shogwarr_interrupt ) { case 2: cpu_set_input_line(device, 2, HOLD_LINE); break; case 1: cpu_set_input_line(device, 3, HOLD_LINE); break; - + // the code for this interupt is provided by the MCU.. //case 0: cpu_set_input_line(device, 4, HOLD_LINE); break; case 0: @@ -1989,7 +1989,7 @@ static INTERRUPT_GEN( shogwarr_interrupt ) { kaneko16_mainram[0x2dfe/2]=0x0000; } - + } } } @@ -3631,8 +3631,8 @@ followed by several tables in the following format OFFSET 0 - the location of a word which specifies the size of the block - this is usually '3', but if it's larger than 3 it enables an 'inline encryption' mode, whereby the decryption table is stored in the - - right before the length register - + - right before the length register + OFFSET 1 - a 'mode' register of some sort, usually 0,1,2 or 3 for used data, shogun also called a 'blank' command (length 0) with mode 8 OFFSET 2 - unknown, might be some kind of 'step' register @@ -3645,7 +3645,7 @@ OFFSET 4-5 (or after the inline decryption table) - the length of the current bl OFFSET 6-size - data for thie block -this continues for the number of blocks specified +this continues for the number of blocks specified after all the blocks there is a 0x1000 block of data which is the same between games where games specify the same decryption key the table used is the same, I don't know where these tables come from. @@ -3671,7 +3671,7 @@ static UINT8 calc3_table01[64] = { 0x20,0x1c,0x1f,0xc1,0x25,0x2e,0x49,0xe7,0x90,0x1b,0xb4,0xcf,0x1e,0x61,0xd7,0x46, 0xda,0x89,0x08,0x77,0xb1,0x81,0x6b,0x2d,0xb6,0xbc,0x99,0xc9,0x35,0x0a,0x0f,0x01 }; - + /* ok */ static UINT8 calc3_table15[64] = { 0x0C,0xEB,0x30,0x25,0xA8,0xED,0xE3,0x23,0xAC,0x2B,0x8D,0x34,0x88,0x9F,0x55,0xB5, @@ -3681,37 +3681,37 @@ static UINT8 calc3_table15[64] = { }; /* partial guessed tables -unsigned char table31[64] = { - // x x x ok x x x ok x x x ok x x x ok - 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x3b, - 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xb1, 0x00, 0x00, 0x00, 0xdc, - 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0xde, - 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xb1 +unsigned char table31[64] = { + // x x x ok x x x ok x x x ok x x x ok + 0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0xaf, 0x00, 0x00, 0x00, 0x3a, 0x00, 0x00, 0x00, 0x3b, + 0x00, 0x00, 0x00, 0xbb, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0xb1, 0x00, 0x00, 0x00, 0xdc, + 0x00, 0x00, 0x00, 0xb5, 0x00, 0x00, 0x00, 0x3d, 0x00, 0x00, 0x00, 0x4f, 0x00, 0x00, 0x00, 0xde, + 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x26, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0xb1 }; - -unsigned char tableb0[64] = { - // x x x ok x x x ok x x x ok x x x ok - 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x81, - 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x32, - 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x5b + +unsigned char tableb0[64] = { + // x x x ok x x x ok x x x ok x x x ok + 0x00, 0x00, 0x00, 0x5e, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00, 0x00, 0x68, 0x00, 0x00, 0x00, 0x81, + 0x00, 0x00, 0x00, 0x85, 0x00, 0x00, 0x00, 0x6d, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x32, + 0x00, 0x00, 0x00, 0x76, 0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0x2a, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xb2, 0x00, 0x00, 0x00, 0xe4, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x5b }; -unsigned char tableb7[64] = { - // x x x ok x x x ok x x x ok x x x ok - 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xd7, - 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x82, - 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x26, - 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x33 +unsigned char tableb7[64] = { + // x x x ok x x x ok x x x ok x x x ok + 0x00, 0x00, 0x00, 0x33, 0x00, 0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0xd7, + 0x00, 0x00, 0x00, 0xe7, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, 0x2b, 0x00, 0x00, 0x00, 0x82, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x26, + 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x9d, 0x00, 0x00, 0x00, 0x33 }; -unsigned char tablebb[64] = { - // x x x ok x x x ok x x x ok x x x ok - 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x3d, - 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x69, - 0x00, 0x00, 0x00, 0xeb, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00, 0x97, 0x00, 0x00, 0x00, 0x9e, - 0x00, 0x00, 0x00, 0xe1, 0x00, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x4d +unsigned char tablebb[64] = { + // x x x ok x x x ok x x x ok x x x ok + 0x00, 0x00, 0x00, 0x62, 0x00, 0x00, 0x00, 0x4a, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x3d, + 0x00, 0x00, 0x00, 0xec, 0x00, 0x00, 0x00, 0x99, 0x00, 0x00, 0x00, 0xa0, 0x00, 0x00, 0x00, 0x69, + 0x00, 0x00, 0x00, 0xeb, 0x00, 0x00, 0x00, 0x6f, 0x00, 0x00, 0x00, 0x97, 0x00, 0x00, 0x00, 0x9e, + 0x00, 0x00, 0x00, 0xe1, 0x00, 0x00, 0x00, 0x9f, 0x00, 0x00, 0x00, 0xfd, 0x00, 0x00, 0x00, 0x4d }; */ @@ -3727,67 +3727,67 @@ static UINT16 calc3_database; int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram, int dstoffset) { UINT8* rom = memory_region(machine,"cpu1"); - UINT8 numregions; + UINT8 numregions; UINT16 length; int x; int offset = 0; numregions = rom[offset+0]; - + if (tabnum > numregions) { printf("CALC3 error, requested table > num tables!\n"); return 0; } - + rom++; - + // scan through the linked list to find the start of the requested table info for (x=0;x<tabnum;x++) { - UINT8 blocksize_offset = rom[offset+0]; // location of the 'block length' + UINT8 blocksize_offset = rom[offset+0]; // location of the 'block length' offset+= blocksize_offset+1; length = rom[offset+0] | (rom[offset+1]<<8); - offset+=length+2; + offset+=length+2; } // we're at the start of the block, get the info about it - { + { UINT16 inline_table_base = 0; UINT16 inline_table_size = 0; calc3_database = offset; - calc3_blocksize_offset = rom[offset+0]; // location of the 'block length' + calc3_blocksize_offset = rom[offset+0]; // location of the 'block length' calc3_mode = rom[offset+1]; calc3_unknown = rom[offset+2]; calc3_decryption_key_byte = rom[offset+3]; - + // if blocksize_offset > 3, it appears to specify the encryption table as 'inline' which can be of any size (odd or even) and loops over the bytes to decrypt // the decryption key specified seems to be ignored? if (calc3_blocksize_offset>3) - { + { inline_table_base = offset+4; inline_table_size = calc3_blocksize_offset-3; } - + offset+= calc3_blocksize_offset+1; length = rom[offset+0] | (rom[offset+1]<<8); offset+=2; - + if (inline_table_size) { printf("Block %02x Found Base %04x - Inline Encryption (size %02x) - Mode? %02x Unknown %02x Key (unused?) %02x Length %04x\n", tabnum, calc3_database, inline_table_size, calc3_mode, calc3_unknown, calc3_decryption_key_byte, length); } else { - printf("Block %02x Found Base %04x - Mode? %02x Unknown %02x Key (unused?) %02x Length %04x\n", tabnum, calc3_database, calc3_mode, calc3_unknown, calc3_decryption_key_byte, length); + printf("Block %02x Found Base %04x - Mode? %02x Unknown %02x Key (unused?) %02x Length %04x\n", tabnum, calc3_database, calc3_mode, calc3_unknown, calc3_decryption_key_byte, length); } - - + + // copy + decrypt the table to the specified memory area if (dstram) { int i; - + if (length==0x00) { // shogwarr does this with 'mode' as 0x08, which probably has some special meaning @@ -3801,19 +3801,19 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram, UINT8 dat = rom[offset+i]; dat -= rom[inline_table_base + (i%inline_table_size)]; dstram[(dstoffset+i)^1] = dat; - } + } } else { UINT8* table = calc3_table00; - + // 0x00 seems to have no 'encryption' if (calc3_decryption_key_byte == 0x00) table = calc3_table00; - + // currently only handle 2 of the formats :-( if (calc3_decryption_key_byte == 0x01) table = calc3_table01; if (calc3_decryption_key_byte == 0x15) table = calc3_table15; - + for (i=0;i<length;i++) { UINT8 dat = rom[offset+i]; @@ -3822,12 +3822,12 @@ int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* dstram, } } } - + calc3_dataend = offset+length+1; } - + //printf("data base %04x data end %04x\n", calc3_database, calc3_dataend); - + return length; } @@ -3840,7 +3840,7 @@ static UINT8 calc3_blocksize_offset; DRIVER_INIT( calc3 ) { UINT8* rom = memory_region(machine,"cpu1"); - UINT8 numregions; + UINT8 numregions; int x; @@ -3851,48 +3851,48 @@ DRIVER_INIT( calc3 ) } printf("crc %04x\n",calc3_mcu_crc); numregions = rom[0]; - + for (x=0;x<numregions;x++) { UINT8* tmpdstram = malloc(0x2000); int length; memset(tmpdstram, 0x00,0x2000); length = calc3_decompress_table(machine, x, tmpdstram, 0); - + // dump to file if (length) { FILE *fp; char filename[256]; - + if (calc3_blocksize_offset==3) - { + { sprintf(filename,"data_%s_table_%04x k%02x m%02x u%02x length %04x", machine->gamedrv->name, - x, calc3_decryption_key_byte, calc3_mode, calc3_unknown, length); + x, calc3_decryption_key_byte, calc3_mode, calc3_unknown, length); } else { sprintf(filename,"data_%s_table_%04x k%02x (use indirect size %02x) m%02x u%02x length %04x", machine->gamedrv->name, - x, calc3_decryption_key_byte, calc3_blocksize_offset-3, calc3_mode, calc3_unknown, length); + x, calc3_decryption_key_byte, calc3_blocksize_offset-3, calc3_mode, calc3_unknown, length); } - + fp=fopen(filename, "w+b"); if (fp) { fwrite(tmpdstram, length, 1, fp); fclose(fp); } - } + } free(tmpdstram); } - + // there is also a 0x1000 block of data at the end.. same on both games, maybe it's related to the decryption tables?? // the calc3_dataend points to the data after the last block processed, as we process all the blocks in the above loop, we assume this points // to that extra block of data - + // dump out the 0x1000 sized block at the end { FILE *fp; diff --git a/src/mame/drivers/mlanding.c b/src/mame/drivers/mlanding.c index 939c20ecc93..ce4569cb5d5 100644 --- a/src/mame/drivers/mlanding.c +++ b/src/mame/drivers/mlanding.c @@ -2,12 +2,12 @@ Dual 68k + 2xZ80 no other hardware info..but it doesn't seem related to taitoair.c at all - TODO: - - Fix "sprite" emulation, it's probably a blitter/buffer with commands etc.; - - Comms between the four CPUs; - - understand how to display the "dots", my guess is that they are at 0x200000-0x203fff of the sub cpu (this might need a side-by-side); - - Fix "sound cpu error" msg; - - Inputs, particularly needed for a game like this one; + TODO: + - Fix "sprite" emulation, it's probably a blitter/buffer with commands etc.; + - Comms between the four CPUs; + - understand how to display the "dots", my guess is that they are at 0x200000-0x203fff of the sub cpu (this might need a side-by-side); + - Fix "sound cpu error" msg; + - Inputs, particularly needed for a game like this one; */ #include "driver.h" @@ -134,7 +134,7 @@ static ADDRESS_MAP_START( mlanding_mem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1d0002, 0x1d0003) AM_WRITE(sound_reset_w) //sound reset ?? AM_RANGE(0x2d0000, 0x2d0001) AM_READNOP AM_WRITE8(taitosound_port_w, 0x00ff) -// AM_RANGE(0x2d0002, 0x2d0003) AM_READ8(taitosound_comm_r, 0xff00) AM_WRITE8(taitosound_comm_w, 0x00ff) +// AM_RANGE(0x2d0002, 0x2d0003) AM_READ8(taitosound_comm_r, 0xff00) AM_WRITE8(taitosound_comm_w, 0x00ff) AM_RANGE(0x2d0002, 0x2d0003) AM_READ8(taitosound_comm_r, 0x00ff) AM_WRITE8(taitosound_comm_w, 0x00ff) AM_RANGE(0x200000, 0x20ffff) AM_RAM_WRITE(paletteram16_xBBBBBGGGGGRRRRR_word_w) AM_BASE(&paletteram16)//AM_SHARE(2) diff --git a/src/mame/drivers/pachifev.c b/src/mame/drivers/pachifev.c index 8ee4336241d..5ffca531c86 100644 --- a/src/mame/drivers/pachifev.c +++ b/src/mame/drivers/pachifev.c @@ -42,7 +42,7 @@ ADDRESS_MAP_END static ADDRESS_MAP_START( pachifev_io, ADDRESS_SPACE_IO, 8 ) // AM_RANGE(0x0f70, 0x0f70) AM_WRITE() -// AM_RANGE(0x0f71, 0x0f71) AM_WRITE() +// AM_RANGE(0x0f71, 0x0f71) AM_WRITE() ADDRESS_MAP_END diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 0ca0a7283b5..8320b6407f4 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -144,7 +144,7 @@ Ernesto Corvi & Mariusz Wojcieszek #define REG_BPLCON3 (0x106/2) /* W D Bit plane control reg (enhanced features) */ #define REG_BPL1MOD (0x108/2) /* W A Bit plane modulo (odd planes) */ #define REG_BPL2MOD (0x10A/2) /* W A Bit Plane modulo (even planes) */ -#define REG_BPLCON4 (0x10C/2) /* W D Bit plane control reg. (display masks) */ +#define REG_BPLCON4 (0x10C/2) /* W D Bit plane control reg. (display masks) */ #define REG_BPL1DAT (0x110/2) /* W D Bit plane 1 data (parallel-to-serial convert) */ #define REG_BPL2DAT (0x112/2) /* W D Bit plane 2 data (parallel-to-serial convert) */ #define REG_BPL3DAT (0x114/2) /* W D Bit plane 3 data (parallel-to-serial convert) */ diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c index 3c0599cb3fb..d9b584bff3d 100644 --- a/src/mame/machine/kaneko16.c +++ b/src/mame/machine/kaneko16.c @@ -325,7 +325,7 @@ static void calc3_mcu_run(running_machine *machine) if ( calc3_mcu_status != (1|2|4|8) ) return; //calc3_mcu_status = 0; - + mcu_command = kaneko16_mcu_ram[calc3_mcu_command_offset/2 + 0]; if (mcu_command == 0) return; @@ -333,13 +333,13 @@ static void calc3_mcu_run(running_machine *machine) logerror("%s : MCU executed command at %04X: %04X\n", cpuexec_describe_context(machine),calc3_mcu_command_offset,mcu_command); - + switch (mcu_command) { case 0x00ff: { - + int param1 = kaneko16_mcu_ram[(0>>1) + 1]; int param2 = kaneko16_mcu_ram[(0>>1) + 2]; @@ -373,20 +373,20 @@ static void calc3_mcu_run(running_machine *machine) // clear old command (handshake to main cpu) kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+0] = 0x0000; /* - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+1] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+2] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+3] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+4] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+5] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+6] = 0x0000; - kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+7] = 0x0000; - */ + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+1] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+2] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+3] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+4] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+5] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+6] = 0x0000; + kaneko16_mcu_ram[(calc3_mcu_command_offset>>1)+7] = 0x0000; + */ calc3_mcu_command_offset = param3; // where next command will be written? - + } break; - + case 0x0001: case 0x0002: case 0x0003: @@ -395,40 +395,40 @@ static void calc3_mcu_run(running_machine *machine) case 0x0006: case 0x0007: // the 'case' seems to be the number of commands in the list - // there are parts of the code where i've seen up to '5' specified, and the game uploads 5 transfer commands + // there are parts of the code where i've seen up to '5' specified, and the game uploads 5 transfer commands // { int num_transfers = mcu_command; int i; - + logerror("Calc3 transfer request, %d transfers\n", num_transfers); - + for (i=0;i<num_transfers;i++) { int param1 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 1 + (2*i)]; - int param2 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 2 + (2*i)]; + int param2 = kaneko16_mcu_ram[(calc3_mcu_command_offset>>1) + 2 + (2*i)]; UINT8 commandtabl = (param1&0xff00) >> 8; UINT16 commandaddr = (param1&0x00ff) | (param2&0xff00); UINT32 fakeoffs; - + logerror("transfer %d table %02x writeback address %04x\n", i, commandtabl, commandaddr); - + // the data SHOULD be written somewhere to main ram, probably related to the writeaddress set in command 0xff // but I'm not sure how, for now write it back to a FAKE region instead fakeoffs = 0x1e00*commandtabl; - + calc3_decompress_table(machine, commandtabl, (UINT8*)kaneko16_calc3_fakeram, fakeoffs); - + // write back WHERE we wrote the data to the address specified so that the code can jump to it etc. fakeoffs+=0xf00000; fakeoffs+=2;// the first 2 bytes don't seem to be the offset it expects to jump to.. - + printf("writing back fake address %08x to %08x\n", fakeoffs, commandaddr); kaneko16_mcu_ram[(commandaddr>>1)+0] = (fakeoffs>>16)&0xffff; kaneko16_mcu_ram[(commandaddr>>1)+1] = (fakeoffs&0xffff); } - + // reset 'number of commands' to 0 to indicate processing complete to the main cpu. kaneko16_mcu_ram[calc3_mcu_command_offset>>1] = 0x0000;; } diff --git a/src/mame/machine/konamigx.c b/src/mame/machine/konamigx.c index cd7e4be82d1..06da1d01f27 100644 --- a/src/mame/machine/konamigx.c +++ b/src/mame/machine/konamigx.c @@ -305,8 +305,8 @@ void K053936GP_1_zoom_draw(running_machine *machine, bitmap_t *bitmap, const rec pri : 0 = topmost, 255 = backmost (pixel priority) */ -INLINE void zdrawgfxzoom32GP( - bitmap_t *bitmap, const rectangle *cliprect, const gfx_element *gfx, +INLINE void zdrawgfxzoom32GP( + bitmap_t *bitmap, const rectangle *cliprect, const gfx_element *gfx, UINT32 code, UINT32 color, int flipx, int flipy, int sx, int sy, int scalex, int scaley, int alpha, int drawmode, int zcode, int pri) { diff --git a/src/mame/video/amigaaga.c b/src/mame/video/amigaaga.c index e4b62295047..c135fa8ea0f 100644 --- a/src/mame/video/amigaaga.c +++ b/src/mame/video/amigaaga.c @@ -9,7 +9,7 @@ Done: - bitplane data fetching - support for up to 8 standard bitplanes - HAM8 mode - - preliminary sprites + - preliminary sprites To do: - incorrect hstart/hstop values in CD32 logo, lsrquiz & lsrquiz2 @@ -467,9 +467,9 @@ INLINE void fetch_sprite_data(int scanline, int sprite) aga_sprdatb[sprite][3] = amiga_chip_ram_r(CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) + 2); CUSTOM_REG_LONG(REG_SPR0PTH + 2 * sprite) += 4; aga_sprite_fetched_words = 4; - if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X %04X-%04X %04X-%04X %04X-%04X\n", - scanline, sprite, - aga_sprdata[sprite][0], aga_sprdatb[sprite][0], + if (LOG_SPRITE_DMA) logerror("%3d:sprite %d fetch: data=%04X-%04X %04X-%04X %04X-%04X %04X-%04X\n", + scanline, sprite, + aga_sprdata[sprite][0], aga_sprdatb[sprite][0], aga_sprdata[sprite][1], aga_sprdatb[sprite][1], aga_sprdata[sprite][2], aga_sprdatb[sprite][2], aga_sprdata[sprite][3], aga_sprdatb[sprite][3]); diff --git a/src/mame/video/kaneko16.c b/src/mame/video/kaneko16.c index b90508232dc..ada63993ef5 100644 --- a/src/mame/video/kaneko16.c +++ b/src/mame/video/kaneko16.c @@ -635,7 +635,7 @@ void kaneko16_draw_sprites(running_machine *machine, bitmap_t *bitmap, const rec UINT32 primask = kaneko16_priority.sprite[curr_pri]; - kaneko16_draw_sprites_custom( + kaneko16_draw_sprites_custom( bitmap,cliprect,machine->gfx[0], s->code, s->color, diff --git a/src/mame/video/liberate.c b/src/mame/video/liberate.c index 28ebf63f70a..0812ce72a64 100644 --- a/src/mame/video/liberate.c +++ b/src/mame/video/liberate.c @@ -85,7 +85,7 @@ static TILE_GET_INFO( prosport_get_back_tile_info ) /* TODO: bits 0-3 are used and there's an unimplemented per-tile flip y / +0x10 tile banking, understand where. */ tile = (prosport_bg_vram[tile_index] & 0xf0)>>4; -// if(!(tile & 0x08)) { tile+=0x10; } +// if(!(tile & 0x08)) { tile+=0x10; } tile+= deco16_io_ram[0]&0x20; //Pro Bowling bg tiles banking bit SET_TILE_INFO(8, tile, 0, 0); diff --git a/src/mame/video/psikyosh.c b/src/mame/video/psikyosh.c index c303f2fc271..b793c732d6e 100644 --- a/src/mame/video/psikyosh.c +++ b/src/mame/video/psikyosh.c @@ -421,7 +421,7 @@ static void draw_background(running_machine *machine, bitmap_t *bitmap, const re /* sx and sy is top-left of entire sprite regardless of flip */ /* Note that Level 5-4 of sbomberb boss is perfect! (Alpha blended zoomed) as well as S1945II logo */ /* pixel is only plotted if z is >= priority_buffer[y][x] */ -static void psikyosh_drawgfxzoom( +static void psikyosh_drawgfxzoom( bitmap_t *dest_bmp,const rectangle *clip,const gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,int offsx,int offsy, int alpha, diff --git a/src/mame/video/stvvdp2.c b/src/mame/video/stvvdp2.c index 06fe9bc7b7a..7b8a52a5e63 100644 --- a/src/mame/video/stvvdp2.c +++ b/src/mame/video/stvvdp2.c @@ -2392,7 +2392,7 @@ INLINE UINT16 stv_add_blend(UINT16 a, UINT16 b) } -static void stv_vdp2_drawgfxzoom( +static void stv_vdp2_drawgfxzoom( bitmap_t *dest_bmp,const rectangle *clip,const gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,int sx,int sy, int transparency,int transparent_color,int scalex, int scaley, diff --git a/src/mame/video/taito_f3.c b/src/mame/video/taito_f3.c index bce9a26626c..1e7bb3c6606 100644 --- a/src/mame/video/taito_f3.c +++ b/src/mame/video/taito_f3.c @@ -2619,7 +2619,7 @@ static void scanline_draw(running_machine *machine, bitmap_t *bitmap, const rect dest++; \ pri++; -INLINE void f3_drawgfx( +INLINE void f3_drawgfx( bitmap_t *dest_bmp,const rectangle *clip,const gfx_element *gfx, UINT32 code, UINT32 color, diff --git a/src/mame/video/tatsumi.c b/src/mame/video/tatsumi.c index c81634801df..f6e08528f2b 100644 --- a/src/mame/video/tatsumi.c +++ b/src/mame/video/tatsumi.c @@ -247,7 +247,7 @@ VIDEO_START( bigfight ) /********************************************************************/ -INLINE void roundupt_drawgfxzoomrotate( +INLINE void roundupt_drawgfxzoomrotate( bitmap_t *dest_bmp, const rectangle *clip, const gfx_element *gfx, UINT32 code,UINT32 color,int flipx,int flipy,UINT32 ssx,UINT32 ssy, int scalex, int scaley, int rotate, int write_priority_only ) diff --git a/src/version.c b/src/version.c index 03d6bbfb98d..2d58628689a 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.132u1 ("__DATE__")"; +const char build_version[] = "0.132u2 ("__DATE__")"; |