Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-17 22:13:04 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changes for MAME 0.121u1.

Browse Source
This commit is contained in:
Aaron Giles 2007-12-17 16:33:33 +00:00
parent 7b77f12186
commit 8a8ccc5949
148 changed files with 4817 additions and 2870 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitattributes vendored
View File

@ -72,6 +72,7 @@ src/emu/cpu/dsp56k/dsp56ops.c svneol=native#text/plain
src/emu/cpu/e132xs/32xsdasm.c svneol=native#text/plain
src/emu/cpu/e132xs/e132xs.c svneol=native#text/plain
src/emu/cpu/e132xs/e132xs.h svneol=native#text/plain
src/emu/cpu/e132xs/e132xsop.c svneol=native#text/plain
src/emu/cpu/f8/f3853.c svneol=native#text/plain
src/emu/cpu/f8/f3853.h svneol=native#text/plain
src/emu/cpu/f8/f8.c svneol=native#text/plain
@ -3257,6 +3258,8 @@ src/osd/windows/drawd3d.c svneol=native#text/plain
src/osd/windows/drawdd.c svneol=native#text/plain
src/osd/windows/drawgdi.c svneol=native#text/plain
src/osd/windows/drawnone.c svneol=native#text/plain
src/osd/windows/eivc.h svneol=native#text/plain
src/osd/windows/eivcx86.h svneol=native#text/plain
src/osd/windows/input.c svneol=native#text/plain
src/osd/windows/input.h svneol=native#text/plain
src/osd/windows/ledutil.c svneol=native#text/plain

21
makefile
View File

@ -91,10 +91,11 @@ X86_PPC_DRC = 1
# uncomment one of the next lines to build a target-optimized build
# NATIVE = 1
# ATHLON = 1
# AMD64 = 1
# I686 = 1
# P4 = 1
# PM = 1
# AMD64 = 1
# CORE2 = 1
# G4 = 1
# G5 = 1
# CELL = 1
@ -198,6 +199,11 @@ SUFFIX = at
ARCH = -march=athlon
endif
ifdef AMD64
SUFFIX = 64
ARCH = -march=athlon64
endif
ifdef I686
SUFFIX = pp
ARCH = -march=pentiumpro
@ -208,14 +214,14 @@ SUFFIX = p4
ARCH = -march=pentium4
endif
ifdef AMD64
SUFFIX = 64
ARCH = -march=athlon64
endif
ifdef PM
SUFFIX = pm
ARCH = -march=pentium3 -msse2
ARCH = -march=pentium-m
endif
ifdef CORE2
SUFFIX = c2
ARCH = -march=pentium-m -msse3
endif
ifdef G4
@ -237,6 +243,7 @@ ENDIAN = big
endif
#-------------------------------------------------
# form the name of the executable
#-------------------------------------------------

40
src/emu/attotime.c
View File

@ -179,8 +179,8 @@ attotime attotime_sub_attoseconds(attotime _time1, attoseconds_t _attoseconds)
attotime attotime_mul(attotime _time1, UINT32 factor)
{
INT32 attolo, attohi, reslo, reshi;
INT64 temp;
UINT32 attolo, attohi, reslo, reshi;
UINT64 temp;
/* if one of the items is attotime_never, return attotime_never */
if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
@ -191,18 +191,18 @@ attotime attotime_mul(attotime _time1, UINT32 factor)
return attotime_zero;
/* split attoseconds into upper and lower halves which fit into 32 bits */
attohi = div_64x32_rem(_time1.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &attolo);
attohi = divu_64x32_rem(_time1.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &attolo);
/* scale the lower half, then split into high/low parts */
temp = mul_32x32(attolo, factor);
temp = div_64x32_rem(temp, ATTOSECONDS_PER_SECOND_SQRT, &reslo);
temp = mulu_32x32(attolo, factor);
temp = divu_64x32_rem(temp, ATTOSECONDS_PER_SECOND_SQRT, &reslo);
/* scale the upper half, then split into high/low parts */
temp += mul_32x32(attohi, factor);
temp = div_64x32_rem(temp, ATTOSECONDS_PER_SECOND_SQRT, &reshi);
temp += mulu_32x32(attohi, factor);
temp = divu_64x32_rem(temp, ATTOSECONDS_PER_SECOND_SQRT, &reshi);
/* scale the seconds */
temp += mul_32x32(_time1.seconds, factor);
temp += mulu_32x32(_time1.seconds, factor);
if (temp >= ATTOTIME_MAX_SECONDS)
return attotime_never;
@ -218,9 +218,9 @@ attotime attotime_mul(attotime _time1, UINT32 factor)
attotime attotime_div(attotime _time1, UINT32 factor)
{
INT32 attolo, attohi, reshi, reslo, remainder;
UINT32 attolo, attohi, reshi, reslo, remainder;
attotime result;
INT64 temp;
UINT64 temp;
/* if one of the items is attotime_never, return attotime_never */
if (_time1.seconds >= ATTOTIME_MAX_SECONDS)
@ -231,21 +231,21 @@ attotime attotime_div(attotime _time1, UINT32 factor)
return _time1;
/* split attoseconds into upper and lower halves which fit into 32 bits */
attohi = div_64x32_rem(_time1.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &attolo);
attohi = divu_64x32_rem(_time1.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &attolo);
/* divide the seconds and get the remainder */
result.seconds = div_64x32_rem(_time1.seconds, factor, &remainder);
result.seconds = divu_64x32_rem(_time1.seconds, factor, &remainder);
/* combine the upper half of attoseconds with the remainder and divide that */
temp = (INT64)attohi + mul_32x32(remainder, ATTOSECONDS_PER_SECOND_SQRT);
reshi = div_64x32_rem(temp, factor, &remainder);
temp = (INT64)attohi + mulu_32x32(remainder, ATTOSECONDS_PER_SECOND_SQRT);
reshi = divu_64x32_rem(temp, factor, &remainder);
/* combine the lower half of attoseconds with the remainder and divide that */
temp = attolo + mul_32x32(remainder, ATTOSECONDS_PER_SECOND_SQRT);
reslo = div_64x32_rem(temp, factor, &remainder);
temp = attolo + mulu_32x32(remainder, ATTOSECONDS_PER_SECOND_SQRT);
reslo = divu_64x32_rem(temp, factor, &remainder);
/* round based on the remainder */
result.attoseconds = (attoseconds_t)reslo + mul_32x32(reshi, ATTOSECONDS_PER_SECOND_SQRT);
result.attoseconds = (attoseconds_t)reslo + mulu_32x32(reshi, ATTOSECONDS_PER_SECOND_SQRT);
if (remainder >= factor / 2)
if (++result.attoseconds >= ATTOSECONDS_PER_SECOND)
{
@ -297,15 +297,15 @@ const char *attotime_string(attotime _time, int precision)
/* case 2: we want 9 or fewer digits of precision */
else if (precision <= 9)
{
INT32 upper = _time.attoseconds / ATTOSECONDS_PER_SECOND_SQRT;
UINT32 upper = _time.attoseconds / ATTOSECONDS_PER_SECOND_SQRT;
sprintf(buffer, "%d.%0*d", _time.seconds, precision, upper);
}
/* case 3: more than 9 digits of precision */
else
{
INT32 lower;
INT32 upper = div_64x32_rem(_time.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &lower);
UINT32 lower;
UINT32 upper = divu_64x32_rem(_time.attoseconds, ATTOSECONDS_PER_SECOND_SQRT, &lower);
sprintf(buffer, "%d.%09d%0*d", _time.seconds, upper, precision - 9, lower);
}
return buffer;

2
src/emu/clifront.c
View File

@ -67,7 +67,7 @@ static void match_roms(const char *hash, int length, int *found);
COMMAND-LINE OPTIONS
***************************************************************************/
const options_entry cli_options[] =
static const options_entry cli_options[] =
{
/* core commands */
{ NULL, NULL, OPTION_HEADER, "CORE COMMANDS" },

2
src/emu/cpu/adsp2100/adsp2100.c
View File

@ -2048,7 +2048,7 @@ static void adsp21xx_get_info(UINT32 state, cpuinfo *info)
}
}
void adsp21xx_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
static void adsp21xx_load_boot_data(UINT8 *srcdata, UINT32 *dstdata)
{
/* see how many words we need to copy */
int pagelen = (srcdata[(3)] + 1) * 8;

2
src/emu/cpu/alph8201/alph8201.c
View File

@ -184,7 +184,7 @@ typedef struct {
} s_opcode;
static ALPHA8201_Regs R;
int ALPHA8201_ICount;
static int ALPHA8201_ICount;
static int inst_cycles;
#define intRAM R.RAM

1
src/emu/cpu/cop400/cop400.h
View File

@ -36,6 +36,7 @@ enum {
};
extern void cop410_get_info(UINT32 state, cpuinfo *info);
extern void cop411_get_info(UINT32 state, cpuinfo *info);
extern void cop420_get_info(UINT32 state, cpuinfo *info);
#ifdef MAME_DEBUG

6
src/emu/cpu/cp1610/cp1610.c
View File

@ -1545,7 +1545,7 @@ static void cp1610_xori(int d)
cp1610_icount -= 8;
}
void cp1610_reset(void)
static void cp1610_reset(void)
{
/* This is how we set the reset vector */
cpunum_set_input_line(cpu_getactivecpu(), CP1610_RESET, PULSE_LINE);
@ -2157,7 +2157,7 @@ static void cp1610_do_jumps(void)
}
/* Execute cycles - returns number of cycles actually run */
int cp1610_execute(int cycles)
static int cp1610_execute(int cycles)
{
UINT16 opcode;
@ -3382,7 +3382,7 @@ static void cp1610_set_context (void *src)
cp1610 = *(cp1610_Regs *) src;
}
void cp1610_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void cp1610_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
cp1610.intr_enabled = 0;
cp1610.reset_pending = 0;

3
src/emu/cpu/cpu.mak
View File

@ -498,7 +498,8 @@ DBGOBJS += $(CPUOBJ)/e132xs/32xsdasm.o
endif
$(CPUOBJ)/e132xs/e132xs.o: $(CPUSRC)/e132xs/e132xs.c \
$(CPUSRC)/e132xs/e132xs.h
$(CPUSRC)/e132xs/e132xs.h \
$(CPUSRC)/e132xs/e132xsop.c

2543
src/emu/cpu/e132xs/e132xs.c
View File

File diff suppressed because it is too large Load Diff

28
src/emu/cpu/e132xs/e132xs.h
View File

@ -3,6 +3,22 @@
#include "cpuintrf.h"
/*
A note about clock multipliers and dividers:
E1-16[T] and E1-32[T] accept a straight clock
E1-16X[T|N] and E1-32X[T|N] accept a clock and multiply it
internally by 4; in the emulator, you MUST specify 4 * XTAL
to achieve the correct speed
E1-16XS[R] and E1-32XS[R] accept a clock and multiply it
internally by 8; in the emulator, you MUST specify 8 * XTAL
to achieve the correct speed
*/
/* Functions */
#if (HAS_E116T)
@ -98,6 +114,8 @@ extern int hyp_type_16bit;
#define SR_REGISTER 1
#define BCR_REGISTER 20
#define TPR_REGISTER 21
#define TCR_REGISTER 22
#define TR_REGISTER 23
#define ISR_REGISTER 25
#define FCR_REGISTER 26
#define MCR_REGISTER 27
@ -127,7 +145,15 @@ extern int hyp_type_16bit;
/* Delay values */
#define NO_DELAY 0
#define DELAY_EXECUTE 1
#define DELAY_TAKEN 2
/* IRQ numbers */
#define IRQ_INT1 0
#define IRQ_INT2 1
#define IRQ_INT3 2
#define IRQ_INT4 3
#define IRQ_IO1 4
#define IRQ_IO2 5
#define IRQ_IO3 6
/* Trap numbers */
#define IO2 48

1926
src/emu/cpu/e132xs/e132xsop.c Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/emu/cpu/f8/f8.c
View File

@ -56,7 +56,7 @@ typedef struct {
int irq_request;
} f8_Regs;
int f8_icount;
static int f8_icount;
static f8_Regs f8;
@ -1531,7 +1531,7 @@ static void f8_ns_isar_d(void)
f8.is = (f8.is & 0x38) | ((f8.is - 1) & 0x07);
}
void f8_reset(void)
static void f8_reset(void)
{
UINT8 data;
int i;
@ -1570,7 +1570,7 @@ void f8_reset(void)
}
/* Execute cycles - returns number of cycles actually run */
int f8_execute(int cycles)
static int f8_execute(int cycles)
{
f8_icount = cycles;

2
src/emu/cpu/h83002/h8periph.c
View File

@ -339,12 +339,14 @@ void h8_itu_write8(UINT8 reg, UINT8 val)
}
}
#ifdef UNUSED_FUNCTION
UINT8 h8_debugger_itu_read8(UINT8 reg)
{
UINT8 val;
val = 0;
return val;
}
#endif
UINT8 h8_register_read8(UINT32 address)

2
src/emu/cpu/hd6309/hd6309.c
View File

@ -556,7 +556,7 @@ static void hd6309_reset(void)
UpdateState();
}
void hd6309_exit(void)
static void hd6309_exit(void)
{
/* nothing to do ? */
}

14
src/emu/cpu/i386/i386.c
View File

@ -55,7 +55,7 @@ static void i386_load_protected_mode_segment( I386_SREG *seg )
seg->d = (seg->flags & 0x4000) ? 1 : 0;
}
void i386_load_segment_descriptor( int segment )
static void i386_load_segment_descriptor( int segment )
{
if (PROTECTED_MODE)
{
@ -496,7 +496,7 @@ static void i386_postload(void)
CHANGE_PC(I.eip);
}
void i386_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void i386_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
int i, j;
static const int regs8[8] = {AL,CL,DL,BL,AH,CH,DH,BH};
@ -614,7 +614,7 @@ static void build_opcode_table(UINT32 features)
}
}
void i386_reset(void)
static void i386_reset(void)
{
int (*save_irqcallback)(int);
@ -696,7 +696,7 @@ static void i386_set_a20_line(int state)
}
}
int i386_execute(int num_cycles)
static int i386_execute(int num_cycles)
{
I.cycles = num_cycles;
I.base_cycles = num_cycles;
@ -1067,7 +1067,7 @@ void i386_get_info(UINT32 state, cpuinfo *info)
#if (HAS_I486)
void i486_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void i486_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
i386_init(index, clock, config, irqcallback);
}
@ -1173,7 +1173,7 @@ void i486_get_info(UINT32 state, cpuinfo *info)
#if (HAS_PENTIUM)
void pentium_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void pentium_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
i386_init(index, clock, config, irqcallback);
}
@ -1299,7 +1299,7 @@ void pentium_get_info(UINT32 state, cpuinfo *info)
#if (HAS_MEDIAGX)
void mediagx_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void mediagx_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
i386_init(index, clock, config, irqcallback);
}

2
src/emu/cpu/i8039/i8039.c
View File

@ -96,7 +96,7 @@ typedef struct
} I8039_Regs;
static I8039_Regs R;
int i8039_ICount;
static int i8039_ICount;
static int inst_cycles;
static UINT8 Old_T1;

6
src/emu/cpu/i8085/i8085.c
View File

@ -1261,7 +1261,7 @@ static void Interrupt(void)
}
}
int i8085_execute(int cycles)
static int i8085_execute(int cycles)
{
i8085_ICount = cycles;
@ -1536,7 +1536,7 @@ static void i8085_set_irq_line(int irqline, int state)
**************************************************************************/
#if (HAS_8080)
void i8080_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void i8080_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
init_tables();
I.cputype = 0;
@ -1558,7 +1558,7 @@ void i8080_init(int index, int clock, const void *config, int (*irqcallback)(int
state_save_register_item_array("i8080", index, I.irq_state);
}
void i8080_set_irq_line(int irqline, int state)
static void i8080_set_irq_line(int irqline, int state)
{
if (irqline == INPUT_LINE_NMI)
{

2
src/emu/cpu/i86/i286.c
View File

@ -65,7 +65,7 @@ typedef struct
memory_interface mem;
} i80286_Regs;
int i80286_ICount;
static int i80286_ICount;
static i80286_Regs I;
static unsigned prefix_base; /* base address of the latest prefix segment */

2
src/emu/cpu/i86/i86.c
View File

@ -57,7 +57,7 @@ i8086_Regs;
/* cpu state */
/***************************************************************************/
int i8086_ICount;
static int i8086_ICount;
static i8086_Regs I;
static unsigned prefix_base; /* base address of the latest prefix segment */

2
src/emu/cpu/i8x41/i8x41.c
View File

@ -111,7 +111,7 @@ typedef struct {
int (*irq_callback)(int irqline);
} I8X41;
int i8x41_ICount;
static int i8x41_ICount;
static I8X41 i8x41;

4
src/emu/cpu/konami/konami.c
View File

@ -167,8 +167,8 @@ static PAIR ea; /* effective address */
}
/* public globals */
int konami_ICount=50000;
int konami_Flags; /* flags for speed optimization (obsolete!!) */
static int konami_ICount=50000;
//int konami_Flags; /* flags for speed optimization (obsolete!!) */
/* these are re-defined in konami.h TO RAM, ROM or functions in memory.c */
#define RM(Addr) KONAMI_RDMEM(Addr)

31
src/emu/cpu/m37710/m37710.c
View File

@ -56,12 +56,13 @@
#define M37710_DEBUG (0) // enables verbose logging for peripherals, etc.
extern void m37710_set_irq_line(int line, int state);
static void m37710_set_irq_line(int line, int state);
/* Our CPU structure */
m37710i_cpu_struct m37710i_cpu = {0};
int m37710_ICount = 0, m37710_fullCount = 0;
int m37710_ICount = 0;
static int m37710_fullCount = 0;
/* Temporary Variables */
uint m37710i_source;
@ -882,7 +883,7 @@ void m37710i_update_irqs(void)
/* external functions */
void m37710_reset(void)
static void m37710_reset(void)
{
/* Start the CPU */
CPU_STOPPED = 0;
@ -927,6 +928,7 @@ void m37710_exit(void)
/* nothing to do yet */
}
#ifdef UNUSED_FUNCTION
/* return elapsed cycles in the current slice */
int m37710_getcycles(void)
{
@ -940,9 +942,10 @@ void m37710_yield(void)
m37710_ICount = 0;
}
#endif
/* Execute some instructions */
int m37710_execute(int cycles)
static int m37710_execute(int cycles)
{
m37710_fullCount = cycles;
@ -959,45 +962,47 @@ static void m37710_get_context(void *dst_context)
}
/* Set the current CPU context */
void m37710_set_context(void *src_context)
static void m37710_set_context(void *src_context)
{
m37710i_cpu = *(m37710i_cpu_struct*)src_context;
m37710i_jumping(REG_PB | REG_PC);
}
/* Get the current Program Counter */
#ifdef UNUSED_FUNCTION
unsigned m37710_get_pc(void)
{
return REG_PC;
}
#endif
/* Set the Program Counter */
void m37710_set_pc(unsigned val)
static void m37710_set_pc(unsigned val)
{
REG_PC = MAKE_UINT_16(val);
m37710_jumping(REG_PB | REG_PC);
}
/* Get the current Stack Pointer */
unsigned m37710_get_sp(void)
static unsigned m37710_get_sp(void)
{
return REG_S;
}
/* Set the Stack Pointer */
void m37710_set_sp(unsigned val)
static void m37710_set_sp(unsigned val)
{
REG_S = MAKE_UINT_16(val);
}
/* Get a register */
unsigned m37710_get_reg(int regnum)
static unsigned m37710_get_reg(int regnum)
{
return FTABLE_GET_REG(regnum);
}
/* Set a register */
void m37710_set_reg(int regnum, unsigned value)
static void m37710_set_reg(int regnum, unsigned value)
{
FTABLE_SET_REG(regnum, value);
}
@ -1013,16 +1018,18 @@ void m37710_state_save(void *file)
}
/* Set an interrupt line */
void m37710_set_irq_line(int line, int state)
static void m37710_set_irq_line(int line, int state)
{
FTABLE_SET_LINE(line, state);
}
/* Set the callback that is called when servicing an interrupt */
#ifdef UNUSED_FUNCTION
void m37710_set_irq_callback(int (*callback)(int))
{
INT_ACK = callback;
}
#endif
/* Disassemble an instruction */
#ifdef MAME_DEBUG
@ -1043,7 +1050,7 @@ static void m37710_restore_state(void)
m37710i_jumping(REG_PB | REG_PC);
}
void m37710_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void m37710_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
INT_ACK = irqcallback;

2
src/emu/cpu/m6800/m6800.c
View File

@ -1299,7 +1299,7 @@ static void m6802_init(int index, int clock, const void *config, int (*irqcallba
* M6803 almost (fully?) equal to the M6801
****************************************************************************/
#if (HAS_M6803)
void m6803_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void m6803_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
// m6800.subtype = SUBTYPE_M6803;
m6800.insn = m6803_insn;

2
src/emu/cpu/mips/mips3drc.c
View File

@ -550,7 +550,7 @@ static void mips3_set_info(UINT32 state, cpuinfo *info)
}
void mips3_get_info(UINT32 state, cpuinfo *info)
static void mips3_get_info(UINT32 state, cpuinfo *info)
{
switch (state)
{

14
src/emu/cpu/nec/nec.c
View File

@ -1145,12 +1145,12 @@ static void configure_memory_16bit(void)
/* Wrappers for the different CPU types */
#if (HAS_V20||HAS_V25)
void v20_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void v20_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
nec_init(index, clock, config, irqcallback, 0);
configure_memory_8bit();
}
int v20_execute(int cycles)
static int v20_execute(int cycles)
{
nec_ICount=cycles;
chip_type=V20;
@ -1177,12 +1177,12 @@ int v20_execute(int cycles)
#endif
#if (HAS_V30||HAS_V35)
void v30_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void v30_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
nec_init(index, clock, config, irqcallback, 1);
configure_memory_16bit();
}
int v30_execute(int cycles) {
static int v30_execute(int cycles) {
nec_ICount=cycles;
chip_type=V30;
@ -1208,12 +1208,12 @@ int v30_execute(int cycles) {
#endif
#if (HAS_V33)
void v33_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void v33_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
nec_init(index, clock, config, irqcallback, 2);
configure_memory_16bit();
}
int v33_execute(int cycles)
static int v33_execute(int cycles)
{
nec_ICount=cycles;
chip_type=V33;
@ -1301,7 +1301,7 @@ static void nec_set_info(UINT32 state, cpuinfo *info)
* Generic get_info
**************************************************************************/
void nec_get_info(UINT32 state, cpuinfo *info)
static void nec_get_info(UINT32 state, cpuinfo *info)
{
int flags;

10
src/emu/cpu/pic16c5x/pic16c5x.c
View File

@ -1078,7 +1078,7 @@ ADDRESS_MAP_END
* PIC16C54 Reset
****************************************************************************/
void pic16C54_reset(void)
static void pic16C54_reset(void)
{
picmodel = 0x16C54;
picRAMmask = 0x1f;
@ -1130,7 +1130,7 @@ ADDRESS_MAP_END
* PIC16C55 Reset
****************************************************************************/
void pic16C55_reset(void)
static void pic16C55_reset(void)
{
picmodel = 0x16C55;
picRAMmask = 0x1f;
@ -1182,7 +1182,7 @@ ADDRESS_MAP_END
* PIC16C56 Reset
****************************************************************************/
void pic16C56_reset(void)
static void pic16C56_reset(void)
{
picmodel = 0x16C56;
picRAMmask = 0x1f;
@ -1239,7 +1239,7 @@ ADDRESS_MAP_END
* PIC16C57 Reset
****************************************************************************/
void pic16C57_reset(void)
static void pic16C57_reset(void)
{
picmodel = 0x16C57;
picRAMmask = 0x7f;
@ -1297,7 +1297,7 @@ ADDRESS_MAP_END
* PIC16C58 Reset
****************************************************************************/
void pic16C58_reset(void)
static void pic16C58_reset(void)
{
picmodel = 0x16C58;
picRAMmask = 0x7f;

4
src/emu/cpu/powerpc/ppc403.c
View File

@ -566,7 +566,7 @@ static void ppc_wrteei(UINT32 op)
/**************************************************************************/
/* PPC403 Serial Port */
UINT8 ppc403_spu_r(UINT32 a)
static UINT8 ppc403_spu_r(UINT32 a)
{
switch(a & 0xf)
{
@ -582,7 +582,7 @@ UINT8 ppc403_spu_r(UINT32 a)
}
}
void ppc403_spu_w(UINT32 a, UINT8 d)
static void ppc403_spu_w(UINT32 a, UINT8 d)
{
switch(a & 0xf)
{

14
src/emu/cpu/powerpc/ppcdrc.c
View File

@ -33,8 +33,8 @@ static int ppcdrc602_execute(int cycles);
static void ppcdrc602_set_irq_line(int irqline, int state);
#endif
#if (HAS_PPC403)
UINT8 ppc403_spu_r(UINT32 a);
void ppc403_spu_w(UINT32 a, UINT8 d);
static UINT8 ppc403_spu_r(UINT32 a);
static void ppc403_spu_w(UINT32 a, UINT8 d);
static void ppcdrc403_init(int index, int clock, const void *_config, int (*irqcallback)(int));
static void ppcdrc403_exit(void);
static void ppcdrc403_reset(void);
@ -1002,7 +1002,7 @@ static void code_log(const char *label, x86code *start, x86code *stop)
/* Initialization and shutdown */
void ppc_init(void)
static void ppc_init(void)
{
int i,j;
@ -1939,7 +1939,7 @@ static void ppc_set_info(UINT32 state, cpuinfo *info)
}
}
void ppc_get_info(UINT32 state, cpuinfo *info)
static void ppc_get_info(UINT32 state, cpuinfo *info)
{
switch(state)
{
@ -2077,7 +2077,7 @@ void ppc_get_info(UINT32 state, cpuinfo *info)
/* PowerPC 403 */
#if (HAS_PPC403)
void ppc403_set_info(UINT32 state, cpuinfo *info)
static void ppc403_set_info(UINT32 state, cpuinfo *info)
{
if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
{
@ -2115,7 +2115,7 @@ void ppc403_get_info(UINT32 state, cpuinfo *info)
/* PowerPC 603 */
#if (HAS_PPC603)
void ppc603_set_info(UINT32 state, cpuinfo *info)
static void ppc603_set_info(UINT32 state, cpuinfo *info)
{
if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
{
@ -2165,7 +2165,7 @@ void ppc603_get_info(UINT32 state, cpuinfo *info)
/* PowerPC 602 */
#if (HAS_PPC602)
void ppc602_set_info(UINT32 state, cpuinfo *info)
static void ppc602_set_info(UINT32 state, cpuinfo *info)
{
if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
{

4
src/emu/cpu/saturn/saturn.c
View File

@ -153,7 +153,7 @@ INLINE void saturn_take_irq(void)
saturn.pending_irq = 0;
}
int saturn_execute(int cycles)
static int saturn_execute(int cycles)
{
saturn_ICount = cycles;
@ -195,6 +195,7 @@ int saturn_execute(int cycles)
return cycles - saturn_ICount;
}
#ifdef UNUSED_FUNCTION
void saturn_set_nmi_line(int state)
{
if (saturn.nmi_state == state) return;
@ -225,6 +226,7 @@ void saturn_set_irq_callback(int (*callback)(int))
{
saturn.irq_callback = callback;
}
#endif
#if 0
static void saturn_state_save(void *file)

2
src/emu/cpu/sh2/sh2.c
View File

@ -2845,7 +2845,7 @@ READ32_HANDLER( sh2_internal_r )
return sh2.m[offset];
}
void sh2_set_frt_input(int cpunum, int state)
static void sh2_set_frt_input(int cpunum, int state)
{
if(state == PULSE_LINE)
{

6
src/emu/cpu/sh4/sh4.c
View File

@ -3944,7 +3944,7 @@ READ32_HANDLER( sh4_internal_r )
return sh4.m[offset];
}
void sh4_set_frt_input(int cpunum, int state)
static void sh4_set_frt_input(int cpunum, int state)
{
if(state == PULSE_LINE)
{
@ -3984,7 +3984,7 @@ void sh4_set_frt_input(int cpunum, int state)
cpuintrf_pop_context();
}
void sh4_set_irln_input(int cpunum, int value)
static void sh4_set_irln_input(int cpunum, int value)
{
if (sh4.irln == value)
return;
@ -4221,7 +4221,7 @@ static void sh4_init(int index, int clock, const void *config, int (*irqcallback
}
void sh4_dma_ddt(struct sh4_ddt_dma *s)
static void sh4_dma_ddt(struct sh4_ddt_dma *s)
{
UINT32 chcr;
UINT32 *p32bits;

4
src/emu/cpu/sharc/sharc.c
View File

@ -845,7 +845,7 @@ static void sharc_set_info(UINT32 state, cpuinfo *info)
}
#if (HAS_ADSP21062)
void adsp21062_set_info(UINT32 state, cpuinfo *info)
static void adsp21062_set_info(UINT32 state, cpuinfo *info)
{
if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 2)
{
@ -956,7 +956,7 @@ static ADDRESS_MAP_START( internal_pgm, ADDRESS_SPACE_PROGRAM, 64 )
AM_RANGE(0x20000, 0x7ffff) AM_RAM
ADDRESS_MAP_END
void sharc_get_info(UINT32 state, cpuinfo *info)
static void sharc_get_info(UINT32 state, cpuinfo *info)
{
switch(state)
{

8
src/emu/cpu/sharc/sharcdsm.c
View File

@ -298,7 +298,7 @@ static void get_if_condition(int cond)
}
}
void pm_dm_ureg(int g, int d, int i, int m, int ureg, int update)
static void pm_dm_ureg(int g, int d, int i, int m, int ureg, int update)
{
if (update) // post-modify
{
@ -353,7 +353,7 @@ void pm_dm_ureg(int g, int d, int i, int m, int ureg, int update)
}
}
void pm_dm_imm_dreg(int g, int d, int i, int data, int dreg, int update)
static void pm_dm_imm_dreg(int g, int d, int i, int data, int dreg, int update)
{
if (update) // post-modify
{
@ -407,7 +407,7 @@ void pm_dm_imm_dreg(int g, int d, int i, int data, int dreg, int update)
}
}
void pm_dm_dreg(int g, int d, int i, int m, int dreg)
static void pm_dm_dreg(int g, int d, int i, int m, int dreg)
{
if (d)
{
@ -433,7 +433,7 @@ void pm_dm_dreg(int g, int d, int i, int m, int dreg)
}
}
void shiftop(int shift, int data, int rn, int rx)
static void shiftop(int shift, int data, int rn, int rx)
{
INT8 data8 = data & 0xff;
int bit6 = data & 0x3f;

2
src/emu/cpu/t11/t11dasm.c
View File

@ -17,7 +17,7 @@ static offs_t pcbase;
#define PARAM_WORD(v) ((v) = rombase[pc - pcbase] | (rombase[pc + 1 - pcbase] << 8), pc += 2)
unsigned MakeEA (char **ea, int lo, unsigned pc, int width)
static unsigned MakeEA (char **ea, int lo, unsigned pc, int width)
{
char *buffer = cpuintrf_temp_str();
int reg, pm;

8
src/emu/cpu/tlcs90/tlcs90.c
View File

@ -2302,7 +2302,7 @@ static READ8_HANDLER( t90_internal_registers_r )
return data;
}
void t90_start_timer(int i)
static void t90_start_timer(int i)
{
int prescaler;
attotime period;
@ -2349,7 +2349,7 @@ void t90_start_timer(int i)
logerror("%04X: CPU Timer %d started at %lf Hz\n", activecpu_get_pc(), i, 1.0 / attotime_to_double(period));
}
void t90_start_timer4(void)
static void t90_start_timer4(void)
{
int prescaler;
attotime period;
@ -2372,13 +2372,13 @@ void t90_start_timer4(void)
}
void t90_stop_timer(int i)
static void t90_stop_timer(int i)
{
timer_adjust(T90.timer[i], attotime_never, i, attotime_zero);
logerror("%04X: CPU Timer %d stopped\n", activecpu_get_pc(), i);
}
void t90_stop_timer4(void)
static void t90_stop_timer4(void)
{
t90_stop_timer(4);
}

4
src/emu/cpu/tms32025/tms32025.c
View File

@ -130,8 +130,8 @@ Table 3-2. TMS32025/26 Memory Blocks
#endif
UINT16 *tms32025_pgmmap[0x200];
UINT16 *tms32025_datamap[0x200];
static UINT16 *tms32025_pgmmap[0x200];
static UINT16 *tms32025_datamap[0x200];
#define SET_PC(x) do { R.PC = (x); change_pc(R.PC<<1); } while (0)

2
src/emu/cpu/tms32031/tms32031.c
View File

@ -416,7 +416,7 @@ static void tms32031_reset(void)
static UINT32 hits[0x200*4];
#endif
void tms32031_exit(void)
static void tms32031_exit(void)
{
#if (LOG_OPCODE_USAGE)
int i;

2
src/emu/cpu/tms32051/dis32051.c
View File

@ -127,7 +127,7 @@ static char *GET_SHIFT(int shift)
return buffer;
}
void dasm_group_be(UINT16 opcode)
static void dasm_group_be(UINT16 opcode)
{
int subop = opcode & 0xff;

2
src/emu/cpu/tms32051/tms32051.c
View File

@ -670,7 +670,7 @@ static void tms_get_info(UINT32 state, cpuinfo *info)
}
#if (HAS_TMS32051)
void tms32051_set_info(UINT32 state, cpuinfo *info)
static void tms32051_set_info(UINT32 state, cpuinfo *info)
{
if (state >= CPUINFO_INT_INPUT_STATE && state <= CPUINFO_INT_INPUT_STATE + 5)
{

2
src/emu/cpu/tms34010/34010dsm.c
View File

@ -246,7 +246,7 @@ static void print_reg_list(UINT16 rev)
}
unsigned Dasm340x0(char *buff, UINT32 pc, int is_34020)
static unsigned Dasm340x0(char *buff, UINT32 pc, int is_34020)
{
int flags = 0;
UINT8 bad = 0;

2
src/emu/cpu/upd7810/upd7810.c
View File

@ -1497,7 +1497,7 @@ static void upd7810_timers(int cycles)
}
}
void upd7810_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void upd7810_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
upd7810.config = *(const UPD7810_CONFIG*) config;
upd7810.irq_callback = irqcallback;

4
src/emu/cpu/v30mz/v30mz.c
View File

@ -949,8 +949,8 @@ static void nec_init(int index, int clock, const void *config, int (*irqcallback
I.irq_callback = irqcallback;
}
void v30mz_init(int index, int clock, const void *config, int (*irqcallback)(int)) { nec_init(index, clock, config, irqcallback, 3); }
int v30mz_execute(int cycles)
static void v30mz_init(int index, int clock, const void *config, int (*irqcallback)(int)) { nec_init(index, clock, config, irqcallback, 3); }
static int v30mz_execute(int cycles)
{
nec_ICount=cycles;
chip_type=V30MZ;

10
src/emu/cpu/v810/v810.c
View File

@ -945,7 +945,7 @@ static UINT32 (*OpCodeTable[64])(void) =
/* 0x3f */ opOUTW // out.w reg2, disp16[reg1] 6b
};
void v810_init(int index, int clock, const void *config, int (*irqcallback)(int))
static void v810_init(int index, int clock, const void *config, int (*irqcallback)(int))
{
v810.irq_line = CLEAR_LINE;
v810.nmi_line = CLEAR_LINE;
@ -958,7 +958,7 @@ void v810_init(int index, int clock, const void *config, int (*irqcallback)(int)
}
void v810_reset(void)
static void v810_reset(void)
{
int i;
for(i=0;i<64;i++) v810.reg[i]=0;
@ -967,7 +967,7 @@ void v810_reset(void)
ECR = 0x0000fff0;
}
int v810_execute(int cycles)
static int v810_execute(int cycles)
{
v810_ICount = cycles;
while(v810_ICount>=0)
@ -981,13 +981,13 @@ int v810_execute(int cycles)
return cycles-v810_ICount;
}
void v810_get_context(void *dst)
static void v810_get_context(void *dst)
{
if(dst)
*(v810info *)dst = v810;
}
void v810_set_context(void *src)
static void v810_set_context(void *src)
{
if(src)
v810 = *(v810info *)src;

4
src/emu/cpu/z180/z180.c
View File

@ -743,7 +743,7 @@ typedef struct {
#define Z180_IOCR_RMASK 0xff
#define Z180_IOCR_WMASK 0xff
int z180_icount;
static int z180_icount;
static Z180_Regs Z180;
static UINT32 EA;
@ -2294,6 +2294,7 @@ static void z180_set_context (void *src)
z180_change_pc(_PCD);
}
#ifdef UNUSED_FUNCTION
READ8_HANDLER( z180_internal_r )
{
return Z180.io[offset & 0x3f];
@ -2305,6 +2306,7 @@ WRITE8_HANDLER( z180_internal_w )
info.i = data;
z180_set_info( CPUINFO_INT_REGISTER + Z180_CNTLA0 + (offset & 0x3f), &info );
}
#endif
/****************************************************************************
* Set IRQ line state

2
src/emu/cpu/z8000/z8000.c
View File

@ -84,7 +84,7 @@ typedef struct {
int (*irq_callback)(int irqline);
} z8000_Regs;
int z8000_ICount;
static int z8000_ICount;
/* current CPU context */
static z8000_Regs Z;

4
src/emu/debug/debugcpu.c
View File

@ -77,7 +77,7 @@ static UINT64 tempvar[NUM_TEMP_VARIABLES];
FUNCTION PROTOTYPES
***************************************************************************/
void debug_cpu_exit(running_machine *machine);
static void debug_cpu_exit(running_machine *machine);
static void perform_trace(debug_cpu_info *info);
static void prepare_for_step_overout(void);
static void process_source_file(void);
@ -288,7 +288,7 @@ void debug_cpu_init(running_machine *machine)
debug_cpu_exit - free all memory
-------------------------------------------------*/
void debug_cpu_exit(running_machine *machine)
static void debug_cpu_exit(running_machine *machine)
{
int cpunum, spacenum;

6
src/emu/driver.h
View File

@ -283,14 +283,14 @@ struct _game_driver
#define MDRV_CPU_REPLACE(tag, _type, _clock) \
cpu = driver_find_cpu(machine, tag); \
cpu->type = (CPU_##_type); \
cpu->clock = (_clock); \
cpu->type = (CPU_##_type); \
cpu->clock = (_clock); \
/* CPU parameters */
#define MDRV_CPU_FLAGS(_flags) \
if (cpu) \
cpu->flags = (_flags); \
cpu->flags = (_flags); \
#define MDRV_CPU_CONFIG(config) \
if (cpu) \

20
src/emu/emupal.c
View File

@ -59,8 +59,8 @@ struct _palette_private
};
/* typedef struct _colortable colortable; */
struct _colortable
/* typedef struct _colortable_t colortable_t; */
struct _colortable_t
{
running_machine * machine; /* associated machine */
UINT32 entries; /* number of entries */
@ -365,9 +365,9 @@ void palette_set_shadow_dRGB32(running_machine *machine, int mode, int dr, int d
with the given number of entries
-------------------------------------------------*/
colortable *colortable_alloc(running_machine *machine, UINT32 palettesize)
colortable_t *colortable_alloc(running_machine *machine, UINT32 palettesize)
{
colortable *ctable;
colortable_t *ctable;
UINT32 index;
/* allocate the colortable */
@ -400,7 +400,7 @@ colortable *colortable_alloc(running_machine *machine, UINT32 palettesize)
of a colortable entry
-------------------------------------------------*/
void colortable_entry_set_value(colortable *ctable, UINT32 entry, UINT16 value)
void colortable_entry_set_value(colortable_t *ctable, UINT32 entry, UINT16 value)
{
/* ensure values are within range */
assert(entry < ctable->entries);
@ -420,7 +420,7 @@ void colortable_entry_set_value(colortable *ctable, UINT32 entry, UINT16 value)
of a colortable entry
-------------------------------------------------*/
UINT16 colortable_entry_get_value(colortable *ctable, UINT32 entry)
UINT16 colortable_entry_get_value(colortable_t *ctable, UINT32 entry)
{
assert(entry < ctable->entries);
return ctable->raw[entry];
@ -432,7 +432,7 @@ UINT16 colortable_entry_get_value(colortable *ctable, UINT32 entry)
color of a colortable palette entry
-------------------------------------------------*/
void colortable_palette_set_color(colortable *ctable, UINT32 entry, rgb_t color)
void colortable_palette_set_color(colortable_t *ctable, UINT32 entry, rgb_t color)
{
/* ensure values are within range */
assert(entry < ctable->palentries);
@ -460,7 +460,7 @@ void colortable_palette_set_color(colortable *ctable, UINT32 entry, rgb_t color)
of a colortable palette entry
-------------------------------------------------*/
rgb_t colortable_palette_get_color(colortable *ctable, UINT32 entry)
rgb_t colortable_palette_get_color(colortable_t *ctable, UINT32 entry)
{
assert(entry < ctable->palentries);
return ctable->palette[entry];
@ -473,7 +473,7 @@ rgb_t colortable_palette_get_color(colortable *ctable, UINT32 entry)
color
-------------------------------------------------*/
UINT32 colortable_get_transpen_mask(colortable *ctable, const gfx_element *gfx, int color, int transcolor)
UINT32 colortable_get_transpen_mask(colortable_t *ctable, const gfx_element *gfx, int color, int transcolor)
{
UINT32 entry = gfx->color_base + (color % gfx->total_colors) * gfx->color_granularity;
UINT32 mask = 0;
@ -503,7 +503,7 @@ UINT32 colortable_get_transpen_mask(colortable *ctable, const gfx_element *gfx,
(each group maps to a gfx color)
-------------------------------------------------*/
void colortable_configure_tilemap_groups(colortable *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor)
void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor)
{
int color;

16
src/emu/emupal.h
View File

@ -112,7 +112,7 @@
TYPE DEFINITIONS
***************************************************************************/
typedef struct _colortable colortable;
typedef struct _colortable_t colortable_t;
@ -154,25 +154,25 @@ void palette_set_shadow_dRGB32(running_machine *machine, int mode, int dr, int d
/* ----- colortable management ----- */
/* allocate a new colortable with the given number of entries */
colortable *colortable_alloc(running_machine *machine, UINT32 palettesize);
colortable_t *colortable_alloc(running_machine *machine, UINT32 palettesize);
/* set the value of a colortable entry */
void colortable_entry_set_value(colortable *ctable, UINT32 entry, UINT16 value);
void colortable_entry_set_value(colortable_t *ctable, UINT32 entry, UINT16 value);
/* return the value of a colortable entry */
UINT16 colortable_entry_get_value(colortable *ctable, UINT32 entry);
UINT16 colortable_entry_get_value(colortable_t *ctable, UINT32 entry);
/* change the color of a colortable palette entry */
void colortable_palette_set_color(colortable *ctable, UINT32 entry, rgb_t color);
void colortable_palette_set_color(colortable_t *ctable, UINT32 entry, rgb_t color);
/* return the color of a colortable palette entry */
rgb_t colortable_palette_get_color(colortable *ctable, UINT32 entry);
rgb_t colortable_palette_get_color(colortable_t *ctable, UINT32 entry);
/* return a 32-bit transparency mask for a given gfx element and color */
UINT32 colortable_get_transpen_mask(colortable *ctable, const gfx_element *gfx, int color, int transcolor);
UINT32 colortable_get_transpen_mask(colortable_t *ctable, const gfx_element *gfx, int color, int transcolor);
/* configure groups in a tilemap to represent transparency based on colortable entries (each group maps to a gfx color) */
void colortable_configure_tilemap_groups(colortable *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor);
void colortable_configure_tilemap_groups(colortable_t *ctable, tilemap *tmap, const gfx_element *gfx, int transcolor);

2
src/emu/machine/tmp68301.c
View File

@ -61,7 +61,7 @@ static TIMER_CALLBACK( tmp68301_timer_callback )
}
}
void tmp68301_update_timer( int i )
static void tmp68301_update_timer( int i )
{
UINT16 TCR = tmp68301_regs[(0x200 + i * 0x20)/2];
UINT16 MAX1 = tmp68301_regs[(0x204 + i * 0x20)/2];

2
src/emu/mame.c
View File

@ -1073,6 +1073,7 @@ void mame_printf_debug(const char *format, ...)
appropriate callback
-------------------------------------------------*/
#ifdef UNUSED_FUNCTION
void mame_printf_log(const char *format, ...)
{
va_list argptr;
@ -1089,6 +1090,7 @@ void mame_printf_log(const char *format, ...)
(*output_cb[OUTPUT_CHANNEL_LOG])(output_cb_param[OUTPUT_CHANNEL_LOG], format, argptr);
va_end(argptr);
}
#endif

1
src/emu/mame.h
View File

@ -186,6 +186,7 @@ struct _running_machine
/* fix me - some games try to modify remapped_colortable directly */
/* search for "palette hack" to find instances */
const pen_t * pens; /* remapped palette pen numbers */
struct _colortable_t * colortable; /* global colortable for remapping */
const UINT16 * game_colortable; /* lookup table used to map gfx pen numbers to color numbers */
const pen_t * remapped_colortable;/* the above, already remapped through Machine->pens */
pen_t * shadow_table; /* table for looking up a shadowed pen */

4
src/emu/sndintrf.c
View File

@ -67,7 +67,7 @@ struct _sndintrf_data
EXTERNAL PROTOTYPES
***************************************************************************/
void dummy_sound_get_info(void *token, UINT32 state, sndinfo *info);
static void dummy_sound_get_info(void *token, UINT32 state, sndinfo *info);
void custom_get_info(void *token, UINT32 state, sndinfo *info);
void samples_get_info(void *token, UINT32 state, sndinfo *info);
void dac_get_info(void *token, UINT32 state, sndinfo *info);
@ -945,7 +945,7 @@ static void dummy_sound_set_info(void *token, UINT32 state, sndinfo *info)
}
void dummy_sound_get_info(void *token, UINT32 state, sndinfo *info)
static void dummy_sound_get_info(void *token, UINT32 state, sndinfo *info)
{
switch (state)
{

4
src/emu/sound/3812intf.h
View File

@ -25,20 +25,24 @@ struct Y8950interface
/* YM3812 */
READ8_HANDLER ( YM3812_status_port_0_r );
WRITE8_HANDLER( YM3812_control_port_0_w );
READ8_HANDLER( YM3812_read_port_0_r );
WRITE8_HANDLER( YM3812_write_port_0_w );
READ8_HANDLER ( YM3812_status_port_1_r );
WRITE8_HANDLER( YM3812_control_port_1_w );
READ8_HANDLER( YM3812_read_port_1_r );
WRITE8_HANDLER( YM3812_write_port_1_w );
/* YM3526 */
READ8_HANDLER ( YM3526_status_port_0_r );
WRITE8_HANDLER( YM3526_control_port_0_w );
READ8_HANDLER( YM3526_read_port_0_r );
WRITE8_HANDLER( YM3526_write_port_0_w );
READ8_HANDLER ( YM3526_status_port_1_r );
WRITE8_HANDLER( YM3526_control_port_1_w );
READ8_HANDLER( YM3526_read_port_1_r );
WRITE8_HANDLER( YM3526_write_port_1_w );

2
src/emu/sound/astrocde.c
View File

@ -287,7 +287,7 @@ static void *astrocade_start(int sndindex, int clock, const void *config)
*
*************************************/
void astrocade_sound_w(UINT8 num, offs_t offset, UINT8 data)
static void astrocade_sound_w(UINT8 num, offs_t offset, UINT8 data)
{
struct astrocade_info *chip = sndti_token(SOUND_ASTROCADE, num);

2
src/emu/sound/ics2115.c
View File

@ -526,7 +526,7 @@ WRITE8_HANDLER( ics2115_w )
// if (ICS2115LOGERROR) logerror("ICS2115: wi %d, %02x (%04x)\n", offset, data, caller_get_pc());
}
void ics2115_reset(void *_chip)
static void ics2115_reset(void *_chip)
{
struct ics2115 *chip = _chip;
chip->irq_en = 0;

2
src/emu/sound/iremga20.c
View File

@ -56,7 +56,7 @@ struct IremGA20_chip_def
struct IremGA20_channel_def channel[4];
};
void IremGA20_update( void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length )
static void IremGA20_update( void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length )
{
struct IremGA20_chip_def *chip = param;
UINT32 rate[4], pos[4], frac[4], end[4], vol[4], play[4];

6
src/emu/sound/k053260.c
View File

@ -94,7 +94,7 @@ INLINE int limit( int val, int max, int min ) {
#define MAXOUT 0x7fff
#define MINOUT -0x8000
void K053260_update( void * param, stream_sample_t **inputs, stream_sample_t **buffer, int length ) {
static void K053260_update( void * param, stream_sample_t **inputs, stream_sample_t **buffer, int length ) {
static long dpcmcnv[] = { 0,1,2,4,8,16,32,64, -128, -64, -32, -16, -8, -4, -2, -1};
int i, j, lvol[4], rvol[4], play[4], loop[4], ppcm_data[4], ppcm[4];
@ -250,7 +250,7 @@ INLINE void check_bounds( struct K053260_chip_def *ic, int channel ) {
#endif
}
void K053260_write( int chip, offs_t offset, UINT8 data )
static void K053260_write( int chip, offs_t offset, UINT8 data )
{
int i, t;
int r = offset;
@ -367,7 +367,7 @@ void K053260_write( int chip, offs_t offset, UINT8 data )
}
}
UINT8 K053260_read( int chip, offs_t offset )
static UINT8 K053260_read( int chip, offs_t offset )
{
struct K053260_chip_def *ic = sndti_token(SOUND_K053260, chip);

2
src/emu/sound/msm5232.c
View File

@ -665,7 +665,7 @@ INLINE void TG_group_advance(MSM5232 *chip, int groupidx)
#endif
void MSM5232_update_one(void *param, stream_sample_t **inputs, stream_sample_t** buffer, int samples)
static void MSM5232_update_one(void *param, stream_sample_t **inputs, stream_sample_t** buffer, int samples)
{
MSM5232 * chip = param;
stream_sample_t *buf1 = buffer[0];

2
src/emu/sound/nes_apu.c
View File

@ -657,7 +657,7 @@ WRITE8_HANDLER( NESPSG_0_w ) {apu_write(0,offset,data);}
WRITE8_HANDLER( NESPSG_1_w ) {apu_write(1,offset,data);}
/* UPDATE APU SYSTEM */
void NESPSG_update_sound(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
static void NESPSG_update_sound(void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length)
{
struct nesapu_info *info = param;
apu_update(info, buffer[0], length);

8
src/emu/sound/pokey.c
View File

@ -551,7 +551,7 @@ static TIMER_CALLBACK_PTR( pokey_pot_trigger_7 );
#endif
void pokey_update(void *param, stream_sample_t **inputs, stream_sample_t **_buffer, int length)
static void pokey_update(void *param, stream_sample_t **inputs, stream_sample_t **_buffer, int length)
{
struct POKEYregisters *chip = param;
stream_sample_t *buffer = _buffer[0];
@ -1037,7 +1037,7 @@ READ8_HANDLER( quad_pokey_r )
}
void pokey_register_w(int chip, int offs, int data)
static void pokey_register_w(int chip, int offs, int data)
{
struct POKEYregisters *p = sndti_token(SOUND_POKEY, chip);
int ch_mask = 0, new_val;
@ -1473,7 +1473,7 @@ void pokey4_serin_ready(int after)
timer_set_ptr(attotime_mul(p->clock_period, after), p, pokey_serin_ready);
}
void pokey_break_w(int chip, int shift)
static void pokey_break_w(int chip, int shift)
{
struct POKEYregisters *p = sndti_token(SOUND_POKEY, chip);
if( shift ) /* shift code ? */
@ -1510,7 +1510,7 @@ void pokey4_break_w(int shift)
pokey_break_w(3, shift);
}
void pokey_kbcode_w(int chip, int kbcode, int make)
static void pokey_kbcode_w(int chip, int kbcode, int make)
{
struct POKEYregisters *p = sndti_token(SOUND_POKEY, chip);
/* make code ? */

8
src/emu/sound/qsound.c
View File

@ -91,8 +91,8 @@ struct qsound_info
};
/* Function prototypes */
void qsound_update( void *param, stream_sample_t **inputs, stream_sample_t **outputs, int length );
void qsound_set_command(struct qsound_info *chip, int data, int value);
static void qsound_update( void *param, stream_sample_t **inputs, stream_sample_t **outputs, int length );
static void qsound_set_command(struct qsound_info *chip, int data, int value);
static void *qsound_start(int sndindex, int clock, const void *config)
{
@ -198,7 +198,7 @@ READ8_HANDLER( qsound_status_r )
return 0x80;
}
void qsound_set_command(struct qsound_info *chip, int data, int value)
static void qsound_set_command(struct qsound_info *chip, int data, int value)
{
int ch=0,reg=0;
if (data < 0x80)
@ -313,7 +313,7 @@ void qsound_set_command(struct qsound_info *chip, int data, int value)
}
void qsound_update( void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length )
static void qsound_update( void *param, stream_sample_t **inputs, stream_sample_t **buffer, int length )
{
struct qsound_info *chip = param;
int i,j;

2
src/emu/sound/s14001a.c
View File

@ -289,7 +289,7 @@ static void PostPhoneme(S14001AChip *chip) /* figure out what the heck to do aft
#endif
}
void s14001a_clock(S14001AChip *chip) /* called once per clock */
static void s14001a_clock(S14001AChip *chip) /* called once per clock */
{
UINT8 CurDelta; // Current delta

2
src/emu/sound/scsp.c
View File

@ -1370,11 +1370,13 @@ static void dma_scsp(struct _SCSP *SCSP)
cpunum_set_input_line(2,dma_transfer_end,HOLD_LINE);
}
#ifdef UNUSED_FUNCTION
int SCSP_IRQCB(void *param)
{
CheckPendingIRQ(param);
return -1;
}
#endif
static void SCSP_Update(void *param, stream_sample_t **inputs, stream_sample_t **buf, int samples)
{

2
src/emu/sound/tms36xx.c
View File

@ -447,7 +447,7 @@ void tms36xx_note_w(int chip, int octave, int note)
tms->tune_max = note + 1;
}
void tms3617_enable(struct TMS36XX *tms, int enable)
static void tms3617_enable(struct TMS36XX *tms, int enable)
{
int i, bits = 0;

2
src/emu/sound/ymz280b.c
View File

@ -707,6 +707,7 @@ static void *ymz280b_start(int sndindex, int clock, const void *config)
***********************************************************************************************/
#ifdef UNUSED_FUNCTION
void YMZ280B_sh_stop(void)
{
#if MAKE_WAVS
@ -721,6 +722,7 @@ void YMZ280B_sh_stop(void)
}
#endif
}
#endif

2
src/emu/uimenu.c
View File

@ -531,7 +531,7 @@ int ui_menu_draw(const ui_menu_item *items, int numitems, int selected, const me
bottom
-------------------------------------------------*/
void ui_menu_draw_text_box(const char *text)
static void ui_menu_draw_text_box(const char *text)
{
const char *priortext = ui_getstring(UI_returntoprior);
float line_height = ui_get_line_height();

2
src/emu/uitext.c
View File

@ -18,7 +18,7 @@ extern const char *mess_default_text[];
#endif /* MESS */
lang_struct lang;
static lang_struct lang;
/* All entries in this table must match the enum ordering in "uitext.h" */
static const char *mame_default_text[] =

29
src/emu/validity.c
View File

@ -216,15 +216,15 @@ static void build_quarks(void)
static int validate_inlines(void)
{
#undef rand
UINT64 testu64a = rand() + (rand() << 15) + ((UINT64)rand() << 30) + ((UINT64)rand() << 45) + 1;
INT64 testi64a = rand() + (rand() << 15) + ((INT64)rand() << 30) + ((INT64)rand() << 45) + 1;
volatile UINT64 testu64a = rand() ^ (rand() << 15) ^ ((UINT64)rand() << 30) ^ ((UINT64)rand() << 45);
volatile INT64 testi64a = rand() ^ (rand() << 15) ^ ((INT64)rand() << 30) ^ ((INT64)rand() << 45);
#ifdef PTR64
INT64 testi64b = rand() + (rand() << 15) + ((INT64)rand() << 30) + ((INT64)rand() << 45) + 1;
volatile INT64 testi64b = rand() ^ (rand() << 15) ^ ((INT64)rand() << 30) ^ ((INT64)rand() << 45);
#endif
UINT32 testu32a = rand() + (rand() << 15) + 1;
UINT32 testu32b = rand() + (rand() << 15) + 1;
INT32 testi32a = rand() + (rand() << 15) + 1;
INT32 testi32b = rand() + (rand() << 15) + 1;
volatile UINT32 testu32a = rand() ^ (rand() << 15);
volatile UINT32 testu32b = rand() ^ (rand() << 15);
volatile INT32 testi32a = rand() ^ (rand() << 15);
volatile INT32 testi32b = rand() ^ (rand() << 15);
INT32 resulti32, expectedi32;
UINT32 resultu32, expectedu32;
INT64 resulti64, expectedi64;
@ -233,6 +233,21 @@ static int validate_inlines(void)
UINT32 uremainder, expuremainder;
int error = FALSE;
/* use only non-zero, positive numbers */
if (testu64a == 0) testu64a++;
if (testi64a == 0) testi64a++;
else if (testi64a < 0) testi64a = -testi64a;
#ifdef PTR64
if (testi64b == 0) testi64b++;
else if (testi64b < 0) testi64b = -testi64b;
#endif
if (testu32a == 0) testu32a++;
if (testu32b == 0) testu32b++;
if (testi32a == 0) testi32a++;
else if (testi32a < 0) testi32a = -testi32a;
if (testi32b == 0) testi32b++;
else if (testi32b < 0) testi32b = -testi32b;
resulti64 = mul_32x32(testi32a, testi32b);
expectedi64 = (INT64)testi32a * (INT64)testi32b;
if (resulti64 != expectedi64)

2
src/lib/util/chd.c
View File

@ -835,6 +835,7 @@ core_file *chd_core_file(chd_file *chd)
filename
-------------------------------------------------*/
#ifdef UNUSED_FUNCTION
void chd_multi_filename(const char *origname, char *finalname, int index)
{
char *extension;
@ -856,6 +857,7 @@ void chd_multi_filename(const char *origname, char *finalname, int index)
findex[2] = 'h';
strcpy(extension, findex);
}
#endif

33
src/mame/drivers/acefruit.c
View File

@ -240,29 +240,15 @@ static PALETTE_INIT( acefruit )
palette_set_color( machine, 6, MAKE_RGB(0xff, 0xff, 0xff) );
palette_set_color( machine, 7, MAKE_RGB(0x7f, 0x3f, 0x1f) );
colortable[ 0 ] = 0;
colortable[ 1 ] = 1;
colortable[ 2 ] = 2;
colortable[ 3 ] = 3;
colortable[ 4 ] = 4;
colortable[ 5 ] = 5;
colortable[ 6 ] = 6;
colortable[ 7 ] = 7;
/* tiles */
palette_set_color( machine, 8, MAKE_RGB(0xff, 0xff, 0xff) );
palette_set_color( machine, 9, MAKE_RGB(0x00, 0x00, 0xff) );
palette_set_color( machine, 10, MAKE_RGB(0x00, 0xff, 0x00) );
palette_set_color( machine, 11, MAKE_RGB(0xff, 0x00, 0x00) );
colortable[ 8 ] = 0;
colortable[ 9 ] = 8;
colortable[ 10 ] = 0;
colortable[ 11 ] = 9;
colortable[ 12 ] = 0;
colortable[ 13 ] = 10;
colortable[ 14 ] = 0;
colortable[ 15 ] = 11;
palette_set_color( machine, 8, MAKE_RGB(0x00, 0x00, 0x00) );
palette_set_color( machine, 9, MAKE_RGB(0xff, 0xff, 0xff) );
palette_set_color( machine, 10, MAKE_RGB(0x00, 0x00, 0x00) );
palette_set_color( machine, 11, MAKE_RGB(0x00, 0x00, 0xff) );
palette_set_color( machine, 12, MAKE_RGB(0x00, 0x00, 0x00) );
palette_set_color( machine, 13, MAKE_RGB(0x00, 0xff, 0x00) );
palette_set_color( machine, 14, MAKE_RGB(0x00, 0x00, 0x00) );
palette_set_color( machine, 15, MAKE_RGB(0xff, 0x00, 0x00) );
}
static ADDRESS_MAP_START( acefruit_map, ADDRESS_SPACE_PROGRAM, 8 )
@ -573,8 +559,7 @@ static MACHINE_DRIVER_START( acefruit )
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_SIZE(512, 256)
MDRV_SCREEN_VISIBLE_AREA(0, 511, 0, 255)
MDRV_PALETTE_LENGTH(12)
MDRV_COLORTABLE_LENGTH(16)
MDRV_PALETTE_LENGTH(16)
MDRV_NVRAM_HANDLER(generic_0fill)

35
src/mame/drivers/atarifb.c
View File

@ -121,23 +121,25 @@ int atarifb_game;
*
*************************************/
static const UINT16 colortable_source[] =
{
0x02, 0x00, /* chars */
0x03, 0x02, /* sprites */
0x03, 0x00,
0x03, 0x01, /* sprite masks */
0x03, 0x00,
0x03, 0x02,
};
static PALETTE_INIT( atarifb )
{
palette_set_color(machine,0,MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine,1,MAKE_RGB(0x80,0x80,0x80)); /* grey */
palette_set_color(machine,2,MAKE_RGB(0xff,0xff,0xff)); /* white */
palette_set_color(machine,3,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
memcpy(colortable,colortable_source,sizeof(colortable_source));
/* chars */
palette_set_color(machine,0,MAKE_RGB(0xff,0xff,0xff)); /* white */
palette_set_color(machine,1,MAKE_RGB(0x00,0x00,0x00)); /* black */
/* sprites */
palette_set_color(machine,2,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
palette_set_color(machine,3,MAKE_RGB(0xff,0xff,0xff)); /* white */
palette_set_color(machine,4,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
palette_set_color(machine,5,MAKE_RGB(0x00,0x00,0x00)); /* black */
/* sprite masks */
palette_set_color(machine,6,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
palette_set_color(machine,7,MAKE_RGB(0x80,0x80,0x80)); /* grey */
palette_set_color(machine,8,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
palette_set_color(machine,9,MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine,10,MAKE_RGB(0x40,0x40,0x40)); /* dark grey (?) - used in Soccer only */
palette_set_color(machine,11,MAKE_RGB(0xff,0xff,0xff)); /* white */
}
@ -538,8 +540,7 @@ static MACHINE_DRIVER_START( atarifb )
MDRV_SCREEN_SIZE(38*8, 32*8)
MDRV_SCREEN_VISIBLE_AREA(0*8, 38*8-1, 1*8, 31*8-1)
MDRV_GFXDECODE(atarifb)
MDRV_PALETTE_LENGTH(4)
MDRV_COLORTABLE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
MDRV_PALETTE_LENGTH(12)
MDRV_PALETTE_INIT(atarifb)
MDRV_VIDEO_START(generic)

9
src/mame/drivers/boxer.c
View File

@ -80,10 +80,8 @@ static PALETTE_INIT( boxer )
palette_set_color(machine,0, MAKE_RGB(0x00,0x00,0x00));
palette_set_color(machine,1, MAKE_RGB(0xff,0xff,0xff));
colortable[0] = 0;
colortable[1] = 1;
colortable[2] = 1;
colortable[3] = 0;
palette_set_color(machine,2, MAKE_RGB(0xff,0xff,0xff));
palette_set_color(machine,3, MAKE_RGB(0x00,0x00,0x00));
}
@ -314,8 +312,7 @@ static MACHINE_DRIVER_START(boxer)
MDRV_SCREEN_SIZE(256, 262)
MDRV_SCREEN_VISIBLE_AREA(8, 247, 0, 239)
MDRV_GFXDECODE(boxer)
MDRV_PALETTE_LENGTH(2)
MDRV_COLORTABLE_LENGTH(4)
MDRV_PALETTE_LENGTH(4)
MDRV_PALETTE_INIT(boxer)
MDRV_VIDEO_UPDATE(boxer)

122
src/mame/drivers/bsktball.c
View File

@ -32,101 +32,34 @@
*
*************************************/
static UINT16 colortable_source[] =
{
/* Playfield */
0x01, 0x00, 0x00, 0x00,
0x01, 0x03, 0x03, 0x03,
/* Motion */
0x01, 0x00, 0x00, 0x00,
0x01, 0x00, 0x01, 0x00,
0x01, 0x00, 0x02, 0x00,
0x01, 0x00, 0x03, 0x00,
0x01, 0x01, 0x00, 0x00,
0x01, 0x01, 0x01, 0x00,
0x01, 0x01, 0x02, 0x00,
0x01, 0x01, 0x03, 0x00,
0x01, 0x02, 0x00, 0x00,
0x01, 0x02, 0x01, 0x00,
0x01, 0x02, 0x02, 0x00,
0x01, 0x02, 0x03, 0x00,
0x01, 0x03, 0x00, 0x00,
0x01, 0x03, 0x01, 0x00,
0x01, 0x03, 0x02, 0x00,
0x01, 0x03, 0x03, 0x00,
0x01, 0x00, 0x00, 0x01,
0x01, 0x00, 0x01, 0x01,
0x01, 0x00, 0x02, 0x01,
0x01, 0x00, 0x03, 0x01,
0x01, 0x01, 0x00, 0x01,
0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x02, 0x01,
0x01, 0x01, 0x03, 0x01,
0x01, 0x02, 0x00, 0x01,
0x01, 0x02, 0x01, 0x01,
0x01, 0x02, 0x02, 0x01,
0x01, 0x02, 0x03, 0x01,
0x01, 0x03, 0x00, 0x01,
0x01, 0x03, 0x01, 0x01,
0x01, 0x03, 0x02, 0x01,
0x01, 0x03, 0x03, 0x01,
0x01, 0x00, 0x00, 0x02,
0x01, 0x00, 0x01, 0x02,
0x01, 0x00, 0x02, 0x02,
0x01, 0x00, 0x03, 0x02,
0x01, 0x01, 0x00, 0x02,
0x01, 0x01, 0x01, 0x02,
0x01, 0x01, 0x02, 0x02,
0x01, 0x01, 0x03, 0x02,
0x01, 0x02, 0x00, 0x02,
0x01, 0x02, 0x01, 0x02,
0x01, 0x02, 0x02, 0x02,
0x01, 0x02, 0x03, 0x02,
0x01, 0x03, 0x00, 0x02,
0x01, 0x03, 0x01, 0x02,
0x01, 0x03, 0x02, 0x02,
0x01, 0x03, 0x03, 0x02,
0x01, 0x00, 0x00, 0x03,
0x01, 0x00, 0x01, 0x03,
0x01, 0x00, 0x02, 0x03,
0x01, 0x00, 0x03, 0x03,
0x01, 0x01, 0x00, 0x03,
0x01, 0x01, 0x01, 0x03,
0x01, 0x01, 0x02, 0x03,
0x01, 0x01, 0x03, 0x03,
0x01, 0x02, 0x00, 0x03,
0x01, 0x02, 0x01, 0x03,
0x01, 0x02, 0x02, 0x03,
0x01, 0x02, 0x03, 0x03,
0x01, 0x03, 0x00, 0x03,
0x01, 0x03, 0x01, 0x03,
0x01, 0x03, 0x02, 0x03,
0x01, 0x03, 0x03, 0x03,
};
static PALETTE_INIT( bsktball )
{
palette_set_color(machine,0,MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
palette_set_color(machine,1,MAKE_RGB(0x80,0x80,0x80)); /* LIGHT GREY */
palette_set_color(machine,2,MAKE_RGB(0x50,0x50,0x50)); /* DARK GREY */
palette_set_color(machine,3,MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
memcpy(colortable,colortable_source,sizeof(colortable_source));
int i;
machine->colortable = colortable_alloc(machine, 4);
colortable_palette_set_color(machine->colortable,0,MAKE_RGB(0x00,0x00,0x00)); /* BLACK */
colortable_palette_set_color(machine->colortable,1,MAKE_RGB(0x80,0x80,0x80)); /* LIGHT GREY */
colortable_palette_set_color(machine->colortable,2,MAKE_RGB(0x50,0x50,0x50)); /* DARK GREY */
colortable_palette_set_color(machine->colortable,3,MAKE_RGB(0xff,0xff,0xff)); /* WHITE */
/* playfield */
for (i = 0; i < 2; i++)
{
colortable_entry_set_value(machine->colortable, i*4 + 0, 1);
colortable_entry_set_value(machine->colortable, i*4 + 1, 3 * i);
colortable_entry_set_value(machine->colortable, i*4 + 2, 3 * i);
colortable_entry_set_value(machine->colortable, i*4 + 3, 3 * i);
}
/* motion */
for (i = 0; i < 4*4*4; i++)
{
colortable_entry_set_value(machine->colortable, 2*4 + i*4 + 0, 1);
colortable_entry_set_value(machine->colortable, 2*4 + i*4 + 1, (i >> 2) & 3);
colortable_entry_set_value(machine->colortable, 2*4 + i*4 + 2, (i >> 0) & 3);
colortable_entry_set_value(machine->colortable, 2*4 + i*4 + 3, (i >> 4) & 3);
}
}
@ -288,8 +221,7 @@ static MACHINE_DRIVER_START( bsktball )
MDRV_SCREEN_SIZE(32*8, 28*8)
MDRV_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1)
MDRV_GFXDECODE(bsktball)
MDRV_PALETTE_LENGTH(4)
MDRV_COLORTABLE_LENGTH(sizeof(colortable_source) / sizeof(colortable_source[0]))
MDRV_PALETTE_LENGTH(2*4 + 4*4*4*4)
MDRV_PALETTE_INIT(bsktball)
MDRV_VIDEO_START(bsktball)

13
src/mame/drivers/canyon.c
View File

@ -47,14 +47,10 @@
static PALETTE_INIT( canyon )
{
palette_set_color(machine, 0, MAKE_RGB(0x00, 0x00, 0x00)); /* BLACK */
palette_set_color(machine, 1, MAKE_RGB(0xff, 0xff, 0xff)); /* WHITE */
palette_set_color(machine, 0, MAKE_RGB(0x80, 0x80, 0x80)); /* GREY */
palette_set_color(machine, 1, MAKE_RGB(0x00, 0x00, 0x00)); /* BLACK */
palette_set_color(machine, 2, MAKE_RGB(0x80, 0x80, 0x80)); /* GREY */
colortable[0] = 2;
colortable[1] = 0;
colortable[2] = 2;
colortable[3] = 1;
palette_set_color(machine, 3, MAKE_RGB(0xff, 0xff, 0xff)); /* WHITE */
}
@ -253,8 +249,7 @@ static MACHINE_DRIVER_START( canyon )
MDRV_SCREEN_SIZE(256, 240)
MDRV_SCREEN_VISIBLE_AREA(0, 255, 0, 239)
MDRV_GFXDECODE(canyon)
MDRV_PALETTE_LENGTH(3)
MDRV_COLORTABLE_LENGTH(4)
MDRV_PALETTE_LENGTH(4)
MDRV_PALETTE_INIT(canyon)
MDRV_VIDEO_START(canyon)

2
src/mame/drivers/cherrym.c
View File

@ -16,7 +16,6 @@ static tilemap *bg_tilemap;
static PALETTE_INIT( cm )
{
#define COLOR(gfxn,offs) (colortable[machine->drv->gfxdecodeinfo[gfxn].color_codes_start + offs])
int i;
for ( i = 0; i < machine->drv->total_colors; i++ )
@ -392,7 +391,6 @@ static MACHINE_DRIVER_START( cmv801 )
MDRV_GFXDECODE(cherrym)
MDRV_PALETTE_LENGTH(256)
MDRV_COLORTABLE_LENGTH(256)
MDRV_PALETTE_INIT(cm)
MDRV_VIDEO_START(cm)

2
src/mame/drivers/cischeat.c
View File

@ -523,7 +523,7 @@ READ16_HANDLER( scudhamm_motor_pos_r )
Within $20 vblanks the motor must reach the target. */
WRITE16_HANDLER( scudhamm_motor_command_w )
static WRITE16_HANDLER( scudhamm_motor_command_w )
{
COMBINE_DATA( &scudhamm_motor_command );
}

28
src/mame/drivers/decocass.c
View File

@ -354,26 +354,29 @@ GFXDECODE_END
static PALETTE_INIT( decocass )
{
int i;
machine->colortable = colortable_alloc(machine, 32);
/* set up 32 colors 1:1 pens */
for (i = 0; i < 32; i++)
colortable[i] = i;
colortable_entry_set_value(machine->colortable, i, i);
/* setup straight/flipped colors for background tiles (D7 of color_center_bot ?) */
for (i = 0; i < 8; i++)
{
colortable[32+i] = 3*8+i;
colortable[40+i] = 3*8+((i << 1) & 0x04) + ((i >> 1) & 0x02) + (i & 0x01);
colortable_entry_set_value(machine->colortable, 32+i, 3*8+i);
colortable_entry_set_value(machine->colortable, 40+i, 3*8+((i << 1) & 0x04) + ((i >> 1) & 0x02) + (i & 0x01));
}
/* setup 4 colors for 1bpp object */
colortable[48+0*2+0] = 0;
colortable[48+0*2+1] = 25; /* testtape red from 4th palette section? */
colortable[48+1*2+0] = 0;
colortable[48+1*2+1] = 28; /* testtape blue from 4th palette section? */
colortable[48+2*2+0] = 0;
colortable[48+2*2+1] = 26; /* testtape green from 4th palette section? */
colortable[48+3*2+0] = 0;
colortable[48+3*2+1] = 23; /* ???? */
colortable_entry_set_value(machine->colortable, 48+0*2+0, 0);
colortable_entry_set_value(machine->colortable, 48+0*2+1, 25); /* testtape red from 4th palette section? */
colortable_entry_set_value(machine->colortable, 48+1*2+0, 0);
colortable_entry_set_value(machine->colortable, 48+1*2+1, 28); /* testtape blue from 4th palette section? */
colortable_entry_set_value(machine->colortable, 48+2*2+0, 0);
colortable_entry_set_value(machine->colortable, 48+2*2+1, 26); /* testtape green from 4th palette section? */
colortable_entry_set_value(machine->colortable, 48+3*2+0, 0);
colortable_entry_set_value(machine->colortable, 48+3*2+1, 23); /* ???? */
}
@ -402,8 +405,7 @@ static MACHINE_DRIVER_START( decocass )
MDRV_SCREEN_SIZE(32*8, 32*8)
MDRV_SCREEN_VISIBLE_AREA(1*8, 31*8-1, 1*8, 31*8-1)
MDRV_GFXDECODE(decocass)
MDRV_PALETTE_LENGTH(32)
MDRV_COLORTABLE_LENGTH(32+2*8+2*4)
MDRV_PALETTE_LENGTH(32+2*8+2*4)
MDRV_PALETTE_INIT(decocass)
MDRV_VIDEO_START(decocass)

11
src/mame/drivers/dgpix.c
View File

@ -213,6 +213,13 @@ static WRITE32_HANDLER( coin_w )
coin_counter_w(1, data & 2);
}
static READ32_HANDLER( vblank_r )
{
/* burn a bunch of cycles because this is polled frequently during busy loops */
activecpu_adjust_icount(-100);
return input_port_0_dword_r(offset, 0);
}
static ADDRESS_MAP_START( cpu_map, ADDRESS_SPACE_PROGRAM, 32 )
AM_RANGE(0x00000000, 0x007fffff) AM_RAM
AM_RANGE(0x40000000, 0x4003ffff) AM_READWRITE(vram_r, vram_w)
@ -223,7 +230,7 @@ ADDRESS_MAP_END
static ADDRESS_MAP_START( io_map, ADDRESS_SPACE_IO, 32 )
AM_RANGE(0x0200, 0x0203) AM_READNOP // used to sync with the protecion PIC? tested bits 0 and 1
AM_RANGE(0x0400, 0x0403) AM_READWRITE(input_port_0_dword_r, vbuffer_w)
AM_RANGE(0x0400, 0x0403) AM_READWRITE(vblank_r, vbuffer_w)
AM_RANGE(0x0a10, 0x0a13) AM_READ(input_port_1_dword_r)
AM_RANGE(0x0200, 0x0203) AM_WRITE(coin_w)
AM_RANGE(0x0c00, 0x0c03) AM_WRITENOP // writes only: 1, 0, 1 at startup
@ -311,7 +318,7 @@ static VIDEO_UPDATE( dgpix )
}
static MACHINE_DRIVER_START( dgpix )
MDRV_CPU_ADD(E132XT, 20000000)
MDRV_CPU_ADD(E132XT, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(cpu_map,0)
MDRV_CPU_IO_MAP(io_map,0)

9
src/mame/drivers/dlair.c
View File

@ -181,11 +181,9 @@ static PALETTE_INIT( dleuro )
for (i = 0; i < 8; i++)
{
palette_set_color_rgb(machine, i, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2));
colortable[2 * i + 0] = 8;
colortable[2 * i + 1] = i;
palette_set_color(machine, 2 * i + 0, MAKE_RGB(0, 0, 0));
palette_set_color_rgb(machine, 2 * i + 1, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2));
}
palette_set_color(machine, 8, MAKE_RGB(0, 0, 0));
}
@ -858,8 +856,7 @@ static MACHINE_DRIVER_START( dleuro )
MDRV_SCREEN_VISIBLE_AREA(0, 199, 0, 239)
MDRV_GFXDECODE(dlair)
MDRV_PALETTE_LENGTH(9)
MDRV_COLORTABLE_LENGTH(16)
MDRV_PALETTE_LENGTH(16)
MDRV_PALETTE_INIT(dleuro)
MDRV_VIDEO_START(dleuro)

2
src/mame/drivers/eolith16.c
View File

@ -163,7 +163,7 @@ static PALETTE_INIT( eolith16 )
static MACHINE_DRIVER_START( eolith16 )
MDRV_CPU_ADD(E116T, 60000000) /* 60 MHz */
MDRV_CPU_ADD(E116T, 60000000) /* no internal multiplier */
MDRV_CPU_PROGRAM_MAP(eolith16_map,0)
MDRV_CPU_VBLANK_INT(eolith_speedup,262)

75
src/mame/drivers/exidy.c
View File

@ -744,8 +744,8 @@ static const gfx_layout charlayout_1bpp =
256,
1,
{ 0 },
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
{ STEP8(0,1) },
{ STEP8(0,8) },
8*8
};
@ -755,8 +755,8 @@ static const gfx_layout charlayout_2bpp =
256,
2,
{ 0, 256*8*8 },
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
{ STEP8(0,1) },
{ STEP8(0,8) },
8*8
};
@ -766,21 +766,21 @@ static const gfx_layout spritelayout =
RGN_FRAC(1,1),
1,
{ 0 },
{ 0, 1, 2, 3, 4, 5, 6, 7, 16*8+0, 16*8+1, 16*8+2, 16*8+3, 16*8+4, 16*8+5, 16*8+6, 16*8+7},
{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8, 9*8, 10*8, 11*8, 12*8, 13*8, 14*8, 15*8},
{ STEP8(0,1), STEP8(16*8,1), },
{ STEP16(0,8) },
8*32
};
static GFXDECODE_START( 1bpp )
GFXDECODE_ENTRY( REGION_CPU1, 0x4800, charlayout_1bpp, 0, 4 ) /* the game dynamically modifies this */
GFXDECODE_ENTRY( REGION_GFX1, 0x0000, spritelayout, 8, 2 )
GFXDECODE_ENTRY( REGION_CPU1, 0x4800, charlayout_1bpp, 4, 4 ) /* the game dynamically modifies this */
GFXDECODE_ENTRY( REGION_GFX1, 0x0000, spritelayout, 0, 2 )
GFXDECODE_END
static GFXDECODE_START( 2bpp )
GFXDECODE_ENTRY( REGION_CPU1, 0x6000, charlayout_2bpp, 0, 4 ) /* the game dynamically modifies this */
GFXDECODE_ENTRY( REGION_GFX1, 0x0000, spritelayout, 16, 2 )
GFXDECODE_ENTRY( REGION_CPU1, 0x6000, charlayout_2bpp, 4, 4 ) /* the game dynamically modifies this */
GFXDECODE_ENTRY( REGION_GFX1, 0x0000, spritelayout, 0, 2 )
GFXDECODE_END
@ -836,10 +836,8 @@ static MACHINE_DRIVER_START( targ )
MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16)
MDRV_SCREEN_RAW_PARAMS(EXIDY_PIXEL_CLOCK, EXIDY_HTOTAL, EXIDY_HBEND, EXIDY_HBSTART, EXIDY_VTOTAL, EXIDY_VBEND, EXIDY_VBSTART)
MDRV_GFXDECODE(1bpp)
MDRV_PALETTE_LENGTH(PALETTE_LEN)
MDRV_COLORTABLE_LENGTH(COLORTABLE_LEN)
MDRV_PALETTE_LENGTH(2*2 + 4*2)
MDRV_PALETTE_INIT(exidy)
MDRV_VIDEO_START(exidy)
MDRV_VIDEO_EOF(exidy)
MDRV_VIDEO_UPDATE(exidy)
@ -913,6 +911,7 @@ static MACHINE_DRIVER_START( pepper2 )
/* video hardware */
MDRV_GFXDECODE(2bpp)
MDRV_PALETTE_LENGTH(2*2 + 4*4)
MACHINE_DRIVER_END
@ -1341,10 +1340,8 @@ ROM_END
*
*************************************/
static void exidy_common_init(UINT8 palette[], UINT16 colortable[], UINT8 cmask, UINT8 cinvert)
static void exidy_common_init(UINT8 cmask, UINT8 cinvert)
{
exidy_palette = palette;
exidy_colortable = colortable;
exidy_collision_mask = cmask;
exidy_collision_invert = cinvert;
targ_spec_flag = 0;
@ -1353,7 +1350,12 @@ static void exidy_common_init(UINT8 palette[], UINT16 colortable[], UINT8 cmask,
static DRIVER_INIT( sidetrac )
{
exidy_common_init(sidetrac_palette, exidy_1bpp_colortable, 0x00, 0x00);
exidy_common_init(0x00, 0x00);
/* hard-coded palette controlled via 8x3 DIP switches on the board */
exidy_color_latch[2] = 0xf8;
exidy_color_latch[1] = 0xdc;
exidy_color_latch[0] = 0xb8;
/* ROM in place of character RAM */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x4800, 0x4bff, 0, 0, MWA8_ROM);
@ -1362,19 +1364,35 @@ static DRIVER_INIT( sidetrac )
static DRIVER_INIT( targ )
{
exidy_common_init(targ_palette, exidy_1bpp_colortable, 0x00, 0x00);
exidy_common_init(0x00, 0x00);
/* hard-coded palette controlled via 8x3 DIP switches on the board */
exidy_color_latch[2] = 0x5c;
exidy_color_latch[1] = 0xee;
exidy_color_latch[0] = 0x6b;
targ_spec_flag = 1;
}
static DRIVER_INIT( spectar )
{
exidy_common_init(spectar_palette, exidy_1bpp_colortable, 0x00, 0x00);
exidy_common_init(0x00, 0x00);
/* hard-coded palette controlled via 8x3 DIP switches on the board */
exidy_color_latch[2] = 0x58;
exidy_color_latch[1] = 0xee;
exidy_color_latch[0] = 0x09;
}
static DRIVER_INIT( rallys )
{
exidy_common_init(spectar_palette, exidy_1bpp_colortable, 0x00, 0x00);
exidy_common_init(0x00, 0x00);
/* hard-coded palette controlled via 8x3 DIP switches on the board */
exidy_color_latch[2] = 0x58;
exidy_color_latch[1] = 0xee;
exidy_color_latch[0] = 0x09;
/* sprite locations are slightly different */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x5000, 0, 0, exidy_sprite1_xpos_w);
@ -1385,7 +1403,12 @@ static DRIVER_INIT( rallys )
static DRIVER_INIT( phantoma )
{
exidy_common_init(spectar_palette, exidy_1bpp_colortable, 0x00, 0x00);
exidy_common_init(0x00, 0x00);
/* hard-coded palette controlled via 8x3 DIP switches on the board */
exidy_color_latch[2] = 0x58;
exidy_color_latch[1] = 0xee;
exidy_color_latch[0] = 0x09;
/* sprite locations are slightly different */
memory_install_write8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5000, 0x5000, 0, 0, exidy_sprite1_xpos_w);
@ -1401,19 +1424,19 @@ static DRIVER_INIT( phantoma )
static DRIVER_INIT( mtrap )
{
exidy_common_init(NULL, exidy_1bpp_colortable, 0x14, 0x00);
exidy_common_init(0x14, 0x00);
}
static DRIVER_INIT( venture )
{
exidy_common_init(NULL, exidy_1bpp_colortable, 0x04, 0x04);
exidy_common_init(0x04, 0x04);
}
static DRIVER_INIT( teetert )
{
exidy_common_init(NULL, exidy_1bpp_colortable, 0x0c, 0x0c);
exidy_common_init(0x0c, 0x0c);
/* special input handler for the dial */
memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x5101, 0x5101, 0, 0, teetert_input_r);
@ -1422,7 +1445,7 @@ static DRIVER_INIT( teetert )
static DRIVER_INIT( pepper2 )
{
exidy_common_init(NULL, exidy_2bpp_colortable, 0x14, 0x04);
exidy_common_init(0x14, 0x04);
/* two 6116 character RAMs */
exidy_characterram = memory_install_read8_handler(0, ADDRESS_SPACE_PROGRAM, 0x6000, 0x6fff, 0, 0, MRA8_RAM);
@ -1434,7 +1457,7 @@ static DRIVER_INIT( pepper2 )
static DRIVER_INIT( fax )
{
exidy_common_init(NULL, exidy_2bpp_colortable, 0x04, 0x04);
exidy_common_init(0x04, 0x04);
/* reset the ROM bank */
fax_bank_select_w(0,0);

4
src/mame/drivers/f-32.c
View File

@ -134,10 +134,10 @@ static INPUT_PORTS_START( mosaicf2 )
INPUT_PORTS_END
static MACHINE_DRIVER_START( mosaicf2 )
MDRV_CPU_ADD_TAG("main", E132XT, 20000000) // E132XN actually! /* 20 MHz */
MDRV_CPU_ADD_TAG("main", E132XN, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(common_map,0)
MDRV_CPU_IO_MAP(mosaicf2_io,0)
MDRV_CPU_VBLANK_INT(irq5_line_pulse, 1)
MDRV_CPU_VBLANK_INT(irq0_line_hold, 1)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION)

44
src/mame/drivers/fgoal.c
View File

@ -59,45 +59,22 @@ static PALETTE_INIT( fgoal )
{
int i;
for (i = 0; i < 64; i++)
{
int r = (i >> 4) & 3;
int g = (i >> 2) & 3;
int b = (i >> 0) & 3;
palette_set_color_rgb(machine,i,
intensity(r),
intensity(g),
intensity(b));
}
palette_set_color(machine,0x40,MAKE_RGB(0x2e,0x80,0x2e));
palette_set_color(machine,0x41,MAKE_RGB(0x2e,0x2e,0x2e));
/* for B/W screens PCB can be jumpered to use lower half of PROM */
for (i = 0; i < 128; i++)
{
colortable[i] = color_prom[0x80 | i] & 63;
UINT8 color = color_prom[0x80 | i] & 63;
palette_set_color_rgb(machine, i, intensity(color >> 4), intensity(color >> 2), intensity(color >> 0));
}
colortable[0x80] = 0x40;
colortable[0x81] = 0x40;
colortable[0x82] = 0x40;
colortable[0x83] = 0x40;
colortable[0x84] = 0x40;
colortable[0x85] = 0x40;
colortable[0x86] = 0x40;
colortable[0x87] = 0x40;
for (i = 0; i < 8; i++)
{
palette_set_color(machine, 128 + 0*8 + i, MAKE_RGB(0x2e,0x80,0x2e));
palette_set_color(machine, 128 + 1*8 + i, MAKE_RGB(0x2e,0x2e,0x2e));
}
colortable[0x88] = 0x41;
colortable[0x89] = 0x41;
colortable[0x8a] = 0x41;
colortable[0x8b] = 0x41;
colortable[0x8c] = 0x41;
colortable[0x8d] = 0x41;
colortable[0x8e] = 0x41;
colortable[0x8f] = 0x41;
/* ball is a fixed color */
palette_set_color_rgb(machine, 128 + 16, intensity(0x38 >> 4), intensity(0x38 >> 2), intensity(0x38 >> 0));
}
@ -398,8 +375,7 @@ static MACHINE_DRIVER_START( fgoal )
MDRV_SCREEN_SIZE(256, 263)
MDRV_SCREEN_VISIBLE_AREA(0, 255, 16, 255)
MDRV_GFXDECODE(fgoal)
MDRV_PALETTE_LENGTH(64 + 2)
MDRV_COLORTABLE_LENGTH(128 + 16)
MDRV_PALETTE_LENGTH(128 + 16 + 1)
MDRV_PALETTE_INIT(fgoal)
MDRV_VIDEO_START(fgoal)

99
src/mame/drivers/firetrk.c
View File

@ -15,6 +15,9 @@ Atari Fire Truck + Super Bug + Monte Carlo driver
int firetrk_game;
UINT32 firetrk_color1_mask;
UINT32 firetrk_color2_mask;
static int last_service;
static int steer_dir[2];
static int steer_flag[2];
@ -244,7 +247,7 @@ static MACHINE_RESET( firetrk )
static PALETTE_INIT( firetrk )
{
static const UINT16 colortable_source[] =
static const UINT8 colortable_source[] =
{
0, 0, 1, 0,
2, 0, 3, 0,
@ -254,13 +257,25 @@ static PALETTE_INIT( firetrk )
2, 0, 0, 3,
3, 0, 0, 3
};
static const rgb_t palette_source[] =
{
MAKE_RGB(0x00, 0x00, 0x00),
MAKE_RGB(0x5b, 0x5b, 0x5b),
MAKE_RGB(0xa4, 0xa4, 0xa4),
MAKE_RGB(0xff, 0xff, 0xff)
};
int i;
palette_set_color(machine, 0, MAKE_RGB(0x00, 0x00, 0x00));
palette_set_color(machine, 1, MAKE_RGB(0x5b, 0x5b, 0x5b));
palette_set_color(machine, 2, MAKE_RGB(0xa4, 0xa4, 0xa4));
palette_set_color(machine, 3, MAKE_RGB(0xff, 0xff, 0xff));
memcpy(colortable, colortable_source, sizeof(colortable_source));
firetrk_color1_mask = firetrk_color2_mask = 0;
for (i = 0; i < ARRAY_LENGTH(colortable_source); i++)
{
UINT8 color = colortable_source[i];
if (color == 1)
firetrk_color1_mask |= 1 << i;
else if (color == 2)
firetrk_color2_mask |= 1 << i;
palette_set_color(machine, i, palette_source[color]);
}
}
@ -272,7 +287,7 @@ static void prom_to_palette(running_machine *machine, int number, UINT8 val)
static PALETTE_INIT( montecar )
{
static const UINT16 colortable_source[] =
static const UINT8 colortable_source[] =
{
0x00, 0x00, 0x00, 0x01,
0x00, 0x02, 0x00, 0x03,
@ -280,12 +295,11 @@ static PALETTE_INIT( montecar )
0x03, 0x01, 0x03, 0x00,
0x00, 0x00, 0x02, 0x00,
0x02, 0x01, 0x02, 0x02,
0x00, 0x05, 0x06, 0x07,
0x00, 0x09, 0x0A, 0x0B,
0x00, 0x0D, 0x0E, 0x0F,
0x00, 0x11, 0x12, 0x13,
0x00, 0x15, 0x16, 0x17,
0x18, 0x19
0x00, 0x10, 0x20, 0x30,
0x00, 0x04, 0x08, 0x0C,
0x00, 0x44, 0x48, 0x4C,
0x00, 0x84, 0x88, 0x8C,
0x00, 0xC4, 0xC8, 0xCC
};
/*
@ -307,43 +321,21 @@ static PALETTE_INIT( montecar )
*/
const UINT8* p = memory_region(REGION_PROMS);
int i;
int number = 0;
firetrk_color1_mask = firetrk_color2_mask = 0;
for (i = 0; i < ARRAY_LENGTH(colortable_source); i++)
{
UINT8 color = colortable_source[i];
if (color == 1)
firetrk_color1_mask |= 1 << i;
else if (color == 2)
firetrk_color2_mask |= 1 << i;
prom_to_palette(machine, i, p[0x100 + colortable_source[i]]);
}
prom_to_palette(machine, number++, p[0x100]);
prom_to_palette(machine, number++, p[0x101]);
prom_to_palette(machine, number++, p[0x102]);
prom_to_palette(machine, number++, p[0x103]);
prom_to_palette(machine, number++, p[0x100]);
prom_to_palette(machine, number++, p[0x110]);
prom_to_palette(machine, number++, p[0x120]);
prom_to_palette(machine, number++, p[0x130]);
prom_to_palette(machine, number++, p[0x100]);
prom_to_palette(machine, number++, p[0x104]);
prom_to_palette(machine, number++, p[0x108]);
prom_to_palette(machine, number++, p[0x10C]);
prom_to_palette(machine, number++, p[0x140]);
prom_to_palette(machine, number++, p[0x144]);
prom_to_palette(machine, number++, p[0x148]);
prom_to_palette(machine, number++, p[0x14C]);
prom_to_palette(machine, number++, p[0x180]);
prom_to_palette(machine, number++, p[0x184]);
prom_to_palette(machine, number++, p[0x188]);
prom_to_palette(machine, number++, p[0x18C]);
prom_to_palette(machine, number++, p[0x1C0]);
prom_to_palette(machine, number++, p[0x1C4]);
prom_to_palette(machine, number++, p[0x1C8]);
prom_to_palette(machine, number++, p[0x1CC]);
palette_set_color(machine, number++, MAKE_RGB(0x00, 0x00, 0x00));
palette_set_color(machine, number++, MAKE_RGB(0xff, 0xff, 0xff));
memcpy(colortable, colortable_source, sizeof(colortable_source));
palette_set_color(machine, ARRAY_LENGTH(colortable_source) + 0, MAKE_RGB(0x00, 0x00, 0x00));
palette_set_color(machine, ARRAY_LENGTH(colortable_source) + 1, MAKE_RGB(0xff, 0xff, 0xff));
}
@ -1074,8 +1066,7 @@ static MACHINE_DRIVER_START( firetrk )
MDRV_GFXDECODE(firetrk)
MDRV_PALETTE_INIT(firetrk)
MDRV_PALETTE_LENGTH(4)
MDRV_COLORTABLE_LENGTH(28)
MDRV_PALETTE_LENGTH(28)
MDRV_VIDEO_START(firetrk)
MDRV_VIDEO_EOF(firetrk)
@ -1101,8 +1092,7 @@ static MACHINE_DRIVER_START( superbug )
MDRV_GFXDECODE(superbug)
MDRV_PALETTE_INIT(firetrk)
MDRV_PALETTE_LENGTH(4)
MDRV_COLORTABLE_LENGTH(28)
MDRV_PALETTE_LENGTH(28)
/* sound hardware */
MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)
@ -1122,8 +1112,7 @@ static MACHINE_DRIVER_START( montecar )
MDRV_GFXDECODE(montecar)
MDRV_PALETTE_INIT(montecar)
MDRV_PALETTE_LENGTH(26)
MDRV_COLORTABLE_LENGTH(46)
MDRV_PALETTE_LENGTH(46)
/* sound hardware */
MDRV_SOUND_REPLACE("discrete", DISCRETE, 0)

4
src/mame/drivers/gstream.c
View File

@ -385,10 +385,10 @@ static VIDEO_UPDATE(gstream)
}
static MACHINE_DRIVER_START( gstream )
MDRV_CPU_ADD_TAG("main", E132XT, 16000000) /* 16 Mhz? */
MDRV_CPU_ADD_TAG("main", E132XT, 16000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(gstream_32bit_map,0)
MDRV_CPU_IO_MAP(gstream_io,0)
MDRV_CPU_VBLANK_INT(irq5_line_hold,1)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)

25
src/mame/drivers/lazercmd.c
View File

@ -599,17 +599,15 @@ static GFXDECODE_START( lazercmd )
GFXDECODE_ENTRY( REGION_GFX1, 0, charlayout, 0, 2 )
GFXDECODE_END
static UINT16 colortable_source[] =
{
1, 0,
0, 1
};
static PALETTE_INIT( lazercmd )
{
palette_set_color(machine,0,MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine,1,MAKE_RGB(0xb0,0xb0,0xb0)); /* white */
palette_set_color(machine,2,MAKE_RGB(0xff,0xff,0xff)); /* bright white */
memcpy(colortable,colortable_source,sizeof(colortable_source));
palette_set_color(machine,0,MAKE_RGB(0xb0,0xb0,0xb0)); /* white */
palette_set_color(machine,1,MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine,2,MAKE_RGB(0x00,0x00,0x00)); /* black */
palette_set_color(machine,3,MAKE_RGB(0xb0,0xb0,0xb0)); /* white */
palette_set_color(machine,4,MAKE_RGB(0xff,0xff,0xff)); /* bright white */
}
static MACHINE_DRIVER_START( lazercmd )
@ -634,8 +632,7 @@ static MACHINE_DRIVER_START( lazercmd )
MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1)
MDRV_GFXDECODE(lazercmd)
MDRV_PALETTE_LENGTH(3)
MDRV_COLORTABLE_LENGTH(2*2)
MDRV_PALETTE_LENGTH(5)
MDRV_PALETTE_INIT(lazercmd)
MDRV_VIDEO_UPDATE(lazercmd)
@ -670,8 +667,7 @@ static MACHINE_DRIVER_START( medlanes )
MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, VERT_RES * VERT_CHR - 1)
MDRV_GFXDECODE(lazercmd)
MDRV_PALETTE_LENGTH(3)
MDRV_COLORTABLE_LENGTH(2*2)
MDRV_PALETTE_LENGTH(5)
MDRV_PALETTE_INIT(lazercmd)
MDRV_VIDEO_UPDATE(lazercmd)
@ -706,8 +702,7 @@ static MACHINE_DRIVER_START( bbonk )
MDRV_SCREEN_VISIBLE_AREA(0 * HORZ_CHR, HORZ_RES * HORZ_CHR - 1,
0 * VERT_CHR, (VERT_RES - 1) * VERT_CHR - 1)
MDRV_GFXDECODE(lazercmd)
MDRV_PALETTE_LENGTH(3)
MDRV_COLORTABLE_LENGTH(2*2)
MDRV_PALETTE_LENGTH(5)
MDRV_PALETTE_INIT(lazercmd)
MDRV_VIDEO_UPDATE(lazercmd)

8
src/mame/drivers/limenko.c
View File

@ -475,10 +475,10 @@ GFXDECODE_END
static MACHINE_DRIVER_START( limenko )
MDRV_CPU_ADD(E132XT, 80000000) //E132XN!
MDRV_CPU_ADD(E132XN, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(limenko_map,0)
MDRV_CPU_IO_MAP(limenko_io_map,0)
MDRV_CPU_VBLANK_INT(irq5_line_hold, 1)
MDRV_CPU_VBLANK_INT(irq0_line_hold, 1)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)
@ -501,10 +501,10 @@ static MACHINE_DRIVER_START( limenko )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( spotty )
MDRV_CPU_ADD(GMS30C2232, 80000000) /* 20 MHz with 4x internal clock multiplier? */
MDRV_CPU_ADD(GMS30C2232, 20000000) /* 20 MHz, no internal multiplier */
MDRV_CPU_PROGRAM_MAP(spotty_map,0)
MDRV_CPU_IO_MAP(spotty_io_map,0)
MDRV_CPU_VBLANK_INT(irq5_line_hold, 1)
MDRV_CPU_VBLANK_INT(irq0_line_hold, 1)
MDRV_CPU_ADD(I8051, 4000000) /* 4 MHz */
MDRV_CPU_PROGRAM_MAP(spotty_sound_prg_map, 0)

37
src/mame/drivers/malzak.c
View File

@ -391,31 +391,6 @@ static const gfx_layout saa5050_lolayout =
8 * 10
};
static const rgb_t saa5050_palette[8] =
{
MAKE_RGB(0x00, 0x00, 0x00), /* black */
MAKE_RGB(0xff, 0x00, 0x00), /* red */
MAKE_RGB(0x00, 0xff, 0x00), /* green */
MAKE_RGB(0xff, 0xff, 0x00), /* yellow */
MAKE_RGB(0x00, 0x00, 0xff), /* blue */
MAKE_RGB(0xff, 0x00, 0xff), /* magenta */
MAKE_RGB(0x00, 0xff, 0xff), /* cyan */
MAKE_RGB(0xff, 0xff, 0xff) /* white */
};
/* bgnd, fgnd */
static unsigned short saa5050_colortable[64 * 2] =
{
0,1, 0,1, 0,2, 0,3, 0,4, 0,5, 0,6, 0,7,
1,0, 1,1, 1,2, 1,3, 1,4, 1,5, 1,6, 1,7,
2,0, 2,1, 2,2, 2,3, 2,4, 2,5, 2,6, 2,7,
3,0, 3,1, 3,2, 3,3, 3,4, 3,5, 3,6, 3,7,
4,0, 4,1, 4,2, 4,3, 4,4, 4,5, 4,6, 4,7,
5,0, 5,1, 5,2, 5,3, 5,4, 5,5, 5,6, 5,7,
6,0, 6,1, 6,2, 6,3, 6,4, 6,5, 6,6, 6,7,
7,0, 7,1, 7,2, 7,3, 7,4, 7,5, 7,6, 7,7
};
//add s2636 decodes here (i.e. from zac2650) and maybe re-arrange them
static GFXDECODE_START( malzak )
GFXDECODE_ENTRY( REGION_GFX1, 0, charlayout, 0, 16 )
@ -429,8 +404,13 @@ GFXDECODE_END
static PALETTE_INIT( malzak )
{
palette_set_colors(machine, 0, saa5050_palette, ARRAY_LENGTH(saa5050_palette));
memcpy(colortable, saa5050_colortable, sizeof (saa5050_colortable));
int i;
for (i = 0; i < 8*8; i++)
{
palette_set_color_rgb(machine, i * 2 + 0, pal1bit(i >> 3), pal1bit(i >> 4), pal1bit(i >> 5));
palette_set_color_rgb(machine, i * 2 + 1, pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2));
}
}
@ -478,9 +458,8 @@ static MACHINE_DRIVER_START( malzak )
MDRV_SCREEN_SIZE(240, 256) /* vert size is a guess */
MDRV_SCREEN_VISIBLE_AREA(0, 239, 0, 239)
MDRV_GFXDECODE(malzak)
MDRV_PALETTE_LENGTH(16)
MDRV_PALETTE_LENGTH(128)
MDRV_PALETTE_INIT(malzak)
MDRV_COLORTABLE_LENGTH(128)
// MDRV_MACHINE_RESET(malzak)

3
src/mame/drivers/megadriv.c
View File

@ -608,10 +608,9 @@ static UINT16 get_word_from_68k_mem(UINT32 source)
/* Note, In reality this transfer is NOT instant, the 68k isn't paused
as the 68k address bus isn't accessed */
static void megadrive_do_insta_vram_copy(UINT32 source, UINT16 length);
/* Wani Wani World, James Pond 3, Pirates Gold! */
void megadrive_do_insta_vram_copy(UINT32 source, UINT16 length)
static void megadrive_do_insta_vram_copy(UINT32 source, UINT16 length)
{
int x;

4
src/mame/drivers/megatech.c
View File

@ -1053,11 +1053,11 @@ ROM_START( mt_cols ) /* Columns */
MEGATECH_GAME36(REGION_USER1, REGION_USER2)
ROM_END
/* Game 04 - Great Golf (SMS) - bad dump */
/* Game 04 - Great Golf (SMS) */
#define MEGATECH_GAME04(GAME_REGION, INSTRUCTION_REGION) \
ROM_REGION( 0x300000, GAME_REGION, 0 ) \
ROM_LOAD( "mp11129f.ic1", 0x000000, 0x020000, BAD_DUMP CRC(942738ba) SHA1(e99d4e39c965fc123a39d75521a274687e917a57) ) \
ROM_LOAD( "mp11129f.ic1", 0x000000, 0x020000, CRC(972c75ac) SHA1(2ae74c8563a3cefb27611d17bf3926865b6ebd45) ) \
MEGATECH_INSTRUCTION_REGION( INSTRUCTION_REGION, MEGATECH_GAME_IS_SMS ) \
ROM_LOAD( "12368-04.ic2", 0x000000, 0x08000, CRC(62e5579b) SHA1(e1f531be5c40a1216d4192baeda9352384444410) ) \

4
src/mame/drivers/mexico86.c
View File

@ -383,7 +383,7 @@ static MACHINE_DRIVER_START( mexico86 )
MDRV_CPU_ADD_TAG("main",Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_ADD(Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
MDRV_CPU_ADD(Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@ -391,7 +391,7 @@ static MACHINE_DRIVER_START( mexico86 )
MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem)
MDRV_CPU_VBLANK_INT(mexico86_m68705_interrupt,2)
MDRV_CPU_ADD_TAG("sub", Z80, 24000000/4) /* 6 MHz, Uses clock divided 24MHz OSC */
MDRV_CPU_ADD_TAG("sub", Z80, 8000000/2) /* 4 MHz, Uses 8Mhz OSC */
MDRV_CPU_PROGRAM_MAP(sub_cpu_map,0)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)

1
src/mame/drivers/mogura.c
View File

@ -10,7 +10,6 @@ static tilemap *mogura_tilemap;
static PALETTE_INIT( mogura )
{
int i,j;
#define COLOR(gfxn,offs) (colortable[machine->drv->gfxdecodeinfo[gfxn].color_codes_start + offs])
j = 0;
for (i = 0;i < 0x20;i++)

35
src/mame/drivers/namcos86.c
View File

@ -1088,8 +1088,7 @@ static MACHINE_DRIVER_START( hopmappy )
MDRV_SCREEN_SIZE(64*8, 32*8)
MDRV_SCREEN_VISIBLE_AREA(3 + 8*8, 3 + 44*8-1, 2*8, 30*8-1)
MDRV_GFXDECODE(namcos86)
MDRV_PALETTE_LENGTH(512)
MDRV_COLORTABLE_LENGTH(4096)
MDRV_PALETTE_LENGTH(4096)
MDRV_PALETTE_INIT(namcos86)
MDRV_VIDEO_START(namcos86)
@ -1216,8 +1215,8 @@ ROM_START( skykiddx )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "sk3-1.3r", 0x0000, 0x0200, CRC(9e81dedd) SHA1(9d2ddf51788d22ed65db9070684e586b2f64f99e) ) /* red & green components */
ROM_LOAD( "sk3-2.3s", 0x0200, 0x0200, CRC(cbfec4dd) SHA1(98adf5db270a853ab2a2e1cdd9edfd5657287a96) ) /* blue component */
ROM_LOAD( "sk3-3.4v", 0x0400, 0x0800, CRC(81714109) SHA1(577e513369a4368b7dd29dff80904eb0ac2004ff) ) /* tiles colortable */
ROM_LOAD( "sk3-4.5v", 0x0c00, 0x0800, CRC(1bf25acc) SHA1(a8db254ba4cbb85efc232a5bf9b268534455ad4a) ) /* sprites colortable */
ROM_LOAD( "sk3-3.4v", 0x0400, 0x0800, CRC(81714109) SHA1(577e513369a4368b7dd29dff80904eb0ac2004ff) ) /* tiles color table */
ROM_LOAD( "sk3-4.5v", 0x0c00, 0x0800, CRC(1bf25acc) SHA1(a8db254ba4cbb85efc232a5bf9b268534455ad4a) ) /* sprites color table */
ROM_LOAD( "sk3-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1252,8 +1251,8 @@ ROM_START( skykiddo )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "sk3-1.3r", 0x0000, 0x0200, CRC(9e81dedd) SHA1(9d2ddf51788d22ed65db9070684e586b2f64f99e) ) /* red & green components */
ROM_LOAD( "sk3-2.3s", 0x0200, 0x0200, CRC(cbfec4dd) SHA1(98adf5db270a853ab2a2e1cdd9edfd5657287a96) ) /* blue component */
ROM_LOAD( "sk3-3.4v", 0x0400, 0x0800, CRC(81714109) SHA1(577e513369a4368b7dd29dff80904eb0ac2004ff) ) /* tiles colortable */
ROM_LOAD( "sk3-4.5v", 0x0c00, 0x0800, CRC(1bf25acc) SHA1(a8db254ba4cbb85efc232a5bf9b268534455ad4a) ) /* sprites colortable */
ROM_LOAD( "sk3-3.4v", 0x0400, 0x0800, CRC(81714109) SHA1(577e513369a4368b7dd29dff80904eb0ac2004ff) ) /* tiles color table */
ROM_LOAD( "sk3-4.5v", 0x0c00, 0x0800, CRC(1bf25acc) SHA1(a8db254ba4cbb85efc232a5bf9b268534455ad4a) ) /* sprites color table */
ROM_LOAD( "sk3-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1287,8 +1286,8 @@ ROM_START( hopmappy )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "hm1-1.3r", 0x0000, 0x0200, CRC(cc801088) SHA1(d2c39ac1694d9b8c426e253702ecd096e68c6db9) ) /* red & green components */
ROM_LOAD( "hm1-2.3s", 0x0200, 0x0200, CRC(a1cb71c5) SHA1(d8c33c2e52d64ebf4a07d8a26453e7b872cae413) ) /* blue component */
ROM_LOAD( "hm1-3.4v", 0x0400, 0x0800, CRC(e362d613) SHA1(16d87711c1ac4ac2b649a32a5627cbd62cc5031f) ) /* tiles colortable */
ROM_LOAD( "hm1-4.5v", 0x0c00, 0x0800, CRC(678252b4) SHA1(9e2f7328532be3ac4b48bd5d52cd993108558452) ) /* sprites colortable */
ROM_LOAD( "hm1-3.4v", 0x0400, 0x0800, CRC(e362d613) SHA1(16d87711c1ac4ac2b649a32a5627cbd62cc5031f) ) /* tiles color table */
ROM_LOAD( "hm1-4.5v", 0x0c00, 0x0800, CRC(678252b4) SHA1(9e2f7328532be3ac4b48bd5d52cd993108558452) ) /* sprites color table */
ROM_LOAD( "hm1-5.6u", 0x1400, 0x0020, CRC(475bf500) SHA1(7e6a91e57d3709a5c70786c8e3ed545ee6026d03) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1328,8 +1327,8 @@ ROM_START( roishtar )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "ri1-1.3r", 0x0000, 0x0200, CRC(29cd0400) SHA1(a9b0d09492710e72e34155cd6a7b7c1a34c56b20) ) /* red & green components */
ROM_LOAD( "ri1-2.3s", 0x0200, 0x0200, CRC(02fd278d) SHA1(db104fc7acf2739def902180981eb7ba10ec3dda) ) /* blue component */
ROM_LOAD( "ri1-3.4v", 0x0400, 0x0800, CRC(cbd7e53f) SHA1(77ef70be4e8a21948d697649352a5e3527086cf2) ) /* tiles colortable */
ROM_LOAD( "ri1-4.5v", 0x0c00, 0x0800, CRC(22921617) SHA1(7304cb5a86f524f912feb8b58801393cce5d3b09) ) /* sprites colortable */
ROM_LOAD( "ri1-3.4v", 0x0400, 0x0800, CRC(cbd7e53f) SHA1(77ef70be4e8a21948d697649352a5e3527086cf2) ) /* tiles color table */
ROM_LOAD( "ri1-4.5v", 0x0c00, 0x0800, CRC(22921617) SHA1(7304cb5a86f524f912feb8b58801393cce5d3b09) ) /* sprites color table */
ROM_LOAD( "ri1-5.6u", 0x1400, 0x0020, CRC(e2188075) SHA1(be079ace2070433d4d90c757aef3e415b4e21455) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1370,8 +1369,8 @@ ROM_START( genpeitd )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "gt1-1.3r", 0x0000, 0x0200, CRC(2f0ddddb) SHA1(27fa45c0baf9a48002db11be9b3c0472ecfd986c) ) /* red & green components */
ROM_LOAD( "gt1-2.3s", 0x0200, 0x0200, CRC(87d27025) SHA1(a50f969d48a99c6d29141458fb3e34b23cf5e67c) ) /* blue component */
ROM_LOAD( "gt1-3.4v", 0x0400, 0x0800, CRC(c178de99) SHA1(67289ef9e5068636023316560f9f1690a8384bfb) ) /* tiles colortable */
ROM_LOAD( "gt1-4.5v", 0x0c00, 0x0800, CRC(9f48ef17) SHA1(78c813dd57326f3f5ab785005ef89ba96303adeb) ) /* sprites colortable */
ROM_LOAD( "gt1-3.4v", 0x0400, 0x0800, CRC(c178de99) SHA1(67289ef9e5068636023316560f9f1690a8384bfb) ) /* tiles color table */
ROM_LOAD( "gt1-4.5v", 0x0c00, 0x0800, CRC(9f48ef17) SHA1(78c813dd57326f3f5ab785005ef89ba96303adeb) ) /* sprites color table */
ROM_LOAD( "gt1-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1421,8 +1420,8 @@ ROM_START( rthunder )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "rt1-1.3r", 0x0000, 0x0200, CRC(8ef3bb9d) SHA1(4636d6b8ba7611b11d4863fab02475dc4a619eaf) ) /* red & green components */
ROM_LOAD( "rt1-2.3s", 0x0200, 0x0200, CRC(6510a8f2) SHA1(935f140bfa7e6f8cebafa7f1b0de99dd319273d4) ) /* blue component */
ROM_LOAD( "rt1-3.4v", 0x0400, 0x0800, CRC(95c7d944) SHA1(ca5fea028674882a61507ac7c89ada96f5b2674d) ) /* tiles colortable */
ROM_LOAD( "rt1-4.5v", 0x0c00, 0x0800, CRC(1391fec9) SHA1(8ca94e22110b20d2ecdf03610bcc89ff4245920f) ) /* sprites colortable */
ROM_LOAD( "rt1-3.4v", 0x0400, 0x0800, CRC(95c7d944) SHA1(ca5fea028674882a61507ac7c89ada96f5b2674d) ) /* tiles color table */
ROM_LOAD( "rt1-4.5v", 0x0c00, 0x0800, CRC(1391fec9) SHA1(8ca94e22110b20d2ecdf03610bcc89ff4245920f) ) /* sprites color table */
ROM_LOAD( "rt1-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1472,8 +1471,8 @@ ROM_START( rthundro )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "rt1-1.3r", 0x0000, 0x0200, CRC(8ef3bb9d) SHA1(4636d6b8ba7611b11d4863fab02475dc4a619eaf) ) /* red & green components */
ROM_LOAD( "rt1-2.3s", 0x0200, 0x0200, CRC(6510a8f2) SHA1(935f140bfa7e6f8cebafa7f1b0de99dd319273d4) ) /* blue component */
ROM_LOAD( "rt1-3.4v", 0x0400, 0x0800, CRC(95c7d944) SHA1(ca5fea028674882a61507ac7c89ada96f5b2674d) ) /* tiles colortable */
ROM_LOAD( "rt1-4.5v", 0x0c00, 0x0800, CRC(1391fec9) SHA1(8ca94e22110b20d2ecdf03610bcc89ff4245920f) ) /* sprites colortable */
ROM_LOAD( "rt1-3.4v", 0x0400, 0x0800, CRC(95c7d944) SHA1(ca5fea028674882a61507ac7c89ada96f5b2674d) ) /* tiles color table */
ROM_LOAD( "rt1-4.5v", 0x0c00, 0x0800, CRC(1391fec9) SHA1(8ca94e22110b20d2ecdf03610bcc89ff4245920f) ) /* sprites color table */
ROM_LOAD( "rt1-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )
@ -1523,8 +1522,8 @@ ROM_START( wndrmomo )
ROM_REGION( 0x1420, REGION_PROMS, 0 )
ROM_LOAD( "wm1-1.3r", 0x0000, 0x0200, CRC(1af8ade8) SHA1(1aa0d314c34abc4154092d4b588214afb0b21e22) ) /* red & green components */
ROM_LOAD( "wm1-2.3s", 0x0200, 0x0200, CRC(8694e213) SHA1(f00d692e587c3706e71b6eeef21e1ea87c9dd921) ) /* blue component */
ROM_LOAD( "wm1-3.4v", 0x0400, 0x0800, CRC(2ffaf9a4) SHA1(2002df3cc38e05f3e127d05c244cb101d1f1d85f) ) /* tiles colortable */
ROM_LOAD( "wm1-4.5v", 0x0c00, 0x0800, CRC(f4e83e0b) SHA1(b000d884c6e0373b0403bc9d63eb0452c1197491) ) /* sprites colortable */
ROM_LOAD( "wm1-3.4v", 0x0400, 0x0800, CRC(2ffaf9a4) SHA1(2002df3cc38e05f3e127d05c244cb101d1f1d85f) ) /* tiles color table */
ROM_LOAD( "wm1-4.5v", 0x0c00, 0x0800, CRC(f4e83e0b) SHA1(b000d884c6e0373b0403bc9d63eb0452c1197491) ) /* sprites color table */
ROM_LOAD( "wm1-5.6u", 0x1400, 0x0020, CRC(e4130804) SHA1(e1a3e1383186d036fba6dc8a8681f48f24f59281) ) /* tile address decoder (used at runtime) */
ROM_REGION( 0x10000, REGION_CPU3, 0 )

4
src/mame/drivers/pasha2.c
View File

@ -386,10 +386,10 @@ static VIDEO_UPDATE( pasha2 )
}
static MACHINE_DRIVER_START( pasha2 )
MDRV_CPU_ADD(E116T /*E116XT*/, 20000000) /* 20 MHz */
MDRV_CPU_ADD(E116XT, 20000000*4) /* 4x internal multiplier */
MDRV_CPU_PROGRAM_MAP(pasha2_map,0)
MDRV_CPU_IO_MAP(pasha2_io,0)
MDRV_CPU_VBLANK_INT(irq5_line_pulse, 1)
MDRV_CPU_VBLANK_INT(irq0_line_hold, 1)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_60HZ_VBLANK_DURATION)

67
src/mame/drivers/segas32.c
View File

@ -3533,34 +3533,66 @@ ROM_END
*/
ROM_START( scross )
ROM_REGION( 0x200000, REGION_CPU1, 0 ) /* v60 code */
ROM_LOAD32_WORD_x2( "epr15093.bin", 0x000000, 0x040000, CRC(2adc7a4b) SHA1(dca71f00d94898c0758394704d819e13482bf120) )
ROM_LOAD32_WORD_x2( "epr15094.bin", 0x000002, 0x040000, CRC(bbb0ae73) SHA1(0d8837706405f301adf8fa85c8d4813d7600af98) )
ROM_LOAD32_WORD( "epr15018.bin", 0x100000, 0x080000, CRC(3a98385e) SHA1(8088d337655030c28e290da4bbf44cb647dab66c) )
ROM_LOAD32_WORD( "epr15019.bin", 0x100002, 0x080000, CRC(8bf4ac83) SHA1(e594d9d9b42d0765ed8a20a40b7dd92b75124d34) )
ROM_LOAD32_WORD_x2( "epr-15093.bin", 0x000000, 0x040000, CRC(2adc7a4b) SHA1(dca71f00d94898c0758394704d819e13482bf120) )
ROM_LOAD32_WORD_x2( "epr-15094.bin", 0x000002, 0x040000, CRC(bbb0ae73) SHA1(0d8837706405f301adf8fa85c8d4813d7600af98) )
ROM_LOAD32_WORD( "epr-15018.bin", 0x100000, 0x080000, CRC(3a98385e) SHA1(8088d337655030c28e290da4bbf44cb647dab66c) )
ROM_LOAD32_WORD( "epr-15019.bin", 0x100002, 0x080000, CRC(8bf4ac83) SHA1(e594d9d9b42d0765ed8a20a40b7dd92b75124d34) )
ROM_REGION( 0x180000, REGION_CPU2, 0 ) /* sound CPU */
ROM_LOAD_x4( "epr15192.bin", 0x100000, 0x20000, CRC(7524290b) SHA1(ee58be2c0c4293ee19622b96ca493f4ce4da0038) )
ROM_LOAD_x4( "epr-15192.bin", 0x100000, 0x20000, CRC(7524290b) SHA1(ee58be2c0c4293ee19622b96ca493f4ce4da0038) )
ROM_REGION( 0x400000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */
/* 1ST AND 2ND HALF IDENTICAL (all roms) */
ROM_LOAD16_BYTE( "epr15020.bin", 0x000000, 0x200000, CRC(65afea2f) SHA1(ad573727398bfac8e94f321be84b60e5690bfba6) )
ROM_LOAD16_BYTE( "epr15021.bin", 0x000001, 0x200000, CRC(27bc6969) SHA1(d6bb446becb2d36b73bca5055357a43b837afc0a) )
ROM_LOAD16_BYTE( "epr-15020.bin", 0x000000, 0x200000, CRC(65afea2f) SHA1(ad573727398bfac8e94f321be84b60e5690bfba6) )
ROM_LOAD16_BYTE( "epr-15021.bin", 0x000001, 0x200000, CRC(27bc6969) SHA1(d6bb446becb2d36b73bca5055357a43b837afc0a) )
ROM_REGION32_BE( 0x1000000, REGION_GFX2, 0 ) /* sprites */
/* 1ST AND 2ND HALF IDENTICAL (all roms) */
ROMX_LOAD( "epr15022.bin", 0x000000, 0x200000, CRC(09ca9608) SHA1(cbd0138c1c7811d42b051fed6a7e3526cc4e457f) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15024.bin", 0x000002, 0x200000, CRC(0dc920eb) SHA1(d24d637aa0dcd3bae779ef7e12663df81667dbf7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15026.bin", 0x000004, 0x200000, CRC(67637c37) SHA1(7c250e7e9dd5c07da4fa35bacdfcecd5e8fa4ec7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15028.bin", 0x000006, 0x200000, CRC(9929abdc) SHA1(34b6624ddd3a0aedec0a2b433643a37f745ec66d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15023.bin", 0x800000, 0x200000, CRC(0e42a2bb) SHA1(503214caf5fa9a2324b61e04f378fd1a790322df) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15025.bin", 0x800002, 0x200000, CRC(0c677fc6) SHA1(fc2207008417072e7ee91f722797d827e150ce2d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15027.bin", 0x800004, 0x200000, CRC(d6d077f9) SHA1(928cefae9ae58239fbffb1dcee282c6ac1e661fe) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr15029.bin", 0x800006, 0x200000, CRC(707af749) SHA1(fae5325c983df3cf198878220ad88d47339ac512) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15022.bin", 0x000000, 0x200000, CRC(09ca9608) SHA1(cbd0138c1c7811d42b051fed6a7e3526cc4e457f) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15024.bin", 0x000002, 0x200000, CRC(0dc920eb) SHA1(d24d637aa0dcd3bae779ef7e12663df81667dbf7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15026.bin", 0x000004, 0x200000, CRC(67637c37) SHA1(7c250e7e9dd5c07da4fa35bacdfcecd5e8fa4ec7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15028.bin", 0x000006, 0x200000, CRC(9929abdc) SHA1(34b6624ddd3a0aedec0a2b433643a37f745ec66d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15023.bin", 0x800000, 0x200000, CRC(0e42a2bb) SHA1(503214caf5fa9a2324b61e04f378fd1a790322df) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15025.bin", 0x800002, 0x200000, CRC(0c677fc6) SHA1(fc2207008417072e7ee91f722797d827e150ce2d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15027.bin", 0x800004, 0x200000, CRC(d6d077f9) SHA1(928cefae9ae58239fbffb1dcee282c6ac1e661fe) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15029.bin", 0x800006, 0x200000, CRC(707af749) SHA1(fae5325c983df3cf198878220ad88d47339ac512) , ROM_SKIP(6)|ROM_GROUPWORD )
ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* Sega PCM sound data */
/* 1ST AND 2ND HALF IDENTICAL (all roms, are these OK?) */
ROM_LOAD("epr15031.bin", 0x000000, 0x200000, CRC(663a7fd2) SHA1(b4393a687225b075db21960d19a6ddd7a9d7d086) )
ROM_LOAD("epr15032.bin", 0x200000, 0x200000, CRC(cb709f3d) SHA1(3962c8b5907d1f8f611f58ddac693cc47364a79c) )
ROM_LOAD("epr-15031.bin", 0x000000, 0x200000, CRC(663a7fd2) SHA1(b4393a687225b075db21960d19a6ddd7a9d7d086) )
ROM_LOAD("epr-15032.bin", 0x200000, 0x200000, CRC(cb709f3d) SHA1(3962c8b5907d1f8f611f58ddac693cc47364a79c) )
ROM_END
ROM_START( scrossu )
ROM_REGION( 0x200000, REGION_CPU1, 0 ) /* v60 code */
ROM_LOAD32_WORD_x2( "epr-15091.bin", 0x000000, 0x040000, CRC(2c572293) SHA1(6377a6eb6084f7332ce6eeaaf0c37200da792d0c) )
ROM_LOAD32_WORD_x2( "epr-15092.bin", 0x000002, 0x040000, CRC(6e3e175a) SHA1(feaca0720646e2a4b78b376e99dc86788adb98e7) )
ROM_LOAD32_WORD( "epr-15018.bin", 0x100000, 0x080000, CRC(3a98385e) SHA1(8088d337655030c28e290da4bbf44cb647dab66c) )
ROM_LOAD32_WORD( "epr-15019.bin", 0x100002, 0x080000, CRC(8bf4ac83) SHA1(e594d9d9b42d0765ed8a20a40b7dd92b75124d34) )
ROM_REGION( 0x180000, REGION_CPU2, 0 ) /* sound CPU */
ROM_LOAD_x4( "epr-15192.bin", 0x100000, 0x20000, CRC(7524290b) SHA1(ee58be2c0c4293ee19622b96ca493f4ce4da0038) )
ROM_REGION( 0x400000, REGION_GFX1, ROMREGION_DISPOSE ) /* tiles */
/* 1ST AND 2ND HALF IDENTICAL (all roms) */
ROM_LOAD16_BYTE( "epr-15020.bin", 0x000000, 0x200000, CRC(65afea2f) SHA1(ad573727398bfac8e94f321be84b60e5690bfba6) )
ROM_LOAD16_BYTE( "epr-15021.bin", 0x000001, 0x200000, CRC(27bc6969) SHA1(d6bb446becb2d36b73bca5055357a43b837afc0a) )
ROM_REGION32_BE( 0x1000000, REGION_GFX2, 0 ) /* sprites */
/* 1ST AND 2ND HALF IDENTICAL (all roms) */
ROMX_LOAD( "epr-15022.bin", 0x000000, 0x200000, CRC(09ca9608) SHA1(cbd0138c1c7811d42b051fed6a7e3526cc4e457f) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15024.bin", 0x000002, 0x200000, CRC(0dc920eb) SHA1(d24d637aa0dcd3bae779ef7e12663df81667dbf7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15026.bin", 0x000004, 0x200000, CRC(67637c37) SHA1(7c250e7e9dd5c07da4fa35bacdfcecd5e8fa4ec7) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15028.bin", 0x000006, 0x200000, CRC(9929abdc) SHA1(34b6624ddd3a0aedec0a2b433643a37f745ec66d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15023.bin", 0x800000, 0x200000, CRC(0e42a2bb) SHA1(503214caf5fa9a2324b61e04f378fd1a790322df) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15025.bin", 0x800002, 0x200000, CRC(0c677fc6) SHA1(fc2207008417072e7ee91f722797d827e150ce2d) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15027.bin", 0x800004, 0x200000, CRC(d6d077f9) SHA1(928cefae9ae58239fbffb1dcee282c6ac1e661fe) , ROM_SKIP(6)|ROM_GROUPWORD )
ROMX_LOAD( "epr-15029.bin", 0x800006, 0x200000, CRC(707af749) SHA1(fae5325c983df3cf198878220ad88d47339ac512) , ROM_SKIP(6)|ROM_GROUPWORD )
ROM_REGION( 0x400000, REGION_SOUND1, 0 ) /* Sega PCM sound data */
/* 1ST AND 2ND HALF IDENTICAL (all roms, are these OK?) */
ROM_LOAD("epr-15031.bin", 0x000000, 0x200000, CRC(663a7fd2) SHA1(b4393a687225b075db21960d19a6ddd7a9d7d086) )
ROM_LOAD("epr-15032.bin", 0x200000, 0x200000, CRC(cb709f3d) SHA1(3962c8b5907d1f8f611f58ddac693cc47364a79c) )
ROM_END
@ -4045,5 +4077,6 @@ GAME( 1994, harddunj, harddunk, multi32, harddunk, harddunk, ROT0, "Sega",
GAME( 1992, orunners, 0, multi32, orunners, orunners, ROT0, "Sega", "OutRunners (World)", GAME_IMPERFECT_GRAPHICS )
GAME( 1992, orunneru, orunners, multi32, orunners, orunners, ROT0, "Sega", "OutRunners (US)", GAME_IMPERFECT_GRAPHICS )
GAME( 1992, scross, 0, multi32, scross, scross, ROT0, "Sega", "Stadium Cross (World)", GAME_IMPERFECT_GRAPHICS )
GAME( 1992, scrossu, scross, multi32, scross, scross, ROT0, "Sega", "Stadium Cross (US)", GAME_IMPERFECT_GRAPHICS )
GAME( 1992, titlef, 0, multi32, titlef, titlef, ROT0, "Sega", "Title Fight (World)", GAME_IMPERFECT_GRAPHICS )
GAME( 1992, titlefu, titlef, multi32, titlef, titlef, ROT0, "Sega", "Title Fight (US)", GAME_IMPERFECT_GRAPHICS )

101
src/mame/drivers/snk.c
View File

@ -40,7 +40,7 @@ Oct. 5, 2003:
Stephh's notes (based on the games Z80 code and some tests) :
1) 'ftsoccer'
1) 'fsoccerb'
- The code to support the rotary jotsticks has been removed and/or patched
in this version (check the 'jmp' instruction at 0x00f1).
@ -120,8 +120,8 @@ AT08XX03:
- revamped CPU handshaking, improved clipping and made changes public to
marvins.c, hal21.c and sgladiat.c
- fixed shadows in tnk3, athena, fitegolf, countryc,
and ftsoccer
- added highlights to tdfever and ftsoccer(needs masking at team selection)
and fsoccer
- added highlights to tdfever and fsoccer(needs masking at team selection)
- notes:
Mad Crasher and Gladiator(sgladiat.c) have different memory maps but
@ -466,7 +466,7 @@ static READ8_HANDLER( cpuA_io_r ){
case 0x500: return snk_input_port_r( 9 ); // unused by tdfever
case 0x580: return snk_input_port_r( 10 ); // dsw
case 0x600: return snk_input_port_r( 11 ); // dsw
case 0x080: return snk_input_port_r( 12 ); // player start (types C and D in 'ftsoccer')
case 0x080: return snk_input_port_r( 12 ); // player start (types C and D in 'fsoccer')
case 0x700: return(snk_cpuB_nmi_trigger_r(0));
@ -1258,7 +1258,7 @@ static MACHINE_DRIVER_START( tdfever2 )
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( ftsoccer )
static MACHINE_DRIVER_START( fsoccer )
/* basic machine hardware */
MDRV_CPU_ADD(Z80, 4000000)
@ -1272,7 +1272,7 @@ static MACHINE_DRIVER_START( ftsoccer )
MDRV_CPU_ADD(Z80, 4000000)
/* audio CPU */
MDRV_CPU_PROGRAM_MAP(Y8950_sound_map, 0)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
MDRV_CPU_VBLANK_INT(irq0_line_hold,2)
MDRV_SCREEN_REFRESH_RATE(60)
MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION)
@ -2665,15 +2665,15 @@ ROM_END
/***********************************************************************/
ROM_START( ftsoccer )
ROM_START( fsoccer )
ROM_REGION( 0x10000, REGION_CPU1, 0 ) /* 64k for cpuA code */
ROM_LOAD( "ft-003.bin", 0x00000, 0x10000, CRC(649d4448) SHA1(876a4cf3ce3211ee19390deb17a661ec52b419d2) )
ROM_LOAD( "fs3_ver4.bin", 0x00000, 0x10000, CRC(94c3f918) SHA1(7c8343556d6c3897e72f8b41c6fbdc5c58e78b8c) )
ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* 64k for cpuB code */
ROM_LOAD( "ft-001.bin", 0x00000, 0x10000, CRC(2f68e38b) SHA1(0cbf2de24a5a5ae2134eb6f1e1404691554192bc) )
ROM_LOAD( "fs1_ver4.bin", 0x00000, 0x10000, CRC(97830108) SHA1(dab241baf8d889c768e1fbe25f1e5059b3cbbab6) )
ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* 64k for sound code */
ROM_LOAD( "ft-002.bin", 0x00000, 0x10000, CRC(9ee54ea1) SHA1(4e3bbacaa0e247eb8c4043f394e763817a4f9a28) )
ROM_LOAD( "fs2.bin", 0x00000, 0x10000, CRC(9ee54ea1) SHA1(4e3bbacaa0e247eb8c4043f394e763817a4f9a28) )
ROM_REGION( 0x0c00, REGION_PROMS, 0 )
ROM_LOAD( "prom2.bin", 0x000, 0x400, CRC(bf4ac706) SHA1(b5015563d88dbd93ba2838f01b189812958f142b) ) /* red */
@ -2681,29 +2681,70 @@ ROM_START( ftsoccer )
ROM_LOAD( "prom3.bin", 0x800, 0x400, CRC(dbeddb14) SHA1(6053b587a3c8272aefe728a7198a15aa7fb9b2fa) ) /* blue */
ROM_REGION( 0x8000, REGION_GFX1, ROMREGION_DISPOSE ) /* characters */
ROM_LOAD( "ft-013.bin", 0x0000, 0x08000, CRC(0de7b7ad) SHA1(4fa54b2acf83f03d09d16fc054ad6623cafe0f4a) )
ROM_LOAD( "fs13.bin", 0x0000, 0x08000, CRC(0de7b7ad) SHA1(4fa54b2acf83f03d09d16fc054ad6623cafe0f4a) )
ROM_REGION( 0x50000, REGION_GFX2, ROMREGION_DISPOSE ) /* background tiles */
ROM_LOAD( "ft-014.bin", 0x00000, 0x10000, CRC(38c38b40) SHA1(c4580add0946720441f5ef751d0d4a944cd92ad5) )
ROM_LOAD( "ft-015.bin", 0x10000, 0x10000, CRC(a614834f) SHA1(d73930e4bd780915e1b0d7f3fe7cbeaad19c233f) )
ROM_LOAD( "fs14.bin", 0x00000, 0x10000, CRC(38c38b40) SHA1(c4580add0946720441f5ef751d0d4a944cd92ad5) )
ROM_LOAD( "fs15.bin", 0x10000, 0x10000, CRC(a614834f) SHA1(d73930e4bd780915e1b0d7f3fe7cbeaad19c233f) )
// ROM_REGION( 0x40000, REGION_GFX3, ROMREGION_DISPOSE ) /* 16x16 sprites */
ROM_REGION( 0x80000, REGION_GFX3, ROMREGION_DISPOSE ) /* 32x32 sprites */
ROM_LOAD( "ft-005.bin", 0x10000, 0x10000, CRC(def2f1d8) SHA1(b72e4dec3306d8afe461ac812b2de67ee85f9dd9) )
ROM_LOAD( "ft-006.bin", 0x00000, 0x10000, CRC(588d14b3) SHA1(c0489b061503677a38e4c5800ea8be17aabf4039) )
ROM_LOAD( "fs5.bin", 0x10000, 0x10000, CRC(def2f1d8) SHA1(b72e4dec3306d8afe461ac812b2de67ee85f9dd9) )
ROM_LOAD( "fs6.bin", 0x00000, 0x10000, CRC(588d14b3) SHA1(c0489b061503677a38e4c5800ea8be17aabf4039) )
ROM_LOAD( "ft-007.bin", 0x30000, 0x10000, CRC(d584964b) SHA1(7c806fc40dcce700ed0c268abbd2704938b65ff2) )
ROM_LOAD( "ft-008.bin", 0x20000, 0x10000, CRC(11156a7d) SHA1(f298a54fa4c118bf8e7c7cccb6c95a4b97daf4d4) )
ROM_LOAD( "fs7.bin", 0x30000, 0x10000, CRC(d584964b) SHA1(7c806fc40dcce700ed0c268abbd2704938b65ff2) )
ROM_LOAD( "fs8.bin", 0x20000, 0x10000, CRC(11156a7d) SHA1(f298a54fa4c118bf8e7c7cccb6c95a4b97daf4d4) )
ROM_LOAD( "ft-009.bin", 0x50000, 0x10000, CRC(d8112aa6) SHA1(575dd6dff2f00901603768f2c121eb0ea5afa444) )
ROM_LOAD( "ft-010.bin", 0x40000, 0x10000, CRC(e42864d8) SHA1(fe18f58e5507676780fe181e2fb0e0e9d72e276e) )
ROM_LOAD( "fs9.bin", 0x50000, 0x10000, CRC(d8112aa6) SHA1(575dd6dff2f00901603768f2c121eb0ea5afa444) )
ROM_LOAD( "fs10.bin", 0x40000, 0x10000, CRC(e42864d8) SHA1(fe18f58e5507676780fe181e2fb0e0e9d72e276e) )
ROM_LOAD( "ft-011.bin", 0x70000, 0x10000, CRC(022f3e96) SHA1(57aa423b8f62015566bc3021300ac7e9682ed500) )
ROM_LOAD( "ft-012.bin", 0x60000, 0x10000, CRC(b2442c30) SHA1(ba9331810659726389494ddc7c94c5a02ba80747) )
ROM_LOAD( "fs11.bin", 0x70000, 0x10000, CRC(022f3e96) SHA1(57aa423b8f62015566bc3021300ac7e9682ed500) )
ROM_LOAD( "fs12.bin", 0x60000, 0x10000, CRC(b2442c30) SHA1(ba9331810659726389494ddc7c94c5a02ba80747) )
ROM_REGION( 0x10000, REGION_SOUND1, 0 )
ROM_LOAD( "ft-004.bin", 0x00000, 0x10000, CRC(435c3716) SHA1(42053741f60594e7ae8516b3ba600f5badb3620f) )
ROM_LOAD( "fs4.bin", 0x00000, 0x10000, CRC(435c3716) SHA1(42053741f60594e7ae8516b3ba600f5badb3620f) )
ROM_END
ROM_START( fsoccerb )
ROM_REGION( 0x10000, REGION_CPU1, 0 ) /* 64k for cpuA code */
ROM_LOAD( "ft-003.bin", 0x00000, 0x10000, CRC(649d4448) SHA1(876a4cf3ce3211ee19390deb17a661ec52b419d2) )
ROM_REGION( 0x10000, REGION_CPU2, 0 ) /* 64k for cpuB code */
ROM_LOAD( "ft-001.bin", 0x00000, 0x10000, CRC(2f68e38b) SHA1(0cbf2de24a5a5ae2134eb6f1e1404691554192bc) )
ROM_REGION( 0x10000, REGION_CPU3, 0 ) /* 64k for sound code */
ROM_LOAD( "fs2.bin", 0x00000, 0x10000, CRC(9ee54ea1) SHA1(4e3bbacaa0e247eb8c4043f394e763817a4f9a28) )
ROM_REGION( 0x0c00, REGION_PROMS, 0 )
ROM_LOAD( "prom2.bin", 0x000, 0x400, CRC(bf4ac706) SHA1(b5015563d88dbd93ba2838f01b189812958f142b) ) /* red */
ROM_LOAD( "prom1.bin", 0x400, 0x400, CRC(1bac8010) SHA1(16854b1b6f3d1be48a247796d65aeb90547099b6) ) /* green */
ROM_LOAD( "prom3.bin", 0x800, 0x400, CRC(dbeddb14) SHA1(6053b587a3c8272aefe728a7198a15aa7fb9b2fa) ) /* blue */
ROM_REGION( 0x8000, REGION_GFX1, ROMREGION_DISPOSE ) /* characters */
ROM_LOAD( "fs13.bin", 0x0000, 0x08000, CRC(0de7b7ad) SHA1(4fa54b2acf83f03d09d16fc054ad6623cafe0f4a) )
ROM_REGION( 0x50000, REGION_GFX2, ROMREGION_DISPOSE ) /* background tiles */
ROM_LOAD( "fs14.bin", 0x00000, 0x10000, CRC(38c38b40) SHA1(c4580add0946720441f5ef751d0d4a944cd92ad5) )
ROM_LOAD( "fs15.bin", 0x10000, 0x10000, CRC(a614834f) SHA1(d73930e4bd780915e1b0d7f3fe7cbeaad19c233f) )
// ROM_REGION( 0x40000, REGION_GFX3, ROMREGION_DISPOSE ) /* 16x16 sprites */
ROM_REGION( 0x80000, REGION_GFX3, ROMREGION_DISPOSE ) /* 32x32 sprites */
ROM_LOAD( "fs5.bin", 0x10000, 0x10000, CRC(def2f1d8) SHA1(b72e4dec3306d8afe461ac812b2de67ee85f9dd9) )
ROM_LOAD( "fs6.bin", 0x00000, 0x10000, CRC(588d14b3) SHA1(c0489b061503677a38e4c5800ea8be17aabf4039) )
ROM_LOAD( "fs7.bin", 0x30000, 0x10000, CRC(d584964b) SHA1(7c806fc40dcce700ed0c268abbd2704938b65ff2) )
ROM_LOAD( "fs8.bin", 0x20000, 0x10000, CRC(11156a7d) SHA1(f298a54fa4c118bf8e7c7cccb6c95a4b97daf4d4) )
ROM_LOAD( "fs9.bin", 0x50000, 0x10000, CRC(d8112aa6) SHA1(575dd6dff2f00901603768f2c121eb0ea5afa444) )
ROM_LOAD( "fs10.bin", 0x40000, 0x10000, CRC(e42864d8) SHA1(fe18f58e5507676780fe181e2fb0e0e9d72e276e) )
ROM_LOAD( "fs11.bin", 0x70000, 0x10000, CRC(022f3e96) SHA1(57aa423b8f62015566bc3021300ac7e9682ed500) )
ROM_LOAD( "fs12.bin", 0x60000, 0x10000, CRC(b2442c30) SHA1(ba9331810659726389494ddc7c94c5a02ba80747) )
ROM_REGION( 0x10000, REGION_SOUND1, 0 )
ROM_LOAD( "fs4.bin", 0x00000, 0x10000, CRC(435c3716) SHA1(42053741f60594e7ae8516b3ba600f5badb3620f) )
ROM_END
/***********************************************************************/
@ -3817,7 +3858,7 @@ static INPUT_PORTS_START( countryc )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
INPUT_PORTS_END
static INPUT_PORTS_START( ftsoccer )
static INPUT_PORTS_START( fsoccer )
PORT_START_TAG("IN0")
PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
@ -4250,7 +4291,7 @@ static const SNK_INPUT_PORT_TYPE choppera_io[SNK_MAX_INPUT_PORTS] = {
/* c080 */ SNK_UNUSED
};
static const SNK_INPUT_PORT_TYPE ftsoccer_io[SNK_MAX_INPUT_PORTS] = {
static const SNK_INPUT_PORT_TYPE fsoccer_io[SNK_MAX_INPUT_PORTS] = {
/* c000 */ SNK_INP0,
/* c100 */ SNK_INP1, SNK_INP2, SNK_INP3, SNK_INP4, /* joy1..joy4 */
/* c300 */ SNK_INP5, SNK_INP6, SNK_INP7, SNK_INP8, /* aim1..aim4 */
@ -4424,9 +4465,9 @@ static DRIVER_INIT( tdfever2 ){
snk_irq_delay = 1000;
}
static DRIVER_INIT( ftsoccer ){
static DRIVER_INIT( fsoccer ){
snk_sound_busy_bit = 0x08;
snk_io = ftsoccer_io;
snk_io = fsoccer_io;
hard_flags = 0;
videoram = snk_rambase + 0x800;
snk_gamegroup = 7;
@ -4476,7 +4517,7 @@ GAME( 1986, ikarijp, ikari, ikari, ikarijp, ikarijp, ROT270, "SNK", "Ik
GAME( 1986, ikarijpb, ikari, ikari, ikarijpb, ikarijpb, ROT270, "bootleg", "Ikari (Japan bootleg)", GAME_NO_COCKTAIL )
GAME( 1986, victroad, 0, victroad, victroad, victroad, ROT270, "SNK", "Victory Road", GAME_NO_COCKTAIL )
GAME( 1986, dogosoke, victroad, victroad, victroad, dogosoke, ROT270, "SNK", "Dogou Souken", GAME_NO_COCKTAIL )
GAME( 1986, dogosokj, victroad, victroad, dogosokj, dogosoke, ROT270, "bootleg", "Dogou Souken (Joystick bootleg)", GAME_NO_COCKTAIL )
GAME( 1986, dogosokj, victroad, victroad, dogosokj, dogosoke, ROT270, "bootleg", "Dogou Souken (Joystick hack bootleg)", GAME_NO_COCKTAIL )
GAME( 1987, gwar, 0, gwar, gwar, gwar, ROT270, "SNK", "Guerrilla War (US)", GAME_NO_COCKTAIL )
GAME( 1987, gwarj, gwar, gwar, gwar, gwar, ROT270, "SNK", "Guevara (Japan)", GAME_NO_COCKTAIL )
GAME( 1987, gwara, gwar, gwar, gwar, gwara, ROT270, "SNK", "Guerrilla War (Version 1)", GAME_NO_COCKTAIL )
@ -4492,6 +4533,8 @@ GAME( 1988, choppera, chopper, chopper1, choppera, choppera, ROT270, "SNK", "Ch
GAME( 1988, chopperb, chopper, chopper1, legofair, chopper, ROT270, "SNK", "Chopper I (US set 3)", GAME_NO_COCKTAIL )
GAME( 1988, legofair, chopper, chopper1, legofair, chopper, ROT270, "SNK", "Koukuu Kihei Monogatari - The Legend of Air Cavalry (Japan)", GAME_NO_COCKTAIL )
GAME( 1987, tdfever, 0, tdfever, tdfever, tdfever, ROT270, "SNK", "TouchDown Fever", GAME_NO_COCKTAIL )
GAME( 1987, tdfeverj, tdfever, tdfever, tdfeverj, tdfever, ROT270, "SNK", "TouchDown Fever (Japan)", GAME_NO_COCKTAIL )
GAME( 1987, tdfeverj, tdfever, tdfever, tdfeverj, tdfever, ROT270, "SNK", "TouchDown Fever (Japan)", GAME_NO_COCKTAIL )
GAME( 1988, tdfever2, tdfever, tdfever2, tdfever, tdfever2, ROT270, "SNK", "TouchDown Fever 2", GAME_NO_COCKTAIL ) /* upgrade kit for Touchdown Fever */
GAME( 1988, ftsoccer, 0, ftsoccer, ftsoccer, ftsoccer, ROT0, "SNK", "Fighting Soccer", GAME_NO_COCKTAIL )
GAME( 1988, fsoccer, 0, fsoccer, fsoccer, fsoccer, ROT0, "SNK", "Fighting Soccer (version 4)", GAME_NO_COCKTAIL )
GAME( 1988, fsoccerb, fsoccer, fsoccer, fsoccer, fsoccer, ROT0, "bootleg", "Fighting Soccer (joystick hack bootleg)", GAME_NO_COCKTAIL )

16
src/mame/drivers/tmaster.c
View File

@ -33,7 +33,7 @@ To Do:
***************************************************************************/
int okibank;
static int okibank;
static WRITE16_HANDLER( tmaster_oki_bank_w )
{
if (ACCESSING_MSB)
@ -55,9 +55,9 @@ static WRITE16_HANDLER( tmaster_oki_bank_w )
***************************************************************************/
int touchscreen;
static int touchscreen;
void show_touchscreen(void)
static void show_touchscreen(void)
{
#ifdef MAME_DEBUG
popmessage("% d] %03x %03x - %d",touchscreen,readinputportbytag("TSCREEN_X")&0x1ff,readinputportbytag("TSCREEN_Y"),okibank);
@ -127,9 +127,9 @@ static READ16_HANDLER( tmaster_tscreen_y_lo_r ) { return 0x00; }
***************************************************************************/
static mame_bitmap *tmaster_bitmap[2];
UINT16 *tmaster_regs;
UINT16 tmaster_color;
UINT16 tmaster_addr;
static UINT16 *tmaster_regs;
static UINT16 tmaster_color;
static UINT16 tmaster_addr;
static VIDEO_START( tmaster )
{
@ -235,7 +235,7 @@ static void tmaster_draw(void)
}
}
WRITE16_HANDLER( tmaster_blitter_w )
static WRITE16_HANDLER( tmaster_blitter_w )
{
COMBINE_DATA( tmaster_regs + offset );
switch (offset*2)
@ -300,7 +300,7 @@ ADDRESS_MAP_END
***************************************************************************/
INPUT_PORTS_START( tmaster )
static INPUT_PORTS_START( tmaster )
PORT_START_TAG("TSCREEN_X")
PORT_BIT( 0x01ff, 0x100, IPT_LIGHTGUN_X ) PORT_CROSSHAIR(X, 1, 0, 0) PORT_SENSITIVITY(35) PORT_KEYDELTA(3) PORT_PLAYER(1)
PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_IMPULSE(5) // press

12
src/mame/drivers/turbo.c
View File

@ -1328,8 +1328,8 @@ ROM_START( buckrog )
ROM_LOAD( "pr-5195.cpu-ic53", 0x0020, 0x0020, CRC(181c6d23) SHA1(4749b205cbaa513ee65a644946235d2cfe275648) ) /* sprite state machine */
ROM_LOAD( "pr-5196.cpu-ic10", 0x0100, 0x0200, CRC(04204bcf) SHA1(5636eb184463ac58fcfd20012d13d14fb0769124) ) /* sprite Y scaling */
ROM_LOAD( "pr-5197.cpu-ic78", 0x0300, 0x0200, CRC(a42674af) SHA1(db3590dd0d0f8a85d4ba32ac4ee33f2f4ee4c348) ) /* video timing */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char colortable */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite colortable */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char color table */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite color table */
ROM_END
@ -1366,8 +1366,8 @@ ROM_START( buckrogn )
ROM_LOAD( "pr-5195.cpu-ic53", 0x0020, 0x0020, CRC(181c6d23) SHA1(4749b205cbaa513ee65a644946235d2cfe275648) ) /* sprite state machine */
ROM_LOAD( "pr-5196.cpu-ic10", 0x0100, 0x0200, CRC(04204bcf) SHA1(5636eb184463ac58fcfd20012d13d14fb0769124) ) /* sprite Y scaling */
ROM_LOAD( "pr-5197.cpu-ic78", 0x0300, 0x0200, CRC(a42674af) SHA1(db3590dd0d0f8a85d4ba32ac4ee33f2f4ee4c348) ) /* video timing */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char colortable */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite colortable */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char color table */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite color table */
ROM_END
@ -1404,8 +1404,8 @@ ROM_START( zoom909 )
ROM_LOAD( "pr-5195.cpu-ic53", 0x0020, 0x0020, CRC(181c6d23) SHA1(4749b205cbaa513ee65a644946235d2cfe275648) ) /* sprite state machine */
ROM_LOAD( "pr-5196.cpu-ic10", 0x0100, 0x0200, CRC(04204bcf) SHA1(5636eb184463ac58fcfd20012d13d14fb0769124) ) /* sprite Y scaling */
ROM_LOAD( "pr-5197.cpu-ic78", 0x0300, 0x0200, CRC(a42674af) SHA1(db3590dd0d0f8a85d4ba32ac4ee33f2f4ee4c348) ) /* video timing */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char colortable */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, BAD_DUMP CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite colortable */
ROM_LOAD( "pr-5198.cpu-ic93", 0x0500, 0x0200, CRC(32e74bc8) SHA1(dd2c812efd7b8f6b31a45e698d6453ea6bec132e) ) /* char color table */
ROM_LOAD( "pr-5199.cpu-ic95", 0x0700, 0x0400, BAD_DUMP CRC(45e997a8) SHA1(023703b90b503310351b12157b1e732e61430fa5) ) /* sprite color table */
ROM_END

Some files were not shown because too many files have changed in this diff Show More