diff options
| author | 2008-01-17 16:06:09 +0000 | |
|---|---|---|
| committer | 2008-01-17 16:06:09 +0000 | |
| commit | 2299164694a688d0e7e4a4ec1fca370ddab127ff (patch) | |
| tree | 6be24e73eea5ce57b7b3cad28c88b608bb6bc9af /src/emu | |
| parent | 01e7b495afcf6d64920bb30ce0884e8b83f330bc (diff) | |
Pushed CUSTOM_INPUT macro to all users.mame0122u6
Changed TMS0285 -> TMC0285.
Spacing cleanups for 0.122u6.
Version bump to 0.122u6.
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/i8039/i8039.c | 34 | ||||
| -rw-r--r-- | src/emu/cpu/pic16c5x/pic16c5x.h | 2 | ||||
| -rw-r--r-- | src/emu/sndintrf.c | 6 | ||||
| -rw-r--r-- | src/emu/sndintrf.h | 2 | ||||
| -rw-r--r-- | src/emu/sound/5220intf.c | 6 | ||||
| -rw-r--r-- | src/emu/sound/sound.mak | 4 | ||||
| -rw-r--r-- | src/emu/sound/tms5220.c | 18 | ||||
| -rw-r--r-- | src/emu/sound/tms5220.h | 2 |
8 files changed, 37 insertions, 37 deletions
diff --git a/src/emu/cpu/i8039/i8039.c b/src/emu/cpu/i8039/i8039.c index 971fb9b13e6..521a02ba4d7 100644 --- a/src/emu/cpu/i8039/i8039.c +++ b/src/emu/cpu/i8039/i8039.c @@ -63,8 +63,8 @@ static int Ext_IRQ(void); static int Timer_IRQ(void); #define M_RDMEM(A) I8039_RDMEM(A) -//#define M_RDOP(A) I8039_RDOP(A) -//#define M_RDOP_ARG(A) I8039_RDOP_ARG(A) +//#define M_RDOP(A) I8039_RDOP(A) +//#define M_RDOP_ARG(A) I8039_RDOP_ARG(A) #define M_IN(A) I8039_In(A) #define M_OUT(A,V) I8039_Out(A,V) @@ -289,16 +289,16 @@ static void anl_a_xr0(void) { R.A &= INTRAM_R(R0); } static void anl_a_xr1(void) { R.A &= INTRAM_R(R1); } static void anl_bus_n(void) { bus_w( bus_r() & M_RDMEM_OPCODE() ); } -static void anl_p1_n(void) +static void anl_p1_n(void) { - R.P1 &= M_RDMEM_OPCODE(); - port_w( 1, R.P1 ); + R.P1 &= M_RDMEM_OPCODE(); + port_w( 1, R.P1 ); } -static void anl_p2_n(void) +static void anl_p2_n(void) { - R.P2 &= M_RDMEM_OPCODE(); - port_w( 2, R.P2 ); + R.P2 &= M_RDMEM_OPCODE(); + port_w( 2, R.P2 ); } static void anld_p4_a(void) { port_w( 4, (port_r(4) & M_RDMEM_OPCODE()) & 0x0f ); } @@ -463,16 +463,16 @@ static void orl_a_r7(void) { R.A |= R7; } static void orl_a_xr0(void) { R.A |= INTRAM_R(R0); } static void orl_a_xr1(void) { R.A |= INTRAM_R(R1); } static void orl_bus_n(void) { bus_w( bus_r() | M_RDMEM_OPCODE() ); } -static void orl_p1_n(void) +static void orl_p1_n(void) { R.P1 |= M_RDMEM_OPCODE(); - port_w(1, R.P1); + port_w(1, R.P1); } -static void orl_p2_n(void) +static void orl_p2_n(void) { R.P2 |= M_RDMEM_OPCODE(); - port_w(2, R.P2); + port_w(2, R.P2); } static void orld_p4_a(void) { port_w(4, port_r(4) | R.A ); } @@ -610,7 +610,7 @@ static void i8039_init (int index, int clock, const void *config, int (*irqcallb state_save_register_item("i8039", index, R.irq_state); state_save_register_item("i8039", index, R.irq_extra_cycles); state_save_register_item("i8039", index, R.Old_T1); - + R.cpu_feature = 0; R.ram_mask = 0x7F; R.int_rom_size = 0x800; @@ -652,7 +652,7 @@ static void i8039_reset (void) R.tirq_en = R.xirq_en = 0; R.timerON = R.countON = 0; - if (R.cpu_feature & FEATURE_M58715) + if (R.cpu_feature & FEATURE_M58715) { //R.timerON = 1; /* Mario Bros. doesn't work without this */ //R.PSW |= C_FLAG; //MB will play startup sound, but wrong # */ @@ -735,7 +735,7 @@ static int i8039_execute(int cycles) { unsigned opcode, T1, timerInt; int count; - + i8039_ICount = (cycles - R.irq_extra_cycles); R.irq_extra_cycles = 0; @@ -775,11 +775,11 @@ static int i8039_execute(int cycles) if (R.masterClock >= 32) { /* NS990113 */ R.masterClock -= 32; R.timer++; - if (R.timer == 0) + if (R.timer == 0) timerInt = 1; } } - + if (timerInt) { count = Timer_IRQ(); /* Handle Timer IRQ */ diff --git a/src/emu/cpu/pic16c5x/pic16c5x.h b/src/emu/cpu/pic16c5x/pic16c5x.h index 92eeb513a45..121d54347fd 100644 --- a/src/emu/cpu/pic16c5x/pic16c5x.h +++ b/src/emu/cpu/pic16c5x/pic16c5x.h @@ -21,7 +21,7 @@ * * External Clock is divided internally by 4 for the instruction cycle * times. (Each instruction cycle passes through 4 machine states). This - * is handled by the cpu execution engine. + * is handled by the cpu execution engine. */ enum { diff --git a/src/emu/sndintrf.c b/src/emu/sndintrf.c index 33215436560..1c05d8b8bd9 100644 --- a/src/emu/sndintrf.c +++ b/src/emu/sndintrf.c @@ -108,7 +108,7 @@ void namcona_get_info(void *token, UINT32 state, sndinfo *info); void tms36xx_get_info(void *token, UINT32 state, sndinfo *info); void tms3615_get_info(void *token, UINT32 state, sndinfo *info); void tms5110_get_info(void *token, UINT32 state, sndinfo *info); -void tms0285_get_info(void *token, UINT32 state, sndinfo *info); +void tmc0285_get_info(void *token, UINT32 state, sndinfo *info); void tms5200_get_info(void *token, UINT32 state, sndinfo *info); void tms5220_get_info(void *token, UINT32 state, sndinfo *info); void vlm5030_get_info(void *token, UINT32 state, sndinfo *info); @@ -289,8 +289,8 @@ static const struct #if (HAS_TMS5110) { SOUND_TMS5110, tms5110_get_info }, #endif -#if (HAS_TMS0285) - { SOUND_TMS0285, tms0285_get_info }, +#if (HAS_TMC0285) + { SOUND_TMC0285, tmc0285_get_info }, #endif #if (HAS_TMS5200) { SOUND_TMS5200, tms5200_get_info }, diff --git a/src/emu/sndintrf.h b/src/emu/sndintrf.h index 3279075f954..4b9a3712180 100644 --- a/src/emu/sndintrf.h +++ b/src/emu/sndintrf.h @@ -73,7 +73,7 @@ enum _sound_type SOUND_TMS36XX, SOUND_TMS3615, SOUND_TMS5110, - SOUND_TMS0285, + SOUND_TMC0285, SOUND_TMS5200, SOUND_TMS5220, SOUND_VLM5030, diff --git a/src/emu/sound/5220intf.c b/src/emu/sound/5220intf.c index 826febd6c6b..65831b056ee 100644 --- a/src/emu/sound/5220intf.c +++ b/src/emu/sound/5220intf.c @@ -76,7 +76,7 @@ static void *tms5220_start(int sndindex, int clock, const void *config) static void *tms5200_start(int sndindex, int clock, const void *config) { struct tms5220_info *info = tms5220_start(sndindex, clock, config); - tms5220_set_variant(info->chip, variant_tms0285); + tms5220_set_variant(info->chip, variant_tmc0285); return info; } @@ -269,12 +269,12 @@ void tms5220_get_info(void *token, UINT32 state, sndinfo *info) } } -void tms0285_get_info(void *token, UINT32 state, sndinfo *info) +void tmc0285_get_info(void *token, UINT32 state, sndinfo *info) { switch (state) { case SNDINFO_PTR_START: info->start = tms5200_start; break; - case SNDINFO_STR_NAME: info->s = "TMS0285"; break; + case SNDINFO_STR_NAME: info->s = "TMC0285"; break; default: tms5220_get_info(token, state, info); break; } } diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak index ad2211be567..a6b51bfe355 100644 --- a/src/emu/sound/sound.mak +++ b/src/emu/sound/sound.mak @@ -581,7 +581,7 @@ endif #------------------------------------------------- SOUNDDEFS += -DHAS_TMS5110=$(if $(filter TMS5110,$(SOUNDS)),1,0) -SOUNDDEFS += -DHAS_TMS0285=$(if $(filter TMS0285,$(SOUNDS)),1,0) +SOUNDDEFS += -DHAS_TMC0285=$(if $(filter TMC0285,$(SOUNDS)),1,0) SOUNDDEFS += -DHAS_TMS5200=$(if $(filter TMS5200,$(SOUNDS)),1,0) SOUNDDEFS += -DHAS_TMS5220=$(if $(filter TMS5220,$(SOUNDS)),1,0) @@ -589,7 +589,7 @@ ifneq ($(filter TMS5110,$(SOUNDS)),) SOUNDOBJS += $(SOUNDOBJ)/tms5110.o $(SOUNDOBJ)/5110intf.o endif -ifneq ($(filter TMS0285 TMS5200 TMS5220,$(SOUNDS)),) +ifneq ($(filter TMC0285 TMS5200 TMS5220,$(SOUNDS)),) SOUNDOBJS += $(SOUNDOBJ)/tms5220.o $(SOUNDOBJ)/5220intf.o endif diff --git a/src/emu/sound/tms5220.c b/src/emu/sound/tms5220.c index 6c6e8a577df..32ff8736caf 100644 --- a/src/emu/sound/tms5220.c +++ b/src/emu/sound/tms5220.c @@ -108,7 +108,7 @@ struct tms5220 UINT8 data_register; /* data register, used by read command */ UINT8 RDB_flag; /* whether we should read data register or status register */ - /* flag for variant tms0285/tms5200 emulation */ + /* flag for variant tmc0285/tms5200 emulation */ /* The TMC0285 AKA TMS5200 is an early variant of the TMS5220 used in the early releases of the Speech Module for the TI-99/4(a) computer, in Zaccaria's 'Money Money', and in a few other places. @@ -308,7 +308,7 @@ void tms5220_set_read_and_branch(void *chip, void (*func)(void)) /********************************************************************************************** - tms5220_set_variant -- sets the tms5220 core to emulate its buggy forerunner, the tms0285 + tms5220_set_variant -- sets the tms5220 core to emulate its buggy forerunner, the tmc0285 ***********************************************************************************************/ @@ -906,12 +906,12 @@ static int parse_frame(struct tms5220 *tms, int the_first_frame) return 1; // WARNING: This code below breaks Victory's power-on test! If you change it // make sure you test Victory. -// { -// if (DEBUG_5220) logerror("Buffer Empty set - Last frame stop frame\n"); +// { +// if (DEBUG_5220) logerror("Buffer Empty set - Last frame stop frame\n"); -// tms->buffer_empty = 1; -// return 1; -// } +// tms->buffer_empty = 1; +// return 1; +// } if (tms->speak_external) /* count the total number of bits available */ @@ -984,7 +984,7 @@ static int parse_frame(struct tms5220 *tms, int the_first_frame) tms->new_k[0] = k1table[extract_bits(tms, 5)]; tms->new_k[1] = k2table[extract_bits(tms, 5)]; tms->new_k[2] = k3table[extract_bits(tms, 4)]; - if (tms->variant == variant_tms0285) + if (tms->variant == variant_tmc0285) tms->new_k[3] = k3table[extract_bits(tms, 4)]; /* ??? */ else tms->new_k[3] = k4table[extract_bits(tms, 4)]; @@ -1004,7 +1004,7 @@ static int parse_frame(struct tms5220 *tms, int the_first_frame) tms->new_k[0] = k1table[extract_bits(tms, 5)]; tms->new_k[1] = k2table[extract_bits(tms, 5)]; tms->new_k[2] = k3table[extract_bits(tms, 4)]; - if (tms->variant == variant_tms0285) + if (tms->variant == variant_tmc0285) tms->new_k[3] = k3table[extract_bits(tms, 4)]; /* ??? */ else tms->new_k[3] = k4table[extract_bits(tms, 4)]; diff --git a/src/emu/sound/tms5220.h b/src/emu/sound/tms5220.h index 6122d05502d..b127cb2dc49 100644 --- a/src/emu/sound/tms5220.h +++ b/src/emu/sound/tms5220.h @@ -25,7 +25,7 @@ void tms5220_set_read_and_branch(void *chip, void (*func)(void)); typedef enum { variant_tms5220, /* TMS5220_IS_TMS5220, TMS5220_IS_TMS5220C, TMS5220_IS_TSP5220C */ - variant_tms0285 /* TMS5220_IS_TMS5200, TMS5220_IS_CD2501 */ + variant_tmc0285 /* TMS5220_IS_TMS5200, TMS5220_IS_CD2501 */ } tms5220_variant; void tms5220_set_variant(void *chip, tms5220_variant new_variant); |
