diff --git a/src/devices/sound/mas3507d.cpp b/src/devices/sound/mas3507d.cpp index 11c2c79e8b7..d1a4e380609 100644 --- a/src/devices/sound/mas3507d.cpp +++ b/src/devices/sound/mas3507d.cpp @@ -257,12 +257,12 @@ int gain_to_db(double val) { } float gain_to_percentage(int val) { - double db = gain_to_db(val); - - if (db == 0) { + if (val == 0) { return 0; // Special case for muting it seems } + double db = gain_to_db(val); + return powf(10.0, (db + 6) / 20.0); } diff --git a/src/mame/drivers/ksys573.cpp b/src/mame/drivers/ksys573.cpp index 629b413e468..c691abe3ff9 100644 --- a/src/mame/drivers/ksys573.cpp +++ b/src/mame/drivers/ksys573.cpp @@ -2350,7 +2350,7 @@ void ksys573_state::ddrsbm(machine_config &config) { k573d(config); subdevice("k573dio")->output_callback().set(FUNC(ksys573_state::ddrsolo_output_callback)); - subdevice("k573dio")->set_fake_fpga(true); + subdevice("k573dio")->set_ddrsbm_fpga(true); cassyi(config); } diff --git a/src/mame/machine/k573dio.cpp b/src/mame/machine/k573dio.cpp index 92935f43650..2c29645951c 100644 --- a/src/mame/machine/k573dio.cpp +++ b/src/mame/machine/k573dio.cpp @@ -112,7 +112,7 @@ k573dio_device::k573dio_device(const machine_config &mconfig, const char *tag, d k573fpga(*this, "k573fpga"), digital_id(*this, "digital_id"), output_cb(*this), - is_fake_fpga(false), + is_ddrsbm_fpga(false), buffer_speed(0x400) { } @@ -125,7 +125,7 @@ void k573dio_device::device_start() save_pointer(NAME(ram), 32 * 1024 * 1024 ); k573fpga->set_ram(ram.get()); - k573fpga->set_fake_fpga(is_fake_fpga); + k573fpga->set_ddrsbm_fpga(is_ddrsbm_fpga); k573fpga->set_buffer_speed(buffer_speed); k573fpga->set_mp3_dynamic_base(mp3_dynamic_base); diff --git a/src/mame/machine/k573dio.h b/src/mame/machine/k573dio.h index c3e5236f54f..a0320a00892 100644 --- a/src/mame/machine/k573dio.h +++ b/src/mame/machine/k573dio.h @@ -19,7 +19,7 @@ public: required_device digital_id; void amap(address_map &map); - void set_fake_fpga(bool flag) { is_fake_fpga = flag; } + void set_ddrsbm_fpga(bool flag) { is_ddrsbm_fpga = flag; } void set_buffer_speed(uint32_t speed) { buffer_speed = speed; } void set_mp3_dynamic_base(uint32_t base) { mp3_dynamic_base = base; } @@ -83,7 +83,7 @@ private: void output(int offset, uint16_t data); - bool is_fake_fpga; + bool is_ddrsbm_fpga; uint32_t buffer_speed, mp3_dynamic_base; }; diff --git a/src/mame/machine/k573enc.h b/src/mame/machine/k573enc.h deleted file mode 100644 index 3f115675fb1..00000000000 --- a/src/mame/machine/k573enc.h +++ /dev/null @@ -1,120 +0,0 @@ -// license:BSD-3-Clause -// copyright-holders:windyfairy -#ifndef MAME_MACHINE_K573ENC_H -#define MAME_MACHINE_K573ENC_H - -#pragma once - -#include - -std::unordered_map k573enc_lookup({ - { 0x031a, 0 }, - { 0x038e, 1 }, - { 0x0aa7, 2 }, - { 0x0c51, 3 }, - { 0x0e34, 4 }, - { 0x14d9, 5 }, - { 0x154d, 6 }, - { 0x18a0, 7 }, - { 0x18da, 8 }, - { 0x1c67, 9 }, - { 0x20dc, 10 }, - { 0x21d6, 11 }, - { 0x2698, 12 }, - { 0x28b6, 13 }, - { 0x2a5f, 14 }, - { 0x2c7c, 15 }, - { 0x3009, 16 }, - { 0x3395, 17 }, - { 0x3505, 18 }, - { 0x3722, 19 }, - { 0x38cb, 20 }, - { 0x3aaf, 21 }, - { 0x3e3b, 22 }, - { 0x41c8, 23 }, - { 0x4371, 24 }, - { 0x451b, 25 }, - { 0x4555, 26 }, - { 0x46c4, 27 }, - { 0x48e1, 28 }, - { 0x4c6e, 29 }, - { 0x4fc0, 30 }, - { 0x4ffa, 31 }, - { 0x5387, 32 }, - { 0x5530, 33 }, - { 0x56b4, 34 }, - { 0x5714, 35 }, - { 0x5c10, 36 }, - { 0x5c83, 37 }, - { 0x5dcd, 38 }, - { 0x5fd6, 39 }, - { 0x6010, 40 }, - { 0x617f, 41 }, - { 0x6546, 42 }, - { 0x6729, 43 }, - { 0x685f, 44 }, - { 0x6dcf, 45 }, - { 0x6e43, 46 }, - { 0x6fec, 47 }, - { 0x7195, 48 }, - { 0x755c, 49 }, - { 0x78e8, 50 }, - { 0x7c3b, 51 } -}); - -uint8_t k573enc_keys[52][16] = { - { 0x14, 0x26, 0x28, 0x4c, 0x50, 0x98, 0xa0, 0x31, 0x41, 0x62, 0x82, 0xc4, 0x05, 0x89, 0x0a, 0x13 }, - { 0x12, 0x36, 0x24, 0x6c, 0x48, 0xd8, 0x90, 0xb1, 0x21, 0x63, 0x42, 0xc6, 0x84, 0x8d, 0x09, 0x1b }, - { 0x03, 0x7a, 0x06, 0xf4, 0x0c, 0xe9, 0x18, 0xd3, 0x30, 0xa7, 0x60, 0x4f, 0xc0, 0x9e, 0x81, 0x3d }, - { 0x2d, 0x40, 0x5a, 0x80, 0xb4, 0x01, 0x69, 0x02, 0xd2, 0x04, 0xa5, 0x08, 0x4b, 0x10, 0x96, 0x20 }, - { 0x26, 0x68, 0x4c, 0xd0, 0x98, 0xa1, 0x31, 0x43, 0x62, 0x86, 0xc4, 0x0d, 0x89, 0x1a, 0x13, 0x34 }, - { 0x6d, 0x14, 0xda, 0x28, 0xb5, 0x50, 0x6b, 0xa0, 0xd6, 0x41, 0xad, 0x82, 0x5b, 0x05, 0xb6, 0x0a }, - { 0x7b, 0x04, 0xf6, 0x08, 0xed, 0x10, 0xdb, 0x20, 0xb7, 0x40, 0x6f, 0x80, 0xde, 0x01, 0xbd, 0x02 }, - { 0x40, 0x58, 0x80, 0xb0, 0x01, 0x61, 0x02, 0xc2, 0x04, 0x85, 0x08, 0x0b, 0x10, 0x16, 0x20, 0x2c }, - { 0x4c, 0x56, 0x98, 0xac, 0x31, 0x59, 0x62, 0xb2, 0xc4, 0x65, 0x89, 0xca, 0x13, 0x95, 0x26, 0x2b }, - { 0x6b, 0x4a, 0xd6, 0x94, 0xad, 0x29, 0x5b, 0x52, 0xb6, 0xa4, 0x6d, 0x49, 0xda, 0x92, 0xb5, 0x25 }, - { 0x0e, 0x94, 0x1c, 0x29, 0x38, 0x52, 0x70, 0xa4, 0xe0, 0x49, 0xc1, 0x92, 0x83, 0x25, 0x07, 0x4a }, - { 0x1e, 0x92, 0x3c, 0x25, 0x78, 0x4a, 0xf0, 0x94, 0xe1, 0x29, 0xc3, 0x52, 0x87, 0xa4, 0x0f, 0x49 }, - { 0x24, 0xb4, 0x48, 0x69, 0x90, 0xd2, 0x21, 0xa5, 0x42, 0x4b, 0x84, 0x96, 0x09, 0x2d, 0x12, 0x5a }, - { 0x06, 0xda, 0x0c, 0xb5, 0x18, 0x6b, 0x30, 0xd6, 0x60, 0xad, 0xc0, 0x5b, 0x81, 0xb6, 0x03, 0x6d }, - { 0x0f, 0xe6, 0x1e, 0xcd, 0x3c, 0x9b, 0x78, 0x37, 0xf0, 0x6e, 0xe1, 0xdc, 0xc3, 0xb9, 0x87, 0x73 }, - { 0x2e, 0xcc, 0x5c, 0x99, 0xb8, 0x33, 0x71, 0x66, 0xe2, 0xcc, 0xc5, 0x99, 0x8b, 0x33, 0x17, 0x66 }, - { 0x41, 0x84, 0x82, 0x09, 0x05, 0x12, 0x0a, 0x24, 0x14, 0x48, 0x28, 0x90, 0x50, 0x21, 0xa0, 0x42 }, - { 0x57, 0xb0, 0xae, 0x61, 0x5d, 0xc2, 0xba, 0x85, 0x75, 0x0b, 0xea, 0x16, 0xd5, 0x2c, 0xab, 0x58 }, - { 0x73, 0x80, 0xe6, 0x01, 0xcd, 0x02, 0x9b, 0x04, 0x37, 0x08, 0x6e, 0x10, 0xdc, 0x20, 0xb9, 0x40 }, - { 0x70, 0xaa, 0xe0, 0x55, 0xc1, 0xaa, 0x83, 0x55, 0x07, 0xaa, 0x0e, 0x55, 0x1c, 0xaa, 0x38, 0x55 }, - { 0x49, 0xd6, 0x92, 0xad, 0x25, 0x5b, 0x4a, 0xb6, 0x94, 0x6d, 0x29, 0xda, 0x52, 0xb5, 0xa4, 0x6b }, - { 0x43, 0xfe, 0x86, 0xfd, 0x0d, 0xfb, 0x1a, 0xf7, 0x34, 0xef, 0x68, 0xdf, 0xd0, 0xbf, 0xa1, 0x7f }, - { 0x65, 0xee, 0xca, 0xdd, 0x95, 0xbb, 0x2b, 0x77, 0x56, 0xee, 0xac, 0xdd, 0x59, 0xbb, 0xb2, 0x77 }, - { 0x98, 0x14, 0x31, 0x28, 0x62, 0x50, 0xc4, 0xa0, 0x89, 0x41, 0x13, 0x82, 0x26, 0x05, 0x4c, 0x0a }, - { 0x9d, 0x28, 0x3b, 0x50, 0x76, 0xa0, 0xec, 0x41, 0xd9, 0x82, 0xb3, 0x05, 0x67, 0x0a, 0xce, 0x14 }, - { 0xb5, 0x06, 0x6b, 0x0c, 0xd6, 0x18, 0xad, 0x30, 0x5b, 0x60, 0xb6, 0xc0, 0x6d, 0x81, 0xda, 0x03 }, - { 0xbf, 0x00, 0x7f, 0x00, 0xfe, 0x00, 0xfd, 0x00, 0xfb, 0x00, 0xf7, 0x00, 0xef, 0x00, 0xdf, 0x00 }, - { 0xaa, 0x30, 0x55, 0x60, 0xaa, 0xc0, 0x55, 0x81, 0xaa, 0x03, 0x55, 0x06, 0xaa, 0x0c, 0x55, 0x18 }, - { 0x89, 0x58, 0x13, 0xb0, 0x26, 0x61, 0x4c, 0xc2, 0x98, 0x85, 0x31, 0x0b, 0x62, 0x16, 0xc4, 0x2c }, - { 0xaa, 0x4e, 0x55, 0x9c, 0xaa, 0x39, 0x55, 0x72, 0xaa, 0xe4, 0x55, 0xc9, 0xaa, 0x93, 0x55, 0x27 }, - { 0xb8, 0x70, 0x71, 0xe0, 0xe2, 0xc1, 0xc5, 0x83, 0x8b, 0x07, 0x17, 0x0e, 0x2e, 0x1c, 0x5c, 0x38 }, - { 0xbc, 0x7e, 0x79, 0xfc, 0xf2, 0xf9, 0xe5, 0xf3, 0xcb, 0xe7, 0x97, 0xcf, 0x2f, 0x9f, 0x5e, 0x3f }, - { 0xd3, 0x32, 0xa7, 0x64, 0x4f, 0xc8, 0x9e, 0x91, 0x3d, 0x23, 0x7a, 0x46, 0xf4, 0x8c, 0xe9, 0x19 }, - { 0xf4, 0x08, 0xe9, 0x10, 0xd3, 0x20, 0xa7, 0x40, 0x4f, 0x80, 0x9e, 0x01, 0x3d, 0x02, 0x7a, 0x04 }, - { 0xe6, 0x38, 0xcd, 0x70, 0x9b, 0xe0, 0x37, 0xc1, 0x6e, 0x83, 0xdc, 0x07, 0xb9, 0x0e, 0x73, 0x1c }, - { 0xf6, 0x20, 0xed, 0x40, 0xdb, 0x80, 0xb7, 0x01, 0x6f, 0x02, 0xde, 0x04, 0xbd, 0x08, 0x7b, 0x10 }, - { 0xe4, 0x40, 0xc9, 0x80, 0x93, 0x01, 0x27, 0x02, 0x4e, 0x04, 0x9c, 0x08, 0x39, 0x10, 0x72, 0x20 }, - { 0xe1, 0x52, 0xc3, 0xa4, 0x87, 0x49, 0x0f, 0x92, 0x1e, 0x25, 0x3c, 0x4a, 0x78, 0x94, 0xf0, 0x29 }, - { 0xfb, 0x54, 0xf7, 0xa8, 0xef, 0x51, 0xdf, 0xa2, 0xbf, 0x45, 0x7f, 0x8a, 0xfe, 0x15, 0xfd, 0x2a }, - { 0xfe, 0x72, 0xfd, 0xe4, 0xfb, 0xc9, 0xf7, 0x93, 0xef, 0x27, 0xdf, 0x4e, 0xbf, 0x9c, 0x7f, 0x39 }, - { 0x84, 0x80, 0x09, 0x01, 0x12, 0x02, 0x24, 0x04, 0x48, 0x08, 0x90, 0x10, 0x21, 0x20, 0x42, 0x40 }, - { 0x9f, 0x8e, 0x3f, 0x1d, 0x7e, 0x3a, 0xfc, 0x74, 0xf9, 0xe8, 0xf3, 0xd1, 0xe7, 0xa3, 0xcf, 0x47 }, - { 0xba, 0x82, 0x75, 0x05, 0xea, 0x0a, 0xd5, 0x14, 0xab, 0x28, 0x57, 0x50, 0xae, 0xa0, 0x5d, 0x41 }, - { 0xb1, 0xac, 0x63, 0x59, 0xc6, 0xb2, 0x8d, 0x65, 0x1b, 0xca, 0x36, 0x95, 0x6c, 0x2b, 0xd8, 0x56 }, - { 0x8f, 0xc6, 0x1f, 0x8d, 0x3e, 0x1b, 0x7c, 0x36, 0xf8, 0x6c, 0xf1, 0xd8, 0xe3, 0xb1, 0xc7, 0x63 }, - { 0xbb, 0xd6, 0x77, 0xad, 0xee, 0x5b, 0xdd, 0xb6, 0xbb, 0x6d, 0x77, 0xda, 0xee, 0xb5, 0xdd, 0x6b }, - { 0xa9, 0xe2, 0x53, 0xc5, 0xa6, 0x8b, 0x4d, 0x17, 0x9a, 0x2e, 0x35, 0x5c, 0x6a, 0xb8, 0xd4, 0x71 }, - { 0xba, 0xfc, 0x75, 0xf9, 0xea, 0xf3, 0xd5, 0xe7, 0xab, 0xcf, 0x57, 0x9f, 0xae, 0x3f, 0x5d, 0x7e }, - { 0xd7, 0x90, 0xaf, 0x21, 0x5f, 0x42, 0xbe, 0x84, 0x7d, 0x09, 0xfa, 0x12, 0xf5, 0x24, 0xeb, 0x48 }, - { 0xfe, 0x84, 0xfd, 0x09, 0xfb, 0x12, 0xf7, 0x24, 0xef, 0x48, 0xdf, 0x90, 0xbf, 0x21, 0x7f, 0x42 }, - { 0xc8, 0xdc, 0x91, 0xb9, 0x23, 0x73, 0x46, 0xe6, 0x8c, 0xcd, 0x19, 0x9b, 0x32, 0x37, 0x64, 0x6e }, - { 0xe5, 0xce, 0xcb, 0x9d, 0x97, 0x3b, 0x2f, 0x76, 0x5e, 0xec, 0xbc, 0xd9, 0x79, 0xb3, 0xf2, 0x67 } -}; - -#endif // MAME_MACHINE_K573ENC_H diff --git a/src/mame/machine/k573fpga.cpp b/src/mame/machine/k573fpga.cpp index 9e40625d5ae..f184f99211b 100644 --- a/src/mame/machine/k573fpga.cpp +++ b/src/mame/machine/k573fpga.cpp @@ -4,7 +4,6 @@ #include "speaker.h" #include "k573fpga.h" -#include "k573enc.h" // TODO: Check if this is optimal #define MINIMUM_BUFFER 1 @@ -22,7 +21,7 @@ k573fpga_device::k573fpga_device(const machine_config &mconfig, const char *tag, device_t(mconfig, KONAMI_573_DIGITAL_FPGA, tag, owner, clock), mas3507d(*this, "mpeg"), m_samples(*this, "samples"), - use_fake_fpga(false) + use_ddrsbm_fpga(false) { } @@ -178,15 +177,6 @@ void k573fpga_device::set_mpeg_ctrl(uint16_t data) } } -int32_t k573fpga_device::find_enc_key() -{ - if (k573enc_lookup.find(crypto_key1) == k573enc_lookup.end()) { - return -1; - } - - return k573enc_lookup[crypto_key1]; -} - inline uint16_t k573fpga_device::fpga_decrypt_byte_real(uint16_t v) { uint16_t m = crypto_key1 ^ crypto_key2; @@ -231,17 +221,24 @@ inline uint16_t k573fpga_device::fpga_decrypt_byte_real(uint16_t v) return (v >> 8) | ((v & 0xff) << 8); } -inline uint16_t k573fpga_device::fpga_decrypt_byte_fake(uint16_t data, uint32_t crypto_idx) +inline uint16_t k573fpga_device::fpga_decrypt_byte_ddrsbm(uint16_t data, uint32_t crypto_idx) { - // Not the real algorithm. Only used for DDR Solo Bass Mix (ddrsbm) - int32_t crypto_enc_idx = find_enc_key(); + uint8_t key[16] = {0}; + uint16_t key_state = bitswap<16>( + crypto_key1, + 13, 11, 9, 7, + 5, 3, 1, 15, + 14, 12, 10, 8, + 6, 4, 2, 0 + ); - if (crypto_enc_idx == -1) { - return data; + for (int i = 0; i < 8; i++) { + key[i * 2] = key_state & 0xff; + key[i * 2 + 1] = (key_state >> 8) & 0xff; + key_state = (((((key_state >> 8) >> 7) & 1) | (((key_state >> 8) << 1) & 0xff)) << 8) | + (((key_state & 0xff) >> 7) & 1) | (((key_state & 0xff) << 1) & 0xff); } - uint8_t *key = k573enc_keys[crypto_enc_idx]; - uint16_t output_word = 0; for (int cur_bit = 0; cur_bit < 8; cur_bit++) { int even_bit_shift = (cur_bit * 2) & 0xff; @@ -277,7 +274,7 @@ SAMPLES_UPDATE_CB_MEMBER(k573fpga_device::k573fpga_stream_update) int new_samples = 0; - if (!use_fake_fpga && mp3_start_adr != mp3_dynamic_base) { + if (!use_ddrsbm_fpga && mp3_start_adr != mp3_dynamic_base) { // Base addresses are kind of a "hack" and should be dealt with eventually. // Files that are loaded at he base address are dynamic, meaning the data constantly changes. // Data will not get loaded outside of the base address region past the boot sequence, however. @@ -295,13 +292,13 @@ SAMPLES_UPDATE_CB_MEMBER(k573fpga_device::k573fpga_stream_update) crypto_key3 = orig_crypto_key3; for (int32_t cur_idx = mp3_start_adr; cur_idx < mp3_end_adr; cur_idx += 2) { - if (use_fake_fpga) { - ram_swap[cur_idx >> 1] = fpga_decrypt_byte_fake(ram[cur_idx >> 1], (cur_idx - mp3_start_adr) / 2); + if (use_ddrsbm_fpga) { + ram_swap[cur_idx >> 1] = fpga_decrypt_byte_ddrsbm(ram[cur_idx >> 1], (cur_idx - mp3_start_adr) / 2); } else { ram_swap[cur_idx >> 1] = fpga_decrypt_byte_real(ram[cur_idx >> 1]); } - if (!use_fake_fpga) { + if (!use_ddrsbm_fpga) { crypto_key1 = (crypto_key1 & 0x8000) | ((crypto_key1 << 1) & 0x7FFE) | ((crypto_key1 >> 14) & 1); if ((((crypto_key1 >> 15) ^ crypto_key1) & 1) != 0) { @@ -355,13 +352,13 @@ SAMPLES_UPDATE_CB_MEMBER(k573fpga_device::k573fpga_stream_update) int32_t cur_idx; for (cur_idx = mp3_last_decrypt_adr; cur_idx - mp3_last_decrypt_adr < decrypt_buffer_speed * decrypt_buffer && cur_idx < mp3_end_adr; cur_idx += 2) { - if (use_fake_fpga) { - ram_swap[cur_idx >> 1] = fpga_decrypt_byte_fake(ram[cur_idx >> 1], (cur_idx - mp3_start_adr) / 2); + if (use_ddrsbm_fpga) { + ram_swap[cur_idx >> 1] = fpga_decrypt_byte_ddrsbm(ram[cur_idx >> 1], (cur_idx - mp3_start_adr) / 2); } else { ram_swap[cur_idx >> 1] = fpga_decrypt_byte_real(ram[cur_idx >> 1]); } - if (!use_fake_fpga) { + if (!use_ddrsbm_fpga) { crypto_key1 = (crypto_key1 & 0x8000) | ((crypto_key1 << 1) & 0x7FFE) | ((crypto_key1 >> 14) & 1); if ((((crypto_key1 >> 15) ^ crypto_key1) & 1) != 0) { diff --git a/src/mame/machine/k573fpga.h b/src/mame/machine/k573fpga.h index d65c60aa800..0ef9481a6a9 100644 --- a/src/mame/machine/k573fpga.h +++ b/src/mame/machine/k573fpga.h @@ -25,7 +25,7 @@ public: required_device mas3507d; required_device m_samples; - void set_fake_fpga(bool flag) { use_fake_fpga = flag; } + void set_ddrsbm_fpga(bool flag) { use_ddrsbm_fpga = flag; } void set_ram(uint16_t *v) { ram = v; } @@ -63,7 +63,7 @@ private: uint8_t crypto_key3, orig_crypto_key3; uint32_t mp3_start_adr, mp3_end_adr, mpeg_ctrl_flag; - bool use_fake_fpga; + bool use_ddrsbm_fpga; uint32_t mp3_last_frame, mp3_last_adr, mp3_next_sync, mp3_last_decrypt_adr; int16_t *channel_l_pcm, *channel_r_pcm; @@ -82,7 +82,7 @@ private: int32_t find_enc_key(); uint16_t fpga_decrypt_byte_real(uint16_t data); - uint16_t fpga_decrypt_byte_fake(uint16_t data, uint32_t crypto_idx); + uint16_t fpga_decrypt_byte_ddrsbm(uint16_t data, uint32_t crypto_idx); SAMPLES_UPDATE_CB_MEMBER(k573fpga_stream_update); };