diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/devices/bus/neogeo/prot_cmc.cpp | |
parent | f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff) |
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing
changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'src/devices/bus/neogeo/prot_cmc.cpp')
-rw-r--r-- | src/devices/bus/neogeo/prot_cmc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/bus/neogeo/prot_cmc.cpp b/src/devices/bus/neogeo/prot_cmc.cpp index 77591827f54..336bb543a21 100644 --- a/src/devices/bus/neogeo/prot_cmc.cpp +++ b/src/devices/bus/neogeo/prot_cmc.cpp @@ -689,15 +689,15 @@ int cmc_prot_device::m1_address_scramble(int address, uint16_t key) int block = (address >> 16) & 7; int aux = address & 0xffff; - aux ^= bitswap<16>(key,12,0,2,4,8,15,7,13,10,1,3,6,11,9,14,5); - aux = bitswap<16>(aux, + aux ^= BITSWAP16(key,12,0,2,4,8,15,7,13,10,1,3,6,11,9,14,5); + aux = BITSWAP16(aux, p1[block][15], p1[block][14], p1[block][13], p1[block][12], p1[block][11], p1[block][10], p1[block][9], p1[block][8], p1[block][7], p1[block][6], p1[block][5], p1[block][4], p1[block][3], p1[block][2], p1[block][1], p1[block][0]); aux ^= m1_address_0_7_xor[(aux >> 8) & 0xff]; aux ^= m1_address_8_15_xor[aux & 0xff] << 8; - aux = bitswap<16>(aux, 7,15,14,6,5,13,12,4,11,3,10,2,9,1,8,0); + aux = BITSWAP16(aux, 7,15,14,6,5,13,12,4,11,3,10,2,9,1,8,0); return (block << 16) | aux; } |