80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Whitespace

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-29 20:56:53 -05:00
parent 8e00b37e22
commit c40c138af0
1 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/sound/snd_adlibgold.c
View File

@@ -40,7 +40,7 @@ typedef struct adgold_t
int adgold_mma_intpos[2]; int adgold_mma_intpos[2];
pc_timer_t adgold_mma_timer_count; pc_timer_t adgold_mma_timer_count;
uint8_t adgold_midi_ctrl, midi_queue[16]; uint8_t adgold_midi_ctrl, midi_queue[16];
int midi_r, midi_w; int midi_r, midi_w;
int uart_in, uart_out, sysex; int uart_in, uart_out, sysex;
@@ -57,7 +57,7 @@ typedef struct adgold_t
opl_t opl; opl_t opl;
ym7128_t ym7128; ym7128_t ym7128;
int fm_vol_l, fm_vol_r; int fm_vol_l, fm_vol_r;
int samp_vol_l, samp_vol_r; int samp_vol_l, samp_vol_r;
int aux_vol_l, aux_vol_r; int aux_vol_l, aux_vol_r;
@@ -85,7 +85,7 @@ static int bass_attenuation[0x10] =
(int)(0.708 * 16384), /*3 dB*/ (int)(0.708 * 16384), /*3 dB*/
(int)(0 * 16384), /*0 dB*/ (int)(0 * 16384), /*0 dB*/
(int)(0.708 * 16384), /*3 dB*/ (int)(0.708 * 16384), /*3 dB*/
(int)(1 * 16384), /*6 dB*/ (int)(1 * 16384), /*6 dB*/
(int)(1.413 * 16384), /*9 dB*/ (int)(1.413 * 16384), /*9 dB*/
(int)(1.995 * 16384), /*12 dB*/ (int)(1.995 * 16384), /*12 dB*/
(int)(2.819 * 16384), /*15 dB*/ (int)(2.819 * 16384), /*15 dB*/
@@ -115,7 +115,7 @@ static int treble_attenuation[0x10] =
(int)(0.708 * 16384), /*3 dB*/ (int)(0.708 * 16384), /*3 dB*/
(int)(0 * 16384), /*0 dB*/ (int)(0 * 16384), /*0 dB*/
(int)(0.708 * 16384), /*3 dB*/ (int)(0.708 * 16384), /*3 dB*/
(int)(1 * 16384), /*6 dB*/ (int)(1 * 16384), /*6 dB*/
(int)(1.413 * 16384), /*9 dB*/ (int)(1.413 * 16384), /*9 dB*/
(int)(1.995 * 16384), /*12 dB*/ (int)(1.995 * 16384), /*12 dB*/
(int)(1.995 * 16384), (int)(1.995 * 16384),
@@ -171,10 +171,10 @@ void adgold_update_irq_status(adgold_t *adgold)
void adgold_getsamp_dma(adgold_t *adgold, int channel) void adgold_getsamp_dma(adgold_t *adgold, int channel)
{ {
int temp; int temp;
if ((adgold->adgold_mma_regs[channel][0xc] & 0x60) && (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) >= 127)) if ((adgold->adgold_mma_regs[channel][0xc] & 0x60) && (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) >= 127))
return; return;
temp = dma_channel_read(1); temp = dma_channel_read(1);
if (temp == DMA_NODATA) return; if (temp == DMA_NODATA) return;
adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_end[channel]] = temp; adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_end[channel]] = temp;
@@ -184,7 +184,7 @@ void adgold_getsamp_dma(adgold_t *adgold, int channel)
temp = dma_channel_read(1); temp = dma_channel_read(1);
adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_end[channel]] = temp; adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_end[channel]] = temp;
adgold->adgold_mma_fifo_end[channel] = (adgold->adgold_mma_fifo_end[channel] + 1) & 255; adgold->adgold_mma_fifo_end[channel] = (adgold->adgold_mma_fifo_end[channel] + 1) & 255;
} }
if (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) >= adgold->adgold_mma_intpos[channel]) if (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) >= adgold->adgold_mma_intpos[channel])
{ {
adgold->adgold_mma_status &= ~(0x01 << channel); adgold->adgold_mma_status &= ~(0x01 << channel);
@@ -208,7 +208,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
return; return;
} }
if (val == 0xfe) if (val == 0xfe)
{ {
adgold->adgold_38x_state = 0; adgold->adgold_38x_state = 0;
return; return;
} }
@@ -229,7 +229,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
if (val & 2) if (val & 2)
memcpy(adgold->adgold_eeprom, adgold->adgold_38x_regs, 0x1a); memcpy(adgold->adgold_eeprom, adgold->adgold_38x_regs, 0x1a);
break; break;
case 0x04: /*Final output volume left*/ case 0x04: /*Final output volume left*/
adgold->adgold_38x_regs[0x04] = val; adgold->adgold_38x_regs[0x04] = val;
adgold->vol_l = attenuation[val & 0x3f]; adgold->vol_l = attenuation[val & 0x3f];
@@ -246,7 +246,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
adgold->adgold_38x_regs[0x07] = val; adgold->adgold_38x_regs[0x07] = val;
adgold->treble = val & 0xf; adgold->treble = val & 0xf;
break; break;
case 0x09: /*FM volume left*/ case 0x09: /*FM volume left*/
adgold->adgold_38x_regs[0x09] = val; adgold->adgold_38x_regs[0x09] = val;
adgold->fm_vol_l = (int)(int8_t)(val - 128); adgold->fm_vol_l = (int)(int8_t)(val - 128);
@@ -271,12 +271,12 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
adgold->adgold_38x_regs[0x0e] = val; adgold->adgold_38x_regs[0x0e] = val;
adgold->aux_vol_r = (int)(int8_t)(val - 128); adgold->aux_vol_r = (int)(int8_t)(val - 128);
break; break;
case 0x18: /*Surround*/ case 0x18: /*Surround*/
adgold->adgold_38x_regs[0x18] = val; adgold->adgold_38x_regs[0x18] = val;
ym7128_write(&adgold->ym7128, val); ym7128_write(&adgold->ym7128, val);
break; break;
default: default:
adgold->adgold_38x_regs[adgold->adgold_38x_addr] = val; adgold->adgold_38x_regs[adgold->adgold_38x_addr] = val;
break; break;
@@ -311,11 +311,11 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
case 0x7: case 0x7:
adgold->adgold_mma.timer2_latch = (adgold->adgold_mma.timer2_latch & 0xff) | (val << 8); adgold->adgold_mma.timer2_latch = (adgold->adgold_mma.timer2_latch & 0xff) | (val << 8);
break; break;
case 0x8: case 0x8:
if ((val & 1) && !(adgold->adgold_mma_regs[0][8] & 1)) /*Reload timer 0*/ if ((val & 1) && !(adgold->adgold_mma_regs[0][8] & 1)) /*Reload timer 0*/
adgold->adgold_mma.timer0_count = adgold->adgold_mma.timer0_latch; adgold->adgold_mma.timer0_count = adgold->adgold_mma.timer0_latch;
if ((val & 2) && !(adgold->adgold_mma_regs[0][8] & 2)) /*Reload timer 1*/ if ((val & 2) && !(adgold->adgold_mma_regs[0][8] & 2)) /*Reload timer 1*/
adgold->adgold_mma.timer1_count = adgold->adgold_mma.timer1_latch; adgold->adgold_mma.timer1_count = adgold->adgold_mma.timer1_latch;
@@ -325,7 +325,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
if ((val & 8) && !(adgold->adgold_mma_regs[0][8] & 8)) /*Reload base timer*/ if ((val & 8) && !(adgold->adgold_mma_regs[0][8] & 8)) /*Reload base timer*/
adgold->adgold_mma.timerbase_count = adgold->adgold_mma.timerbase_latch; adgold->adgold_mma.timerbase_count = adgold->adgold_mma.timerbase_latch;
break; break;
case 0x9: case 0x9:
switch (val & 0x18) switch (val & 0x18)
{ {
@@ -345,7 +345,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
{ {
if (!(adgold->adgold_mma_regs[0][0x9] & 1)) if (!(adgold->adgold_mma_regs[0][0x9] & 1))
adgold->adgold_mma.voice_count[0] = adgold->adgold_mma.voice_latch[0]; adgold->adgold_mma.voice_count[0] = adgold->adgold_mma.voice_latch[0];
if (adgold->adgold_mma_regs[0][0xc] & 1) if (adgold->adgold_mma_regs[0][0xc] & 1)
{ {
if (adgold->adgold_mma_regs[0][0xc] & 0x80) if (adgold->adgold_mma_regs[0][0xc] & 0x80)
@@ -385,7 +385,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
} }
adgold->adgold_mma_enable[0] = val & 0x01; adgold->adgold_mma_enable[0] = val & 0x01;
break; break;
case 0xb: case 0xb:
if (((adgold->adgold_mma_fifo_end[0] - adgold->adgold_mma_fifo_start[0]) & 255) < 128) if (((adgold->adgold_mma_fifo_end[0] - adgold->adgold_mma_fifo_start[0]) & 255) < 128)
{ {
@@ -398,14 +398,14 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
} }
} }
break; break;
case 0xc: case 0xc:
adgold->adgold_mma_intpos[0] = (7 - ((val >> 2) & 7)) * 8; adgold->adgold_mma_intpos[0] = (7 - ((val >> 2) & 7)) * 8;
break; break;
case 0xd: case 0xd:
adgold->adgold_midi_ctrl = val & 0x3f; adgold->adgold_midi_ctrl = val & 0x3f;
if ((adgold->adgold_midi_ctrl & 0x0f) != 0x0f) { if ((adgold->adgold_midi_ctrl & 0x0f) != 0x0f) {
if ((adgold->adgold_midi_ctrl & 0x0f) == 0x00) { if ((adgold->adgold_midi_ctrl & 0x0f) == 0x00) {
adgold->uart_out = 0; adgold->uart_out = 0;
@@ -432,7 +432,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
adgold_update_irq_status(adgold); adgold_update_irq_status(adgold);
break; break;
case 0xe: case 0xe:
if (adgold->uart_out) { if (adgold->uart_out) {
midi_raw_out_byte(val); midi_raw_out_byte(val);
@@ -468,7 +468,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
{ {
if (!(adgold->adgold_mma_regs[1][0x9] & 1)) if (!(adgold->adgold_mma_regs[1][0x9] & 1))
adgold->adgold_mma.voice_count[1] = adgold->adgold_mma.voice_latch[1]; adgold->adgold_mma.voice_count[1] = adgold->adgold_mma.voice_latch[1];
if (adgold->adgold_mma_regs[1][0xc] & 1) if (adgold->adgold_mma_regs[1][0xc] & 1)
{ {
while (((adgold->adgold_mma_fifo_end[1] - adgold->adgold_mma_fifo_start[1]) & 255) < 128) while (((adgold->adgold_mma_fifo_end[1] - adgold->adgold_mma_fifo_start[1]) & 255) < 128)
@@ -479,7 +479,7 @@ void adgold_write(uint16_t addr, uint8_t val, void *p)
} }
adgold->adgold_mma_enable[1] = val & 0x01; adgold->adgold_mma_enable[1] = val & 0x01;
break; break;
case 0xb: case 0xb:
if (((adgold->adgold_mma_fifo_end[1] - adgold->adgold_mma_fifo_start[1]) & 255) < 128) if (((adgold->adgold_mma_fifo_end[1] - adgold->adgold_mma_fifo_start[1]) & 255) < 128)
{ {
@@ -506,7 +506,7 @@ uint8_t adgold_read(uint16_t addr, void *p)
{ {
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
uint8_t temp = 0; uint8_t temp = 0;
switch (addr & 7) switch (addr & 7)
{ {
case 0: case 1: case 0: case 1:
@@ -519,7 +519,7 @@ uint8_t adgold_read(uint16_t addr, void *p)
else else
temp = opl3_read(addr, &adgold->opl); temp = opl3_read(addr, &adgold->opl);
break; break;
case 3: case 3:
if (adgold->adgold_38x_state) if (adgold->adgold_38x_state)
{ {
@@ -535,7 +535,7 @@ uint8_t adgold_read(uint16_t addr, void *p)
default: default:
temp = adgold->adgold_38x_regs[adgold->adgold_38x_addr]; temp = adgold->adgold_38x_regs[adgold->adgold_38x_addr];
} }
} }
else else
temp = opl3_read(addr, &adgold->opl); temp = opl3_read(addr, &adgold->opl);
@@ -592,7 +592,7 @@ void adgold_update(adgold_t *adgold)
for (; adgold->pos < sound_pos_global; adgold->pos++) for (; adgold->pos < sound_pos_global; adgold->pos++)
{ {
adgold->mma_buffer[0][adgold->pos] = adgold->mma_buffer[1][adgold->pos] = 0; adgold->mma_buffer[0][adgold->pos] = adgold->mma_buffer[1][adgold->pos] = 0;
if (adgold->adgold_mma_regs[0][9] & 0x20) if (adgold->adgold_mma_regs[0][9] & 0x20)
adgold->mma_buffer[0][adgold->pos] += adgold->adgold_mma_out[0] / 2; adgold->mma_buffer[0][adgold->pos] += adgold->adgold_mma_out[0] / 2;
if (adgold->adgold_mma_regs[0][9] & 0x40) if (adgold->adgold_mma_regs[0][9] & 0x40)
@@ -620,11 +620,11 @@ void adgold_mma_poll(adgold_t *adgold, int channel)
adgold->adgold_mma_out[channel] = dat; adgold->adgold_mma_out[channel] = dat;
adgold->adgold_mma_fifo_start[channel] = (adgold->adgold_mma_fifo_start[channel] + 1) & 255; adgold->adgold_mma_fifo_start[channel] = (adgold->adgold_mma_fifo_start[channel] + 1) & 255;
break; break;
case 0x40: /*12-bit sensible format*/ case 0x40: /*12-bit sensible format*/
if (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) < 2) if (((adgold->adgold_mma_fifo_end[channel] - adgold->adgold_mma_fifo_start[channel]) & 255) < 2)
return; return;
dat = adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_start[channel]] & 0xf0; dat = adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_start[channel]] & 0xf0;
adgold->adgold_mma_fifo_start[channel] = (adgold->adgold_mma_fifo_start[channel] + 1) & 255; adgold->adgold_mma_fifo_start[channel] = (adgold->adgold_mma_fifo_start[channel] + 1) & 255;
dat |= (adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_start[channel]] << 8); dat |= (adgold->adgold_mma_fifo[channel][adgold->adgold_mma_fifo_start[channel]] << 8);
@@ -632,7 +632,7 @@ void adgold_mma_poll(adgold_t *adgold, int channel)
adgold->adgold_mma_out[channel] = dat; adgold->adgold_mma_out[channel] = dat;
break; break;
} }
if (adgold->adgold_mma_regs[channel][0xc] & 1) if (adgold->adgold_mma_regs[channel][0xc] & 1)
{ {
adgold_getsamp_dma(adgold, channel); adgold_getsamp_dma(adgold, channel);
@@ -652,9 +652,9 @@ void adgold_mma_poll(adgold_t *adgold, int channel)
void adgold_timer_poll(void *p) void adgold_timer_poll(void *p)
{ {
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
timer_advance_u64(&adgold->adgold_mma_timer_count, (uint64_t)((double)TIMER_USEC * 1.88964)); timer_advance_u64(&adgold->adgold_mma_timer_count, (uint64_t)((double)TIMER_USEC * 1.88964));
if (adgold->adgold_midi_ctrl & 0x3f) { if (adgold->adgold_midi_ctrl & 0x3f) {
if ((adgold->adgold_midi_ctrl & 0x3f) != 0x3f) { if ((adgold->adgold_midi_ctrl & 0x3f) != 0x3f) {
if (adgold->uart_out) if (adgold->uart_out)
@@ -729,7 +729,7 @@ static void adgold_get_buffer(int32_t *buffer, int len, void *p)
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
int16_t* adgold_buffer = malloc(sizeof(int16_t) * len * 2); int16_t* adgold_buffer = malloc(sizeof(int16_t) * len * 2);
if (adgold_buffer == NULL) fatal("adgold_buffer = NULL"); if (adgold_buffer == NULL) fatal("adgold_buffer = NULL");
int c; int c;
opl3_update(&adgold->opl); opl3_update(&adgold->opl);
@@ -745,7 +745,7 @@ static void adgold_get_buffer(int32_t *buffer, int len, void *p)
if (adgold->surround_enabled) if (adgold->surround_enabled)
ym7128_apply(&adgold->ym7128, adgold_buffer, len); ym7128_apply(&adgold->ym7128, adgold_buffer, len);
switch (adgold->adgold_38x_regs[0x8] & 6) switch (adgold->adgold_38x_regs[0x8] & 6)
{ {
case 0: case 0:
@@ -763,7 +763,7 @@ static void adgold_get_buffer(int32_t *buffer, int len, void *p)
case 6: /*Left and right channels*/ case 6: /*Left and right channels*/
break; break;
} }
switch (adgold->adgold_38x_regs[0x8] & 0x18) switch (adgold->adgold_38x_regs[0x8] & 0x18)
{ {
case 0x00: /*Forced mono*/ case 0x00: /*Forced mono*/
@@ -855,10 +855,10 @@ static void adgold_input_msg(void *p, uint8_t *msg, uint32_t len)
{ {
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
uint8_t i; uint8_t i;
if (adgold->sysex) if (adgold->sysex)
return; return;
if (adgold->uart_in) { if (adgold->uart_in) {
adgold->adgold_mma_status |= 0x04; adgold->adgold_mma_status |= 0x04;
@@ -866,7 +866,7 @@ static void adgold_input_msg(void *p, uint8_t *msg, uint32_t len)
adgold->midi_queue[adgold->midi_w++] = msg[i]; adgold->midi_queue[adgold->midi_w++] = msg[i];
adgold->midi_w &= 0x0f; adgold->midi_w &= 0x0f;
} }
adgold_update_irq_status(adgold); adgold_update_irq_status(adgold);
} }
} }
@@ -875,7 +875,7 @@ static int adgold_input_sysex(void *p, uint8_t *buffer, uint32_t len, int abort)
{ {
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
uint32_t i; uint32_t i;
if (abort) { if (abort) {
adgold->sysex = 0; adgold->sysex = 0;
return 0; return 0;
@@ -903,7 +903,7 @@ void *adgold_init(const device_t *info)
adgold->surround_enabled = device_get_config_int("surround"); adgold->surround_enabled = device_get_config_int("surround");
adgold->gameport_enabled = device_get_config_int("gameport"); adgold->gameport_enabled = device_get_config_int("gameport");
opl3_init(&adgold->opl); opl3_init(&adgold->opl);
if (adgold->surround_enabled) if (adgold->surround_enabled)
ym7128_init(&adgold->ym7128); ym7128_init(&adgold->ym7128);
@@ -940,25 +940,25 @@ void *adgold_init(const device_t *info)
adgold->samp_vol_l = (int)(int8_t)(adgold->adgold_eeprom[0x0b] - 128); adgold->samp_vol_l = (int)(int8_t)(adgold->adgold_eeprom[0x0b] - 128);
adgold->samp_vol_r = (int)(int8_t)(adgold->adgold_eeprom[0x0c] - 128); adgold->samp_vol_r = (int)(int8_t)(adgold->adgold_eeprom[0x0c] - 128);
adgold->aux_vol_l = (int)(int8_t)(adgold->adgold_eeprom[0x0d] - 128); adgold->aux_vol_l = (int)(int8_t)(adgold->adgold_eeprom[0x0d] - 128);
adgold->aux_vol_r = (int)(int8_t)(adgold->adgold_eeprom[0x0e] - 128); adgold->aux_vol_r = (int)(int8_t)(adgold->adgold_eeprom[0x0e] - 128);
adgold->adgold_mma_enable[0] = 0; adgold->adgold_mma_enable[0] = 0;
adgold->adgold_mma_fifo_start[0] = adgold->adgold_mma_fifo_end[0] = 0; adgold->adgold_mma_fifo_start[0] = adgold->adgold_mma_fifo_end[0] = 0;
/*388/389 are handled by adlib_init*/ /*388/389 are handled by adlib_init*/
io_sethandler(0x0388, 0x0008, adgold_read, NULL, NULL, adgold_write, NULL, NULL, adgold); io_sethandler(0x0388, 0x0008, adgold_read, NULL, NULL, adgold_write, NULL, NULL, adgold);
if (adgold->gameport_enabled) if (adgold->gameport_enabled)
gameport_remap(gameport_add(&gameport_201_device), 0x201); gameport_remap(gameport_add(&gameport_201_device), 0x201);
timer_add(&adgold->adgold_mma_timer_count, adgold_timer_poll, adgold, 1); timer_add(&adgold->adgold_mma_timer_count, adgold_timer_poll, adgold, 1);
sound_add_handler(adgold_get_buffer, adgold); sound_add_handler(adgold_get_buffer, adgold);
sound_set_cd_audio_filter(adgold_filter_cd_audio, adgold); sound_set_cd_audio_filter(adgold_filter_cd_audio, adgold);
if (device_get_config_int("receive_input")) if (device_get_config_int("receive_input"))
midi_in_handler(1, adgold_input_msg, adgold_input_sysex, adgold); midi_in_handler(1, adgold_input_msg, adgold_input_sysex, adgold);
return adgold; return adgold;
} }
@@ -966,7 +966,7 @@ void adgold_close(void *p)
{ {
FILE *f; FILE *f;
adgold_t *adgold = (adgold_t *)p; adgold_t *adgold = (adgold_t *)p;
f = nvr_fopen("adgold.bin", "wb"); f = nvr_fopen("adgold.bin", "wb");
if (f) if (f)
{ {