diff options
author | 2017-12-13 21:01:10 -0700 | |
---|---|---|
committer | 2017-12-13 21:01:10 -0700 | |
commit | 54155441e9ba9941e85d80c4834a66376a11e791 (patch) | |
tree | aa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/mame/machine/seibuspi.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/mame/machine/seibuspi.cpp')
-rw-r--r-- | src/mame/machine/seibuspi.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mame/machine/seibuspi.cpp b/src/mame/machine/seibuspi.cpp index d27ff9a39c1..316e73384ae 100644 --- a/src/mame/machine/seibuspi.cpp +++ b/src/mame/machine/seibuspi.cpp @@ -171,7 +171,7 @@ void seibuspi_sprite_decrypt(uint8_t *src, int rom_size) /* first of all, permutate 16 of the 48 bits */ bs = spi_bitswap[key_table[addr & 0xff]&0xf]; - y3 = bitswap<16>(y3, bs[0],bs[1],bs[2],bs[3],bs[4],bs[5],bs[6],bs[7], + y3 = BITSWAP16(y3, bs[0],bs[1],bs[2],bs[3],bs[4],bs[5],bs[6],bs[7], bs[8],bs[9],bs[10],bs[11],bs[12],bs[13],bs[14],bs[15]); @@ -350,7 +350,7 @@ void seibuspi_rise10_sprite_decrypt(uint8_t *rom, int size) uint32_t plane54,plane3210; plane54 = rom[0*size+2*i] + (rom[0*size+2*i+1] << 8); - plane3210 = bitswap<32>( + plane3210 = BITSWAP32( rom[2*size+2*i] + (rom[2*size+2*i+1] << 8) + (rom[1*size+2*i] << 16) + (rom[1*size+2*i+1] << 24), 23,13,24,4,16,12,25,30, 3,5,29,17,14,22,2,11, |