summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/segas16b.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/segas16b.cpp')
-rw-r--r--src/mame/drivers/segas16b.cpp62
1 files changed, 31 insertions, 31 deletions
diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp
index 4e0ec52c7f7..8cea6b979a7 100644
--- a/src/mame/drivers/segas16b.cpp
+++ b/src/mame/drivers/segas16b.cpp
@@ -3829,7 +3829,7 @@ void segas16b_state::tilemap_16b_fpointbl_fill_latch(int i, uint16_t* latched_pa
else if (i == 1)
{
// 6661 vs 1666
- latched_pageselect[i] = bitswap<16>(m_bootleg_page[3] ,3, 2, 1, 0 , 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 ) ;
+ latched_pageselect[i] = BITSWAP16(m_bootleg_page[3] ,3, 2, 1, 0 , 7, 6, 5, 4, 11, 10, 9, 8, 15, 14, 13, 12 ) ;
latched_yscroll[i] = m_bootleg_scroll[0x10/2]+2;
latched_xscroll[i] = -m_bootleg_scroll[0x18/2]-1;
}
@@ -4226,11 +4226,11 @@ ROM_START( afighterf )
ROM_LOAD( "epr10039.bin", 0x00000, 0x8000, CRC(b04757b0) SHA1(24bface5a23ed658675f414c9937bf9d7f7ed5ec) )
ROM_REGION( 0x2000, "maincpu:key", 0 ) // decryption key
- ROM_LOAD( "317-unknown.key", 0x0000, 0x2000, CRC(fee04be8) SHA1(c58d78299ef4cede517be823a8a8a90e46c6ba0d) )
+ ROM_LOAD( "317-unknown.key", 0x0000, 0x2000, NO_DUMP )
ROM_END
-ROM_START( afighterg )
+ROM_START( afighterg ) // could be 16A
ROM_REGION( 0x30000, "maincpu", 0 ) // 68000 code
ROM_LOAD16_BYTE( "epr10160.bin", 0x00001, 0x08000, CRC(86f020da) SHA1(e7ac4b70dc375d9e2491f1a90ae154699e7627a2) ) // == encrypted 10169 (not perfect match) (same rev as 10354)
ROM_LOAD16_BYTE( "epr10163.bin", 0x00000, 0x08000, CRC(6d62eccd) SHA1(a400850f717a71a3e0059173d77f0bd067f1b520) )
@@ -4258,11 +4258,11 @@ ROM_START( afighterg )
ROM_LOAD( "epr10039.bin", 0x00000, 0x8000, CRC(b04757b0) SHA1(24bface5a23ed658675f414c9937bf9d7f7ed5ec) )
ROM_REGION( 0x2000, "maincpu:key", 0 ) // decryption key
- ROM_LOAD( "317-unknown.key", 0x0000, 0x2000, CRC(fee04be8) SHA1(c58d78299ef4cede517be823a8a8a90e46c6ba0d) )
+ ROM_LOAD( "317-unknown.key", 0x0000, 0x2000, NO_DUMP )
ROM_END
-ROM_START( afighterh )
+ROM_START( afighterh ) // could be 16A
ROM_REGION( 0x30000, "maincpu", 0 ) // 68000 code
ROM_LOAD16_BYTE( "epr10354.bin", 0x00001, 0x08000, CRC(6dad6dd1) SHA1(8cdd1c10d60cda09f888b2f03b7d4c76100b4ad0) ) // == encrypted 10169 (not perfect match) (same rev as 10160)
ROM_LOAD16_BYTE( "epr10357.bin", 0x00000, 0x08000, CRC(69777a15) SHA1(26fcca4b5476596cec9a59f5445f0b24c9373a8b) )
@@ -4290,7 +4290,7 @@ ROM_START( afighterh )
ROM_LOAD( "epr10039.bin", 0x00000, 0x8000, CRC(b04757b0) SHA1(24bface5a23ed658675f414c9937bf9d7f7ed5ec) )
ROM_REGION( 0x2000, "maincpu:key", 0 ) // decryption key
- ROM_LOAD( "317-0018.key", 0x0000, 0x2000, CRC(fee04be8) SHA1(c58d78299ef4cede517be823a8a8a90e46c6ba0d) )
+ ROM_LOAD( "317-unknown.key", 0x0000, 0x2000, NO_DUMP )
ROM_END
@@ -9021,7 +9021,7 @@ DRIVER_INIT_MEMBER(segas16b_state, fpointbla)
for (int i = 0;i < 0x10000;i++)
{
- m_decrypted_opcodes[i] = bitswap<16>(rom[i], 8,9,10,11,12,13,14,15, 0, 1, 2, 3, 4, 5, 6, 7);
+ m_decrypted_opcodes[i] = BITSWAP16(rom[i], 8,9,10,11,12,13,14,15, 0, 1, 2, 3, 4, 5, 6, 7);
}
}
@@ -9089,10 +9089,10 @@ GAME( 1987, aliensyn7, aliensyn, system16b_mc8123, aliensyn, segas16b_state,
GAME( 1987, aliensyn3, aliensyn, system16b_fd1089a, aliensyn, segas16b_state,generic_5358_small, ROT0, "Sega", "Alien Syndrome (set 3, System 16B, FD1089A 317-0033)", 0 )
GAME( 1987, aliensynj, aliensyn, system16b_fd1089a, aliensynj,segas16b_state,generic_5358_small, ROT0, "Sega", "Alien Syndrome (set 6, Japan, new, System 16B, FD1089A 317-0033)", 0 )
-GAME( 1986, afightere, afighter, system16b, afighter_analog,afighter_16b_analog_state,generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, unprotected, analog controls)", 0 )
-GAME( 1986, afighterf, afighter, system16b_fd1089b, afighter_analog,afighter_16b_analog_state,generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089B 317-unknown, analog controls)", 0 ) // encrypted version of afightere
-GAME( 1986, afighterg, afighter, system16b_fd1089b, afighter, segas16b_state, generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089B 317-unknown)", 0 ) // same encryption as afighterf
-GAME( 1986, afighterh, afighter, system16b_fd1089a, afighter, segas16b_state, generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089A 317-0018)", 0 ) // same rev as afighterg
+GAME( 1987, afightere, afighter, system16b, afighter_analog,afighter_16b_analog_state,generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, unprotected, analog controls)", 0 )
+GAME( 1987, afighterf, afighter, system16b_fd1089a, afighter_analog,afighter_16b_analog_state,generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089A 317-unknown, analog controls)", MACHINE_NOT_WORKING ) // encrypted version of afightere
+GAME( 1987, afighterg, afighter, system16b_fd1089a, afighter, segas16b_state, generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089A 317-unknown, set 1)", MACHINE_NOT_WORKING ) // same encryption as afighterf
+GAME( 1987, afighterh, afighter, system16b_fd1089a, afighter, segas16b_state, generic_5358_small, ROT270, "Sega", "Action Fighter (System 16B, FD1089A 317-unknown, set 2)", MACHINE_NOT_WORKING ) // different encryption, same rev as afighterg
GAME( 1988, altbeast, 0, system16b_i8751, altbeast, segas16b_state,generic_5521, ROT0, "Sega", "Altered Beast (set 8) (8751 317-0078)", 0 )
GAME( 1988, altbeastj, altbeast, system16b_i8751, altbeast, segas16b_state,altbeasj_5521, ROT0, "Sega", "Juuouki (set 7, Japan) (8751 317-0077)", 0 )
@@ -9372,14 +9372,14 @@ WRITE16_MEMBER( isgsm_state::data_w )
// 8-bit rotation - used by bloxeed
switch (m_data_type & 0xe0)
{
- case 0x00: data = bitswap<8>(data,0,7,6,5,4,3,2,1); break;
- case 0x20: data = bitswap<8>(data,7,6,5,4,3,2,1,0); break;
- case 0x40: data = bitswap<8>(data,6,5,4,3,2,1,0,7); break;
- case 0x60: data = bitswap<8>(data,5,4,3,2,1,0,7,6); break;
- case 0x80: data = bitswap<8>(data,4,3,2,1,0,7,6,5); break;
- case 0xa0: data = bitswap<8>(data,3,2,1,0,7,6,5,4); break;
- case 0xc0: data = bitswap<8>(data,2,1,0,7,6,5,4,3); break;
- case 0xe0: data = bitswap<8>(data,1,0,7,6,5,4,3,2); break;
+ case 0x00: data = BITSWAP8(data,0,7,6,5,4,3,2,1); break;
+ case 0x20: data = BITSWAP8(data,7,6,5,4,3,2,1,0); break;
+ case 0x40: data = BITSWAP8(data,6,5,4,3,2,1,0,7); break;
+ case 0x60: data = BITSWAP8(data,5,4,3,2,1,0,7,6); break;
+ case 0x80: data = BITSWAP8(data,4,3,2,1,0,7,6,5); break;
+ case 0xa0: data = BITSWAP8(data,3,2,1,0,7,6,5,4); break;
+ case 0xc0: data = BITSWAP8(data,2,1,0,7,6,5,4,3); break;
+ case 0xe0: data = BITSWAP8(data,1,0,7,6,5,4,3,2); break;
}
}
@@ -9455,14 +9455,14 @@ WRITE16_MEMBER( isgsm_state::data_w )
// 8-bit rotation - used by tetris
switch (m_data_type & 0xe0)
{
- case 0x00: byte = bitswap<8>(byte,0,7,6,5,4,3,2,1); break;
- case 0x20: byte = bitswap<8>(byte,7,6,5,4,3,2,1,0); break;
- case 0x40: byte = bitswap<8>(byte,6,5,4,3,2,1,0,7); break;
- case 0x60: byte = bitswap<8>(byte,5,4,3,2,1,0,7,6); break;
- case 0x80: byte = bitswap<8>(byte,4,3,2,1,0,7,6,5); break;
- case 0xa0: byte = bitswap<8>(byte,3,2,1,0,7,6,5,4); break;
- case 0xc0: byte = bitswap<8>(byte,2,1,0,7,6,5,4,3); break;
- case 0xe0: byte = bitswap<8>(byte,1,0,7,6,5,4,3,2); break;
+ case 0x00: byte = BITSWAP8(byte,0,7,6,5,4,3,2,1); break;
+ case 0x20: byte = BITSWAP8(byte,7,6,5,4,3,2,1,0); break;
+ case 0x40: byte = BITSWAP8(byte,6,5,4,3,2,1,0,7); break;
+ case 0x60: byte = BITSWAP8(byte,5,4,3,2,1,0,7,6); break;
+ case 0x80: byte = BITSWAP8(byte,4,3,2,1,0,7,6,5); break;
+ case 0xa0: byte = BITSWAP8(byte,3,2,1,0,7,6,5,4); break;
+ case 0xc0: byte = BITSWAP8(byte,2,1,0,7,6,5,4,3); break;
+ case 0xe0: byte = BITSWAP8(byte,1,0,7,6,5,4,3,2); break;
}
}
@@ -9510,7 +9510,7 @@ WRITE16_MEMBER( isgsm_state::cart_security_high_w )
uint32_t isgsm_state::shinfz_security(uint32_t input)
{
- return bitswap<32>(input, 19, 20, 25, 26, 15, 0, 16, 2, 8, 9, 13, 14, 31, 21, 7, 18, 11, 30, 22, 17, 3, 4, 12, 28, 29, 5, 27, 10, 23, 24, 1, 6);
+ return BITSWAP32(input, 19, 20, 25, 26, 15, 0, 16, 2, 8, 9, 13, 14, 31, 21, 7, 18, 11, 30, 22, 17, 3, 4, 12, 28, 29, 5, 27, 10, 23, 24, 1, 6);
}
uint32_t isgsm_state::tetrbx_security(uint32_t input)
@@ -9734,7 +9734,7 @@ DRIVER_INIT_MEMBER(isgsm_state,isgsm)
std::vector<uint16_t> temp(0x20000/2);
uint16_t *rom = (uint16_t *)memregion("bios")->base();
for (int addr = 0; addr < 0x20000/2; addr++)
- temp[addr ^ 0x4127] = bitswap<16>(rom[addr], 6, 14, 4, 2, 12, 10, 8, 0, 1, 9, 11, 13, 3, 5, 7, 15);
+ temp[addr ^ 0x4127] = BITSWAP16(rom[addr], 6, 14, 4, 2, 12, 10, 8, 0, 1, 9, 11, 13, 3, 5, 7, 15);
memcpy(rom, &temp[0], 0x20000);
}
@@ -9745,7 +9745,7 @@ DRIVER_INIT_MEMBER(isgsm_state,shinfz)
std::vector<uint16_t> temp(0x200000/2);
uint16_t *rom = (uint16_t *)memregion("gamecart_rgn")->base();
for (int addr = 0; addr < 0x200000/2; addr++)
- temp[addr ^ 0x68956] = bitswap<16>(rom[addr], 8, 4, 12, 3, 6, 7, 1, 0, 15, 11, 5, 14, 10, 2, 9, 13);
+ temp[addr ^ 0x68956] = BITSWAP16(rom[addr], 8, 4, 12, 3, 6, 7, 1, 0, 15, 11, 5, 14, 10, 2, 9, 13);
memcpy(rom, &temp[0], 0x200000);
m_read_xor = 0x66;
@@ -9759,7 +9759,7 @@ DRIVER_INIT_MEMBER(isgsm_state,tetrbx)
std::vector<uint16_t> temp(0x80000/2);
uint16_t *rom = (uint16_t *)memregion("gamecart_rgn")->base();
for (int addr = 0; addr < 0x80000/2; addr++)
- temp[addr ^ 0x2A6E6] = bitswap<16>(rom[addr], 4, 0, 12, 5, 7, 3, 1, 14, 10, 11, 9, 6, 15, 2, 13, 8);
+ temp[addr ^ 0x2A6E6] = BITSWAP16(rom[addr], 4, 0, 12, 5, 7, 3, 1, 14, 10, 11, 9, 6, 15, 2, 13, 8);
memcpy(rom, &temp[0], 0x80000);
m_read_xor = 0x73;