From b347392d924cfc2da9ec893c1e1b9bb183915ed6 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Tue, 18 Dec 2007 08:24:58 +0000 Subject: [PATCH] Cleanups for MAME 0.122. Added missing driver entry for orbs. --- src/emu/sound/m58817.c | 22 ++--- src/emu/sound/scsp.c | 50 ++++++------ src/emu/sound/sound.mak | 2 +- src/mame/audio/dkong.c | 24 +++--- src/mame/drivers/cave.c | 2 +- src/mame/drivers/dkong.c | 56 ++++++------- src/mame/drivers/gotya.c | 10 +-- src/mame/drivers/neodrvr.c | 160 ++++++++++++++++++------------------- src/mame/drivers/peplus.c | 2 +- src/mame/drivers/rpunch.c | 2 +- src/mame/drivers/seta.c | 16 ++-- src/mame/includes/dkong.h | 2 +- src/mame/mamedriv.c | 1 + 13 files changed, 175 insertions(+), 174 deletions(-) diff --git a/src/emu/sound/m58817.c b/src/emu/sound/m58817.c index 15b15f852e4..abccd8f60f5 100644 --- a/src/emu/sound/m58817.c +++ b/src/emu/sound/m58817.c @@ -3,13 +3,13 @@ M58817 interface Written for MAME by couriersud - + - structure from TMS5110 interface - - this is a wrapper around the TMS5110 interface - - M58817 & TMS5110 seem to be similar, however it is very probable - that they use different "coding" tables for energy, pitch - - Speech is understandable, but off - - This driver supports to use a "sample" interface instead as well + - this is a wrapper around the TMS5110 interface + - M58817 & TMS5110 seem to be similar, however it is very probable + that they use different "coding" tables for energy, pitch + - Speech is understandable, but off + - This driver supports to use a "sample" interface instead as well ******************************************************************************/ @@ -56,7 +56,7 @@ static int speech_rom_read_bit(void) const UINT8 *table = memory_region(info->intf->rom_region); int r; - + if (info->speech_rom_bitnum<0) r = 0; else @@ -85,8 +85,8 @@ static void m58817_state_loop(void *chip, int data) case 0x00: // reset ???? info->count=0; /*To be extremely accurate there should be a delays between each of - the function calls below. In real they happen with the frequency of 160 kHz. - */ + the function calls below. In real they happen with the frequency of 160 kHz. + */ if (info->intf->rom_region != -1) { @@ -138,7 +138,7 @@ static void m58817_state_loop(void *chip, int data) tms5110_PDC_set(info->chip, 0); tms5110_PDC_set(info->chip, 1); tms5110_PDC_set(info->chip, 0); - } + } else { for (i=0;istream); + //stream_update(info->stream); info->command_latch = data & 0x0f; } diff --git a/src/emu/sound/scsp.c b/src/emu/sound/scsp.c index ed26a1b7217..ffa63d0c2cd 100644 --- a/src/emu/sound/scsp.c +++ b/src/emu/sound/scsp.c @@ -471,7 +471,7 @@ static void SCSP_StartSlot(struct _SCSP *SCSP, struct _SLOT *slot) slot->active=1; start_offset = PCM8B(slot) ? SA(slot) : SA(slot) & 0x7FFFE; slot->base=SCSP->SCSPRAM + start_offset; - slot->cur_addr=0; + slot->cur_addr=0; slot->nxt_addr=1<step=SCSP_Step(slot); Compute_EG(SCSP,slot); @@ -1183,28 +1183,28 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot) addr1=(slot->cur_addr>>(SHIFT-1))&0x7fffe; addr2=(slot->nxt_addr>>(SHIFT-1))&0x7fffe; } - - /*if(MDL(slot)!=0 || MDXSL(slot)!=0 || MDYSL(slot)!=0) - { - INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2; - INT32 cycle=LEA(slot)-LSA(slot); // cycle corresponds to 2 pi - smp*=cycle; // associate cycle with full 16-bit sample range - smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF) - while(smp<0) smp+=cycle; smp%=cycle; // keep modulation sampler within a single cycle - if(!PCM8B(slot)) smp<<=1; - - addr1+=smp; addr2+=smp; - if(!PCM8B(slot)) - { - addr1&=0x7fffe; addr2&=0x7fffe; - } - else - { - addr1&=0x7ffff; addr2&=0x7ffff; - } - }*/ - + /*if(MDL(slot)!=0 || MDXSL(slot)!=0 || MDYSL(slot)!=0) + { + INT32 smp=(SCSP->RINGBUF[(SCSP->BUFPTR+MDXSL(slot))&63]+SCSP->RINGBUF[(SCSP->BUFPTR+MDYSL(slot))&63])/2; + INT32 cycle=LEA(slot)-LSA(slot); // cycle corresponds to 2 pi + + smp*=cycle; // associate cycle with full 16-bit sample range + smp>>=0x1A-MDL(slot); // ex. for MDL=0xF, sample range corresponds to +/- 64 pi (32=2^5 cycles) so shift by 11 (16-5 == 0x1A-0xF) + while(smp<0) smp+=cycle; smp%=cycle; // keep modulation sampler within a single cycle + if(!PCM8B(slot)) smp<<=1; + + addr1+=smp; addr2+=smp; + if(!PCM8B(slot)) + { + addr1&=0x7fffe; addr2&=0x7fffe; + } + else + { + addr1&=0x7ffff; addr2&=0x7ffff; + } + }*/ + if(PCM8B(slot)) //8 bit signed { INT8 *p1=(signed char *) (SCSP->SCSPRAM+((SA(slot)+addr1)^1)); @@ -1236,10 +1236,10 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot) else slot->cur_addr+=step; slot->nxt_addr=slot->cur_addr+(1<cur_addr>>SHIFT; addr2=slot->nxt_addr>>SHIFT; - + if(addr1>=LSA(slot) && !(slot->Backwards)) { if(LPSLNK(slot) && slot->EG.state==ATTACK) @@ -1298,7 +1298,7 @@ INLINE INT32 SCSP_UpdateSlot(struct _SCSP *SCSP, struct _SLOT *slot) if(!STWINH(slot)) *RBUFDST=sample; - + return sample; } diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak index 28928e7e702..17f9db32cc9 100644 --- a/src/emu/sound/sound.mak +++ b/src/emu/sound/sound.mak @@ -600,7 +600,7 @@ endif SOUNDDEFS += -DHAS_M58817=$(if $(filter M58817,$(SOUNDS)),1,0) ifneq ($(filter M58817,$(SOUNDS)),) -SOUNDOBJS += $(SOUNDOBJ)/m58817.o +SOUNDOBJS += $(SOUNDOBJ)/m58817.o endif diff --git a/src/mame/audio/dkong.c b/src/mame/audio/dkong.c index 1f7c4311349..8e677a8fa04 100644 --- a/src/mame/audio/dkong.c +++ b/src/mame/audio/dkong.c @@ -17,10 +17,10 @@ ****************************************************************/ /* Set to 1 to use speech synthesizer instead of samples. - * Disabled by default since M58817 emulation is not + * Disabled by default since M58817 emulation is not * complete due to missing information about coefficients. */ - + #define RADARSC1_USE_M58817 (0) #define ACTIVELOW_PORT_BIT(P,A,D) (((P) & (~(1 << (A)))) | (((D) ^ 1) << (A))) @@ -693,7 +693,7 @@ static SOUND_START( radarsc1 ) static SOUND_RESET( dkong ) { dkong_state *state = machine->driver_data; - + state->mcustatus = 0; state->page = 0; @@ -709,12 +709,12 @@ static SOUND_RESET( dkongjr ) int i; sound_reset_dkong(machine); - + state->envelope = 0; state->tt = 0; state->decay = 0; state->sh_climb_count = 0; - + for (i=0;i<10;i++) state->dkongjr_latch[i]=0; } @@ -725,7 +725,7 @@ static SOUND_RESET( dkongjr ) * ****************************************************************/ -/* +/* http://www.freepatentsonline.com/4633500.html @@ -803,7 +803,7 @@ static READ8_HANDLER( dkong_sh_tune_r ) dkong_state *state = Machine->driver_data; UINT8 *SND = memory_region(REGION_CPU2); - if ( state->page & 0x40 ) + if ( state->page & 0x40 ) { return soundlatch_r(0) & 0x0F; } @@ -982,22 +982,22 @@ WRITE8_HANDLER( dkongjr_snd_w1 ) case 3: /* Port 3 write ==> PB 5 */ I8035_P2_W_AL(5,data & 1); break; -#if 0 // above verified from schematics +#if 0 // above verified from schematics case 3: /* roar */ if (data) sample_start (7,2,0); break; #endif case 4: /* Port 4 write */ - I8035_T_W_AL(1, data & 1); + I8035_T_W_AL(1, data & 1); break; case 5: /* Port 5 write */ - I8035_T_W_AL(0, data & 1); + I8035_T_W_AL(0, data & 1); break; case 6: /* Port 6 write ==> PB 4 */ I8035_P2_W_AL(4,data & 1); break; -#if 0 // above verified from schematics +#if 0 // above verified from schematics case 6: /* snapjaw */ if (data) sample_stop (7); @@ -1022,7 +1022,7 @@ WRITE8_HANDLER( dkongjr_snd_w2 ) case 0: dkong_audio_irq_w(0, data & 1); break; -#if 0 // above verified from schematics +#if 0 // above verified from schematics case 0: /* death */ if (data) sample_stop (7); diff --git a/src/mame/drivers/cave.c b/src/mame/drivers/cave.c index 8a9901e682f..791a18790c5 100644 --- a/src/mame/drivers/cave.c +++ b/src/mame/drivers/cave.c @@ -4375,7 +4375,7 @@ GAME( 1995, donpachi, 0, donpachi, cave, donpachi, ROT270, "Atlus/Cav GAME( 1995, donpacjp, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (Japan)" , 0 ) GAME( 1995, donpackr, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (Korea)" , 0 ) GAME( 1995, donpachk, donpachi, donpachi, cave, donpachi, ROT270, "Atlus/Cave", "DonPachi (Hong Kong)" , 0 ) -GAME( 1995, metmqstr, 0, metmqstr, metmqstr, metmqstr, ROT0, "Banpresto/Pandorabox", "Metamoqester (International)" , 0 ) +GAME( 1995, metmqstr, 0, metmqstr, metmqstr, metmqstr, ROT0, "Banpresto/Pandorabox", "Metamoqester (International)" , 0 ) GAME( 1995, nmaster, metmqstr, metmqstr, metmqstr, metmqstr, ROT0, "Banpresto/Pandorabox", "Oni - The Ninja Master (Japan)" , 0 ) GAME( 1995, plegends, 0, pwrinst2, metmqstr, pwrins2j, ROT0, "Atlus/Cave", "Power Instinct Legends (US, Ver. 95/06/20)" , 0 ) GAME( 1995, plegendj, plegends, pwrinst2, metmqstr, pwrins2j, ROT0, "Atlus/Cave", "Gouketsuji Ichizoku Saikyou Densetsu (Japan, Ver. 95/06/20)", 0 ) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index 5239cbafb2d..a4c8e7fd455 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -9,7 +9,7 @@ TODO: Clarify - 8ballact: read 1507 no mapped - drakton - add dkongjr conversion -- dkong3 dma (Z80 dma) +- dkong3 dma (Z80 dma) - implement 74LS259 (8bit addressable latches), 74LS175 (QUAD D FlipFlop), 74LS373 (Octal transparent latch) Done: @@ -56,35 +56,35 @@ Done: Couriersud: 12/2007 - - changed dkong/radarscp based games to use hardware-conformant I8035 memory maps - - Added drakton clone drktnjr on dkongjr hardware - - wrote M58817 sound driver and hooked it up - Uses tms5110 speech synthesis. LPC format is identical, however coefficients - seem to be different. Until coefficients are known, samples are used. - - moved address remapping proms to REGION_USER1 (hunchbkd & co) - - Service now adds credit - - Hooked up coin_counters - - remove GAME_NOT_WORKING GAME_WRONG_COLORS from hunchbkd - - fixed shootgal0121u4red - - dkongjr: mapped more interface lines between sound board and cpu board - - tagged all inputs, all reads use tag names - - moved more static vars into dkong_state - + - changed dkong/radarscp based games to use hardware-conformant I8035 memory maps + - Added drakton clone drktnjr on dkongjr hardware + - wrote M58817 sound driver and hooked it up + Uses tms5110 speech synthesis. LPC format is identical, however coefficients + seem to be different. Until coefficients are known, samples are used. + - moved address remapping proms to REGION_USER1 (hunchbkd & co) + - Service now adds credit + - Hooked up coin_counters + - remove GAME_NOT_WORKING GAME_WRONG_COLORS from hunchbkd + - fixed shootgal0121u4red + - dkongjr: mapped more interface lines between sound board and cpu board + - tagged all inputs, all reads use tag names + - moved more static vars into dkong_state + General notes - + The dma8257 is responsible for copying sprite data from 0x6900 (or where ever it is located) to 0x7400 (sprite banks). - 2650 based games had a rom for address lookups. This is needed for proper operation of the 8257 code. - Where this was missing, I copied the entry from hunchbkd and marked it as BAD_DUMP. - Additional protection was done by pals. The only driver with a PAL entry is herbiedk. + 2650 based games had a rom for address lookups. This is needed for proper operation of the 8257 code. + Where this was missing, I copied the entry from hunchbkd and marked it as BAD_DUMP. + Additional protection was done by pals. The only driver with a PAL entry is herbiedk. I added NO_DUMP entries for the other 2650 games. - Thanks to Mike I was able to closer analyze TKG02/03/04 schematics. The radar scope to donkey kong conversions done - should lead to the same discrete sound as TKG04 (2 board boards). However the colours are different. - Red girders are back. Until the release of TKG04, the 2 board release, schematics were largely identical with radar scope. - There were slight modifications from release to release in the analog video logic. Already at TKG2-02(03) the - darlington amplifier for the blue channel was replaced with a emitter one by leaving away (OMIT in schematics) - a resistor and transistor. Later on, TKG3-06, 4066 switches and background generation circuits for radarscope were removed. - I have added a driver configuration switch to switch between TKG4 and TKG2-01 (radarscope) palettes. + Thanks to Mike I was able to closer analyze TKG02/03/04 schematics. The radar scope to donkey kong conversions done + should lead to the same discrete sound as TKG04 (2 board boards). However the colours are different. + Red girders are back. Until the release of TKG04, the 2 board release, schematics were largely identical with radar scope. + There were slight modifications from release to release in the analog video logic. Already at TKG2-02(03) the + darlington amplifier for the blue channel was replaced with a emitter one by leaving away (OMIT in schematics) + a resistor and transistor. Later on, TKG3-06, 4066 switches and background generation circuits for radarscope were removed. + I have added a driver configuration switch to switch between TKG4 and TKG2-01 (radarscope) palettes. At a later stage, a TKG2-02 will be added as well. @@ -486,7 +486,7 @@ static WRITE8_HANDLER( p8257_drq_w ) static READ8_HANDLER( dkong_in2_r ) { UINT8 r; - + r = (readinputportbytag("IN2") & 0xBF) | (dkong_audio_status_r(0) << 6); coin_counter_w(offset, r >> 7); if (r & 0x10) @@ -849,7 +849,7 @@ static INPUT_PORTS_START( dkong_in2 ) PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE ) /* not connected - held to high - used as service */ PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN ) /* not connected - held to high */ PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SPECIAL ) /* status from sound cpu */ - PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) + PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN1 ) INPUT_PORTS_END static INPUT_PORTS_START( dkong_dsw0 ) diff --git a/src/mame/drivers/gotya.c b/src/mame/drivers/gotya.c index e8e770c4ffc..59dc9f78474 100644 --- a/src/mame/drivers/gotya.c +++ b/src/mame/drivers/gotya.c @@ -9,12 +9,12 @@ TODO: Emulated sound HD38882PA06 I think HD38880 is a CPU/MCU, because the game just sends it a sound command (0-0x1a) - + couriersud: - The chips above are speech synthesis chips. HD38880 is the main chip - whereas HD38882 is an eprom interface. PARCOR based. - http://www.freepatentsonline.com/4435832.html - Datasheet lists no parcor coefficients + The chips above are speech synthesis chips. HD38880 is the main chip + whereas HD38882 is an eprom interface. PARCOR based. + http://www.freepatentsonline.com/4435832.html + Datasheet lists no parcor coefficients ****************************************************************************/ diff --git a/src/mame/drivers/neodrvr.c b/src/mame/drivers/neodrvr.c index 87db508e5aa..aa1a5de8b57 100644 --- a/src/mame/drivers/neodrvr.c +++ b/src/mame/drivers/neodrvr.c @@ -406,98 +406,98 @@ INPUT_PORTS_END /*************************************************************************** - Neo-Geo game pcb infos: - ======================= + Neo-Geo game pcb infos: + ======================= - The Neo-Geo games for AES (home) and MVS (arcade) systems are cartridge based. + The Neo-Geo games for AES (home) and MVS (arcade) systems are cartridge based. - Each cartridge consists of two pcb's: CHA and PROG. + Each cartridge consists of two pcb's: CHA and PROG. - CHA pcb contains gfx data ('C' - rom), text layer data ('S' - rom) and sound driver ('M' - rom). - PROG pcb contains sample data ('V' - rom) and program code ('P' - rom). + CHA pcb contains gfx data ('C' - rom), text layer data ('S' - rom) and sound driver ('M' - rom). + PROG pcb contains sample data ('V' - rom) and program code ('P' - rom). - On most pcb's various custom/protection chips can also be found: + On most pcb's various custom/protection chips can also be found: - CHA: - . NEO-273 - . NEO-CMC - . NEO-ZMC - . NEO-ZMC2 - . PRO-CT0 - . SNK-9201 + CHA: + . NEO-273 + . NEO-CMC + . NEO-ZMC + . NEO-ZMC2 + . PRO-CT0 + . SNK-9201 - PROG: - . ALTERA - . NEO-COMA - . NEO-PCM2 (SNK 1999) - . NEO-PCM2 (PLAYMORE 2002) - . NEO-PVC - . NEO-SMA - . PCM + PROG: + . ALTERA + . NEO-COMA + . NEO-PCM2 (SNK 1999) + . NEO-PCM2 (PLAYMORE 2002) + . NEO-PVC + . NEO-SMA + . PCM - Known pcb's: - ============ + Known pcb's: + ============ - MVS CHA: - . NEO-MVS CHA-8M - . NEO-MVS CHA42G - . NEO-MVS CHA42G-1 - . NEO-MVS CHA42G-2 - . NEO-MVS CHA42G-3B - . NEO-MVS CHA256 - . NEO-MVS CHA256B - . NEO-MVS PSTM CHA136 - . NEO-MVS CHA512Y - . NEO-MVS CHAFIO + MVS CHA: + . NEO-MVS CHA-8M + . NEO-MVS CHA42G + . NEO-MVS CHA42G-1 + . NEO-MVS CHA42G-2 + . NEO-MVS CHA42G-3B + . NEO-MVS CHA256 + . NEO-MVS CHA256B + . NEO-MVS PSTM CHA136 + . NEO-MVS CHA512Y + . NEO-MVS CHAFIO - MVS PROG: - . NEO-MVS PROG8M42 - . NEO-MVS PROG16 - . NEO-MVS PROG42G - . NEO-MVS PROG42G-1 - . NEO-MVS PROGGSC - . NEO-MVS PROGTOP - . NEO-MVS PROGSF1 - . NEO-MVS PROGEOP - . NEO-MVS PROGLBA - LBA-SUB (2000.2.24) - . NEO-MVS PROGBK1 - . NEO-MVS PROGBK2 - . NEO-MVS PROGBK2R - . NEO-MVS PROGBK3R - . NEO-MVS PROGBK3S + MVS PROG: + . NEO-MVS PROG8M42 + . NEO-MVS PROG16 + . NEO-MVS PROG42G + . NEO-MVS PROG42G-1 + . NEO-MVS PROGGSC + . NEO-MVS PROGTOP + . NEO-MVS PROGSF1 + . NEO-MVS PROGEOP + . NEO-MVS PROGLBA - LBA-SUB (2000.2.24) + . NEO-MVS PROGBK1 + . NEO-MVS PROGBK2 + . NEO-MVS PROGBK2R + . NEO-MVS PROGBK3R + . NEO-MVS PROGBK3S - AES CHA: - . NEO-AEG CHA-32 - . NEO-AEG CHA42G-1 - . NEO-AEG CHA42G-3 - . NEO-AEG CHA42G-4 - . NEO-AEG CHA256 - . NEO-AEG CHA256[B] - . NEO-AEG CHA256RY - . NEO-AEG CHA512Y - . NEO-AEG CHAFIO (SNK 1999.8.10) + AES CHA: + . NEO-AEG CHA-32 + . NEO-AEG CHA42G-1 + . NEO-AEG CHA42G-3 + . NEO-AEG CHA42G-4 + . NEO-AEG CHA256 + . NEO-AEG CHA256[B] + . NEO-AEG CHA256RY + . NEO-AEG CHA512Y + . NEO-AEG CHAFIO (SNK 1999.8.10) - AES PROG: - . NEO-AEG PROG-NAM - . NEO-AEG PROG-HERO - . NEO-AEG PROG B - . NEO-AEG PROG-4A - . NEO-AEG PROG-4B - . NEO-AEG PROG16 - . NEO-AEG PROG42G-COM - . NEO-AEG PROG42G-1 - . NEO-AEG PROG4096B - . NEO-AEG PROGGS - . NEO-AEG PROGLBA - . NEO-AEG PROGRK - . NEO-AEG PROGRKB - . NEO-AEG PROGBK1Y - . NEO-AEG PROGBK2 - . NEO-AEG PROGBK3R + AES PROG: + . NEO-AEG PROG-NAM + . NEO-AEG PROG-HERO + . NEO-AEG PROG B + . NEO-AEG PROG-4A + . NEO-AEG PROG-4B + . NEO-AEG PROG16 + . NEO-AEG PROG42G-COM + . NEO-AEG PROG42G-1 + . NEO-AEG PROG4096B + . NEO-AEG PROGGS + . NEO-AEG PROGLBA + . NEO-AEG PROGRK + . NEO-AEG PROGRKB + . NEO-AEG PROGBK1Y + . NEO-AEG PROGBK2 + . NEO-AEG PROGBK3R - The above only covers SNK / SNK-PLAYMORE pcb's. There also exists a - wide range of 'bootleg' pcb's. + The above only covers SNK / SNK-PLAYMORE pcb's. There also exists a + wide range of 'bootleg' pcb's. ****************************************************************************/ @@ -1698,7 +1698,7 @@ ROM_START( androdun ) ROM_REGION( 0x100000, NEOGEO_REGION_AUDIO_DATA_1, 0 ) ROM_LOAD( "049-v1.bin", 0x000000, 0x080000, CRC(577c85b3) SHA1(2c3072401fe73497dca0e9009ae2ba4053fe936d) ) ROM_LOAD( "049-v2.bin", 0x080000, 0x080000, CRC(e14551c4) SHA1(763a9912b9df55defb190af3f29ae034f6dd78d6) ) - /* The MVS version has only v1 rom, size 8mbit. */ + /* The MVS version has only v1 rom, size 8mbit. */ NO_DELTAT_REGION diff --git a/src/mame/drivers/peplus.c b/src/mame/drivers/peplus.c index e720a680dc6..98873b19797 100644 --- a/src/mame/drivers/peplus.c +++ b/src/mame/drivers/peplus.c @@ -600,7 +600,7 @@ static READ8_HANDLER( peplus_input_bank_a_r ) } else { coin_out_state = 3; // Coin-Out On } - + last_coin_out = activecpu_gettotalcycles(); } diff --git a/src/mame/drivers/rpunch.c b/src/mame/drivers/rpunch.c index f381d20dbc6..a13e5227038 100644 --- a/src/mame/drivers/rpunch.c +++ b/src/mame/drivers/rpunch.c @@ -323,7 +323,7 @@ static INPUT_PORTS_START( rpunch ) PORT_START_TAG("SERVICE") /* c0018/c001a upper 8 bits */ PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_SERVICE1 ) - PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Hold F2 at bootup */ + PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_SERVICE ) /* Hold F2 at bootup */ PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Freeze game */ PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_COIN2 ) PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_COIN1 ) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index d3259dc92ce..9bbbd4ef93a 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -2006,7 +2006,7 @@ static ADDRESS_MAP_START( orbs_readmem, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x500000, 0x500001) AM_READ(input_port_0_word_r ) // P1 AM_RANGE(0x500002, 0x500003) AM_READ(input_port_1_word_r ) // P2 AM_RANGE(0x500004, 0x500005) AM_READ(input_port_2_word_r ) // Coins - //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 + //AM_RANGE(0x600000, 0x60000f) AM_READ(krzybowl_input_r ) // P1 AM_RANGE(0x8000f0, 0x8000f1) AM_READ(MRA16_RAM ) // NVRAM AM_RANGE(0x800100, 0x8001ff) AM_READ(MRA16_RAM ) // NVRAM AM_RANGE(0xa00000, 0xa03fff) AM_READ(seta_sound_word_r ) // Sound @@ -8765,14 +8765,14 @@ ROM_START( orbs ) ROM_LOAD16_BYTE( "orbs.u9", 0x000001, 0x080000, CRC(f269d16f) SHA1(34f38789cb3256e334b0ac8acd9f339d14481578) ) ROM_REGION( 0x200000, REGION_GFX1, ROMREGION_DISPOSE ) /* Sprites */ - ROM_LOAD( "orbs.u14", 0x000000, 0x080000, CRC(1cc76541) SHA1(d8a233212bfb9a9c686a40e470524f95b34417fa) ) - ROM_LOAD( "orbs.u13", 0x080000, 0x080000, CRC(784bdc1a) SHA1(de2c5b38561b8ba6bd800126d010b734c2751575) ) - ROM_LOAD( "orbs.u12", 0x100000, 0x080000, CRC(b8c352c2) SHA1(7d6fd1425d9d5cf6a14a1ddceba0ad10e472dfa5) ) - ROM_LOAD( "orbs.u11", 0x180000, 0x080000, CRC(58cb38ba) SHA1(1c6c5f7ccb9c81b71bc1cbad080799b97962f262) ) - + ROM_LOAD( "orbs.u14", 0x000000, 0x080000, CRC(1cc76541) SHA1(d8a233212bfb9a9c686a40e470524f95b34417fa) ) + ROM_LOAD( "orbs.u13", 0x080000, 0x080000, CRC(784bdc1a) SHA1(de2c5b38561b8ba6bd800126d010b734c2751575) ) + ROM_LOAD( "orbs.u12", 0x100000, 0x080000, CRC(b8c352c2) SHA1(7d6fd1425d9d5cf6a14a1ddceba0ad10e472dfa5) ) + ROM_LOAD( "orbs.u11", 0x180000, 0x080000, CRC(58cb38ba) SHA1(1c6c5f7ccb9c81b71bc1cbad080799b97962f262) ) + ROM_REGION( 0x100000, REGION_SOUND1, 0 ) /* Samples */ - ROM_LOAD( "orbs.u15", 0x000000, 0x080000, CRC(bc0e9fe3) SHA1(758a44d07d59af8bbc87602df25dfcdc6cb8d9b3) ) - ROM_LOAD( "orbs.u16", 0x080000, 0x080000, CRC(aecd8373) SHA1(5620bcb281a9ea4920cfe81d163827013289c5bf) ) + ROM_LOAD( "orbs.u15", 0x000000, 0x080000, CRC(bc0e9fe3) SHA1(758a44d07d59af8bbc87602df25dfcdc6cb8d9b3) ) + ROM_LOAD( "orbs.u16", 0x080000, 0x080000, CRC(aecd8373) SHA1(5620bcb281a9ea4920cfe81d163827013289c5bf) ) ROM_END ROM_START( extdwnhl ) diff --git a/src/mame/includes/dkong.h b/src/mame/includes/dkong.h index 163a65ae4de..f2f9c6b3c3b 100644 --- a/src/mame/includes/dkong.h +++ b/src/mame/includes/dkong.h @@ -69,7 +69,7 @@ struct _dkong_state UINT8 has_discrete_interface; UINT8 page,mcustatus; - + double envelope,tt; UINT8 decay; UINT8 portT; diff --git a/src/mame/mamedriv.c b/src/mame/mamedriv.c index 3452529a4ef..64db2e81fbb 100644 --- a/src/mame/mamedriv.c +++ b/src/mame/mamedriv.c @@ -6657,6 +6657,7 @@ BOMULEUL CHAJARA SEGA ST-V 1997/04/11 DRIVER( eightfrc ) /* (c) 1994 Tecmo */ DRIVER( kiwame ) /* (c) 1994 Athena */ DRIVER( krzybowl ) /* (c) 1994 American Sammy */ + DRIVER( orbs ) /* (c) 1994 American Sammy */ DRIVER( extdwnhl ) /* (c) 1995 Sammy Japan */ DRIVER( gundhara ) /* (c) 1995 Banpresto */ DRIVER( sokonuke ) /* (c) 1995 Sammy Industries */