diff options
author | Aaron Giles <aaron@aarongiles.com> | 2010-11-08 09:08:55 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2010-11-08 09:08:55 +0000 |
commit | 92b3dd111fff846e8dfdf115fa0d07890ce5870b (patch) | |
tree | adfef3d89fe10d480a4671c8de1414158fcf9fba /src/emu/sound/disc_mth.c | |
parent | 12111c21d0df5aefaaf605c9d58470288a7b0fdf (diff) |
Cleanup & version bump.mame0140u1
Diffstat (limited to 'src/emu/sound/disc_mth.c')
-rw-r--r-- | src/emu/sound/disc_mth.c | 698 |
1 files changed, 349 insertions, 349 deletions
diff --git a/src/emu/sound/disc_mth.c b/src/emu/sound/disc_mth.c index c3ed99658f9..e26d86885f6 100644 --- a/src/emu/sound/disc_mth.c +++ b/src/emu/sound/disc_mth.c @@ -2300,7 +2300,7 @@ DISCRETE_STEP(dst_xtime_and) //case XTIME__IN0_0__IN1_0__IN0_X__IN1_NOX: //case XTIME__IN0_0__IN1_1__IN0_NOX__IN1_X: //case XTIME__IN0_1__IN1_0__IN0_X__IN1_NOX: - // break; + // break; case XTIME__IN0_1__IN1_1__IN0_NOX__IN1_NOX: out = 1; @@ -2308,52 +2308,52 @@ DISCRETE_STEP(dst_xtime_and) case XTIME__IN0_0__IN1_1__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------- - * ...^....^... - * - * in1 1 ------------- - * 0 - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------- + * ...^....^... + * + * in1 1 ------------- + * 0 + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time0; break; case XTIME__IN0_1__IN1_0__IN0_NOX__IN1_X: /* - * in0 1 ------------- - * 0 - * ...^....^... - * - * in1 1 ------ - * 0 ------- - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------------- + * 0 + * ...^....^... + * + * in1 1 ------ + * 0 ------- + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time1; break; case XTIME__IN0_0__IN1_0__IN0_X__IN1_X: /* - * in0 1 ----- ------- - * 0 -------- ------ - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ------ -------- - * ...^....^... ...^....^... - * - * out 1 ----- ----- - * 0 ------- ------- - * ...^....^... ...^....^... - */ + * in0 1 ----- ------- + * 0 -------- ------ + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ------ -------- + * ...^....^... ...^....^... + * + * out 1 ----- ----- + * 0 ------- ------- + * ...^....^... ...^....^... + */ // use x_time of input that went to 0 first/longer if (x_time0 >= x_time1) x_time = x_time0; @@ -2363,92 +2363,92 @@ DISCRETE_STEP(dst_xtime_and) case XTIME__IN0_0__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 -- - * 0 ----- ----- ------------ - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 -- + * 0 ----- ----- ------------ + * ...^....^... ...^....^... + */ // may have went high for a bit in this cycle //if (x_time0 < x_time1) - // x_time = time1 - x_time0; + // x_time = time1 - x_time0; break; case XTIME__IN0_1__IN1_0__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 -- - * 0 ----- ----- ------------ - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 -- + * 0 ----- ----- ------------ + * ...^....^... ...^....^... + */ // may have went high for a bit in this cycle //if (x_time0 > x_time1) - // x_time = x_time0 - x_time1; + // x_time = x_time0 - x_time1; break; case XTIME__IN0_1__IN1_1__IN0_NOX__IN1_X: /* - * in0 1 ------------ - * 0 - * ...^....^... - * - * in1 1 ------ - * 0 ------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------------ + * 0 + * ...^....^... + * + * in1 1 ------ + * 0 ------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 1; x_time = x_time1; break; case XTIME__IN0_1__IN1_1__IN0_X__IN1_NOX: /* - * in1 0 ------ - * 0 ------ - * ...^....^... - * - * in1 1 ------------ - * 0 - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in1 0 ------ + * 0 ------ + * ...^....^... + * + * in1 1 ------------ + * 0 + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 1; x_time = x_time0; break; case XTIME__IN0_1__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------ -------- - * 0 ------ ---- - * ...^....^... ...^....^... - * - * in1 1 -------- ------ - * 0 ---- ------ - * ...^....^... ...^....^... - * - * out 1 ------ ------ - * 0 ------ ------ - * ...^....^... ...^....^... - */ + * in0 1 ------ -------- + * 0 ------ ---- + * ...^....^... ...^....^... + * + * in1 1 -------- ------ + * 0 ---- ------ + * ...^....^... ...^....^... + * + * out 1 ------ ------ + * 0 ------ ------ + * ...^....^... ...^....^... + */ out = 1; if (x_time0 < x_time1) x_time = x_time0; @@ -2520,7 +2520,7 @@ DISCRETE_STEP(dst_xtime_or) //case XTIME__IN0_0__IN1_1__IN0_X__IN1_NOX: //case XTIME__IN0_1__IN1_1__IN0_NOX__IN1_X: //case XTIME__IN0_1__IN1_1__IN0_X__IN1_NOX: - // break; + // break; case XTIME__IN0_0__IN1_0__IN0_NOX__IN1_NOX: out = 0; @@ -2528,54 +2528,54 @@ DISCRETE_STEP(dst_xtime_or) case XTIME__IN0_0__IN1_0__IN0_NOX__IN1_X: /* - * in0 1 - * 0 ------------- - * ...^....^... - * - * in1 1 ------ - * 0 ------- - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 + * 0 ------------- + * ...^....^... + * + * in1 1 ------ + * 0 ------- + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 0; x_time = x_time1; break; case XTIME__IN0_0__IN1_0__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------- - * ...^....^... - * - * in1 1 - * 0 ------------- - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------- + * ...^....^... + * + * in1 1 + * 0 ------------- + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 0; x_time = x_time0; break; case XTIME__IN0_0__IN1_0__IN0_X__IN1_X: /* - * in0 1 ----- ------- - * 0 -------- ------ - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ------ -------- - * ...^....^... ...^....^... - * - * out 1 ------- ------- - * 0 ----- ----- - * ...^....^... ...^....^... - */ + * in0 1 ----- ------- + * 0 -------- ------ + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ------ -------- + * ...^....^... ...^....^... + * + * out 1 ------- ------- + * 0 ----- ----- + * ...^....^... ...^....^... + */ out = 0; // use x_time of input that was 1 last/longer // this means at 0 for less x_time @@ -2587,94 +2587,94 @@ DISCRETE_STEP(dst_xtime_or) case XTIME__IN0_0__IN1_1__IN0_NOX__IN1_X: /* - * in0 1 - * 0 ------------ - * ...^....^... - * - * in1 1 ------ - * 0 ------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 + * 0 ------------ + * ...^....^... + * + * in1 1 ------ + * 0 ------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time1; break; case XTIME__IN0_1__IN1_0__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------ - * ...^....^... - * - * in1 1 - * 0 ------------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------ + * ...^....^... + * + * in1 1 + * 0 ------------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time0; break; case XTIME__IN0_0__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 ------------ ----- ----- - * 0 -- - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 ------------ ----- ----- + * 0 -- + * ...^....^... ...^....^... + */ // if (x_time0 > x_time1) /* Not sure if it is better to use 1 - * or the total energy which would smear the switch points together. - * Let's try just using 1 */ + * or the total energy which would smear the switch points together. + * Let's try just using 1 */ //x_time = xtime_0 - xtime_1; break; case XTIME__IN0_1__IN1_0__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 ------------ ----- ----- - * 0 -- - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 ------------ ----- ----- + * 0 -- + * ...^....^... ...^....^... + */ //if (x_time0 < x_time1) /* Not sure if it is better to use 1 - * or the total energy which would smear the switch points together. - * Let's try just using 1 */ + * or the total energy which would smear the switch points together. + * Let's try just using 1 */ //x_time = xtime_1 - xtime_0; break; case XTIME__IN0_1__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------ -------- - * 0 ------ ---- - * ...^....^... ...^....^... - * - * in1 1 -------- ------ - * 0 ---- ------ - * ...^....^... ...^....^... - * - * out 1 -------- -------- - * 0 ---- ---- - * ...^....^... ...^....^... - */ + * in0 1 ------ -------- + * 0 ------ ---- + * ...^....^... ...^....^... + * + * in1 1 -------- ------ + * 0 ---- ------ + * ...^....^... ...^....^... + * + * out 1 -------- -------- + * 0 ---- ---- + * ...^....^... ...^....^... + */ if (x_time0 > x_time1) x_time = x_time0; else @@ -2740,7 +2740,7 @@ DISCRETE_STEP(dst_xtime_xor) // these are all 1 //case XTIME__IN0_0__IN1_1__IN0_NOX__IN1_NOX: //case XTIME__IN0_1__IN1_0__IN0_NOX__IN1_NOX: - // break; + // break; case XTIME__IN0_1__IN1_1__IN0_NOX__IN1_NOX: case XTIME__IN0_0__IN1_0__IN0_NOX__IN1_NOX: @@ -2749,196 +2749,196 @@ DISCRETE_STEP(dst_xtime_xor) case XTIME__IN0_1__IN1_0__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------ - * ...^....^... - * - * in1 1 - * 0 ------------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------ + * ...^....^... + * + * in1 1 + * 0 ------------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ case XTIME__IN0_0__IN1_1__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------- - * ...^....^... - * - * in1 1 ------------- - * 0 - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------- + * ...^....^... + * + * in1 1 ------------- + * 0 + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time0; break; case XTIME__IN0_0__IN1_1__IN0_NOX__IN1_X: /* - * in0 1 - * 0 ------------ - * ...^....^... - * - * in1 1 ------ - * 0 ------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 + * 0 ------------ + * ...^....^... + * + * in1 1 ------ + * 0 ------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ case XTIME__IN0_1__IN1_0__IN0_NOX__IN1_X: /* - * in0 1 ------------- - * 0 - * ...^....^... - * - * in1 1 ------ - * 0 ------- - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------------- + * 0 + * ...^....^... + * + * in1 1 ------ + * 0 ------- + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ x_time = x_time1; break; case XTIME__IN0_0__IN1_0__IN0_X__IN1_NOX: /* - * in0 1 ------ - * 0 ------ - * ...^....^... - * - * in1 1 - * 0 ------------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------ + * 0 ------ + * ...^....^... + * + * in1 1 + * 0 ------------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ case XTIME__IN0_1__IN1_1__IN0_X__IN1_NOX: /* - * in1 0 ------ - * 0 ------ - * ...^....^... - * - * in1 1 ------------ - * 0 - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in1 0 ------ + * 0 ------ + * ...^....^... + * + * in1 1 ------------ + * 0 + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 0; x_time = x_time0; break; case XTIME__IN0_0__IN1_0__IN0_NOX__IN1_X: /* - * in0 1 - * 0 ------------ - * ...^....^... - * - * in1 1 ------ - * 0 ------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 + * 0 ------------ + * ...^....^... + * + * in1 1 ------ + * 0 ------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ case XTIME__IN0_1__IN1_1__IN0_NOX__IN1_X: /* - * in0 1 ------------ - * 0 - * ...^....^... - * - * in1 1 ------ - * 0 ------ - * ...^....^... - * - * out 1 ------ - * 0 ------ - * ...^....^... - */ + * in0 1 ------------ + * 0 + * ...^....^... + * + * in1 1 ------ + * 0 ------ + * ...^....^... + * + * out 1 ------ + * 0 ------ + * ...^....^... + */ out = 0; x_time = x_time1; break; case XTIME__IN0_0__IN1_0__IN0_X__IN1_X: /* - * in0 1 ----- ------- - * 0 ------- ----- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 -- -- - * 0 ----- ----- ----- ----- - * ...^....^... ...^....^... - */ + * in0 1 ----- ------- + * 0 ------- ----- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 -- -- + * 0 ----- ----- ----- ----- + * ...^....^... ...^....^... + */ case XTIME__IN0_1__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------ -------- - * 0 ------ ---- - * ...^....^... ...^....^... - * - * in1 1 -------- ------ - * 0 ---- ------ - * ...^....^... ...^....^... - * - * out 1 -- -- - * 0 ---- ------ ---- ------ - * ...^....^... ...^....^... - */ + * in0 1 ------ -------- + * 0 ------ ---- + * ...^....^... ...^....^... + * + * in1 1 -------- ------ + * 0 ---- ------ + * ...^....^... ...^....^... + * + * out 1 -- -- + * 0 ---- ------ ---- ------ + * ...^....^... ...^....^... + */ out = 0; /* Not sure if it is better to use 0 - * or the total energy which would smear the switch points together. - * Let's try just using 0 */ + * or the total energy which would smear the switch points together. + * Let's try just using 0 */ // x_time = abs(x_time0 - x_time1); break; case XTIME__IN0_0__IN1_1__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 ----- ----- ----- ----- - * 0 -- -- - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 ----- ----- ----- ----- + * 0 -- -- + * ...^....^... ...^....^... + */ case XTIME__IN0_1__IN1_0__IN0_X__IN1_X: /* - * in0 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * in1 1 ------- ----- - * 0 ----- ------- - * ...^....^... ...^....^... - * - * out 1 ----- ----- ----- ----- - * 0 -- -- - * ...^....^... ...^....^... - */ + * in0 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * in1 1 ------- ----- + * 0 ----- ------- + * ...^....^... ...^....^... + * + * out 1 ----- ----- ----- ----- + * 0 -- -- + * ...^....^... ...^....^... + */ /* Not sure if it is better to use 1 - * or the total energy which would smear the switch points together. - * Let's try just using 1 */ + * or the total energy which would smear the switch points together. + * Let's try just using 1 */ // x_time = 1.0 - abs(x_time0 - x_time1); break; } |