From 99d297a6fd4623eef4a3195d8c97c1a3a57bb592 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 5 Mar 2009 09:38:53 +0000 Subject: Cleanups and version bump. --- src/emu/fileio.c | 2 +- src/emu/memory.c | 4 +- src/emu/sound/ay8910.c | 14 +++--- src/emu/sound/disc_flt.c | 2 +- src/emu/sound/scspdsp.c | 2 +- src/lib/util/chd.c | 4 +- src/mame/audio/exidy.c | 2 +- src/mame/audio/mcr.c | 10 ++-- src/mame/audio/mw8080bw.c | 12 ++--- src/mame/audio/williams.c | 2 +- src/mame/drivers/btime.c | 32 ++++++------- src/mame/drivers/carpolo.c | 2 +- src/mame/drivers/cntsteer.c | 8 ++-- src/mame/drivers/coinmstr.c | 6 +-- src/mame/drivers/funworld.c | 2 +- src/mame/drivers/galaxian.c | 2 +- src/mame/drivers/goldnpkr.c | 2 +- src/mame/drivers/hvyunit.c | 114 ++++++++++++++++++++++---------------------- src/mame/drivers/itech8.c | 2 +- src/mame/drivers/laserbat.c | 2 +- src/mame/drivers/m10.c | 2 +- src/mame/drivers/maxaflex.c | 2 +- src/mame/drivers/mcr.c | 4 +- src/mame/drivers/mcr3.c | 8 ++-- src/mame/drivers/mcr68.c | 2 +- src/mame/drivers/model3.c | 4 +- src/mame/drivers/mpu4.c | 2 +- src/mame/drivers/namcofl.c | 2 +- src/mame/drivers/nyny.c | 2 +- src/mame/drivers/qix.c | 2 +- src/mame/drivers/r2dtank.c | 2 +- src/mame/drivers/royalmah.c | 6 +-- src/mame/drivers/seibuspi.c | 2 +- src/mame/drivers/seta.c | 8 ++-- src/mame/drivers/spiders.c | 2 +- src/mame/drivers/tetrisp2.c | 10 ++-- src/mame/drivers/tutankhm.c | 2 +- src/mame/video/decocass.c | 2 +- src/mame/video/goldstar.c | 40 ++++++++-------- src/mame/video/m10.c | 2 +- src/mame/video/segaic24.c | 14 +++--- src/osd/windows/vconv.c | 2 +- src/version.c | 2 +- 43 files changed, 175 insertions(+), 175 deletions(-) diff --git a/src/emu/fileio.c b/src/emu/fileio.c index e9e073c8ca3..886e9afec52 100644 --- a/src/emu/fileio.c +++ b/src/emu/fileio.c @@ -896,7 +896,7 @@ static int zip_filename_match(const zip_file_header *header, const astring *file } /*------------------------------------------------- - zip_header_is_path - check whether filename + zip_header_is_path - check whether filename in header is a path -------------------------------------------------*/ diff --git a/src/emu/memory.c b/src/emu/memory.c index 7bcd9ce7860..7b7bf72416e 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -1326,8 +1326,8 @@ UINT64 *_memory_install_device_handler64(const address_space *space, const devic /*------------------------------------------------- - memory_install_read_port_handler - install a - new 8-bit input port handler into the given + memory_install_read_port_handler - install a + new 8-bit input port handler into the given address space -------------------------------------------------*/ diff --git a/src/emu/sound/ay8910.c b/src/emu/sound/ay8910.c index 1c7ee1d86ae..595abde6d6d 100644 --- a/src/emu/sound/ay8910.c +++ b/src/emu/sound/ay8910.c @@ -10,7 +10,7 @@ Mostly rewritten by couriersud in 2008 Games using ADSR: gyruss - + TODO: * The AY8930 has an extended mode which is currently not emulated. @@ -287,7 +287,7 @@ static const ay_ym_param ay8910_param = /* * RL = 2000, Based on Matthew Westcott's measurements from Dec 2001. - * + * * http://groups.google.com/group/comp.sys.sinclair/browse_thread/thread/fb3091da4c4caf26/d5959a800cda0b5e?lnk=gst&q=Matthew+Westcott#d5959a800cda0b5e * After what Russell mentioned a couple of weeks back about the lack of * publicised measurements of AY chip volumes - I've finally got round to @@ -298,7 +298,7 @@ static const ay_ym_param ay8910_param = * channel C (setting bits 2 and 5 of register 6), and varied the amplitude * (the low 4 bits of register 10). The voltages were measured between the * channel C output (pin 1) and ground (pin 6). - * + * * Level Voltage * 0 1.147 * 1 1.162 @@ -812,14 +812,14 @@ void ay8910_reset_ym(void *chip) ay8910_write_reg(psg, AY_BCOARSE, 2); ay8910_write_reg(psg, AY_CFINE, 0); ay8910_write_reg(psg, AY_CCOARSE, 4); - //#define AY_NOISEPER (6) + //#define AY_NOISEPER (6) ay8910_write_reg(psg, AY_ENABLE, ~7); ay8910_write_reg(psg, AY_AVOL, 10); ay8910_write_reg(psg, AY_BVOL, 10); ay8910_write_reg(psg, AY_CVOL, 10); - //#define AY_EFINE (11) - //#define AY_ECOARSE (12) - //#define AY_ESHAPE (13) + //#define AY_EFINE (11) + //#define AY_ECOARSE (12) + //#define AY_ESHAPE (13) #endif } diff --git a/src/emu/sound/disc_flt.c b/src/emu/sound/disc_flt.c index ecf544702a4..72c6f98ffd4 100644 --- a/src/emu/sound/disc_flt.c +++ b/src/emu/sound/disc_flt.c @@ -1042,7 +1042,7 @@ static DISCRETE_STEP(dst_rcfilter_sw) node->output[0] = context->vCap[1] + (DST_RCFILTER_SW__VIN - context->vCap[1]) * context->factor; break; default: - for (j = 0; j < DST_RCFILTER_SW_ITERATIONS; j++) + for (j = 0; j < DST_RCFILTER_SW_ITERATIONS; j++) { for (i = 0; i < 4; i++) { diff --git a/src/emu/sound/scspdsp.c b/src/emu/sound/scspdsp.c index 65ec0f82912..cfa648d0be3 100644 --- a/src/emu/sound/scspdsp.c +++ b/src/emu/sound/scspdsp.c @@ -156,7 +156,7 @@ void SCSPDSP_Step(struct _SCSPDSP *DSP) #endif //INPUTS RW // colmns97 hits this -// assert(IRA<0x32); +// assert(IRA<0x32); if(IRA<=0x1f) INPUTS=DSP->MEMS[IRA]; else if(IRA<=0x2F) diff --git a/src/lib/util/chd.c b/src/lib/util/chd.c index daea5b41623..308a67ca8ef 100644 --- a/src/lib/util/chd.c +++ b/src/lib/util/chd.c @@ -1199,7 +1199,7 @@ chd_error chd_set_metadata(chd_file *chd, UINT32 metatag, UINT32 metaindex, cons /* must write at least 1 byte */ if (inputlen < 1) return CHDERR_INVALID_PARAMETER; - + /* no more than 16MB */ if (inputlen >= 16 * 1024 * 1024) return CHDERR_INVALID_PARAMETER; @@ -2372,7 +2372,7 @@ static chd_error metadata_find_entry(chd_file *chd, UINT32 metatag, UINT32 metai metaentry->metatag = get_bigendian_uint32(&raw_meta_header[0]); metaentry->length = get_bigendian_uint32(&raw_meta_header[4]); metaentry->next = get_bigendian_uint64(&raw_meta_header[8]); - + /* checksum is encoded as the high bit of length */ metaentry->flags = metaentry->length >> 24; metaentry->length &= 0x00ffffff; diff --git a/src/mame/audio/exidy.c b/src/mame/audio/exidy.c index fd7ab9fd13a..cb3022a6b92 100644 --- a/src/mame/audio/exidy.c +++ b/src/mame/audio/exidy.c @@ -814,7 +814,7 @@ MACHINE_DRIVER_START( venture_audio ) MDRV_CPU_PROGRAM_MAP(venture_audio_map,0) MDRV_RIOT6532_ADD("riot", SH6532_CLOCK, r6532_interface) - + MDRV_PIA6821_ADD("pia0", venture_pia0_intf) MDRV_PIA6821_ADD("pia1", venture_pia1_intf) diff --git a/src/mame/audio/mcr.c b/src/mame/audio/mcr.c index a88a69d3b12..6e7f911e012 100644 --- a/src/mame/audio/mcr.c +++ b/src/mame/audio/mcr.c @@ -606,7 +606,7 @@ static const pia6821_interface csdeluxe_pia_intf = MACHINE_DRIVER_START(chip_squeak_deluxe) MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2) MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0) - + MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -617,7 +617,7 @@ MACHINE_DRIVER_END MACHINE_DRIVER_START(chip_squeak_deluxe_stereo) MDRV_CPU_ADD("csdcpu", M68000, CSDELUXE_CLOCK/2) MDRV_CPU_PROGRAM_MAP(csdeluxe_map,0) - + MDRV_PIA6821_ADD("csdpia", csdeluxe_pia_intf) MDRV_SOUND_ADD("csddac", DAC, 0) @@ -725,7 +725,7 @@ static const pia6821_interface soundsgood_pia_intf = MACHINE_DRIVER_START(sounds_good) MDRV_CPU_ADD("sgcpu", M68000, SOUNDSGOOD_CLOCK/2) MDRV_CPU_PROGRAM_MAP(soundsgood_map,0) - + MDRV_PIA6821_ADD("sgpia", soundsgood_pia_intf) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -827,7 +827,7 @@ static const pia6821_interface turbocs_pia_intf = MACHINE_DRIVER_START(turbo_chip_squeak) MDRV_CPU_ADD("tcscpu", M6809E, TURBOCS_CLOCK) MDRV_CPU_PROGRAM_MAP(turbocs_map,0) - + MDRV_PIA6821_ADD("tcspia", turbocs_pia_intf) MDRV_SPEAKER_STANDARD_MONO("mono") @@ -988,7 +988,7 @@ static const pia6821_interface squawkntalk_pia1_intf = MACHINE_DRIVER_START(squawk_n_talk) MDRV_CPU_ADD("sntcpu", M6802, SQUAWKTALK_CLOCK) MDRV_CPU_PROGRAM_MAP(squawkntalk_map,0) - + MDRV_PIA6821_ADD("sntpia0", squawkntalk_pia0_intf) MDRV_PIA6821_ADD("sntpia1", squawkntalk_pia1_intf) diff --git a/src/mame/audio/mw8080bw.c b/src/mame/audio/mw8080bw.c index 7d546257868..119506b4801 100644 --- a/src/mame/audio/mw8080bw.c +++ b/src/mame/audio/mw8080bw.c @@ -787,14 +787,14 @@ static DISCRETE_SOUND_START(boothill) * Combine all sound sources. ************************************************/ /* There is a 1uF cap on the input to the amp that I was too lazy to simulate. - * It is just a DC blocking cap needed by the Norton amp. Doing the extra - * work to simulate it is not going to make a difference to the waveform - * or to how it sounds. Also I use a regular amp in place of the Norton - * for the same reasons. Ease of coding/simulation. */ + * It is just a DC blocking cap needed by the Norton amp. Doing the extra + * work to simulate it is not going to make a difference to the waveform + * or to how it sounds. Also I use a regular amp in place of the Norton + * for the same reasons. Ease of coding/simulation. */ /* The schematics show the Hit sounds as shown. - * This makes the death of the enemy sound on the players side. - * This should be verified. */ + * This makes the death of the enemy sound on the players side. + * This should be verified. */ DISCRETE_MIXER2(NODE_91, BOOTHILL_GAME_ON_EN, BOOTHILL_L_SHOT_SND, BOOTHILL_L_HIT_SND, &boothill_l_mixer) diff --git a/src/mame/audio/williams.c b/src/mame/audio/williams.c index e12304b5b41..69b078ffcb8 100644 --- a/src/mame/audio/williams.c +++ b/src/mame/audio/williams.c @@ -196,7 +196,7 @@ static const ym2151_interface adpcm_ym2151_interface = MACHINE_DRIVER_START( williams_cvsd_sound ) MDRV_CPU_ADD("cvsdcpu", M6809E, CVSD_MASTER_CLOCK) MDRV_CPU_PROGRAM_MAP(williams_cvsd_map,0) - + MDRV_PIA6821_ADD("cvsdpia", cvsd_pia_intf) MDRV_SPEAKER_STANDARD_MONO("mono") diff --git a/src/mame/drivers/btime.c b/src/mame/drivers/btime.c index 2c4d0a44f6d..008463219d0 100644 --- a/src/mame/drivers/btime.c +++ b/src/mame/drivers/btime.c @@ -1341,7 +1341,7 @@ static const discrete_mixer_desc btime_sound_mixer_desc = 0, /* Modelled separately */ 0, 1}; -/* R49 has 4.7k in schematics, but listed as 47k in bill of material +/* R49 has 4.7k in schematics, but listed as 47k in bill of material * 47k gives proper low pass filtering */ #define BTIME_R49 RES_K(47) @@ -1352,16 +1352,16 @@ static const discrete_mixer_desc btime_sound_mixer_desc = * * With R51 being 1K, the gain is way to high (23.5). Therefore R51 * is set to 5k, but this is a hack. With the modification, - * sound levels are in line with observations. + * sound levels are in line with observations. * FIXME: Verify R51,R50,R52 and R49 on real pcb - * + * * http://www.coinopvideogames.com/videogames01.php - * There are two recordings from 1982 where the filtered sound is way louder + * There are two recordings from 1982 where the filtered sound is way louder * than the music. There is a later recording * http://www.coinopvideogames.com/videogames03.php * in which the filtered sounds have volumes closer to the music. - * - */ + * + */ #define BTIME_R52 RES_K(1) #define BTIME_R51 RES_K(5) /* schematics 1k */ @@ -1390,17 +1390,17 @@ static DISCRETE_SOUND_START( btime_sound ) DISCRETE_MIXER2(NODE_40, 1, NODE_22, NODE_30, &btime_sound_mixer_desc) DISCRETE_CRFILTER(NODE_41, 1, NODE_40, RES_K(10), CAP_U(10)) - + /* Amplifier is upc1181H3 - * - * http://www.mydarc.de/dj7oh/fad/ics/upc1181/upc1181.htm - * - * A linear frequency response is mentioned as well as a lower - * edge frequency determined by cap on pin3, however no formula given. - * - * not modelled here - */ - + * + * http://www.mydarc.de/dj7oh/fad/ics/upc1181/upc1181.htm + * + * A linear frequency response is mentioned as well as a lower + * edge frequency determined by cap on pin3, however no formula given. + * + * not modelled here + */ + /* Assuming a 4 Ohm impedance speaker */ DISCRETE_CRFILTER(NODE_43, 1, NODE_41, 3.0, CAP_U(100)) diff --git a/src/mame/drivers/carpolo.c b/src/mame/drivers/carpolo.c index 2278c79aaca..8424493ddfd 100644 --- a/src/mame/drivers/carpolo.c +++ b/src/mame/drivers/carpolo.c @@ -237,7 +237,7 @@ static MACHINE_DRIVER_START( carpolo ) times a sec, so it's a good place */ MDRV_MACHINE_START(carpolo) MDRV_MACHINE_RESET(carpolo) - + MDRV_PIA6821_ADD("pia0", carpolo_pia0_intf) MDRV_PIA6821_ADD("pia1", carpolo_pia1_intf) diff --git a/src/mame/drivers/cntsteer.c b/src/mame/drivers/cntsteer.c index dce0269c88a..2e906923720 100644 --- a/src/mame/drivers/cntsteer.c +++ b/src/mame/drivers/cntsteer.c @@ -12,7 +12,7 @@ todo: finish sprite fixes - correct roz rotation + correct roz rotation colour fixes for the sprites Dip-Switches make cntsteer work, comms looks awkward and probably different than Zero Target @@ -178,10 +178,10 @@ static VIDEO_UPDATE( zerotrgt ) */ static WRITE8_HANDLER(cntsteer_vregs_w) { -// static UINT8 test[5]; +// static UINT8 test[5]; -// test[offset] = data; -// popmessage("%02x %02x %02x %02x %02x",test[0],test[1],test[2],test[3],test[4]); +// test[offset] = data; +// popmessage("%02x %02x %02x %02x %02x",test[0],test[1],test[2],test[3],test[4]); switch(offset) { diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c index 5d25ece657b..eb6e97b7ff2 100644 --- a/src/mame/drivers/coinmstr.c +++ b/src/mame/drivers/coinmstr.c @@ -268,7 +268,7 @@ static INPUT_PORTS_START( quizmstr ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE) PORT_TOGGLE PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON3 ) - + PORT_START("PIA0.B") PORT_DIPNAME( 0x01, 0x01, "PIA0.B" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -750,7 +750,7 @@ static INPUT_PORTS_START( pokeroul ) PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Short Term Meters") PORT_TOGGLE PORT_CODE(KEYCODE_0) PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Refill Mode") PORT_TOGGLE PORT_CODE(KEYCODE_9) PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("0-8") PORT_CODE(KEYCODE_S) - + PORT_START("PIA0.B") PORT_DIPNAME( 0x01, 0x01, "PIA0.B" ) PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) @@ -982,7 +982,7 @@ static MACHINE_DRIVER_START( coinmstr ) MDRV_CPU_ADD("cpu",Z80,8000000) // ? MDRV_CPU_PROGRAM_MAP(coinmstr_map,0) MDRV_CPU_VBLANK_INT("screen", irq0_line_hold) - + MDRV_PIA6821_ADD("pia0", pia_0_intf) MDRV_PIA6821_ADD("pia1", pia_1_intf) MDRV_PIA6821_ADD("pia2", pia_2_intf) diff --git a/src/mame/drivers/funworld.c b/src/mame/drivers/funworld.c index b5191c05edc..30a1ca9dd9b 100644 --- a/src/mame/drivers/funworld.c +++ b/src/mame/drivers/funworld.c @@ -2017,7 +2017,7 @@ static MACHINE_DRIVER_START( funworld ) MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) - + MDRV_PIA6821_ADD("pia0", pia0_intf) MDRV_PIA6821_ADD("pia1", pia1_intf) diff --git a/src/mame/drivers/galaxian.c b/src/mame/drivers/galaxian.c index 0890cb12891..a2cad788009 100644 --- a/src/mame/drivers/galaxian.c +++ b/src/mame/drivers/galaxian.c @@ -1683,7 +1683,7 @@ static DISCRETE_SOUND_START( konami_sound ) /* Input impedance of a M51516L is typically 30k (datasheet) */ DISCRETE_CRFILTER(NODE_40,1,NODE_30,RES_K(30),CAP_U(0.15)) - + DISCRETE_OUTPUT(NODE_40, 10.0 ) DISCRETE_SOUND_END diff --git a/src/mame/drivers/goldnpkr.c b/src/mame/drivers/goldnpkr.c index 42971284073..b8414f0a26e 100644 --- a/src/mame/drivers/goldnpkr.c +++ b/src/mame/drivers/goldnpkr.c @@ -2308,7 +2308,7 @@ static MACHINE_DRIVER_START( goldnpkr_base ) MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) MDRV_NVRAM_HANDLER(generic_0fill) - + MDRV_PIA6821_ADD("pia0", goldnpkr_pia0_intf) MDRV_PIA6821_ADD("pia1", goldnpkr_pia1_intf) diff --git a/src/mame/drivers/hvyunit.c b/src/mame/drivers/hvyunit.c index aec1221719a..72fa6b01cdd 100644 --- a/src/mame/drivers/hvyunit.c +++ b/src/mame/drivers/hvyunit.c @@ -1,7 +1,7 @@ /*************************************************************************************** driver based on djboy.c / airbustr.c - + PROTECTION SIMULATION IS VERY PRELIMINARY AND SHOULD BE TREATED AS 100% GUESSWORK @@ -82,18 +82,18 @@ static MACHINE_RESET( mermaid ) /* ticks for the attract mode. */ mcu_ram.attract_timer = 0; /* - helper for the program flow. - 0 = title screen - 1 = demo mode - 2 = ranking - 3 = Push 1p button - 4 = Push 1p AND/OR 2p button - 5 = player 1 plays - 6 = player 2 plays - 7 = service mode - 8 = game over screen - ... - */ + helper for the program flow. + 0 = title screen + 1 = demo mode + 2 = ranking + 3 = Push 1p button + 4 = Push 1p AND/OR 2p button + 5 = player 1 plays + 6 = player 2 plays + 7 = service mode + 8 = game over screen + ... + */ mcu_ram.program_flow = 0; if(input_port_read(machine, "DSW1") & 4) //service mode mcu_ram.program_flow = 7; @@ -102,7 +102,7 @@ static MACHINE_RESET( mermaid ) static WRITE8_HANDLER( mermaid_data_w ) { -// printf("%02x\n",data); +// printf("%02x\n",data); if(mcu_ram.access_ram_w) { mcu_ram.internal_ram[(mcu_ram.internal_ram_index++)&0x7f] = data; @@ -136,14 +136,14 @@ static READ8_HANDLER( mermaid_data_r ) return mcu_ram.internal_ram[(mcu_ram.internal_ram_index++)&0x7f]; } -// popmessage("%02x",test_mcu); +// popmessage("%02x",test_mcu); switch(mcu_data) { /* - pc=55f1 - store internal mcu ram values, not yet handled. - */ + pc=55f1 + store internal mcu ram values, not yet handled. + */ case 0: { /*next data will be an internal protection RAM read*/ @@ -151,26 +151,26 @@ static READ8_HANDLER( mermaid_data_r ) return 0; } /* - (PC=4f20) 01 $e003 = val - (PC=4f2b) 01 $e004 = val - (PC=4f5c) 01 val > 0xa and e06f = val coin counter (5) - 0 = title screen - 4 = "push 1p button" - 5 = "push 2p button" - 6 = copyright Kaneko msg (what is for?) - 7 = ranking - 8 = (trigger) attract mode - b = (trigger?) player 1 plays - c = (trigger?) player 2 plays - 0x10 = game over screen - 0x80 = coin error! msg - (PC=4f82) 01 val<<=1 and check if < 0 program flow (6) - (PC=4ef3) 01 $e06c = val, (complement it and AND $3) - (PC=4f13) 01 $e06d = $e06e = val - (PC=4f13) 01 - (PC=14b3) 01 - (PC=14ca) 81 - */ + (PC=4f20) 01 $e003 = val + (PC=4f2b) 01 $e004 = val + (PC=4f5c) 01 val > 0xa and e06f = val coin counter (5) + 0 = title screen + 4 = "push 1p button" + 5 = "push 2p button" + 6 = copyright Kaneko msg (what is for?) + 7 = ranking + 8 = (trigger) attract mode + b = (trigger?) player 1 plays + c = (trigger?) player 2 plays + 0x10 = game over screen + 0x80 = coin error! msg + (PC=4f82) 01 val<<=1 and check if < 0 program flow (6) + (PC=4ef3) 01 $e06c = val, (complement it and AND $3) + (PC=4f13) 01 $e06d = $e06e = val + (PC=4f13) 01 + (PC=14b3) 01 + (PC=14ca) 81 + */ case 1: { switch(mcu_ram_mux[1]) @@ -228,20 +228,20 @@ static READ8_HANDLER( mermaid_data_r ) return res; } /* - (PC=4fbe) 03 ? (Is it read?) - */ + (PC=4fbe) 03 ? (Is it read?) + */ case 3: return mame_rand(space->machine); /* - (PC=4e4d) 06 complement and put it to e06a - (PC=4e59) 06 $e019 = val - (PC=4f5c) 06 $e06f = val if NOT > 09 - (PC=4f82) 06 val<<=1 and check if < 0 - */ -// case 6: return 0; + (PC=4e4d) 06 complement and put it to e06a + (PC=4e59) 06 $e019 = val + (PC=4f5c) 06 $e06f = val if NOT > 09 + (PC=4f82) 06 val<<=1 and check if < 0 + */ +// case 6: return 0; /* - pc=5621 put the value to e003 (and 8) - pc=562f put the value to e004 (and 4) - */ + pc=5621 put the value to e003 (and 8) + pc=562f put the value to e004 (and 4) + */ /* read back dsw. */ case 0xff: return 0; } @@ -262,13 +262,13 @@ static READ8_HANDLER( mermaid_data_r ) static READ8_HANDLER( mermaid_status_r ) { static UINT8 unk_bit,mcu_status = 8; -// printf("R St\n"); +// printf("R St\n"); unk_bit^=4; mcu_status^=8; return mcu_status | unk_bit | 0x10; -// return mame_rand(space->machine); +// return mame_rand(space->machine); } static TILE_GET_INFO( get_bg_tile_info ) @@ -291,11 +291,11 @@ static VIDEO_START(hvyunit) static VIDEO_UPDATE(hvyunit) { - + tilemap_set_scrollx( bg_tilemap,0, ((port0_data&0x40)<<2)+ hu_scrollx + SX_POS); //TODO tilemap_set_scrolly( bg_tilemap,0, ((port0_data&0x80)<<1)+ hu_scrolly + SY_POS); // TODO -// popmessage("%02x %02x",hu_scrollx[0],hu_scrolly[0]); +// popmessage("%02x %02x",hu_scrollx[0],hu_scrolly[0]); bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); tilemap_draw(bitmap, cliprect, bg_tilemap, 0, 0); @@ -399,10 +399,10 @@ static ADDRESS_MAP_START(sub_io, ADDRESS_SPACE_IO, 8 ) AM_RANGE(0x08, 0x08) AM_WRITE(hu_scrollx_w) AM_RANGE(0x0c, 0x0c) AM_READ(mermaid_status_r) AM_RANGE(0x0e, 0x0e) AM_RAM - -// AM_RANGE(0x22, 0x22) AM_READ(hu_scrolly_hi_reset) //22/a2 taken from ram $f065 -// AM_RANGE(0xa2, 0xa2) AM_READ(hu_scrolly_hi_set) - + +// AM_RANGE(0x22, 0x22) AM_READ(hu_scrolly_hi_reset) //22/a2 taken from ram $f065 +// AM_RANGE(0xa2, 0xa2) AM_READ(hu_scrolly_hi_set) + ADDRESS_MAP_END static WRITE8_HANDLER( sound_bankswitch_w ) diff --git a/src/mame/drivers/itech8.c b/src/mame/drivers/itech8.c index f3bb1f6517a..36522f4239f 100644 --- a/src/mame/drivers/itech8.c +++ b/src/mame/drivers/itech8.c @@ -1794,7 +1794,7 @@ static MACHINE_DRIVER_START( itech8_sound_ym3812 ) /* basic machine hardware */ MDRV_CPU_ADD("soundcpu", M6809, CLOCK_8MHz/4) MDRV_CPU_PROGRAM_MAP(sound3812_map,0) - + MDRV_PIA6821_ADD("pia", pia_interface) /* sound hardware */ diff --git a/src/mame/drivers/laserbat.c b/src/mame/drivers/laserbat.c index 80ebb74caf9..246784aeb3e 100644 --- a/src/mame/drivers/laserbat.c +++ b/src/mame/drivers/laserbat.c @@ -729,7 +729,7 @@ static MACHINE_DRIVER_START( catnmous ) MDRV_CPU_ADD("audiocpu", M6802,3580000) /* ? */ MDRV_CPU_PROGRAM_MAP(catnmous_sound_map,0) MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle, (double)3580000/4096) - + MDRV_PIA6821_ADD("pia", pia_intf) /* video hardware */ diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index 77c6af9fa07..5fe0f10443d 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -126,7 +126,7 @@ Notes (couriersud) #define DEBUG (0) -#define LOG(x) do { if (DEBUG) printf x; } while (0) +#define LOG(x) do { if (DEBUG) printf x; } while (0) static WRITE8_DEVICE_HANDLER(ic8j1_output_changed) { diff --git a/src/mame/drivers/maxaflex.c b/src/mame/drivers/maxaflex.c index 7d4dcdf47b8..5b857effc38 100644 --- a/src/mame/drivers/maxaflex.c +++ b/src/mame/drivers/maxaflex.c @@ -435,7 +435,7 @@ static MACHINE_DRIVER_START( a600xl ) MDRV_CPU_ADD("mcu", M68705, 3579545) MDRV_CPU_PROGRAM_MAP(mcu_mem,0) - + MDRV_PIA6821_ADD("pia", a600xl_pia_interface) /* video hardware */ diff --git a/src/mame/drivers/mcr.c b/src/mame/drivers/mcr.c index d6c6fab6f8b..7bdba70afe4 100644 --- a/src/mame/drivers/mcr.c +++ b/src/mame/drivers/mcr.c @@ -586,14 +586,14 @@ static WRITE8_HANDLER( nflfoot_op4_w ) static READ8_HANDLER( demoderb_ip1_r ) { - return input_port_read(space->machine, "SSIO.IP1") | + return input_port_read(space->machine, "SSIO.IP1") | (input_port_read(space->machine, input_mux ? "SSIO.IP1.ALT2" : "SSIO.IP1.ALT1") << 2); } static READ8_HANDLER( demoderb_ip2_r ) { - return input_port_read(space->machine, "SSIO.IP2") | + return input_port_read(space->machine, "SSIO.IP2") | (input_port_read(space->machine, input_mux ? "SSIO.IP2.ALT2" : "SSIO.IP2.ALT1") << 2); } diff --git a/src/mame/drivers/mcr3.c b/src/mame/drivers/mcr3.c index f3d34e1fa95..77be494caef 100644 --- a/src/mame/drivers/mcr3.c +++ b/src/mame/drivers/mcr3.c @@ -123,14 +123,14 @@ static INT8 maxrpm_p2_shift; static READ8_HANDLER( demoderm_ip1_r ) { - return input_port_read(space->machine, "MONO.IP1") | + return input_port_read(space->machine, "MONO.IP1") | (input_port_read(space->machine, input_mux ? "MONO.IP1.ALT2" : "MONO.IP1.ALT1") << 2); } static READ8_HANDLER( demoderm_ip2_r ) { - return input_port_read(space->machine, "MONO.IP2") | + return input_port_read(space->machine, "MONO.IP2") | (input_port_read(space->machine, input_mux ? "MONO.IP2.ALT2" : "MONO.IP2.ALT1") << 2); } @@ -536,7 +536,7 @@ static INPUT_PORTS_START( demoderm ) PORT_START("MONO.IP1.ALT1") /* J2 10-13,15-18 */ /* The high 6 bits contain the steering wheel value */ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1) - + PORT_START("MONO.IP1.ALT2") /* IN1 (muxed) -- the high 6 bits contain the steering wheel value */ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(3) @@ -546,7 +546,7 @@ static INPUT_PORTS_START( demoderm ) PORT_START("MONO.IP2.ALT1") /* J3 1-8 */ /* The high 6 bits contain the steering wheel value */ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(2) - + PORT_START("MONO.IP2.ALT2") /* IN2 (muxed) -- the high 6 bits contain the steering wheel value */ PORT_BIT( 0x3f, 0x00, IPT_DIAL ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(4) diff --git a/src/mame/drivers/mcr68.c b/src/mame/drivers/mcr68.c index 6383a065ec5..0c0359b4def 100644 --- a/src/mame/drivers/mcr68.c +++ b/src/mame/drivers/mcr68.c @@ -888,7 +888,7 @@ static MACHINE_DRIVER_START( zwackery ) // MDRV_WATCHDOG_VBLANK_INIT(8) MDRV_MACHINE_START(zwackery) MDRV_MACHINE_RESET(zwackery) - + MDRV_PIA6821_ADD("pia0", zwackery_pia0_intf) MDRV_PIA6821_ADD("pia1", zwackery_pia1_intf) MDRV_PIA6821_ADD("pia2", zwackery_pia2_intf) diff --git a/src/mame/drivers/model3.c b/src/mame/drivers/model3.c index 6dd8dc2e24b..733000b5306 100644 --- a/src/mame/drivers/model3.c +++ b/src/mame/drivers/model3.c @@ -3117,7 +3117,7 @@ ROM_START( von2 ) /* Step 2.0 */ ROM_REGION( 0x1000000, "samples", 0 ) /* SCSP samples */ /* WARNING: mpr- numbers here are a guess based on how other sets are ordered and may not be right. - If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */ + If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */ ROM_LOAD( "mpr-20663.22", 0x000000, 0x400000, CRC(977eb6a4) SHA1(9dbba51630cbef2351d79b82ab6ae3af4aed99f0) ) ROM_LOAD( "mpr-20665.24", 0x400000, 0x400000, CRC(0efc0ca8) SHA1(1414becad21eb7d03d816a8cba47506f941b3c29) ) ROM_LOAD( "mpr-20664.23", 0x800000, 0x400000, CRC(89220782) SHA1(18a3585af960a76eb08f187223e9b69ad16809a1) ) @@ -3193,7 +3193,7 @@ ROM_START( von254g ) /* Step 2.0 */ ROM_REGION( 0x1000000, "samples", 0 ) /* SCSP samples */ /* WARNING: mpr- numbers here are a guess based on how other sets are ordered and may not be right. - If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */ + If restoring a real PCB, go by the IC numbers in the extension! (.22, .24) */ ROM_LOAD( "mpr-20663.22", 0x000000, 0x400000, CRC(977eb6a4) SHA1(9dbba51630cbef2351d79b82ab6ae3af4aed99f0) ) ROM_LOAD( "mpr-20665.24", 0x400000, 0x400000, CRC(0efc0ca8) SHA1(1414becad21eb7d03d816a8cba47506f941b3c29) ) ROM_LOAD( "mpr-20664.23", 0x800000, 0x400000, CRC(89220782) SHA1(18a3585af960a76eb08f187223e9b69ad16809a1) ) diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c index c5172e49362..572da662606 100644 --- a/src/mame/drivers/mpu4.c +++ b/src/mame/drivers/mpu4.c @@ -1851,7 +1851,7 @@ static MACHINE_DRIVER_START( mpu4mod2 ) MDRV_CPU_PROGRAM_MAP(mod2_memmap,0) MDRV_TIMER_ADD_PERIODIC("50hz",gen_50hz, HZ(100)) - + MDRV_PIA6821_ADD("pia_ic3", pia_ic3_intf) MDRV_PIA6821_ADD("pia_ic4", pia_ic4_intf) MDRV_PIA6821_ADD("pia_ic5", pia_ic5_intf) diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index fccabeb7957..6a434117158 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -568,7 +568,7 @@ ROM_START( speedrcr ) ROM_REGION16_LE( 0x4000, "c75", 0 ) // C75 program ROM_LOAD( "c75.bin", 0, 0x4000, CRC(42f539a5) SHA1(3103e5a0a2867620309fd4fe478a2be0effbeff8) ) - ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data + ROM_REGION16_LE( 0x80000, "c75data", 0 ) // C75 data ROM_LOAD("se1_spr.21l", 0x000000, 0x80000, CRC(850a27ac) SHA1(7d5db840ec67659a1f2e69a62cdb03ce6ee0b47b) ) ROM_REGION( 0x200000, NAMCONB1_ROTGFXREGION, 0 ) // "RCHAR" (roz characters) diff --git a/src/mame/drivers/nyny.c b/src/mame/drivers/nyny.c index 19ef5281121..474ed952dcc 100644 --- a/src/mame/drivers/nyny.c +++ b/src/mame/drivers/nyny.c @@ -690,7 +690,7 @@ static MACHINE_DRIVER_START( nyny ) /* 74LS123 */ MDRV_TTL74123_ADD("ic48_1", ic48_1_config) - + MDRV_PIA6821_ADD("pia1", pia_1_intf) MDRV_PIA6821_ADD("pia2", pia_2_intf) diff --git a/src/mame/drivers/qix.c b/src/mame/drivers/qix.c index a84c9228aaa..3cbea88826f 100644 --- a/src/mame/drivers/qix.c +++ b/src/mame/drivers/qix.c @@ -563,7 +563,7 @@ static MACHINE_DRIVER_START( qix_base ) MDRV_MACHINE_RESET(qix) MDRV_NVRAM_HANDLER(generic_0fill) - + MDRV_PIA6821_ADD("pia0", qix_pia_0_intf) MDRV_PIA6821_ADD("pia1", qix_pia_1_intf) MDRV_PIA6821_ADD("pia2", qix_pia_2_intf) diff --git a/src/mame/drivers/r2dtank.c b/src/mame/drivers/r2dtank.c index c6095a4b8a4..63dba7d52a8 100644 --- a/src/mame/drivers/r2dtank.c +++ b/src/mame/drivers/r2dtank.c @@ -535,7 +535,7 @@ static MACHINE_DRIVER_START( r2dtank ) /* 74LS123 */ MDRV_TTL74123_ADD("74123", ttl74123_intf) - + MDRV_PIA6821_ADD("pia_main", pia_main_intf) MDRV_PIA6821_ADD("pia_audio", pia_audio_intf) diff --git a/src/mame/drivers/royalmah.c b/src/mame/drivers/royalmah.c index 0bb4543e88f..26593b2528d 100644 --- a/src/mame/drivers/royalmah.c +++ b/src/mame/drivers/royalmah.c @@ -377,7 +377,7 @@ static WRITE8_HANDLER ( daisyari_bank_w ) dsw_select = (data & 0xc); address = 0x10000 + ((data & 0x30)>>4) * 0x10000 + (data & 0x1) * 0x8000; -// printf("%08x %02x\n",address,data); +// printf("%08x %02x\n",address,data); memory_set_bankptr(space->machine, 1,&rom[address]); @@ -388,7 +388,7 @@ static READ8_HANDLER ( mjclub_dsw_r ) { switch (dsw_select) { -// case 0x00: return input_port_read(space->machine, "DSW4"); +// case 0x00: return input_port_read(space->machine, "DSW4"); case 0x40: return input_port_read(space->machine, "DSW2"); case 0x80: return input_port_read(space->machine, "DSW3"); case 0xc0: return input_port_read(space->machine, "DSW4"); @@ -407,7 +407,7 @@ static WRITE8_HANDLER ( mjclub_bank_w ) data &= 0x0f; address = 0x10000 + data * 0x8000; -// printf("%08x\n",address); +// printf("%08x\n",address); memory_set_bankptr(space->machine, 1,&rom[address]); diff --git a/src/mame/drivers/seibuspi.c b/src/mame/drivers/seibuspi.c index 8013e3fdc1c..2a1ae5eddcf 100644 --- a/src/mame/drivers/seibuspi.c +++ b/src/mame/drivers/seibuspi.c @@ -2103,7 +2103,7 @@ static MACHINE_DRIVER_START( sys386f2 ) MDRV_CPU_VBLANK_INT("screen", spi_interrupt) /* no z80? */ - + MDRV_NVRAM_HANDLER(sxx2f) MDRV_MACHINE_RESET(seibu386) diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c index 06b70c4d975..375229247fc 100644 --- a/src/mame/drivers/seta.c +++ b/src/mame/drivers/seta.c @@ -8260,7 +8260,7 @@ static MACHINE_DRIVER_START( inttoote ) MDRV_CPU_ADD("maincpu", M68000, 16000000) MDRV_CPU_PROGRAM_MAP(inttoote_map,0) MDRV_CPU_VBLANK_INT_HACK(inttoote_interrupt,8+1+1+1) - + MDRV_PIA6821_ADD("pia0", inttoote_pia0_intf) MDRV_PIA6821_ADD("pia1", inttoote_pia1_intf) @@ -9097,17 +9097,17 @@ ROM_START( jjsquawb ) ROM_REGION( 0x400000, "gfxtemp", 0 ) ROM_LOAD( "3.bin", 0x000000, 0x200000, CRC(b1e3a4bb) SHA1(be2241a4fbb99444487e7b550faac4ee1ee1ad15) ) ROM_LOAD( "1.bin", 0x200000, 0x200000, CRC(a5d37cf7) SHA1(9573777f3cdd6b25f0bd56f65f583fddda21c900) ) - + ROM_REGION( 0x200000, "gfx2", 0 ) /* Layer 1 */ ROM_COPY( "gfxtemp", 0x000000, 0x000000, 0x100000 ) ROM_COPY( "gfxtemp", 0x200000, 0x100000, 0x100000 ) - + ROM_REGION( 0x200000, "gfx3", 0 ) /* Layer 2 */ ROM_COPY( "gfxtemp", 0x100000, 0x000000, 0x100000 ) ROM_COPY( "gfxtemp", 0x300000, 0x100000, 0x100000 ) - + ROM_REGION( 0x100000, "x1", 0 ) /* Samples */ ROM_LOAD( "1", 0x000000, 0x100000, CRC(181a55b8) SHA1(6fa404f85bad93cc15e80feb61d19bed84602b82) ) /* jj-rom5.040 + jj-rom6.040 from jjsquawk */ ROM_END diff --git a/src/mame/drivers/spiders.c b/src/mame/drivers/spiders.c index 2c061f7ad84..7be296a0ed5 100644 --- a/src/mame/drivers/spiders.c +++ b/src/mame/drivers/spiders.c @@ -726,7 +726,7 @@ static MACHINE_DRIVER_START( spiders ) MDRV_MC6845_ADD("crtc", MC6845, CRTC_CLOCK, mc6845_intf) /* 74LS123 */ - + MDRV_PIA6821_ADD("pia1", pia_1_intf) MDRV_PIA6821_ADD("pia2", pia_2_intf) MDRV_PIA6821_ADD("pia3", pia_3_intf) diff --git a/src/mame/drivers/tetrisp2.c b/src/mame/drivers/tetrisp2.c index ae5eef62725..6fdcb96fd74 100644 --- a/src/mame/drivers/tetrisp2.c +++ b/src/mame/drivers/tetrisp2.c @@ -484,11 +484,11 @@ static ADDRESS_MAP_START( rocknms_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE(rockn_priority_w) AM_BASE(&tetrisp2_priority) // Priority AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(tetrisp2_palette_w) AM_BASE(&paletteram16) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line +// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(tetrisp2_vram_rot_w) AM_BASE(&tetrisp2_vram_rot) // Rotation AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(tetrisp2_vram_fg_w) AM_BASE(&tetrisp2_vram_fg) // Foreground AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(tetrisp2_vram_bg_w) AM_BASE(&tetrisp2_vram_bg) // Background -// AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? +// AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? AM_RANGE(0x900000, 0x903fff) AM_READWRITE(rockn_nvram_r, tetrisp2_nvram_w) AM_BASE(&tetrisp2_nvram) AM_SIZE(&tetrisp2_nvram_size) // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_READWRITE(rockn_soundvolume_r, rockn_soundvolume_w) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_DEVREADWRITE8("ymz", ymz280b_r, ymz280b_w, 0x00ff) // Sound @@ -519,11 +519,11 @@ static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x108000, 0x10ffff) AM_RAM // Work RAM AM_RANGE(0x200000, 0x23ffff) AM_RAM_WRITE(rocknms_sub_priority_w) AM_BASE(&rocknms_sub_priority) // Priority AM_RANGE(0x300000, 0x31ffff) AM_RAM_WRITE(rocknms_sub_palette_w) AM_BASE(&paletteram16_2) // Palette -// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line +// AM_RANGE(0x500000, 0x50ffff) AM_RAM // Line AM_RANGE(0x600000, 0x60ffff) AM_RAM_WRITE(rocknms_sub_vram_rot_w) AM_BASE(&rocknms_sub_vram_rot) // Rotation AM_RANGE(0x800000, 0x803fff) AM_RAM_WRITE(rocknms_sub_vram_fg_w) AM_BASE(&rocknms_sub_vram_fg) // Foreground AM_RANGE(0x804000, 0x807fff) AM_RAM_WRITE(rocknms_sub_vram_bg_w) AM_BASE(&rocknms_sub_vram_bg) // Background -// AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? +// AM_RANGE(0x808000, 0x809fff) AM_RAM // ??? AM_RANGE(0x900000, 0x907fff) AM_RAM // NVRAM AM_RANGE(0xa30000, 0xa30001) AM_WRITE(rockn_soundvolume_w) // Sound Volume AM_RANGE(0xa40000, 0xa40003) AM_DEVWRITE8("ymz", ymz280b_w, 0x00ff) // Sound @@ -538,7 +538,7 @@ static ADDRESS_MAP_START( rocknms_sub_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0xba0000, 0xba001f) AM_WRITE(rocknms_sub_systemregs_w) // system param AM_RANGE(0xba001a, 0xba001b) AM_WRITENOP // Lev 4 irq ack AM_RANGE(0xba001e, 0xba001f) AM_WRITENOP // Lev 2 irq ack -// AM_RANGE(0xbe0000, 0xbe0001) AM_READNOP // INT-level1 dummy read +// AM_RANGE(0xbe0000, 0xbe0001) AM_READNOP // INT-level1 dummy read AM_RANGE(0xbe0002, 0xbe0003) AM_READWRITE(rocknms_main2sub_r, rocknms_sub2main_w) // MAIN <-> SUB Communication AM_RANGE(0xbe000a, 0xbe000b) AM_READ(watchdog_reset16_r ) // Watchdog ADDRESS_MAP_END diff --git a/src/mame/drivers/tutankhm.c b/src/mame/drivers/tutankhm.c index 893a6c7dcef..3ae171ee5da 100644 --- a/src/mame/drivers/tutankhm.c +++ b/src/mame/drivers/tutankhm.c @@ -13,7 +13,7 @@ Note: * The sound board uses a 14.318 MHz xtal. * The cpu/video board uses a 18.432 MHz xtal. - + Todo: * Discrete filters * Starfield diff --git a/src/mame/video/decocass.c b/src/mame/video/decocass.c index fc796053c9e..5480d1c8c35 100644 --- a/src/mame/video/decocass.c +++ b/src/mame/video/decocass.c @@ -519,7 +519,7 @@ VIDEO_START( decocass ) gfx_element_set_source(machine->gfx[3], decocass_objectram); /* This should ensure that the fake 17th tile is left blank - * now that dirty-tile tracking is handled by the core */ + * now that dirty-tile tracking is handled by the core */ gfx_element_decode(machine->gfx[2], 16); } diff --git a/src/mame/video/goldstar.c b/src/mame/video/goldstar.c index d8ea367313a..6570b28e836 100644 --- a/src/mame/video/goldstar.c +++ b/src/mame/video/goldstar.c @@ -35,10 +35,10 @@ WRITE8_HANDLER( cm_outport0_w ) ---- --x- (fg enable) ---- -x-- (girl enable?) ---- x--- (reels enable) - - xxxx ---- unused? - - */ + + xxxx ---- unused? + + */ //popmessage("%02x",data); } @@ -156,7 +156,7 @@ VIDEO_START( goldstar ) goldstar_fg_tilemap = tilemap_create(machine,get_goldstar_fg_tile_info,tilemap_scan_rows,8,8, 64, 32); tilemap_set_transparent_pen(goldstar_fg_tilemap,0); - + // is there an enable reg for this game? cm_enable_reg = 0x0b; } @@ -236,12 +236,12 @@ static const rectangle am1a_visible3 = { 0*8, (14+48)*8-1, 16*8, (16+6)*8-1 }; VIDEO_UPDATE( goldstar ) { int i; - + bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); if (!cm_enable_reg &0x01) - return 0; - + return 0; + if (cm_enable_reg &0x08) { for (i= 0;i < 64;i++) @@ -256,7 +256,7 @@ VIDEO_UPDATE( goldstar ) tilemap_draw(bitmap, &visible2, goldstar_reel2_tilemap, 0, 0); tilemap_draw(bitmap, &visible3, goldstar_reel3_tilemap, 0, 0); } - + if (cm_enable_reg &0x04) { if (memory_region(screen->machine,"user1")) @@ -265,12 +265,12 @@ VIDEO_UPDATE( goldstar ) drawgfxzoom(bitmap,gfx,cmaster_girl_num,cmaster_girl_pal,0,0,32*8,16*8,cliprect,TRANSPARENCY_PEN,0, 0x20000, 0x10000); } } - + if (cm_enable_reg &0x02) { tilemap_draw(bitmap,cliprect, goldstar_fg_tilemap, 0, 0); } - + return 0; } @@ -281,10 +281,10 @@ VIDEO_UPDATE( cmast91 ) bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); if (!cm_enable_reg &0x01) - return 0; - + return 0; + if (cm_enable_reg &0x08) - { + { for (i= 0;i < 64;i++) { tilemap_set_scrolly(goldstar_reel1_tilemap, i, goldstar_reel1_scroll[i]); @@ -298,10 +298,10 @@ VIDEO_UPDATE( cmast91 ) } if (cm_enable_reg &0x02) - { + { tilemap_draw(bitmap, cliprect, goldstar_fg_tilemap, 0, 0); } - + return 0; } @@ -312,7 +312,7 @@ VIDEO_UPDATE( amcoe1a ) bitmap_fill(bitmap,cliprect,get_black_pen(screen->machine)); if (!cm_enable_reg &0x01) - return 0; + return 0; if (cm_enable_reg &0x08) { @@ -327,14 +327,14 @@ VIDEO_UPDATE( amcoe1a ) tilemap_draw(bitmap, &am1a_visible2, goldstar_reel2_tilemap, 0, 0); tilemap_draw(bitmap, &am1a_visible3, goldstar_reel3_tilemap, 0, 0); } - + if (cm_enable_reg &0x04) { // no girls } - + if (cm_enable_reg &0x02) - { + { tilemap_draw(bitmap, cliprect, goldstar_fg_tilemap, 0, 0); } diff --git a/src/mame/video/m10.c b/src/mame/video/m10.c index 8bc4d35575e..cb071c89020 100644 --- a/src/mame/video/m10.c +++ b/src/mame/video/m10.c @@ -65,7 +65,7 @@ WRITE8_HANDLER( m10_colorram_w ) WRITE8_HANDLER( m10_chargen_w ) { m10_state *state = space->machine->driver_data; - + if (state->chargen[offset] != data) { state->chargen[offset] = data; diff --git a/src/mame/video/segaic24.c b/src/mame/video/segaic24.c index e5036df0c29..da85b5e943f 100644 --- a/src/mame/video/segaic24.c +++ b/src/mame/video/segaic24.c @@ -437,7 +437,7 @@ void sys24_tile_draw(running_machine *machine, bitmap_t *bitmap, const rectangle if(hscr & 0x8000) { UINT16 *hscrtb = sys24_tile_ram + 0x4000 + 0x200*layer; - + switch((ctrl & 0x6000) >> 13) { case 1: { int y; @@ -507,7 +507,7 @@ void sys24_tile_draw(running_machine *machine, bitmap_t *bitmap, const rectangle c2.min_y = v; if(!((-vscr) & 0x200)) layer ^= 1; - + tilemap_draw(bitmap, &c1, sys24_tile_layer[layer], tpri, lpri); tilemap_draw(bitmap, &c2, sys24_tile_layer[layer^1], tpri, lpri); break; @@ -523,7 +523,7 @@ void sys24_tile_draw(running_machine *machine, bitmap_t *bitmap, const rectangle c2.min_x = h; if(!((+hscr) & 0x200)) layer ^= 1; - + tilemap_draw(bitmap, &c1, sys24_tile_layer[layer], tpri, lpri); tilemap_draw(bitmap, &c2, sys24_tile_layer[layer^1], tpri, lpri); break; @@ -667,10 +667,10 @@ void sys24_sprite_vh_start(running_machine *machine) Clip? 0 01---nnn nnnnnnnn next sprite 1 hVH----- -------- hide/vflip/hflip - 2 -------y yyyyyyyy Clip top - 2 -------x xxxxxxxx Clip left - 2 -------y yyyyyyyy Clip bottom - 2 -------x xxxxxxxx Clip right + 2 -------y yyyyyyyy Clip top + 2 -------x xxxxxxxx Clip left + 2 -------y yyyyyyyy Clip bottom + 2 -------x xxxxxxxx Clip right Skipped entry 0 10---nnn nnnnnnnn next sprite diff --git a/src/osd/windows/vconv.c b/src/osd/windows/vconv.c index e3a597955f7..266457fac43 100644 --- a/src/osd/windows/vconv.c +++ b/src/osd/windows/vconv.c @@ -364,7 +364,7 @@ static void build_command_line(int argc, char *argv[]) // else keep looking } - + // if we didn't match, process if (!matched) { diff --git a/src/version.c b/src/version.c index 1a4221a9bc0..dee33509b8d 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.129u5 ("__DATE__")"; +const char build_version[] = "0.129u6 ("__DATE__")"; -- cgit v1.2.3