diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-02-12 18:36:50 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-02-12 18:36:50 +0100 |
commit | 6cd609036fa0636940c0578cadcdc5f2fa54c042 (patch) | |
tree | 91d2f64def14039c33b2eb6668926c9ac3f20f61 | |
parent | be88bed2384951aae8c1f9bff51c74fbc0ce128f (diff) | |
parent | a2f6af88c76f49183432b3cf1a0dbf82fc6ab76d (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
-rw-r--r-- | src/mame/drivers/igs_m027.c | 14 | ||||
-rw-r--r-- | src/mame/machine/pgmcrypt.c | 6 | ||||
-rw-r--r-- | src/mame/machine/pgmcrypt.h | 2 | ||||
-rw-r--r-- | src/mame/mame.lst | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/mame/drivers/igs_m027.c b/src/mame/drivers/igs_m027.c index 754dde25f6b..a352f0e4c53 100644 --- a/src/mame/drivers/igs_m027.c +++ b/src/mame/drivers/igs_m027.c @@ -61,7 +61,7 @@ public: DECLARE_DRIVER_INIT(gonefsh2); DECLARE_DRIVER_INIT(sddz); DECLARE_DRIVER_INIT(hauntedh); - DECLARE_DRIVER_INIT(bigd2); + DECLARE_DRIVER_INIT(zhongguo); DECLARE_DRIVER_INIT(klxyj); DECLARE_DRIVER_INIT(fearless); TILE_GET_INFO_MEMBER(get_tx_tilemap_tile_info); @@ -569,7 +569,7 @@ ROM_END /* -Big D2 +Zhong Guo Chu Da D IGS, 2000 PCB Layout @@ -612,10 +612,10 @@ Notes: */ -ROM_START( bigd2 ) +ROM_START( zhongguo ) ROM_REGION( 0x04000, "maincpu", 0 ) /* Internal rom of IGS027A ARM based MCU */ - ROM_LOAD( "bigd2_igs027a", 0x00000, 0x4000, NO_DUMP ) + ROM_LOAD( "zhongguo_igs027a", 0x00000, 0x4000, NO_DUMP ) ROM_REGION( 0x80000, "user1", 0 ) // external ARM data / prg ROM_LOAD( "p2600.u10", 0x000000, 0x80000, CRC(9ad34135) SHA1(54717753d1296efe49946369fd4a27181f19dbc0) ) @@ -953,9 +953,9 @@ DRIVER_INIT_MEMBER(igs_m027_state,gonefsh2) pgm_create_dummy_internal_arm_region(); } -DRIVER_INIT_MEMBER(igs_m027_state,bigd2) +DRIVER_INIT_MEMBER(igs_m027_state,zhongguo) { - big2_decrypt(machine()); + zhongguo_decrypt(machine()); //sdwx_gfx_decrypt(machine()); pgm_create_dummy_internal_arm_region(); } @@ -968,7 +968,7 @@ DRIVER_INIT_MEMBER(igs_m027_state,bigd2) GAME( 2002, sdwx, 0, igs_majhong, sdwx, igs_m027_state, sdwx, ROT0, "IGS", "Sheng Dan Wu Xian", GAME_IS_SKELETON ) // aka Christmas 5 Line? GAME( 200?, sddz, 0, igs_majhong, sdwx, igs_m027_state, sddz, ROT0, "IGS", "Super Dou Di Zhu", GAME_IS_SKELETON ) -GAME( 2000, bigd2, 0, igs_majhong, sdwx, igs_m027_state, bigd2, ROT0, "IGS", "Big D2", GAME_IS_SKELETON ) +GAME( 2000, zhongguo, 0, igs_majhong, sdwx, igs_m027_state, zhongguo, ROT0, "IGS", "Zhong Guo Chu Da D", GAME_IS_SKELETON ) GAME( 200?, lhzb3, 0, igs_majhong, sdwx, igs_m027_state, lhzb3, ROT0, "IGS", "Long Hu Zheng Ba 3", GAME_IS_SKELETON ) GAME( 200?, lhzb4, 0, igs_majhong, sdwx, igs_m027_state, lhzb4, ROT0, "IGS", "Long Hu Zheng Ba 4", GAME_IS_SKELETON ) GAME( 200?, klxyj, 0, igs_majhong, sdwx, igs_m027_state, klxyj, ROT0, "IGS", "Kuai Le Xi You Ji", GAME_IS_SKELETON ) diff --git a/src/mame/machine/pgmcrypt.c b/src/mame/machine/pgmcrypt.c index bca2ddb4382..014181058fb 100644 --- a/src/mame/machine/pgmcrypt.c +++ b/src/mame/machine/pgmcrypt.c @@ -1120,7 +1120,7 @@ void klxyj_decrypt(running_machine &machine) } } -static const UINT8 big2_tab[0x100] = { +static const UINT8 zhongguo_tab[0x100] = { 0x68, 0x56, 0xC2, 0x54, 0xA2, 0x8C, 0x7B, 0x4F, 0x37, 0xAC, 0x60, 0xF8, 0x24, 0xDF, 0x3E, 0x6B, 0xE2, 0x89, 0x3D, 0xF3, 0x31, 0x83, 0x4A, 0x65, 0x27, 0x98, 0xC5, 0xBF, 0x78, 0x3E, 0x6C, 0x02, 0x07, 0x96, 0x88, 0x4D, 0xAE, 0xA6, 0x56, 0x3A, 0x4A, 0xD5, 0xB8, 0x7E, 0x0B, 0xA7, 0x1D, 0xBC, @@ -1139,7 +1139,7 @@ static const UINT8 big2_tab[0x100] = { 0x1E, 0xA6, 0xFC, 0xFE, 0xE3, 0x8E, 0xB1, 0xB7, 0x0F, 0x32, 0xF1, 0xCF, 0x36, 0xFE, 0x65, 0x8E }; -void big2_decrypt(running_machine &machine) +void zhongguo_decrypt(running_machine &machine) { int i; UINT16 *src = (UINT16 *) machine.root_device().memregion("user1")->base(); @@ -1158,7 +1158,7 @@ void big2_decrypt(running_machine &machine) IGS27_CRYPT7 IGS27_CRYPT8 - x ^= big2_tab[(i>> 1) & 0xff] << 8; + x ^= zhongguo_tab[(i>> 1) & 0xff] << 8; src[i] = x; } diff --git a/src/mame/machine/pgmcrypt.h b/src/mame/machine/pgmcrypt.h index 6bda40d33e0..a92c7a7a27b 100644 --- a/src/mame/machine/pgmcrypt.h +++ b/src/mame/machine/pgmcrypt.h @@ -24,7 +24,7 @@ void sdwx_decrypt(running_machine &machine); void hauntedh_decrypt(running_machine &machine); void chessc2_decrypt(running_machine &machine); void klxyj_decrypt(running_machine &machine); -void big2_decrypt(running_machine &machine); +void zhongguo_decrypt(running_machine &machine); void gonefsh2_decrypt(running_machine &machine); void sddz_decrypt(running_machine &machine); void lhzb3_decrypt(running_machine &machine); diff --git a/src/mame/mame.lst b/src/mame/mame.lst index deff10be1e7..bf936d1a583 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -9766,7 +9766,7 @@ tarzana // (c) 1999? starzan // (c) 2000? // IGS027A Cpu Games -bigd2 // (c) 2000 +zhongguo // (c) 2000 sdwx // (c) 2002 sddz // (c) 200? lhzb3 // (c) 200? |