diff options
author | Firehawke <Firehawke@users.noreply.github.com> | 2017-12-13 21:31:27 -0700 |
---|---|---|
committer | Firehawke <Firehawke@users.noreply.github.com> | 2017-12-13 21:31:27 -0700 |
commit | 9ece34eb218c5c1960468294c733fd00ac7fa696 (patch) | |
tree | 7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /src/mame/drivers/pegasus.cpp | |
parent | 54155441e9ba9941e85d80c4834a66376a11e791 (diff) |
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'src/mame/drivers/pegasus.cpp')
-rw-r--r-- | src/mame/drivers/pegasus.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/pegasus.cpp b/src/mame/drivers/pegasus.cpp index 4d767d9e4b9..1e214f8375f 100644 --- a/src/mame/drivers/pegasus.cpp +++ b/src/mame/drivers/pegasus.cpp @@ -405,8 +405,8 @@ void pegasus_state::pegasus_decrypt_rom(uint8_t *ROM) for (int i = 0; i < 0x1000; i++) { b = ROM[i]; - j = BITSWAP16(i, 15, 14, 13, 12, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5, 6, 7); - b = BITSWAP8(b, 3, 2, 1, 0, 7, 6, 5, 4); + j = bitswap<16>(i, 15, 14, 13, 12, 11, 10, 9, 8, 0, 1, 2, 3, 4, 5, 6, 7); + b = bitswap<8>(b, 3, 2, 1, 0, 7, 6, 5, 4); temp_copy[j & 0xfff] = b; } memcpy(ROM, &temp_copy[0], 0x1000); @@ -480,7 +480,7 @@ DRIVER_INIT_MEMBER(pegasus_state, pegasus) static MACHINE_CONFIG_START( pegasus ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809E, XTAL_4MHz) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally + MCFG_CPU_ADD("maincpu", MC6809, XTAL_4MHz) // actually a 6809C - 4MHZ clock coming in, 1MHZ internally MCFG_CPU_PROGRAM_MAP(pegasus_mem) MCFG_TIMER_DRIVER_ADD_PERIODIC("pegasus_firq", pegasus_state, pegasus_firq, attotime::from_hz(400)) |