claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Altheos
2018-11-30 14:32:41 +01:00
parent 6854dd9000
commit 06861bece0
3 changed files with 989 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

424
src/devices/sound/snd_cs423x.c
View File

@@ -60,277 +60,277 @@ static int cs423x_vols[64];
void cs423x_setirq(cs423x_t *cs423x, int irq_ch) void cs423x_setirq(cs423x_t *cs423x, int irq_ch)
{ {
cs423x->irq = irq_ch; cs423x->irq = irq_ch;
} }
void cs423x_setdma(cs423x_t *cs423x, int dma_ch) void cs423x_setdma(cs423x_t *cs423x, int dma_ch)
{ {
cs423x->dma = dma_ch; cs423x->dma = dma_ch;
} }
uint8_t cs423x_read(uint16_t addr, void *p) uint8_t cs423x_read(uint16_t addr, void *p)
{ {
cs423x_t *cs423x = (cs423x_t *)p; cs423x_t *cs423x = (cs423x_t *)p;
uint8_t temp = 0xff; uint8_t temp = 0xff;
if(cs423x->initb) if (cs423x->initb)
return 0x80; return 0x80;
switch (addr & 3) switch (addr & 3)
{ {
case 0: /*Index*/ case 0: /*Index*/
if(cs423x->mode2) if (cs423x->mode2)
temp = cs423x->index | cs423x->trd | cs423x->mce | cs423x->ia4 | cs423x->initb; temp = cs423x->index | cs423x->trd | cs423x->mce | cs423x->ia4 | cs423x->initb;
else else
temp = cs423x->index | cs423x->trd | cs423x->mce | cs423x->initb; temp = cs423x->index | cs423x->trd | cs423x->mce | cs423x->initb;
break; break;
case 1: case 1:
temp = cs423x->regs[cs423x->index]; temp = cs423x->regs[cs423x->index];
if (cs423x->index == 0x0b) { if (cs423x->index == 0x0b) {
temp ^= 0x20; temp ^= 0x20;
cs423x->regs[cs423x->index] = temp; cs423x->regs[cs423x->index] = temp;
} }
break; break;
case 2: case 2:
temp = cs423x->status; temp = cs423x->status;
break; break;
case 3: // Todo Capture I/O read case 3: // Todo Capture I/O read
break; break;
} }
return temp; return temp;
} }
void cs423x_write(uint16_t addr, uint8_t val, void *p) void cs423x_write(uint16_t addr, uint8_t val, void *p)
{ {
cs423x_t *cs423x = (cs423x_t *)p; cs423x_t *cs423x = (cs423x_t *)p;
double freq; double freq;
switch (addr & 3) switch (addr & 3)
{ {
case 0: /*Index*/ case 0: /*Index*/
cs423x->index = val & (cs423x->mode2 ? 0x1F : 0x0F); cs423x->index = val & (cs423x->mode2 ? 0x1F : 0x0F);
cs423x->trd = val & 0x20; cs423x->trd = val & 0x20;
cs423x->mce = val & 0x40; cs423x->mce = val & 0x40;
cs423x->ia4 = val & 0x10; cs423x->ia4 = val & 0x10;
cs423x->initb = val & 0x80; cs423x->initb = val & 0x80;
break; break;
case 1: case 1:
switch (cs423x->index) switch (cs423x->index)
{ {
case 8: case 8:
freq = (double) ((val & 1) ? 16934400LL : 24576000LL); freq = (double)((val & 1) ? 16934400LL : 24576000LL);
switch ((val >> 1) & 7) switch ((val >> 1) & 7)
{ {
case 0: freq /= 3072; break; case 0: freq /= 3072; break;
case 1: freq /= 1536; break; case 1: freq /= 1536; break;
case 2: freq /= 896; break; case 2: freq /= 896; break;
case 3: freq /= 768; break; case 3: freq /= 768; break;
case 4: freq /= 448; break; case 4: freq /= 448; break;
case 5: freq /= 384; break; case 5: freq /= 384; break;
case 6: freq /= 512; break; case 6: freq /= 512; break;
case 7: freq /= 2560; break; case 7: freq /= 2560; break;
} }
cs423x->freq = (int64_t)freq; cs423x->freq = (int64_t)freq;
cs423x->timer_latch = (int64_t)((double)TIMER_USEC * (1000000.0 / (double)cs423x->freq)); cs423x->timer_latch = (int64_t)((double)TIMER_USEC * (1000000.0 / (double)cs423x->freq));
break;
case 9:
cs423x->enable = ((val & 0x41) == 0x01);
if (!cs423x->enable)
cs423x->out_l = cs423x->out_r = 0;
break;
case 11:
break;
case 12:
val |= 0x8a;
cs423x->mode2 = (val >> 6) & 1;
break;
case 14:
cs423x->count = cs423x->regs[15] | (val << 8);
break;
case 24:
if (!(val & 0x70))
cs423x->status &= 0xfe;
break;
case 25:
break;
}
cs423x->regs[cs423x->index] = val;
break;
case 2:
cs423x->status &= 0xfe;
break;
case 3: // Todo Playback I/O Write
break; break;
}
case 9:
cs423x->enable = ((val & 0x41) == 0x01);
if (!cs423x->enable)
cs423x->out_l = cs423x->out_r = 0;
break;
case 11:
break;
case 12:
val |= 0x8a;
cs423x->mode2 = (val >> 6) & 1;
break;
case 14:
cs423x->count = cs423x->regs[15] | (val << 8);
break;
case 24:
if (!(val & 0x70))
cs423x->status &= 0xfe;
break;
case 25:
break;
}
cs423x->regs[cs423x->index] = val;
break;
case 2:
cs423x->status &= 0xfe;
break;
case 3: // Todo Playback I/O Write
break;
}
} }
void cs423x_speed_changed(cs423x_t *cs423x) void cs423x_speed_changed(cs423x_t *cs423x)
{ {
cs423x->timer_latch = (int64_t)((double)TIMER_USEC * (1000000.0 / (double)cs423x->freq)); cs423x->timer_latch = (int64_t)((double)TIMER_USEC * (1000000.0 / (double)cs423x->freq));
} }
void cs423x_update(cs423x_t *cs423x) void cs423x_update(cs423x_t *cs423x)
{ {
for (; cs423x->pos < sound_pos_global; cs423x->pos++) for (; cs423x->pos < sound_pos_global; cs423x->pos++)
{ {
cs423x->buffer[cs423x->pos*2] = cs423x->out_l; cs423x->buffer[cs423x->pos * 2] = cs423x->out_l;
cs423x->buffer[cs423x->pos*2 + 1] = cs423x->out_r; cs423x->buffer[cs423x->pos * 2 + 1] = cs423x->out_r;
} }
} }
static void cs423x_poll(void *p) static void cs423x_poll(void *p)
{ {
cs423x_t *cs423x = (cs423x_t *)p; cs423x_t *cs423x = (cs423x_t *)p;
if (cs423x->timer_latch) if (cs423x->timer_latch)
cs423x->timer_count += cs423x->timer_latch; cs423x->timer_count += cs423x->timer_latch;
else else
cs423x->timer_count = TIMER_USEC; cs423x->timer_count = TIMER_USEC;
cs423x_update(cs423x); cs423x_update(cs423x);
if (cs423x->enable) if (cs423x->enable)
{ {
int32_t temp; int32_t temp;
if(!(cs423x->mode2)) { if (!(cs423x->mode2)) {
switch (cs423x->regs[8] & 0x70) switch (cs423x->regs[8] & 0x70)
{ {
case 0x00: /*Mono, 8-bit PCM*/ case 0x00: /*Mono, 8-bit PCM*/
cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
break; break;
case 0x10: /*Stereo, 8-bit PCM*/ case 0x10: /*Stereo, 8-bit PCM*/
cs423x->out_l = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_l = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
break; break;
case 0x40: /*Mono, 16-bit PCM*/ case 0x40: /*Mono, 16-bit PCM*/
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp;
break; break;
case 0x50: /*Stereo, 16-bit PCM*/ case 0x50: /*Stereo, 16-bit PCM*/
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_l = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_l = (dma_channel_read(cs423x->dma) << 8) | temp;
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp;
break; break;
} }
} }
else { else {
switch (cs423x->regs[8] & 0xf0) switch (cs423x->regs[8] & 0xf0)
{ {
case 0x00: /*Mono, 8-bit PCM*/ case 0x00: /*Mono, 8-bit PCM*/
cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
break; break;
case 0x10: /*Stereo, 8-bit PCM*/ case 0x10: /*Stereo, 8-bit PCM*/
cs423x->out_l = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_l = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256; cs423x->out_r = (dma_channel_read(cs423x->dma) ^ 0x80) * 256;
break; break;
case 0x40: /*Mono, 16-bit PCM*/ case 0x40: /*Mono, 16-bit PCM*/
case 0xc0: /*Mono, 16-bit PCM Big-Endian should not happen on x86*/ case 0xc0: /*Mono, 16-bit PCM Big-Endian should not happen on x86*/
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_l = cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp;
break; break;
case 0x50: /*Stereo, 16-bit PCM*/ case 0x50: /*Stereo, 16-bit PCM*/
case 0xd0: /*Stereo, 16-bit PCM Big-Endian. Should not happen on x86*/ case 0xd0: /*Stereo, 16-bit PCM Big-Endian. Should not happen on x86*/
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_l = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_l = (dma_channel_read(cs423x->dma) << 8) | temp;
temp = dma_channel_read(cs423x->dma); temp = dma_channel_read(cs423x->dma);
cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp; cs423x->out_r = (dma_channel_read(cs423x->dma) << 8) | temp;
break; break;
case 0xa0: /*TODO Mono, ADPCM, 4-bit*/ case 0xa0: /*TODO Mono, ADPCM, 4-bit*/
case 0xb0: /*TODO Stereo, ADPCM, 4-bit*/ case 0xb0: /*TODO Stereo, ADPCM, 4-bit*/
break; break;
} }
} }
if (cs423x->regs[6] & 0x80) // Mute Left-Channel if (cs423x->regs[6] & 0x80) // Mute Left-Channel
cs423x->out_l = 0; cs423x->out_l = 0;
else else
cs423x->out_l = (cs423x->out_l * cs423x_vols[cs423x->regs[6] & 0x3f]) >> 16; cs423x->out_l = (cs423x->out_l * cs423x_vols[cs423x->regs[6] & 0x3f]) >> 16;
if (cs423x->regs[7] & 0x80) // Mute Right-Channel if (cs423x->regs[7] & 0x80) // Mute Right-Channel
cs423x->out_r = 0; cs423x->out_r = 0;
else else
cs423x->out_r = (cs423x->out_r * cs423x_vols[cs423x->regs[7] & 0x3f]) >> 16; cs423x->out_r = (cs423x->out_r * cs423x_vols[cs423x->regs[7] & 0x3f]) >> 16;
if (cs423x->regs[26] & 0x40) // Mono Output Mute if (cs423x->regs[26] & 0x40) // Mono Output Mute
cs423x->out_l = cs423x->out_r = 0; cs423x->out_l = cs423x->out_r = 0;
if (cs423x->count < 0) { if (cs423x->count < 0) {
cs423x->count = cs423x->regs[15] | (cs423x->regs[14] << 8); cs423x->count = cs423x->regs[15] | (cs423x->regs[14] << 8);
if (!(cs423x->status & 0x01)) { if (!(cs423x->status & 0x01)) {
cs423x->status |= 0x01; cs423x->status |= 0x01;
if (cs423x->regs[0xa] & 2) if (cs423x->regs[0xa] & 2)
picint(1 << cs423x->irq); picint(1 << cs423x->irq);
} }
} }
cs423x->count--; cs423x->count--;
} }
else { else {
cs423x->out_l = cs423x->out_r = 0; cs423x->out_l = cs423x->out_r = 0;
} }
} }
void cs423x_init(cs423x_t *cs423x) void cs423x_init(cs423x_t *cs423x)
{ {
int c; int c;
double attenuation; double attenuation;
cs423x->enable = 0; cs423x->enable = 0;
cs423x->status = 0xcc; cs423x->status = 0xcc;
cs423x->index = cs423x->trd = 0; cs423x->index = cs423x->trd = 0;
cs423x->mce = 0x40; cs423x->mce = 0x40;
cs423x->initb = 0; cs423x->initb = 0;
cs423x->mode2 = 0; cs423x->mode2 = 0;
cs423x->regs[0] = cs423x->regs[1] = 0; cs423x->regs[0] = cs423x->regs[1] = 0;
cs423x->regs[2] = cs423x->regs[3] = 0x88; cs423x->regs[2] = cs423x->regs[3] = 0x88;
cs423x->regs[4] = cs423x->regs[5] = 0x88; cs423x->regs[4] = cs423x->regs[5] = 0x88;
cs423x->regs[6] = cs423x->regs[7] = 0x80; cs423x->regs[6] = cs423x->regs[7] = 0x80;
cs423x->regs[8] = 0; cs423x->regs[8] = 0;
cs423x->regs[9] = 0x08; cs423x->regs[9] = 0x08;
cs423x->regs[10] = cs423x->regs[11] = 0; cs423x->regs[10] = cs423x->regs[11] = 0;
cs423x->regs[12] = 0x8a; cs423x->regs[12] = 0x8a;
cs423x->regs[13] = 0; cs423x->regs[13] = 0;
cs423x->regs[14] = cs423x->regs[15] = 0; cs423x->regs[14] = cs423x->regs[15] = 0;
cs423x->regs[16] = cs423x->regs[17] = 0; cs423x->regs[16] = cs423x->regs[17] = 0;
cs423x->regs[18] = cs423x->regs[19] = 0x88; cs423x->regs[18] = cs423x->regs[19] = 0x88;
cs423x->regs[22] = 0x80; cs423x->regs[22] = 0x80;
cs423x->regs[24] = 0; cs423x->regs[24] = 0;
cs423x->regs[25] = CS4231; //CS4231 for GUS MAX cs423x->regs[25] = CS4231; //CS4231 for GUS MAX
cs423x->regs[26] = 0x80; cs423x->regs[26] = 0x80;
cs423x->regs[29] = 0x80; cs423x->regs[29] = 0x80;
cs423x->out_l = 0; cs423x->out_l = 0;
cs423x->out_r = 0; cs423x->out_r = 0;
for (c = 0; c < 64; c++) // DAC and Loopback attenuation for (c = 0; c < 64; c++) // DAC and Loopback attenuation
{ {
attenuation = 0.0; attenuation = 0.0;
if (c & 0x01) attenuation -= 1.5; if (c & 0x01) attenuation -= 1.5;
if (c & 0x02) attenuation -= 3.0; if (c & 0x02) attenuation -= 3.0;
if (c & 0x04) attenuation -= 6.0; if (c & 0x04) attenuation -= 6.0;
if (c & 0x08) attenuation -= 12.0; if (c & 0x08) attenuation -= 12.0;
if (c & 0x10) attenuation -= 24.0; if (c & 0x10) attenuation -= 24.0;
if (c & 0x20) attenuation -= 48.0; if (c & 0x20) attenuation -= 48.0;
attenuation = pow(10, attenuation / 10); attenuation = pow(10, attenuation / 10);
cs423x_vols[c] = (int)(attenuation * 65536); cs423x_vols[c] = (int)(attenuation * 65536);
} }
timer_add(cs423x_poll, &cs423x->timer_count, &cs423x->enable, cs423x); timer_add(cs423x_poll, &cs423x->timer_count, &cs423x->enable, cs423x);
} }

32
src/devices/sound/snd_cs423x.h
View File

@@ -35,30 +35,30 @@
typedef struct cs423x_t typedef struct cs423x_t
{ {
int index; int index;
uint8_t regs[32]; uint8_t regs[32];
uint8_t status; uint8_t status;
int trd; int trd;
int mce; int mce;
int ia4; int ia4;
int mode2; int mode2;
int initb; int initb;
int count; int count;
int16_t out_l, out_r; int16_t out_l, out_r;
int64_t enable; int64_t enable;
int irq, dma; int irq, dma;
int64_t freq; int64_t freq;
int64_t timer_count, timer_latch; int64_t timer_count, timer_latch;
int16_t buffer[SOUNDBUFLEN * 2]; int16_t buffer[SOUNDBUFLEN * 2];
int pos; int pos;
} cs423x_t; } cs423x_t;
void cs423x_setirq(cs423x_t *cs423x, int irq); void cs423x_setirq(cs423x_t *cs423x, int irq);

1424
src/devices/sound/snd_gus.c
View File

File diff suppressed because it is too large Load Diff