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/drivers/dynax.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/drivers/dynax.cpp')
-rw-r--r-- | src/mame/drivers/dynax.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 6d06ce33efe..dc4ec3aef85 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -317,9 +317,9 @@ void dynax_state::hnoridur_palette_update(offs_t offset) { int x = (m_palette_ram[256 * m_palbank + offset] << 8) + m_palette_ram[256 * m_palbank + offset + 16 * 256]; /* The bits are in reverse order! */ - int r = bitswap<8>((x >> 0) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); - int g = bitswap<8>((x >> 5) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); - int b = bitswap<8>((x >> 10) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); + int r = BITSWAP8((x >> 0) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); + int g = BITSWAP8((x >> 5) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); + int b = BITSWAP8((x >> 10) & 0x1f, 7, 6, 5, 0, 1, 2, 3, 4); m_palette->set_pen_color(256 * m_palbank + offset, pal5bit(r), pal5bit(g), pal5bit(b)); } @@ -5345,7 +5345,7 @@ DRIVER_INIT_MEMBER(dynax_state,blktouch) for (i = 0; i < 0x90000; i++) { - src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); + src[i] = BITSWAP8(src[i], 7, 6, 5, 3, 4, 2, 1, 0); } @@ -5353,7 +5353,7 @@ DRIVER_INIT_MEMBER(dynax_state,blktouch) for (i = 0; i < 0xc0000; i++) { - src[i] = bitswap<8>(src[i], 7, 6, 5, 3, 4, 2, 1, 0); + src[i] = BITSWAP8(src[i], 7, 6, 5, 3, 4, 2, 1, 0); } } @@ -5387,7 +5387,7 @@ DRIVER_INIT_MEMBER(dynax_state,maya) std::vector<uint8_t> rom(0xc0000); memcpy(&rom[0], gfx, 0xc0000); for (i = 0; i < 0xc0000; i++) - gfx[i] = rom[bitswap<24>(i, 23, 22, 21, 20, 19, 18, 14, 15, 16, 17, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; + gfx[i] = rom[BITSWAP24(i, 23, 22, 21, 20, 19, 18, 14, 15, 16, 17, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; } } @@ -5404,7 +5404,7 @@ DRIVER_INIT_MEMBER(dynax_state,mayac) std::vector<uint8_t> rom(0xc0000); memcpy(&rom[0], gfx, 0xc0000); for (i = 0; i < 0xc0000; i++) - gfx[i] = rom[bitswap<24>(i, 23, 22, 21, 20, 19, 18, 17, 14, 16, 15, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; + gfx[i] = rom[BITSWAP24(i, 23, 22, 21, 20, 19, 18, 17, 14, 16, 15, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)]; } } @@ -6324,7 +6324,7 @@ DRIVER_INIT_MEMBER(dynax_state,mjelct3) memcpy(&rom1[0], rom, size); for (i = 0; i < size; i++) - rom[i] = bitswap<8>(rom1[bitswap<24>(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8, 1,6,5,4,3,2,7, 0)], 7,6, 1,4,3,2,5,0); + rom[i] = BITSWAP8(rom1[BITSWAP24(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8, 1,6,5,4,3,2,7, 0)], 7,6, 1,4,3,2,5,0); } DRIVER_INIT_MEMBER(dynax_state,mjelct3a) |