diff options
author | Aaron Giles <aaron@aarongiles.com> | 2009-09-10 08:39:42 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2009-09-10 08:39:42 +0000 |
commit | e47035e8342cd2532358a6af3f7314caf42ba292 (patch) | |
tree | abc0ec31497f4ac0e804200f014cdf23de3c9871 | |
parent | fa68c11272125a442eff36e6da5cd3b60256b8ef (diff) |
Cleanups and version bump.
-rw-r--r-- | src/emu/cheat.c | 10 | ||||
-rw-r--r-- | src/emu/cpu/i386/i386ops.c | 2 | ||||
-rw-r--r-- | src/emu/debug/debugcmd.c | 2 | ||||
-rw-r--r-- | src/emu/debug/debugcmt.c | 8 | ||||
-rw-r--r-- | src/emu/input.c | 6 | ||||
-rw-r--r-- | src/emu/machine/68681.c | 2 | ||||
-rw-r--r-- | src/emu/mame.c | 2 | ||||
-rw-r--r-- | src/emu/ui.c | 2 | ||||
-rw-r--r-- | src/emu/uimenu.c | 2 | ||||
-rw-r--r-- | src/lib/util/corestr.c | 4 | ||||
-rw-r--r-- | src/mame/audio/norautp.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/naomi.c | 96 | ||||
-rw-r--r-- | src/mame/drivers/norautp.c | 2 | ||||
-rw-r--r-- | src/mame/drivers/photon2.c | 16 | ||||
-rw-r--r-- | src/mame/machine/atarigen.c | 2 | ||||
-rw-r--r-- | src/mame/machine/dc.c | 36 | ||||
-rw-r--r-- | src/mame/machine/naomibd.c | 26 | ||||
-rw-r--r-- | src/mame/machine/snesdsp3.c | 4 | ||||
-rw-r--r-- | src/mame/machine/snesdsp4.c | 10 | ||||
-rw-r--r-- | src/mame/video/dc.c | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
21 files changed, 119 insertions, 119 deletions
diff --git a/src/emu/cheat.c b/src/emu/cheat.c index bc5a05c89da..6a9fc27df0c 100644 --- a/src/emu/cheat.c +++ b/src/emu/cheat.c @@ -448,7 +448,7 @@ static void cheat_exit(running_machine *machine) /*------------------------------------------------- - cheat_get_global_enable - return the global + cheat_get_global_enable - return the global enabled state of the cheat engine -------------------------------------------------*/ @@ -460,7 +460,7 @@ int cheat_get_global_enable(running_machine *machine) /*------------------------------------------------- - cheat_set_global_enable - globally enable or + cheat_set_global_enable - globally enable or disable the cheat engine -------------------------------------------------*/ @@ -468,7 +468,7 @@ void cheat_set_global_enable(running_machine *machine, int enable) { cheat_private *cheatinfo = machine->cheat_data; cheat_entry *cheat; - + /* if we're enabled currently and we don't want to be, turn things off */ if (!cheatinfo->disabled && !enable) { @@ -479,7 +479,7 @@ void cheat_set_global_enable(running_machine *machine, int enable) popmessage("Cheats Disabled"); cheatinfo->disabled = TRUE; } - + /* if we're disabled currently and we want to be enabled, turn things on */ else if (cheatinfo->disabled && enable) { @@ -648,7 +648,7 @@ int cheat_activate(running_machine *machine, void *entry) cheat_private *cheatinfo = machine->cheat_data; cheat_entry *cheat = (cheat_entry *)entry; int changed = FALSE; - + /* if cheats have been toggled off no point in even trying to do anything */ if (cheatinfo->disabled) return changed; diff --git a/src/emu/cpu/i386/i386ops.c b/src/emu/cpu/i386/i386ops.c index 48d68e9b00f..782a1484471 100644 --- a/src/emu/cpu/i386/i386ops.c +++ b/src/emu/cpu/i386/i386ops.c @@ -893,7 +893,7 @@ static void I386OP(arpl)(i386_state *cpustate) // Opcode 0x63 UINT16 src, dst; UINT8 modrm = FETCH(cpustate); UINT8 flag = 0; - + if( modrm >= 0xc0 ) { src = LOAD_REG16(modrm); dst = LOAD_RM16(modrm); diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c index bc702b2e87f..66d80b20e91 100644 --- a/src/emu/debug/debugcmd.c +++ b/src/emu/debug/debugcmd.c @@ -1471,7 +1471,7 @@ static void execute_wplist(running_machine *machine, int ref, int params, const for (wp = cpuinfo->wplist[spacenum]; wp != NULL; wp = wp->next) { int buflen; - buflen = sprintf(buffer, "%c%4X @ %s-%s %s", wp->enabled ? ' ' : 'D', wp->index, + buflen = sprintf(buffer, "%c%4X @ %s-%s %s", wp->enabled ? ' ' : 'D', wp->index, core_i64_hex_format(memory_byte_to_address(space, wp->address), space->addrchars), core_i64_hex_format(memory_byte_to_address_end(space, wp->address + wp->length) - 1, space->addrchars), types[wp->type & 3]); diff --git a/src/emu/debug/debugcmt.c b/src/emu/debug/debugcmt.c index 850919c7b42..6595194738c 100644 --- a/src/emu/debug/debugcmt.c +++ b/src/emu/debug/debugcmt.c @@ -94,7 +94,7 @@ static void debug_comment_free(running_machine *machine); int debug_comment_init(running_machine *machine) { const device_config *cpu; - + /* allocate memory for the comments */ for (cpu = machine->firstcpu; cpu != NULL; cpu = cpu_next(cpu)) { @@ -269,7 +269,7 @@ UINT32 debug_comment_all_change_count(running_machine *machine) { const device_config *cpu; UINT32 retVal = 0; - + for (cpu = machine->firstcpu; cpu != NULL; cpu = cpu_next(cpu)) { debug_cpu_comment_group *comments = cpu_get_debug_data(cpu)->comments; @@ -541,14 +541,14 @@ static void debug_comment_exit(running_machine *machine) static void debug_comment_free(running_machine *machine) { const device_config *cpu; - + for (cpu = machine->firstcpu; cpu != NULL; cpu = cpu_next(cpu)) { debug_cpu_comment_group *comments = cpu_get_debug_data(cpu)->comments; if (comments != NULL) { int j; - + for (j = 0; j < comments->comment_count; j++) free(comments->comment_info[j]); diff --git a/src/emu/input.c b/src/emu/input.c index ba7acd07d73..2e413bdf9fc 100644 --- a/src/emu/input.c +++ b/src/emu/input.c @@ -576,7 +576,7 @@ void input_init(running_machine *machine) joystick_map map; input_private *state; input_device_list *device_list; - + /* remember this machine */ stashed_machine = machine; @@ -1432,7 +1432,7 @@ input_code input_code_from_token(running_machine *machine, const char *_token) /* if we're a standard code, default the itemclass based on it */ if (standard) itemclass = input_item_standard_class((input_device_class)devclass, (input_item_id)itemid); - + /* otherwise, keep parsing */ else { @@ -1505,7 +1505,7 @@ exit: ***************************************************************************/ /*------------------------------------------------- - debug_global_input_code_pressed - return TRUE + debug_global_input_code_pressed - return TRUE if the given input code has been pressed -------------------------------------------------*/ diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index 969c5e0a5c5..e84245f0a82 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -379,7 +379,7 @@ static TIMER_CALLBACK( tx_timer_callback ) // send the byte unless we're in loopback mode; // in loopback mode do NOT 'actually' send the byte: the TXn pin is held high when loopback mode is on. - if ((duart68681->duart_config->tx_callback) && ((duart68681->channel[ch].MR2&0xC0) != 0x80)) + if ((duart68681->duart_config->tx_callback) && ((duart68681->channel[ch].MR2&0xC0) != 0x80)) duart68681->duart_config->tx_callback(device, ch, duart68681->channel[ch].tx_data); duart68681->channel[ch].tx_ready = 1; diff --git a/src/emu/mame.c b/src/emu/mame.c index 152c4d75b1e..3adfccb07d7 100644 --- a/src/emu/mame.c +++ b/src/emu/mame.c @@ -544,7 +544,7 @@ void mame_frame_update(running_machine *machine) /*------------------------------------------------- - mame_is_valid_machine - return true if the + mame_is_valid_machine - return true if the given machine is valid -------------------------------------------------*/ diff --git a/src/emu/ui.c b/src/emu/ui.c index 77620602d7d..a1dcc70baa3 100644 --- a/src/emu/ui.c +++ b/src/emu/ui.c @@ -1239,7 +1239,7 @@ static UINT32 handler_ingame(running_machine *machine, UINT32 state) /* handle a toggle cheats request */ if (ui_input_pressed(machine, IPT_UI_TOGGLE_CHEAT)) cheat_set_global_enable(machine, !cheat_get_global_enable(machine)); - + /* toggle movie recording */ if (ui_input_pressed(machine, IPT_UI_RECORD_MOVIE)) { diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 3ed2962142b..dd63526b420 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -1231,7 +1231,7 @@ static void ui_menu_handle_keys(ui_menu *menu, UINT32 flags) /* handle a toggle cheats request */ if (exclusive_input_pressed(menu, IPT_UI_TOGGLE_CHEAT, 0)) cheat_set_global_enable(menu->machine, !cheat_get_global_enable(menu->machine)); - + /* see if any other UI keys are pressed */ if (menu->event.iptkey == IPT_INVALID) for (code = __ipt_ui_start; code <= __ipt_ui_end; code++) diff --git a/src/lib/util/corestr.c b/src/lib/util/corestr.c index 4a291b03bc7..97b8154757e 100644 --- a/src/lib/util/corestr.c +++ b/src/lib/util/corestr.c @@ -132,7 +132,7 @@ char *core_i64_hex_format(UINT64 value, UINT8 mindigits) char *bufbase = &buffer[index++ % 16][0]; char *bufptr = bufbase; INT8 curdigit; - + for (curdigit = 15; curdigit >= 0; curdigit--) { int nibble = (value >> (curdigit * 4)) & 0xf; @@ -145,6 +145,6 @@ char *core_i64_hex_format(UINT64 value, UINT8 mindigits) if (bufptr == bufbase) *bufptr++ = '0'; *bufptr = 0; - + return bufbase; } diff --git a/src/mame/audio/norautp.c b/src/mame/audio/norautp.c index c37da688fb2..5c8c1398bab 100644 --- a/src/mame/audio/norautp.c +++ b/src/mame/audio/norautp.c @@ -15,7 +15,7 @@ #define NORAUTP_R2 RES_K(2.2) /* Parts List - Capacitors */ -#define NORAUTP_C1 CAP_U(.009) /* The real value is .01, but using .009 the tone for this line is accurate */ +#define NORAUTP_C1 CAP_U(.009) /* The real value is .01, but using .009 the tone for this line is accurate */ #define NORAUTP_C2 CAP_U(.022) #define NORAUTP_C3 CAP_U(.047) #define NORAUTP_C4 CAP_U(.01) diff --git a/src/mame/drivers/naomi.c b/src/mame/drivers/naomi.c index e06f0b34e51..1e306f41447 100644 --- a/src/mame/drivers/naomi.c +++ b/src/mame/drivers/naomi.c @@ -1668,7 +1668,7 @@ INPUT_PORTS_END // SHOT4 (1<<10) // SERVICE (1<<13) // TEST (1<<14) -// COIN (1<<15) +// COIN (1<<15) static INPUT_PORTS_START( aw ) PORT_START("P1L") @@ -2716,12 +2716,12 @@ ROM_START( dybb99 ) ROM_LOAD("mpr-22140.ic19", 0x9800000, 0x0800000, CRC(4cb54893) SHA1(a99b39cc3c82c3cf90f794bb8c8ba60638a6f921) ) ROM_END -ROM_START( smlg99 ) +ROM_START( smlg99 ) ROM_REGION( 0x200000, "maincpu", 0) NAOMI_BIOS ROM_REGION( 0xb000000, "user1", ROMREGION_ERASEFF) - ROM_LOAD( "epr-22059.ic22", 0x0000000, 0x200000, CRC(5784f970) SHA1(e9ec692206a95cc260521154305693f6022190bc) ) + ROM_LOAD( "epr-22059.ic22", 0x0000000, 0x200000, CRC(5784f970) SHA1(e9ec692206a95cc260521154305693f6022190bc) ) ROM_LOAD( "mpr-22038.ic1", 0x0800000, 0x800000, CRC(0a59fc5b) SHA1(efcbe2f847927fba173d333c889dd7df329d6df6) ) ROM_LOAD( "mpr-22039.ic2", 0x1000000, 0x800000, CRC(4de79b52) SHA1(c63a3ce88db316e882948baf121fa96242010c8d) ) ROM_LOAD( "mpr-22040.ic3", 0x1800000, 0x800000, CRC(b993fd90) SHA1(609de1509f393f884813ca4bcac533e10088ca84) ) @@ -2785,7 +2785,7 @@ ROM_START( f355 ) ROM_LOAD("mpr-21901.ic21",0xa800000, 0x0800000, BAD_DUMP CRC(55dcbd6d) SHA1(9fec353f9e58016090e177f899a799e2e8fc7c9f) ) // returns bad in Naomi test mode ROM_END -ROM_START( hotd2 ) +ROM_START( hotd2 ) ROM_REGION( 0x200000, "maincpu", 0) HOTD2_BIOS @@ -2985,7 +2985,7 @@ IC9 64M D6FB 8917 IC10 64M 6442 18AC IC11 64M 4F77 EEFE -*/ +*/ ROM_START( hmgeo ) @@ -3026,8 +3026,8 @@ ROM_START( hmgeo ) ROM_LOAD( "a313f890.bin", 0x0e0000, 0x00ff04, CRC(8b23c562) SHA1(fcc9d04c150f007dcd4a9a2bbee1e438a81b7c49) ) ROM_LOAD( "a314f794.bin", 0x0f0000, 0x009104, CRC(0c0a9aa2) SHA1(1b9063a18703ce4a03ffe20e3f13e9bae06bdb57) ) ROM_LOAD( "a3158898.bin", 0x100000, 0x0000ac, CRC(e23f61d5) SHA1(80ff570a6846f1af2b87e5888675257728e8e253) ) - ROM_LOAD( "a0800f40.bin", 0x110000, 0x000204, CRC(f4935846) SHA1(d7eaa710274080f378afa4fb2e14f3bd406c45fe) ) - ROM_LOAD( "a0801144.bin", 0x120000, 0x000034, CRC(28a62ac0) SHA1(d9bb6baf5feaca655f333e2f0b9b200f44ef1726) ) + ROM_LOAD( "a0800f40.bin", 0x110000, 0x000204, CRC(f4935846) SHA1(d7eaa710274080f378afa4fb2e14f3bd406c45fe) ) + ROM_LOAD( "a0801144.bin", 0x120000, 0x000034, CRC(28a62ac0) SHA1(d9bb6baf5feaca655f333e2f0b9b200f44ef1726) ) ROM_LOAD( "a0801180.bin", 0x130000, 0x00ff04, CRC(4b9e08b7) SHA1(dab208f7af4475210135aeb648e6bed7db7399b9) ) ROM_LOAD( "a0811084.bin", 0x140000, 0x00ff04, CRC(4003bab7) SHA1(0b1df4b9b1d1a1072719b559a71f5ae5811be63c) ) ROM_LOAD( "a0820f88.bin", 0x150000, 0x007e04, CRC(67fb4342) SHA1(8b8c384a1628756a08aa8131095e49756967b5e2) ) @@ -4191,7 +4191,7 @@ GAME( 1998, naomi, 0, naomi, naomi, naomi, ROT0, "Sega", /* xxxx */ GAME( 2001, hmgeo, naomi, naomi, naomi, naomi, ROT0, "Capcom", "Heavy Metal Geomatrix (JPN, USA, EUR, ASI, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* Games with incomplete dumps */ -/* xxxx */ GAME( 2001, gunsur2, naomi, naomi, naomi, naomi, ROT0, "Capcom / Namco", "Gun Survivor 2: Bio Hazard Code Veronica", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +/* xxxx */ GAME( 2001, gunsur2, naomi, naomi, naomi, naomi, ROT0, "Capcom / Namco", "Gun Survivor 2: Bio Hazard Code Veronica", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* Games with game specific bios sets */ GAME( 1998, hod2bios, 0, naomi, naomi, 0, ROT0, "Sega", "Naomi House of the Dead 2 Bios", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING|GAME_IS_BIOS_ROOT ) @@ -5217,7 +5217,7 @@ ROM_START( vf4cart ) ROM_LOAD( "mpr-23782.ic9", 0x8800000, 0x1000000, CRC(4f72e901) SHA1(a1d231c446d2c34e5a7e7145754b2313a2d03fd4) ) ROM_LOAD( "mpr-23783.ic10", 0x9800000, 0x1000000, CRC(c8d4f6f9) SHA1(9e9df605c050b3780d7df34bd5041d30bc084d2d) ) ROM_LOAD( "mpr-23784.ic11", 0xa800000, 0x1000000, BAD_DUMP CRC(3a7ebe78) SHA1(6f414db03761be0d2f995193df8146f3b82c18a8) ) -ROM_END +ROM_END ROM_START( clubkrte ) NAOMI2_BIOS @@ -5471,8 +5471,8 @@ GAME( 2001, naomi2, 0, naomi, naomi, 0, ROT0, "Sega", /* Complete Dumps */ GAME( 2001, vstrik3c, naomi2, naomi, naomi, 0, ROT0, "Sega", "Virtua Striker 3 (Cart) (USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2001, wldrider, naomi2, naomi, naomi, 0, ROT0, "Sega", "Wild Riders (JPN, USA, EXP, KOR, AUS)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2001, vf4cart, naomi2, naomi, naomi, 0, ROT0, "Sega", "Virtua Fighter 4 (Cart)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2002, clubkrte, naomi2, naomi, naomi, 0, ROT0, "Sega", "Club Kart: European Session", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +GAME( 2001, vf4cart, naomi2, naomi, naomi, 0, ROT0, "Sega", "Virtua Fighter 4 (Cart)", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +GAME( 2002, clubkrte, naomi2, naomi, naomi, 0, ROT0, "Sega", "Club Kart: European Session", GAME_UNEMULATED_PROTECTION|GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) /* GDS-xxxx (Sega first party games) */ GAME( 2001, vstrik3, naomi2, naomigd, naomi, 0, ROT0, "Sega", "Virtua Striker 3 (GDS-0006)", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) @@ -5903,27 +5903,27 @@ ROM_START( dolphin ) AW_BIOS ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax0401p01.ic18", 0x0000000, 0x0800000, CRC(195d6328) SHA1(cf3b5699f81235919dd3b1974d2ecb0376cb4552) ) - ROM_LOAD( "ax0401m01.ic11", 0x1000000, 0x1000000, CRC(5e5dca57) SHA1(e0623c84f66cada37d4c9399a7a8fc6866933144) ) - ROM_LOAD( "ax0402m01.ic12", 0x2000000, 0x1000000, CRC(77dd4771) SHA1(dcd23b8ddc82eab2f325266ffd7ed3fbc1bcdf71) ) - ROM_LOAD( "ax0403m01.ic13", 0x3000000, 0x1000000, CRC(911d0674) SHA1(eec35badcfbfe412b7104a86c2111f5a1b5fb5cd) ) - ROM_LOAD( "ax0404m01.ic14", 0x4000000, 0x1000000, CRC(f82a4ca3) SHA1(da686d86e176a9f24874d2916b1932f03a99a52d) ) - ROM_LOAD( "ax0405m01.ic15", 0x5000000, 0x1000000, CRC(b88298d7) SHA1(490c3ec471018895b7268ee33498dddaccbbfd5a) ) -ROM_END - + ROM_LOAD( "ax0401p01.ic18", 0x0000000, 0x0800000, CRC(195d6328) SHA1(cf3b5699f81235919dd3b1974d2ecb0376cb4552) ) + ROM_LOAD( "ax0401m01.ic11", 0x1000000, 0x1000000, CRC(5e5dca57) SHA1(e0623c84f66cada37d4c9399a7a8fc6866933144) ) + ROM_LOAD( "ax0402m01.ic12", 0x2000000, 0x1000000, CRC(77dd4771) SHA1(dcd23b8ddc82eab2f325266ffd7ed3fbc1bcdf71) ) + ROM_LOAD( "ax0403m01.ic13", 0x3000000, 0x1000000, CRC(911d0674) SHA1(eec35badcfbfe412b7104a86c2111f5a1b5fb5cd) ) + ROM_LOAD( "ax0404m01.ic14", 0x4000000, 0x1000000, CRC(f82a4ca3) SHA1(da686d86e176a9f24874d2916b1932f03a99a52d) ) + ROM_LOAD( "ax0405m01.ic15", 0x5000000, 0x1000000, CRC(b88298d7) SHA1(490c3ec471018895b7268ee33498dddaccbbfd5a) ) +ROM_END + ROM_START( demofist ) ROM_REGION( 0x200000, "maincpu", 0) AW_BIOS ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax0601p01.ic18", 0x0000000, 0x0800000, CRC(0efb38ad) SHA1(9400e37efe3e936474d74400ebdf28ad0869b67b) ) - ROM_LOAD( "ax0601m01.ic11", 0x1000000, 0x1000000, CRC(12fda2c7) SHA1(3afbac221ffe249386e4cb50b4edd013d9a40062) ) - ROM_LOAD( "ax0602m01.ic12", 0x2000000, 0x1000000, CRC(aea61fdf) SHA1(0a088848bbf7a47df8b44b69bf72ed0d4a1088f8) ) - ROM_LOAD( "ax0603m01.ic13", 0x3000000, 0x1000000, CRC(d5879d35) SHA1(977cd3b373c6f94eb21ffb24ff564971d3d633e5) ) - ROM_LOAD( "ax0604m01.ic14", 0x4000000, 0x1000000, CRC(a7b09048) SHA1(229fa2332b58fec2a712c3ebd672662f35a9485a) ) - ROM_LOAD( "ax0605m01.ic15", 0x5000000, 0x1000000, CRC(18d8437e) SHA1(fe2e189e40a89141335e754268d29d46e3eb3bb8) ) - ROM_LOAD( "ax0606m01.ic16", 0x6000000, 0x1000000, CRC(42c81617) SHA1(1cc686af5e3fc56143836e3dcc0067893f82fcf9) ) - ROM_LOAD( "ax0607m01.ic17", 0x7000000, 0x1000000, CRC(96e5aa84) SHA1(e9841f550f2ef409d97004542bcadabb6b9e84af) ) + ROM_LOAD( "ax0601p01.ic18", 0x0000000, 0x0800000, CRC(0efb38ad) SHA1(9400e37efe3e936474d74400ebdf28ad0869b67b) ) + ROM_LOAD( "ax0601m01.ic11", 0x1000000, 0x1000000, CRC(12fda2c7) SHA1(3afbac221ffe249386e4cb50b4edd013d9a40062) ) + ROM_LOAD( "ax0602m01.ic12", 0x2000000, 0x1000000, CRC(aea61fdf) SHA1(0a088848bbf7a47df8b44b69bf72ed0d4a1088f8) ) + ROM_LOAD( "ax0603m01.ic13", 0x3000000, 0x1000000, CRC(d5879d35) SHA1(977cd3b373c6f94eb21ffb24ff564971d3d633e5) ) + ROM_LOAD( "ax0604m01.ic14", 0x4000000, 0x1000000, CRC(a7b09048) SHA1(229fa2332b58fec2a712c3ebd672662f35a9485a) ) + ROM_LOAD( "ax0605m01.ic15", 0x5000000, 0x1000000, CRC(18d8437e) SHA1(fe2e189e40a89141335e754268d29d46e3eb3bb8) ) + ROM_LOAD( "ax0606m01.ic16", 0x6000000, 0x1000000, CRC(42c81617) SHA1(1cc686af5e3fc56143836e3dcc0067893f82fcf9) ) + ROM_LOAD( "ax0607m01.ic17", 0x7000000, 0x1000000, CRC(96e5aa84) SHA1(e9841f550f2ef409d97004542bcadabb6b9e84af) ) ROM_END ROM_START( rumblef ) @@ -5931,14 +5931,14 @@ ROM_START( rumblef ) AW_BIOS ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax1801p01.ic18", 0x0000000, 0x0800000, CRC(2f7fb163) SHA1(bf819d798d9a3a7bc754e111a3f53b9db6d6042a) ) - ROM_LOAD( "ax1801m01.ic11", 0x1000000, 0x1000000, CRC(c38aa61c) SHA1(e2f688a0aa8b0119f5fd3d53c8904e035d43a4b1) ) - ROM_LOAD( "ax1802m01.ic12", 0x2000000, 0x1000000, CRC(72e0ebc8) SHA1(e85300a405ea14c4c9d857eb9685c93faaca1d56) ) - ROM_LOAD( "ax1803m01.ic13", 0x3000000, 0x1000000, CRC(d0f59d98) SHA1(b854796087e9f76a13a21da8249f7224e451e129) ) - ROM_LOAD( "ax1804m01.ic14", 0x4000000, 0x1000000, CRC(15595cba) SHA1(8dd06d1f986cd21a58d20b662b11ed7ba8a6ff7a) ) - ROM_LOAD( "ax1805m01.ic15", 0x5000000, 0x1000000, CRC(3d3f8e0d) SHA1(364a0bda890722b9fb72171f96c742b8f3fef23e) ) - ROM_LOAD( "ax1806m01.ic16", 0x6000000, 0x1000000, CRC(ac2751bb) SHA1(5070fa12bf109ab87e8f7ea46ac4ae78a73105da) ) - ROM_LOAD( "ax1807m01.ic17", 0x7000000, 0x1000000, CRC(3b2fbdb0) SHA1(f9f7e06785d3a07282247aaedd9999aa7c2670b9) ) + ROM_LOAD( "ax1801p01.ic18", 0x0000000, 0x0800000, CRC(2f7fb163) SHA1(bf819d798d9a3a7bc754e111a3f53b9db6d6042a) ) + ROM_LOAD( "ax1801m01.ic11", 0x1000000, 0x1000000, CRC(c38aa61c) SHA1(e2f688a0aa8b0119f5fd3d53c8904e035d43a4b1) ) + ROM_LOAD( "ax1802m01.ic12", 0x2000000, 0x1000000, CRC(72e0ebc8) SHA1(e85300a405ea14c4c9d857eb9685c93faaca1d56) ) + ROM_LOAD( "ax1803m01.ic13", 0x3000000, 0x1000000, CRC(d0f59d98) SHA1(b854796087e9f76a13a21da8249f7224e451e129) ) + ROM_LOAD( "ax1804m01.ic14", 0x4000000, 0x1000000, CRC(15595cba) SHA1(8dd06d1f986cd21a58d20b662b11ed7ba8a6ff7a) ) + ROM_LOAD( "ax1805m01.ic15", 0x5000000, 0x1000000, CRC(3d3f8e0d) SHA1(364a0bda890722b9fb72171f96c742b8f3fef23e) ) + ROM_LOAD( "ax1806m01.ic16", 0x6000000, 0x1000000, CRC(ac2751bb) SHA1(5070fa12bf109ab87e8f7ea46ac4ae78a73105da) ) + ROM_LOAD( "ax1807m01.ic17", 0x7000000, 0x1000000, CRC(3b2fbdb0) SHA1(f9f7e06785d3a07282247aaedd9999aa7c2670b9) ) ROM_END ROM_START( ngbc ) @@ -5946,7 +5946,7 @@ ROM_START( ngbc ) AW_BIOS ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax3301p01.fmem1", 0x000000, 0x800000, CRC(f7e24e67) SHA1(8eef26d44b294faa509304b1b04f4d801337bc99) ) + ROM_LOAD( "ax3301p01.fmem1", 0x000000, 0x800000, CRC(f7e24e67) SHA1(8eef26d44b294faa509304b1b04f4d801337bc99) ) ROM_END ROM_START( kofnw ) @@ -5954,13 +5954,13 @@ ROM_START( kofnw ) AW_BIOS ROM_REGION( 0x8000000, "user1", ROMREGION_ERASE) - ROM_LOAD( "ax2201p01.ic18", 0x0000000, 0x0800000, CRC(27aab918) SHA1(41c5ddd8bd4c91481750606ab44aa115b5fe01d0) ) - ROM_LOAD( "ax2201m01.ic11", 0x1000000, 0x1000000, CRC(22ea665b) SHA1(292c92c9ae43eea2d1c27cedfb89c3956b8dea32) ) - ROM_LOAD( "ax2202m01.ic12", 0x2000000, 0x1000000, CRC(7fad1bea) SHA1(89f3f88af48973a4685955d86ef97a1487b8e7a8) ) - ROM_LOAD( "ax2203m01.ic13", 0x3000000, 0x1000000, CRC(78986ca4) SHA1(5a6c8c12955573f33361d2c6f20f85de35ac7bae) ) - ROM_LOAD( "ax2204m01.ic14", 0x4000000, 0x1000000, CRC(6ffbeb04) SHA1(975062cf364589dbdd5c5cb5ca945f76d87fc120) ) - ROM_LOAD( "ax2205m01.ic15", 0x5000000, 0x1000000, CRC(2851b791) SHA1(566ef95ea066b7bf548986085670242be217befc) ) - ROM_LOAD( "ax2206m01.ic16", 0x6000000, 0x1000000, CRC(e53eb965) SHA1(f50cd53a5859f081d8a278d24a519c9d9b49ab96) ) + ROM_LOAD( "ax2201p01.ic18", 0x0000000, 0x0800000, CRC(27aab918) SHA1(41c5ddd8bd4c91481750606ab44aa115b5fe01d0) ) + ROM_LOAD( "ax2201m01.ic11", 0x1000000, 0x1000000, CRC(22ea665b) SHA1(292c92c9ae43eea2d1c27cedfb89c3956b8dea32) ) + ROM_LOAD( "ax2202m01.ic12", 0x2000000, 0x1000000, CRC(7fad1bea) SHA1(89f3f88af48973a4685955d86ef97a1487b8e7a8) ) + ROM_LOAD( "ax2203m01.ic13", 0x3000000, 0x1000000, CRC(78986ca4) SHA1(5a6c8c12955573f33361d2c6f20f85de35ac7bae) ) + ROM_LOAD( "ax2204m01.ic14", 0x4000000, 0x1000000, CRC(6ffbeb04) SHA1(975062cf364589dbdd5c5cb5ca945f76d87fc120) ) + ROM_LOAD( "ax2205m01.ic15", 0x5000000, 0x1000000, CRC(2851b791) SHA1(566ef95ea066b7bf548986085670242be217befc) ) + ROM_LOAD( "ax2206m01.ic16", 0x6000000, 0x1000000, CRC(e53eb965) SHA1(f50cd53a5859f081d8a278d24a519c9d9b49ab96) ) ROM_END ROM_START( kov7sprt ) @@ -5999,12 +5999,12 @@ GAME( 2001, awbios, 0, aw, aw, 0, ROT0, "Sammy", GAME( 2002, sprtshot, awbios, aw, aw, sprtshot, ROT0, "Sammy USA", "Sports Shooting USA", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2003, demofist, awbios, aw, aw, demofist, ROT0, "Polygon Magic / Dimps", "Demolish Fist", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2003, dolphin, awbios, aw, aw, dolphin, ROT0, "Sammy", "Dolphin Blue", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) -GAME( 2003, ggisuka, awbios, aw, aw, ggisuka, ROT0, "Sammy / Arc System Works", "Guilty Gear Isuka", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2004, rumblef, awbios, aw, aw, rumblef, ROT0, "Sammy / Dimps", "The Rumble Fish", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) +GAME( 2003, dolphin, awbios, aw, aw, dolphin, ROT0, "Sammy", "Dolphin Blue", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) +GAME( 2003, ggisuka, awbios, aw, aw, ggisuka, ROT0, "Sammy / Arc System Works", "Guilty Gear Isuka", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +GAME( 2004, rumblef, awbios, aw, aw, rumblef, ROT0, "Sammy / Dimps", "The Rumble Fish", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) GAME( 2004, rangrmsn, awbios, aw, aw, rangrmsn, ROT0, "Sammy", "Ranger Mission", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) -GAME( 2004, kov7sprt, awbios, aw, aw, kov7sprt, ROT0, "Sammy / IGS", "Knights of Valour - The Seven Spirits", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) -GAME( 2005, ngbc, awbios, aw, aw, ngbc, ROT0, "Sammy / SNK Playmore", "Neo-Geo Battle Coliseum", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) +GAME( 2004, kov7sprt, awbios, aw, aw, kov7sprt, ROT0, "Sammy / IGS", "Knights of Valour - The Seven Spirits", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND ) +GAME( 2005, ngbc, awbios, aw, aw, ngbc, ROT0, "Sammy / SNK Playmore", "Neo-Geo Battle Coliseum", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2005, fotns, awbios, aw, aw, fotns, ROT0, "Sega / Arc System Works", "Fist Of The North Star", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2005, kofnw, awbios, aw, aw, kofnw, ROT0, "Sammy / SNK Playmore", "The King of Fighters Neowave", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) GAME( 2005, xtrmhunt, awbios, aw, aw, xtrmhunt, ROT0, "Sammy", "Extreme Hunting", GAME_IMPERFECT_GRAPHICS|GAME_IMPERFECT_SOUND|GAME_NOT_WORKING ) diff --git a/src/mame/drivers/norautp.c b/src/mame/drivers/norautp.c index 48d181fa981..7cf39142cc8 100644 --- a/src/mame/drivers/norautp.c +++ b/src/mame/drivers/norautp.c @@ -665,7 +665,7 @@ static WRITE8_DEVICE_HANDLER( soundlamps_w ) discrete_sound_w(discrete, NORAUTP_SND_EN, (data >> 7) & 0x01); discrete_sound_w(discrete, NORAUTP_FREQ_DATA, (data >> 4) & 0x07); -// popmessage("sound bits 4-5-6-7: %02x, %02x, %02x, %02x", ((data >> 4) & 0x01), ((data >> 5) & 0x01), ((data >> 6) & 0x01), ((data >> 7) & 0x01)); +// popmessage("sound bits 4-5-6-7: %02x, %02x, %02x, %02x", ((data >> 4) & 0x01), ((data >> 5) & 0x01), ((data >> 6) & 0x01), ((data >> 7) & 0x01)); } static WRITE8_DEVICE_HANDLER( counterlamps_w ) diff --git a/src/mame/drivers/photon2.c b/src/mame/drivers/photon2.c index ebba2290561..8119f04e83c 100644 --- a/src/mame/drivers/photon2.c +++ b/src/mame/drivers/photon2.c @@ -1,9 +1,9 @@ /* - Photon IK2 system + Photon IK2 system - Driver by Mariusz Wojcieszek + Driver by Mariusz Wojcieszek - Russian arcade system based on ZX Spectrum home computer. + Russian arcade system based on ZX Spectrum home computer. */ @@ -27,7 +27,7 @@ static UINT8 nmi_enable = 0; /************************************* * - * Video (copied from MESS apart from support + * Video (copied from MESS apart from support * for changing border color mid-frame) * *************************************/ @@ -54,11 +54,11 @@ static UINT8 nmi_enable = 0; static const rgb_t spectrum_palette[16] = { MAKE_RGB(0x00, 0x00, 0x00), MAKE_RGB(0x00, 0x00, 0xbf), - MAKE_RGB(0xbf, 0x00, 0x00), + MAKE_RGB(0xbf, 0x00, 0x00), MAKE_RGB(0xbf, 0x00, 0xbf), - MAKE_RGB(0x00, 0xbf, 0x00), + MAKE_RGB(0x00, 0xbf, 0x00), MAKE_RGB(0x00, 0xbf, 0xbf), - MAKE_RGB(0xbf, 0xbf, 0x00), + MAKE_RGB(0xbf, 0xbf, 0x00), MAKE_RGB(0xbf, 0xbf, 0xbf), MAKE_RGB(0x00, 0x00, 0x00), MAKE_RGB(0x00, 0x00, 0xff), @@ -114,7 +114,7 @@ VIDEO_UPDATE( spectrum ) int x, y, b, scrx, scry; unsigned short ink, pap; unsigned char *attr, *scr; -// int full_refresh = 1; +// int full_refresh = 1; scr=spectrum_video_ram; diff --git a/src/mame/machine/atarigen.c b/src/mame/machine/atarigen.c index 90ef9d4ca4a..e98acd7dfed 100644 --- a/src/mame/machine/atarigen.c +++ b/src/mame/machine/atarigen.c @@ -1469,7 +1469,7 @@ int atarigen_get_hblank(const device_config *screen) void atarigen_halt_until_hblank_0(const device_config *screen) { const device_config *cpu = cputag_get_cpu(screen->machine, "maincpu"); - + /* halt the CPU until the next HBLANK */ int hpos = video_screen_get_hpos(screen); int width = video_screen_get_width(screen); diff --git a/src/mame/machine/dc.c b/src/mame/machine/dc.c index fd5fd7d4454..e132177b87f 100644 --- a/src/mame/machine/dc.c +++ b/src/mame/machine/dc.c @@ -112,23 +112,23 @@ static const char *const maple_names[] = #endif -static const UINT8 dc_controller_id[0x70] = -{ - 0x00, 0x00, 0x00, 0x01, 0x00, 0x0f, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xff, 0x00, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x63, 0x61, 0x73, 0x74, 0x20, 0x43, 0x6f, 0x6e, 0x74, - 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x64, 0x20, 0x42, 0x79, 0x20, 0x6f, 0x72, 0x20, 0x55, - 0x6e, 0x64, 0x65, 0x72, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x46, 0x72, 0x6f, - 0x6d, 0x20, 0x53, 0x45, 0x47, 0x41, 0x20, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x50, 0x52, 0x49, 0x53, +static const UINT8 dc_controller_id[0x70] = +{ + 0x00, 0x00, 0x00, 0x01, 0x00, 0x0f, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0x00, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x63, 0x61, 0x73, 0x74, 0x20, 0x43, 0x6f, 0x6e, 0x74, + 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, + 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x64, 0x20, 0x42, 0x79, 0x20, 0x6f, 0x72, 0x20, 0x55, + 0x6e, 0x64, 0x65, 0x72, 0x20, 0x4c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x20, 0x46, 0x72, 0x6f, + 0x6d, 0x20, 0x53, 0x45, 0x47, 0x41, 0x20, 0x45, 0x4e, 0x54, 0x45, 0x52, 0x50, 0x52, 0x49, 0x53, 0x45, 0x53, 0x2c, 0x4c, 0x54, 0x44, 0x2e, 0x20, 0x20, 0x20, 0x20, 0x20, 0xae, 0x01, 0xf4, 0x01 }; -static const UINT8 dc_controller_version[0x50] = +static const UINT8 dc_controller_version[0x50] = { 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x2e, 0x30, 0x31, 0x30, 0x2c, 0x31, 0x39, 0x39, 0x38, 0x2f, 0x30, 0x39, 0x2f, 0x32, 0x38, 0x2c, 0x33, 0x31, 0x35, 0x2d, 0x36, 0x32, 0x31, 0x31, 0x2d, 0x41, 0x42, 0x20, 0x20, 0x20, 0x2c, 0x41, 0x6e, 0x61, 0x6c, 0x6f, 0x67, 0x20, 0x4d, - 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x3a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x34, 0x74, 0x68, 0x20, + 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x20, 0x3a, 0x20, 0x54, 0x68, 0x65, 0x20, 0x34, 0x74, 0x68, 0x20, 0x45, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x35, 0x2f, 0x38, 0x20, 0x20, 0x2b, 0x44, 0x46 }; @@ -584,8 +584,8 @@ WRITE64_HANDLER( naomi_maple_w ) { maple_regs[reg] = 1; dat=maple_regs[SB_MDSTAR]; -// printf("Maple DMA: %08x %08x %08x %08x\n",maple_regs[SB_MDSTAR],maple_regs[SB_MDTSEL],maple_regs[SB_MDEN],maple_regs[SB_MDST]); -// printf(" %08x %08x %08x %08x\n",maple_regs[SB_MSYS],maple_regs[SB_MST],maple_regs[SB_MSHTCL],maple_regs[SB_MMSEL]); +// printf("Maple DMA: %08x %08x %08x %08x\n",maple_regs[SB_MDSTAR],maple_regs[SB_MDTSEL],maple_regs[SB_MDEN],maple_regs[SB_MDST]); +// printf(" %08x %08x %08x %08x\n",maple_regs[SB_MSYS],maple_regs[SB_MST],maple_regs[SB_MSHTCL],maple_regs[SB_MMSEL]); while (1) // do transfers { ddtdata.source=dat; // source address @@ -932,8 +932,8 @@ WRITE64_HANDLER( dc_maple_w ) { maple_regs[reg] = 1; dat=maple_regs[SB_MDSTAR]; -// printf("Maple DMA: %08x %08x %08x %08x\n",maple_regs[SB_MDSTAR],maple_regs[SB_MDTSEL],maple_regs[SB_MDEN],maple_regs[SB_MDST]); -// printf(" %08x %08x %08x %08x\n",maple_regs[SB_MSYS],maple_regs[SB_MST],maple_regs[SB_MSHTCL],maple_regs[SB_MMSEL]); +// printf("Maple DMA: %08x %08x %08x %08x\n",maple_regs[SB_MDSTAR],maple_regs[SB_MDTSEL],maple_regs[SB_MDEN],maple_regs[SB_MDST]); +// printf(" %08x %08x %08x %08x\n",maple_regs[SB_MSYS],maple_regs[SB_MST],maple_regs[SB_MSHTCL],maple_regs[SB_MMSEL]); while (1) // do transfers { ddtdata.source=dat; // source address @@ -972,14 +972,14 @@ WRITE64_HANDLER( dc_maple_w ) { case 1: // AW/DC MAPLE_CMD_INFO ddtdata.length = sizeof(dc_controller_id)/4; - + buff[0] = 5; // MAPLE_RESP_INFO memcpy(&buff[1], dc_controller_id, sizeof(dc_controller_id)); break; case 2: // AW/DC MAPLE_CMD_EXT_INFO ddtdata.length = sizeof(dc_controller_id)+sizeof(dc_controller_version)/4; - + buff[0] = 6; // MAPLE_RESP_EXT_INFO memcpy(&buff[1], dc_controller_id, sizeof(dc_controller_id)); memcpy(&buff[1+(0x70/4)], dc_controller_version, sizeof(dc_controller_version)); @@ -994,10 +994,10 @@ WRITE64_HANDLER( dc_maple_w ) case 9: // AW/DC MAPLE_CMD_GET_COND buff[0] = 8; // MAPLE_RESP_DATA - + sprintf(pL, "P%dL", port+1); sprintf(pH, "P%dH", port+1); - + buff[1] = func; buff[2] = input_port_read(space->machine, pH)<<8 | input_port_read(space->machine, pL) | 0xffff0000; buff[3] = 0xffffffff; diff --git a/src/mame/machine/naomibd.c b/src/mame/machine/naomibd.c index 20c26c49029..abe39d8b5d0 100644 --- a/src/mame/machine/naomibd.c +++ b/src/mame/machine/naomibd.c @@ -259,8 +259,8 @@ static const naomibd_config_table naomibd_translate_tbl[] = 0xad8c, 0, 0xf0000, 0x923d, 0, 0x100000, 0x4a65, 0, 0x110000, 0x9958, 0, 0x120000, 0x8216, 0, 0x130000, 0xaa91, 0, 0x140000, 0xd007, 0, 0x150000, 0xead, 0, 0x160000, 0x492, 0, 0x170000, 0xffffffff, 0xffffffff, 0xffffffff } }, - { "pjustic", 0, { 0x923d, 0, 0, 0x3e41, 0, 0x10000, 0xb7af, 0, 0x20000, - 0x9651, 0, 0x30000, 0xad8c, 0, 0x40000, 0xffffffff, 0xffffffff, 0xffffffff } }, + { "pjustic", 0, { 0x923d, 0, 0, 0x3e41, 0, 0x10000, 0xb7af, 0, 0x20000, + 0x9651, 0, 0x30000, 0xad8c, 0, 0x40000, 0xffffffff, 0xffffffff, 0xffffffff } }, { "hmgeo", 0, { 0x6cc8, 0, 0x000000, 0x7b92, 0, 0x010000, 0x69bc, 0, 0x020000, 0x6d16, 0, 0x030000, 0x6134, 0, 0x040000, 0x1340, 0, 0x050000, 0x7716, 0, 0x060000, 0x2e1a, 0, 0x070000, 0x3030, 0, 0x080000, @@ -268,30 +268,30 @@ static const naomibd_config_table naomibd_translate_tbl[] = 0x6df0, 0, 0x0c0000, 0x0dd8, 0, 0x0d0000, 0x576c, 0, 0x0e0000, 0x0534, 0, 0x0f0000, 0x0904, 0, 0x100000, 0x2f14, 0, 0x110000, 0x1792, 0, 0x120000, 0x6866, 0, 0x130000, 0x06fa, 0, 0x140000, - 0x2842, 0, 0x150000, 0x7cc8, 0, 0x160000, 0xffffffff, 0xffffffff, 0xffffffff } }, + 0x2842, 0, 0x150000, 0x7cc8, 0, 0x160000, 0xffffffff, 0xffffffff, 0xffffffff } }, { "wwfroyal",0, { 0xaaaa, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, { "gwing2", 0, { -1, 0x85ddc0, 0, 0xd567, 0, 0x10000, 0xe329, 0, 0x30000, 0xc112, 0, 0x50000, 0xabcd, 0, 0x70000, 0xef01, 0, 0x90000, 0x1234, 0, 0xb0000, 0x5678, 0, 0xd0000, - 0x5555, 0, 0xf0000, 0x6666, 0, 0x110000, 0xa901, 0, 0x130000, 0xa802, 0, 0x150000, + 0x5555, 0, 0xf0000, 0x6666, 0, 0x110000, 0xa901, 0, 0x130000, 0xa802, 0, 0x150000, 0x3232, 0, 0x170000, 0x8989, 0, 0x190000, 0x6655, 0, 0x1a0000, 0x3944, 0, 0x1c0000, 0x655a, 0, 0x1d0000, 0xf513, 0, 0x1e0000, 0xb957, 0, 0, 0x37ca, 0, 0, 0xffffffff, 0xffffffff, 0xffffffff } }, -/* { "pstone2", 0, { 0x4a65, 0, 0x000000, 0x0ead, 0, 0x010000, 0x0492, 0, 0x020000, 0x414a, 0, 0x030000, - 0xad8c, 0, 0x040000, 0x923d, 0, 0x050000, 0x4a65, 0, 0x060000, 0x9958, 0, 0x070000, - 0x8216, 0, 0x080000, 0xaa91, 0, 0x090000, 0xd007, 0, 0x0a0000, 0x71ee, 0, 0x0b0000, - 0x3e41, 0, 0x0c0000, 0xb7af, 0, 0x0d0000, 0x9651, 0, 0x0e0000, 0x0492, 0, 0x0f0000, - 0x414a, 0, 0x100000, 0xaf99, 0, 0x110000, 0x5182, 0, 0x120000, 0x08aa, 0, 0x130000, - 0x69d0, 0, 0x140000, 0x9d71, 0, 0x150000, 0xd319, 0, 0x160000, 0xcc09, 0, 0x170000, - 0x5ec4, 0, 0x180000, 0x7103, 0, 0x190000, 0xffffffff, 0xffffffff, 0xffffffff } }, +/* { "pstone2", 0, { 0x4a65, 0, 0x000000, 0x0ead, 0, 0x010000, 0x0492, 0, 0x020000, 0x414a, 0, 0x030000, + 0xad8c, 0, 0x040000, 0x923d, 0, 0x050000, 0x4a65, 0, 0x060000, 0x9958, 0, 0x070000, + 0x8216, 0, 0x080000, 0xaa91, 0, 0x090000, 0xd007, 0, 0x0a0000, 0x71ee, 0, 0x0b0000, + 0x3e41, 0, 0x0c0000, 0xb7af, 0, 0x0d0000, 0x9651, 0, 0x0e0000, 0x0492, 0, 0x0f0000, + 0x414a, 0, 0x100000, 0xaf99, 0, 0x110000, 0x5182, 0, 0x120000, 0x08aa, 0, 0x130000, + 0x69d0, 0, 0x140000, 0x9d71, 0, 0x150000, 0xd319, 0, 0x160000, 0xcc09, 0, 0x170000, + 0x5ec4, 0, 0x180000, 0x7103, 0, 0x190000, 0xffffffff, 0xffffffff, 0xffffffff } }, */ { "toyfight", 0,{ 0x0615, 0, 0x0000, 0x1999, 0, 0x1000, 0x7510, 0, 0x2000, 0x5736, 0, 0x3000, - 0xffffffff, 0xffffffff, 0xffffffff } }, + 0xffffffff, 0xffffffff, 0xffffffff } }, { "ggx", 0,{ -1, 0x200000, 0x100000, -1, 0x210004, 0x110000, -1, 0x220008, 0x120000, -1, 0x228000, 0x130000, 0x3af9, 0, 0x000000, 0x2288, 0, 0x010000, 0xe5e6, 0, 0x020000, 0xebb0, 0, 0x030000, 0x0228, 0, 0x040000, 0x872c, 0, 0x050000, 0xbba0, 0, 0x060000, 0x772f, 0, 0x070000, 0x2924, 0, 0x080000, 0x3222, 0, 0x090000, 0x7954, 0, 0x0a0000, 0x5acd, 0, 0x0b0000, 0xdd19, 0, 0x0c0000, 0x2428, 0, 0x0d0000, 0x3329, 0, 0x0e0000, 0x2142, 0, 0x0f0000, - 0xffffffff, 0xffffffff, 0xffffffff } }, + 0xffffffff, 0xffffffff, 0xffffffff } }, }; /*************************************************************************** diff --git a/src/mame/machine/snesdsp3.c b/src/mame/machine/snesdsp3.c index e983376e122..08a8dd19c78 100644 --- a/src/mame/machine/snesdsp3.c +++ b/src/mame/machine/snesdsp3.c @@ -2,10 +2,10 @@ DSP-3 emulator code - Copyright (c) 2003-2009 John Weidman, Kris Bleakley, Lancer, Nach, + Copyright (c) 2003-2009 John Weidman, Kris Bleakley, Lancer, Nach, z80 gaiden, and Jonas Quinn - This code is released by ZSNES Team under GNU General Public License + This code is released by ZSNES Team under GNU General Public License version 2 as published by the Free Software Foundation. The implementation below is released under the MAME license for use in MAME, MESS and derivatives by permission of the authors. diff --git a/src/mame/machine/snesdsp4.c b/src/mame/machine/snesdsp4.c index a9aee95ee49..7b9635ad76d 100644 --- a/src/mame/machine/snesdsp4.c +++ b/src/mame/machine/snesdsp4.c @@ -2,10 +2,10 @@ DSP-4 emulator code - Copyright (c) 2004-2009 Dreamer Nom, John Weidman, Kris Bleakley, + Copyright (c) 2004-2009 Dreamer Nom, John Weidman, Kris Bleakley, Nach, z80 gaiden, and Jonas Quinn - This code is released by ZSNES Team under GNU General Public License + This code is released by ZSNES Team under GNU General Public License version 2 as published by the Free Software Foundation. The implementation below is released under the MAME license for use in MAME, MESS and derivatives by permission of the authors. @@ -30,17 +30,17 @@ Fixed-point math reminder: struct DSP4_t DSP4; struct DSP4_vars_t DSP4_vars; -INLINE UINT16 READ_WORD(UINT8 *addr) +INLINE UINT16 READ_WORD(UINT8 *addr) { return (addr[0]) + (addr[1] << 8); } -INLINE UINT32 READ_DWORD(UINT8 *addr) +INLINE UINT32 READ_DWORD(UINT8 *addr) { return (addr[0]) + (addr[1] << 8) + (addr[2] << 16) + (addr[3] << 24); } -INLINE void WRITE_WORD(UINT8 *addr, UINT16 data) +INLINE void WRITE_WORD(UINT8 *addr, UINT16 data) { addr[0] = data; addr[1] = data >> 8; diff --git a/src/mame/video/dc.c b/src/mame/video/dc.c index 265f6cccd25..d27adf765a9 100644 --- a/src/mame/video/dc.c +++ b/src/mame/video/dc.c @@ -1015,7 +1015,7 @@ WRITE64_HANDLER( pvr_ta_w ) dat = (UINT32)(data >> shift); old = pvrta_regs[reg]; - // Dreamcast BIOS attempts to set PVRID to zero and then dies + // Dreamcast BIOS attempts to set PVRID to zero and then dies // if it succeeds. Don't allow. if ((reg != PVRID) && (reg != REVISION)) { diff --git a/src/version.c b/src/version.c index 3969d3ee662..eb8ebc0046c 100644 --- a/src/version.c +++ b/src/version.c @@ -10,4 +10,4 @@ ***************************************************************************/ extern const char build_version[]; -const char build_version[] = "0.133u5 ("__DATE__")"; +const char build_version[] = "0.134 ("__DATE__")"; |