From fb26ec7c01551f742096cdc26fd4c2d8133e5712 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 6 Mar 2008 07:31:20 +0000 Subject: [PATCH] Cleanups and version bump. --- src/build/png2bdc.c | 2 +- src/emu/cheat.c | 4 +- src/emu/cpu/ccpu/ccpu.c | 4 +- src/emu/cpuexec.c | 20 ++++----- src/emu/devintrf.c | 10 ++--- src/emu/machine/8255ppi.c | 2 +- src/emu/machine/z80dma.c | 4 +- src/emu/memory.c | 4 +- src/emu/sound/aica.c | 8 ++-- src/mame/audio/starwars.c | 2 +- src/mame/drivers/ashnojoe.c | 8 ++-- src/mame/drivers/atarisy2.c | 20 ++++----- src/mame/drivers/bagman.c | 6 +-- src/mame/drivers/balsente.c | 6 +-- src/mame/drivers/dkong.c | 86 ++++++++++++++++++------------------- src/mame/drivers/firetrk.c | 2 +- src/mame/drivers/lasso.c | 10 ++--- src/mame/drivers/mpu4drvr.c | 2 +- src/mame/drivers/xmen.c | 12 +++--- src/mame/video/cinemat.c | 2 +- src/mame/video/exidy440.c | 10 ++--- src/mame/video/galspnbl.c | 6 +-- src/mame/video/model2rd.c | 2 +- src/version.c | 2 +- 24 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/build/png2bdc.c b/src/build/png2bdc.c index 7c53e54cfb1..1ee75c4d763 100644 --- a/src/build/png2bdc.c +++ b/src/build/png2bdc.c @@ -348,7 +348,7 @@ static int bitmap_to_chars(bitmap_t *bitmap, render_font *font) if (ch->width <= 0) { /* print info */ -// printf(" Character %X - width = %d\n", chstart, colend - colstart + 1); +// printf(" Character %X - width = %d\n", chstart, colend - colstart + 1); /* allocate a bitmap */ ch->bitmap = bitmap_alloc(colend - colstart + 1, font->height, BITMAP_FORMAT_ARGB32); diff --git a/src/emu/cheat.c b/src/emu/cheat.c index c29e4123390..ebcdcc466b5 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -11246,14 +11246,14 @@ static void cheat_periodicOperation(CheatAction * action) case kOperation_AddSubtract: { - //INT32 temp, bound; + //INT32 temp, bound; /* ----- if extend data field is invalid, direct return ----- */ //if(action->flags & kActionFlag_IgnoreMask) return; /* FIXME: AddSubstract looks seriously broken - * and being worked on. */ + * and being worked on. */ #if 0 temp = ReadData(action); diff --git a/src/emu/cpu/ccpu/ccpu.c b/src/emu/cpu/ccpu/ccpu.c index a03f6b8f1a6..a73c3d2eb90 100644 --- a/src/emu/cpu/ccpu/ccpu.c +++ b/src/emu/cpu/ccpu/ccpu.c @@ -576,8 +576,8 @@ static int ccpu_execute(int cycles) ccpu_icount = -1; /* some games repeat the FRM opcode twice; it apparently does not cause - a second wait, so we make sure we skip any duplicate opcode at this - point */ + a second wait, so we make sure we skip any duplicate opcode at this + point */ if (READOP(ccpu.PC) == opcode) ccpu.PC++; break; diff --git a/src/emu/cpuexec.c b/src/emu/cpuexec.c index b6745891e59..dcfb87a7c09 100644 --- a/src/emu/cpuexec.c +++ b/src/emu/cpuexec.c @@ -748,18 +748,18 @@ void cpu_triggerint(running_machine *machine, int cpunum) int cpu_scalebyfcount(int value) { -// attotime refresh_elapsed = timer_timeelapsed(refresh_timer); -// int result; +// attotime refresh_elapsed = timer_timeelapsed(refresh_timer); +// int result; /* shift off some bits to ensure no overflow */ -// if (value < 65536) -// result = value * (refresh_elapsed.attoseconds >> 16) / (refresh_period.attoseconds >> 16); -// else -// result = value * (refresh_elapsed.attoseconds >> 32) / (refresh_period.attoseconds >> 32); -// if (value >= 0) -// return (result < value) ? result : value; -// else -// return (result > value) ? result : value; +// if (value < 65536) +// result = value * (refresh_elapsed.attoseconds >> 16) / (refresh_period.attoseconds >> 16); +// else +// result = value * (refresh_elapsed.attoseconds >> 32) / (refresh_period.attoseconds >> 32); +// if (value >= 0) +// return (result < value) ? result : value; +// else +// return (result > value) ? result : value; return 0; } diff --git a/src/emu/devintrf.c b/src/emu/devintrf.c index abc6815e14b..2646a6e185d 100644 --- a/src/emu/devintrf.c +++ b/src/emu/devintrf.c @@ -319,7 +319,7 @@ int device_list_class_items(const device_config *listhead, device_class class) /*------------------------------------------------- - device_list_class_first - return the first + device_list_class_first - return the first device in the list of a given class -------------------------------------------------*/ @@ -337,7 +337,7 @@ const device_config *device_list_class_first(const device_config *listhead, devi /*------------------------------------------------- - device_list_class_next - return the next + device_list_class_next - return the next device in the list of a given class -------------------------------------------------*/ @@ -357,7 +357,7 @@ const device_config *device_list_class_next(const device_config *prevdevice, dev /*------------------------------------------------- - device_list_class_find_by_tag - retrieve a + device_list_class_find_by_tag - retrieve a device configuration based on a class and tag -------------------------------------------------*/ @@ -401,8 +401,8 @@ int device_list_class_index(const device_config *listhead, device_class class, c /*------------------------------------------------- - device_list_class_find_by_index - retrieve a - device configuration based on a class and + device_list_class_find_by_index - retrieve a + device configuration based on a class and index -------------------------------------------------*/ diff --git a/src/emu/machine/8255ppi.c b/src/emu/machine/8255ppi.c index 6eb5bfedc37..70aad85a9d1 100644 --- a/src/emu/machine/8255ppi.c +++ b/src/emu/machine/8255ppi.c @@ -143,7 +143,7 @@ void ppi8255_init( const ppi8255_interface *intfce ) ppi8255 *chip = &chips[i]; memset(chip, 0, sizeof(*chip)); - + chip->port_read[0] = intfce->portAread[i]; chip->port_read[1] = intfce->portBread[i]; chip->port_read[2] = intfce->portCread[i]; diff --git a/src/emu/machine/z80dma.c b/src/emu/machine/z80dma.c index 575108ab96a..3d80b1d8144 100644 --- a/src/emu/machine/z80dma.c +++ b/src/emu/machine/z80dma.c @@ -496,14 +496,14 @@ READ8_HANDLER( z80dma_0_r ) { z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_0_TAG); - return z80dma_read(z80dma); + return z80dma_read(z80dma); } READ8_HANDLER( z80dma_1_r ) { z80dma_t *z80dma = devtag_get_token(Machine, Z80DMA, Z80DMA_DEV_1_TAG); - return z80dma_read(z80dma); + return z80dma_read(z80dma); } WRITE8_HANDLER( z80dma_0_w ) diff --git a/src/emu/memory.c b/src/emu/memory.c index 5ab89c3be29..cfb3b2a55b2 100644 --- a/src/emu/memory.c +++ b/src/emu/memory.c @@ -38,8 +38,8 @@ Specifies a mask for the addresses in the current bucket. This mask is applied after a positive hit in the bucket specified by AM_RANGE or AM_SPACE, and is computed before accessing the RAM or calling - through to the read/write handler. If you use AM_MIRROR, below, the - mask is ANDed implicitly with the logical NOT of the mirror. The + through to the read/write handler. If you use AM_MIRROR, below, the + mask is ANDed implicitly with the logical NOT of the mirror. The mask specified by this macro is ANDed against any implicit masks. AM_MIRROR(mirror) diff --git a/src/emu/sound/aica.c b/src/emu/sound/aica.c index dd3e76d85a4..0481369cd72 100644 --- a/src/emu/sound/aica.c +++ b/src/emu/sound/aica.c @@ -6,7 +6,7 @@ - No FM mode - A third sample format (ADPCM) has been added - Some minor other tweeks (no EGHOLD, slighly more capable DSP) - + init: */ @@ -869,7 +869,7 @@ static void AICA_UpdateRegR(struct _AICA *AICA, int reg) case 0x10: // LP check case 0x11: { - //int MSLC = (AICA->udata.data[0xc/2]>>8) & 0x3f; // which slot are we monitoring? + //int MSLC = (AICA->udata.data[0xc/2]>>8) & 0x3f; // which slot are we monitoring? } break; @@ -1205,8 +1205,8 @@ INLINE INT32 AICA_UpdateSlot(struct _AICA *AICA, struct _SLOT *slot) sample=(sample*EG_Update(slot))>>SHIFT; else sample=(sample*EG_TABLE[EG_Update(slot)>>(SHIFT-10)])>>SHIFT; - - if(slot->mslc) + + if(slot->mslc) { AICA->udata.data[0x12/2] = addr1; if (!(AFSEL(AICA))) diff --git a/src/mame/audio/starwars.c b/src/mame/audio/starwars.c index 2c659080874..827e6bd316a 100644 --- a/src/mame/audio/starwars.c +++ b/src/mame/audio/starwars.c @@ -94,7 +94,7 @@ READ8_HANDLER( starwars_m6532_r ) return temp; default: - return 0; + return 0; } } diff --git a/src/mame/drivers/ashnojoe.c b/src/mame/drivers/ashnojoe.c index a51a5fac52e..74b141536a3 100644 --- a/src/mame/drivers/ashnojoe.c +++ b/src/mame/drivers/ashnojoe.c @@ -144,10 +144,10 @@ static READ8_HANDLER(fake_6_r) ret ^= 1; return ret; /* FIXME: earlier attemts to remove ? - return 1; - return 0; - return mame_rand(Machine); - */ + return 1; + return 0; + return mame_rand(Machine); + */ } static WRITE8_HANDLER( adpcm_data_w ) diff --git a/src/mame/drivers/atarisy2.c b/src/mame/drivers/atarisy2.c index 1d377d72a2c..9247333778f 100644 --- a/src/mame/drivers/atarisy2.c +++ b/src/mame/drivers/atarisy2.c @@ -961,7 +961,7 @@ INPUT_PORTS_END static INPUT_PORTS_START( csprint ) - PORT_INCLUDE( ssprint ) + PORT_INCLUDE( ssprint ) PORT_MODIFY("1840") PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED ) @@ -1024,15 +1024,15 @@ static INPUT_PORTS_START( apb ) PORT_DIPSETTING( 0x04, "10" ) PORT_DIPSETTING( 0x00, "25" ) PORT_DIPSETTING( 0x06, "199" ) - PORT_DIPNAME( 0x38, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("5/6A:!5,!4,!3") /* No. Of Demerits Allowed Bonus Inc. Every x Pts Perfect Day Bonus */ - PORT_DIPSETTING( 0x38, DEF_STR( Easiest ) ) /* 11 5000 Yes */ - PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy ) ) /* 10 6000 Yes */ - PORT_DIPSETTING( 0x28, DEF_STR( Easy ) ) /* 9 8000 Yes */ - PORT_DIPSETTING( 0x00, "Medium Easy" ) /* 8 10000 Yes */ - PORT_DIPSETTING( 0x20, "Medium Hard" ) /* 7 11000 Yes */ - PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) /* 6 13000 Yes */ - PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) ) /* 5 15000 No */ - PORT_DIPSETTING( 0x18, DEF_STR( Hardest ) ) /* 4 18000 No */ + PORT_DIPNAME( 0x38, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("5/6A:!5,!4,!3") /* No. Of Demerits Allowed Bonus Inc. Every x Pts Perfect Day Bonus */ + PORT_DIPSETTING( 0x38, DEF_STR( Easiest ) ) /* 11 5000 Yes */ + PORT_DIPSETTING( 0x30, DEF_STR( Very_Easy ) ) /* 10 6000 Yes */ + PORT_DIPSETTING( 0x28, DEF_STR( Easy ) ) /* 9 8000 Yes */ + PORT_DIPSETTING( 0x00, "Medium Easy" ) /* 8 10000 Yes */ + PORT_DIPSETTING( 0x20, "Medium Hard" ) /* 7 11000 Yes */ + PORT_DIPSETTING( 0x10, DEF_STR( Hard ) ) /* 6 13000 Yes */ + PORT_DIPSETTING( 0x08, DEF_STR( Very_Hard ) ) /* 5 15000 No */ + PORT_DIPSETTING( 0x18, DEF_STR( Hardest ) ) /* 4 18000 No */ PORT_DIPNAME( 0xc0, 0x00, "Coins Required" ) PORT_DIPLOCATION("5/6A:!2,!1") PORT_DIPSETTING( 0x80, "3 To Start, 2 To Continue" ) PORT_DIPSETTING( 0xc0, "3 To Start, 1 To Continue" ) diff --git a/src/mame/drivers/bagman.c b/src/mame/drivers/bagman.c index 56e4f721265..4f33a197419 100644 --- a/src/mame/drivers/bagman.c +++ b/src/mame/drivers/bagman.c @@ -55,7 +55,7 @@ I/O C ;AY-3-8910 Data Read Reg. Port B of the 8910 is connected to IN1 DIP locations verified for: - - bagman (manual) + - bagman (manual) ***************************************************************************/ @@ -338,7 +338,7 @@ static INPUT_PORTS_START( sbagman ) INPUT_PORTS_END static INPUT_PORTS_START( pickin ) - PORT_INCLUDE( bagman ) + PORT_INCLUDE( bagman ) PORT_MODIFY("DSW") PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1") @@ -360,7 +360,7 @@ static INPUT_PORTS_START( pickin ) INPUT_PORTS_END static INPUT_PORTS_START( botanic ) - PORT_INCLUDE( bagman ) + PORT_INCLUDE( bagman ) PORT_MODIFY("DSW") PORT_DIPNAME( 0x08, 0x08, "Invulnerability Fruits" ) PORT_DIPLOCATION("SW1:4") diff --git a/src/mame/drivers/balsente.c b/src/mame/drivers/balsente.c index 19592e35afc..52f993f939f 100644 --- a/src/mame/drivers/balsente.c +++ b/src/mame/drivers/balsente.c @@ -215,7 +215,7 @@ *************************************************************************** DIP locations verified for: - - stompin (manual) + - stompin (manual) ***************************************************************************/ @@ -457,7 +457,7 @@ static INPUT_PORTS_START( gghost ) /* Player 2 Trackball */ PORT_MODIFY("AN0") PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_RESET PORT_PLAYER(2) - + PORT_MODIFY("AN1") PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_RESET PORT_REVERSE PORT_PLAYER(2) @@ -846,7 +846,7 @@ static INPUT_PORTS_START( nstocker ) PORT_DIPUNUSED_DIPLOC( 0x40, 0x40, "G1:7" ) /* cheese alert -- we have to map this to player 2 so that it doesn't interfere with - the crosshair controls */ + the crosshair controls */ PORT_MODIFY("AN3") PORT_BIT( 0xff, 0, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(20) PORT_CODE_DEC(KEYCODE_S) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(KEYCODE_F) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_RESET PORT_PLAYER(2) diff --git a/src/mame/drivers/dkong.c b/src/mame/drivers/dkong.c index ffb43af062f..cc5b19519e7 100644 --- a/src/mame/drivers/dkong.c +++ b/src/mame/drivers/dkong.c @@ -252,49 +252,49 @@ Changes: Donkey Kong Junior Notes ======================== - DJR-03 Donkey Kong Modification Kits 02-23-83 - -------------------------------------------------------------- - Nintendo Service Department Bulletin # DJR-03 02-23-83 - GAME: Donkey Kong Junior - SUBJECT: Play Time - - It has come to our attention that play time on Donkey Kong - Junior is, in some cases, excessive, while in other cases - there is concern over the ability of players to learn the - game and thereby retain an interest in playing. - - We are making available, through our Nintendo Distributors, - two EPROM change kits, designated DJR1-E and DJR1-P. - - The E kit consists of four (4) chips and is an easier version - of the program. it presents the board sequence in a way which - familiarizes the players with the game faster. The board - order is vines, springboard, Mario's hideout and keys. - - The P kit is a more difficult version consisting of two chips. - The order remains the same while more and faster - obstacles (snapjaws, nitpickers, etc.) are presented. - -------------------------------------------------------------- - - E-Kit - roms - ------------------------------------------------ - Filename Label Type Loc/PCB CSum - ----------- -------------- ------ ------- ---- -- - 2732.5Ae DJR1-C-5A e 2732 5A(CPU) 68E9 - 2764.5Be DJR1-C-5B e 2764 5B(CPU) B0CF - 2764.5Ce DJR1-C-5C e 2764 5C(CPU) FC64 - 2764.5Ee DJR1-C-5E e 2764 5E(CPU) 7CC6 - ------------------------------------------------ - - P-Kit roms (Still looking for these, suffix is - more than likely P. :) - ------------------------------------------------ - Filename Label Type Loc/PCB CSum - ----------- -------------- ------ ------- ---- -- - empty --------- ---- 5A(CPU) ---- - 2764.5Bp DJR1-C-5B p 2764 5B(CPU) 1B58 - 2764.5Cp DJR1-C-5C p 2764 5C(CPU) F4FE - ------------------------------------------------ + DJR-03 Donkey Kong Modification Kits 02-23-83 + -------------------------------------------------------------- + Nintendo Service Department Bulletin # DJR-03 02-23-83 + GAME: Donkey Kong Junior + SUBJECT: Play Time + + It has come to our attention that play time on Donkey Kong + Junior is, in some cases, excessive, while in other cases + there is concern over the ability of players to learn the + game and thereby retain an interest in playing. + + We are making available, through our Nintendo Distributors, + two EPROM change kits, designated DJR1-E and DJR1-P. + + The E kit consists of four (4) chips and is an easier version + of the program. it presents the board sequence in a way which + familiarizes the players with the game faster. The board + order is vines, springboard, Mario's hideout and keys. + + The P kit is a more difficult version consisting of two chips. + The order remains the same while more and faster + obstacles (snapjaws, nitpickers, etc.) are presented. + -------------------------------------------------------------- + + E-Kit - roms + ------------------------------------------------ + Filename Label Type Loc/PCB CSum + ----------- -------------- ------ ------- ---- -- + 2732.5Ae DJR1-C-5A e 2732 5A(CPU) 68E9 + 2764.5Be DJR1-C-5B e 2764 5B(CPU) B0CF + 2764.5Ce DJR1-C-5C e 2764 5C(CPU) FC64 + 2764.5Ee DJR1-C-5E e 2764 5E(CPU) 7CC6 + ------------------------------------------------ + + P-Kit roms (Still looking for these, suffix is + more than likely P. :) + ------------------------------------------------ + Filename Label Type Loc/PCB CSum + ----------- -------------- ------ ------- ---- -- + empty --------- ---- 5A(CPU) ---- + 2764.5Bp DJR1-C-5B p 2764 5B(CPU) 1B58 + 2764.5Cp DJR1-C-5C p 2764 5C(CPU) F4FE + ------------------------------------------------ ***************************************************************************/ diff --git a/src/mame/drivers/firetrk.c b/src/mame/drivers/firetrk.c index 53426de81d6..6d0c31079a5 100644 --- a/src/mame/drivers/firetrk.c +++ b/src/mame/drivers/firetrk.c @@ -56,7 +56,7 @@ static INPUT_CHANGED( gear_changed ) static INTERRUPT_GEN( firetrk_interrupt ) { /* Super Bug - ASR - when is this used and what is an ASR? */ -// discrete_sound_w(machine, SUPERBUG_ASR_EN, 0); +// discrete_sound_w(machine, SUPERBUG_ASR_EN, 0); /* NMI interrupts are disabled during service mode in firetrk and montecar */ if (!in_service_mode) diff --git a/src/mame/drivers/lasso.c b/src/mame/drivers/lasso.c index df537781b80..24bf1c0f8e1 100644 --- a/src/mame/drivers/lasso.c +++ b/src/mame/drivers/lasso.c @@ -23,7 +23,7 @@ Notes: *************************************************************************** DIP locations verified for: - - lasso + - lasso ***************************************************************************/ @@ -242,14 +242,14 @@ static INPUT_PORTS_START( lasso ) PORT_DIPSETTING( 0x08, DEF_STR( 1C_2C ) ) PORT_DIPSETTING( 0x04, DEF_STR( 1C_3C ) ) PORT_DIPSETTING( 0x0c, DEF_STR( 1C_6C ) ) -// PORT_DIPSETTING( 0x06, DEF_STR( 1C_1C ) ) /* Not documented */ -// PORT_DIPSETTING( 0x0a, DEF_STR( 1C_1C ) ) /* Not documented */ -// PORT_DIPSETTING( 0x0e, DEF_STR( 1C_1C ) ) /* Not documented */ +// PORT_DIPSETTING( 0x06, DEF_STR( 1C_1C ) ) /* Not documented */ +// PORT_DIPSETTING( 0x0a, DEF_STR( 1C_1C ) ) /* Not documented */ +// PORT_DIPSETTING( 0x0e, DEF_STR( 1C_1C ) ) /* Not documented */ PORT_DIPNAME( 0x30, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:!5,!6") PORT_DIPSETTING( 0x00, "3" ) PORT_DIPSETTING( 0x10, "4" ) PORT_DIPSETTING( 0x20, "5" ) -// PORT_DIPSETTING( 0x30, "3" ) /* Not documented */ +// PORT_DIPSETTING( 0x30, "3" ) /* Not documented */ PORT_DIPNAME( 0x40, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:!1") PORT_DIPSETTING( 0x40, DEF_STR( 2C_1C ) ) PORT_DIPSETTING( 0x00, DEF_STR( 1C_1C ) ) diff --git a/src/mame/drivers/mpu4drvr.c b/src/mame/drivers/mpu4drvr.c index 0880157b72e..5b2ef5b1f88 100644 --- a/src/mame/drivers/mpu4drvr.c +++ b/src/mame/drivers/mpu4drvr.c @@ -1573,7 +1573,7 @@ static ADDRESS_MAP_START( dealem_memmap, ADDRESS_SPACE_PROGRAM, 8 ) AM_RANGE(0x0800, 0x0800) AM_DEVWRITE(MC6845, "crtc", mc6845_address_w) AM_RANGE(0x0801, 0x0801) AM_DEVREADWRITE(MC6845, "crtc", mc6845_register_r, mc6845_register_w) -// AM_RANGE(0x0850, 0x0850) AM_READWRITE(bankswitch_r,bankswitch_w) // write bank (rom page select) +// AM_RANGE(0x0850, 0x0850) AM_READWRITE(bankswitch_r,bankswitch_w) // write bank (rom page select) // AM_RANGE(0x08E0, 0x08E7) AM_READ( 68681_duart_r) // AM_RANGE(0x08E0, 0x08E7) AM_WRITE( 68681_duart_w) diff --git a/src/mame/drivers/xmen.c b/src/mame/drivers/xmen.c index 04f4b42851a..f0304811678 100644 --- a/src/mame/drivers/xmen.c +++ b/src/mame/drivers/xmen.c @@ -232,16 +232,16 @@ static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x10a00c, 0x10a00d) AM_READ(K053246_word_r) /* sprites */ AM_RANGE(0x110000, 0x113fff) AM_RAM /* main RAM */ AM_RANGE(0x18fa00, 0x18fa01) AM_WRITE(xmen_18fa00_w) -/* AM_RANGE(0x18c000, 0x197fff) AM_WRITE(K052109_lsb_w) AM_BASE(&xmen6p_tilemapleft) */ +/* AM_RANGE(0x18c000, 0x197fff) AM_WRITE(K052109_lsb_w) AM_BASE(&xmen6p_tilemapleft) */ AM_RANGE(0x18c000, 0x197fff) AM_RAM AM_BASE(&xmen6p_tilemapleft) /* left tilemap (p1,p2,p3 counters) */ /* AM_RANGE(0x1ac000, 0x1af7ff) AM_READ(MRA16_RAM) AM_RANGE(0x1ac000, 0x1af7ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1b0000, 0x1b37ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1b0000, 0x1b37ff) AM_READ(MRA16_RAM) AM_RANGE(0x1b0000, 0x1b37ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1b4000, 0x1b77ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1b4000, 0x1b77ff) AM_READ(MRA16_RAM) AM_RANGE(0x1b4000, 0x1b77ff) AM_WRITE(MWA16_RAM) */ AM_RANGE(0x1ac000, 0x1b7fff) AM_RAM AM_BASE(&xmen6p_tilemapright) /* right tilemap */ @@ -251,7 +251,7 @@ static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 ) AM_RANGE(0x1cc000, 0x1cf7ff) AM_READ(MRA16_RAM) AM_RANGE(0x1cc000, 0x1cf7ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1d0000, 0x1d37ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1d0000, 0x1d37ff) AM_READ(MRA16_RAM) AM_RANGE(0x1d0000, 0x1d37ff) AM_WRITE(MWA16_RAM) */ AM_RANGE(0x1cc000, 0x1d7fff) AM_RAM /* tilemap ? */ @@ -260,9 +260,9 @@ static ADDRESS_MAP_START( 6p_main_map, ADDRESS_SPACE_PROGRAM, 16 ) /* AM_RANGE(0x1ec000, 0x1ef7ff) AM_READ(MRA16_RAM) AM_RANGE(0x1ec000, 0x1ef7ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1f0000, 0x1f37ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1f0000, 0x1f37ff) AM_READ(MRA16_RAM) AM_RANGE(0x1f0000, 0x1f37ff) AM_WRITE(MWA16_RAM) - AM_RANGE(0x1f4000, 0x1f77ff) AM_READ(MRA16_RAM) + AM_RANGE(0x1f4000, 0x1f77ff) AM_READ(MRA16_RAM) AM_RANGE(0x1f4000, 0x1f77ff) AM_WRITE(MWA16_RAM) */ AM_RANGE(0x1ec000, 0x1f7fff) AM_RAM /* tilemap ? */ diff --git a/src/mame/video/cinemat.c b/src/mame/video/cinemat.c index af4bbd40df3..388edd8d9c6 100644 --- a/src/mame/video/cinemat.c +++ b/src/mame/video/cinemat.c @@ -224,7 +224,7 @@ VIDEO_UPDATE( cinemat ) { VIDEO_UPDATE_CALL(vector); vector_clear_list(); - + cpuintrf_push_context(0); ccpu_wdt_timer_trigger(); cpuintrf_pop_context(); diff --git a/src/mame/video/exidy440.c b/src/mame/video/exidy440.c index 7ab7f7a4e63..0602777ef7b 100644 --- a/src/mame/video/exidy440.c +++ b/src/mame/video/exidy440.c @@ -448,11 +448,11 @@ static VIDEO_UPDATE( exidy440 ) int beamy = ((input_port_5_r(machine, 0) & 0xff) * (VBSTART - VBEND)) >> 8; /* The timing of this FIRQ is very important. The games look for an FIRQ - and then wait about 650 cycles, clear the old FIRQ, and wait a - very short period of time (~130 cycles) for another one to come in. - From this, it appears that they are expecting to get beams over - a 12 scanline period, and trying to pick roughly the middle one. - This is how it is implemented. */ + and then wait about 650 cycles, clear the old FIRQ, and wait a + very short period of time (~130 cycles) for another one to come in. + From this, it appears that they are expecting to get beams over + a 12 scanline period, and trying to pick roughly the middle one. + This is how it is implemented. */ attoseconds_t increment = attotime_to_attoseconds(video_screen_get_scan_period(0)); attotime time = attotime_sub(video_screen_get_time_until_pos(0, beamy, beamx), attotime_make(0, increment * 6)); for (i = 0; i <= 12; i++) diff --git a/src/mame/video/galspnbl.c b/src/mame/video/galspnbl.c index d1a133b6384..95959f50cdc 100644 --- a/src/mame/video/galspnbl.c +++ b/src/mame/video/galspnbl.c @@ -63,7 +63,7 @@ static void draw_sprites(running_machine *machine, bitmap_t *bitmap, const recta color = spriteram16[offs+2]; size = 1 << (color & 0x0003); // 1,2,4,8 color = (color & 0x00f0) >> 4; -// sx = spriteram16[offs+4] + screenscroll; +// sx = spriteram16[offs+4] + screenscroll; sx = spriteram16[offs+4]; sy = spriteram16[offs+3]; flipx = attr & 0x0001; @@ -92,7 +92,7 @@ static void draw_background(bitmap_t *bitmap, const rectangle *cliprect) { offs_t offs; -// int screenscroll = 4 - (galspnbl_scroll[0] & 0xff); +// int screenscroll = 4 - (galspnbl_scroll[0] & 0xff); for (offs = 0; offs < 0x20000; offs++) { @@ -129,7 +129,7 @@ VIDEO_UPDATE( galspnbl ) code, color, 0,0, -// 16*sx + screenscroll,8*sy, +// 16*sx + screenscroll,8*sy, 16*sx,8*sy, cliprect,TRANSPARENCY_PEN,0); } diff --git a/src/mame/video/model2rd.c b/src/mame/video/model2rd.c index 9d408a31d5c..b3fe880bda6 100644 --- a/src/mame/video/model2rd.c +++ b/src/mame/video/model2rd.c @@ -72,7 +72,7 @@ static void MODEL2_FUNC_NAME(void *dest, INT32 scanline, const poly_extent *exte UINT8 luma; UINT32 tr, tg, tb; int x; -#endif +#endif /* if it's translucent, there's nothing to render */ #if defined( MODEL2_TRANSLUCENT) return; diff --git a/src/version.c b/src/version.c index 99443bcb722..5014ef155dd 100644 --- a/src/version.c +++ b/src/version.c @@ -9,4 +9,4 @@ ***************************************************************************/ -const char build_version[] = "0.123u3 ("__DATE__")"; +const char build_version[] = "0.123u4 ("__DATE__")";