Style adjustments for previous
This commit is contained in:
parent
67928da1e6
commit
f295e02aaf
28
core/vsu.c
28
core/vsu.c
|
@ -134,17 +134,17 @@ static void vsuEmulateChannel(VB *sim, Channel *chan) {
|
||||||
/* Envelope modification */
|
/* Envelope modification */
|
||||||
if (chan->env.clocks == 0) {
|
if (chan->env.clocks == 0) {
|
||||||
uint8_t new_envelope = chan->env.value;
|
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)
|
||||||
new_envelope--;
|
new_envelope--;
|
||||||
} else if (chan->env.dir == 1 && chan->env.value != 15) {
|
else if (chan->env.dir == 1 && chan->env.value != 15)
|
||||||
new_envelope++;
|
new_envelope++;
|
||||||
} else if (chan->env.rep && chan->env.modmask != 2) {
|
else if (chan->env.rep && chan->env.modmask != 2) {
|
||||||
new_envelope = chan->env.reload;
|
new_envelope = chan->env.reload;
|
||||||
chan->env.modmask = 0;
|
chan->env.modmask = 0;
|
||||||
} else if (!chan->env.modmask) chan->env.modmask = 1;
|
} else if (!chan->env.modmask)
|
||||||
if (chan->env.enb && !chan->env.modmask) {
|
chan->env.modmask = 1;
|
||||||
|
if (chan->env.enb && !chan->env.modmask)
|
||||||
chan->env.value = new_envelope;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -237,8 +237,12 @@ 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)))
|
if (
|
||||||
chan->env.modmask = 1;
|
!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,8 +298,12 @@ 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.modmask = 1;
|
!chan->env.rep && (
|
||||||
|
(chan->env.reload == 0 && chan->env.dir == 0) ||
|
||||||
|
(chan->env.reload == 15 && chan->env.dir == 1)
|
||||||
|
)
|
||||||
|
) 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;
|
||||||
|
|
Loading…
Reference in New Issue