PVB
/
shrooms-vb-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: PVB:67928da1e6ca7007274a04bdd9b4f82e57358594
Branches Tags
PVB:main
PVB:float-code-fix
..
compare: PVB:483714c0d6367ce575f603975c34fe461a144c99
Branches Tags
PVB:main
PVB:float-code-fix

No commits in common. "67928da1e6ca7007274a04bdd9b4f82e57358594" and "483714c0d6367ce575f603975c34fe461a144c99" have entirely different histories.
67928da1e6 ... 483714c0d6

1 changed files with 12 additions and 21 deletions
Show Stats Expand all files Collapse all files

33
core/vsu.c
View File

@ -132,19 +132,14 @@ static void vsuEmulateChannel(VB *sim, Channel *chan) {
} }
/* Envelope modification */ /* Envelope modification */
if (chan->env.clocks == 0) { if (chan->env.enb && !chan->env.modmask && chan->env.clocks == 0) {
uint8_t new_envelope = chan->env.value; if (chan->env.dir == 0 && chan->env.value != 0)
if (chan->env.dir == 0 && chan->env.value != 0) { chan->env.value--;
new_envelope--; else if (chan->env.dir == 1 && chan->env.value != 15)
} else if (chan->env.dir == 1 && chan->env.value != 15) { chan->env.value++;
new_envelope++; else if (chan->env.rep)
} else if (chan->env.rep && chan->env.modmask != 2) { chan->env.value = chan->env.reload;
new_envelope = chan->env.reload; else chan->env.modmask = 1;
chan->env.modmask = 0;
} else if (!chan->env.modmask) chan->env.modmask = 1;
if (chan->env.enb && !chan->env.modmask) {
chan->env.value = new_envelope;
}
chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220; chan->env.clocks = ((uint32_t) chan->env.interval + 1) * 307220;
} }
@ -220,7 +215,6 @@ static void vsuWriteEV0(VB *sim, int index, uint8_t value) {
chan->env.interval = value & 7; chan->env.interval = value & 7;
chan->env.value = value >> 4 & 15; chan->env.value = value >> 4 & 15;
chan->env.reload = chan->env.value; chan->env.reload = chan->env.value;
if (chan->env.modmask == 1) chan->env.modmask = 2;
if (index == 4) { if (index == 4) {
chan->freqmod = vsuCheckFreqMod(sim); chan->freqmod = vsuCheckFreqMod(sim);
vsuNextFreqMod(sim, chan); vsuNextFreqMod(sim, chan);
@ -237,8 +231,6 @@ static void vsuWriteEV1(VB *sim, int index, uint8_t value) {
/* Parse fields */ /* Parse fields */
chan->env.enb = value & 1; chan->env.enb = value & 1;
chan->env.rep = value >> 1 & 1; chan->env.rep = value >> 1 & 1;
if (!chan->env.rep && ((chan->env.reload == 0 && chan->env.dir == 0) || (chan->env.reload == 15 && chan->env.dir == 1)))
chan->env.modmask = 1;
/* Processing by channel */ /* Processing by channel */
switch (index) { switch (index) {
@ -294,9 +286,8 @@ static void vsuWriteINT(VB *sim, int index, uint8_t value) {
/* Update state */ /* Update state */
chan->int_.clocks = 76805 * ((uint32_t) chan->int_.interval + 1); chan->int_.clocks = 76805 * ((uint32_t) chan->int_.interval + 1);
chan->env.modmask = 0; chan->env.modmask = 0;
if (!chan->env.rep && ((chan->env.reload == 0 && chan->env.dir == 0) || (chan->env.reload == 15 && chan->env.dir == 1))) if (chan->env.enb)
chan->env.modmask = 1; chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
chan->env.clocks = 307220 * ((uint32_t) chan->env.interval + 1);
if (index != 5) { if (index != 5) {
chan->wave.sample = 0; chan->wave.sample = 0;
chan->clocks = 4 * (2048 - (uint32_t) chan->freq.current); chan->clocks = 4 * (2048 - (uint32_t) chan->freq.current);
@ -386,7 +377,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
/* Clocks until next state change */ /* Clocks until next state change */
chan->until = chan->clocks; chan->until = chan->clocks;
if (chan->env.enb && chan->env.modmask != 2 && if (chan->env.enb && !chan->env.modmask &&
chan->env.clocks < chan->until) chan->env.clocks < chan->until)
chan->until = chan->env.clocks; chan->until = chan->env.clocks;
if (chan->int_.auto_ && chan->int_.clocks < chan->until) if (chan->int_.auto_ && chan->int_.clocks < chan->until)
@ -396,7 +387,7 @@ static void vsuEmulate(VB *sim, uint32_t clocks) {
/* Manage clocks */ /* Manage clocks */
chan->clocks -= chan->until; chan->clocks -= chan->until;
if (chan->env.enb && chan->env.modmask != 2) if (chan->env.enb && !chan->env.modmask)
chan->env.clocks -= chan->until; chan->env.clocks -= chan->until;
if (chan->int_.auto_) if (chan->int_.auto_)
chan->int_.clocks -= chan->until; chan->int_.clocks -= chan->until;