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

Clean up formatting on the AD1848 and WSS code

Browse Source
This commit is contained in:
RichardG867
2021-05-20 23:17:07 -03:00
parent 7461108f38
commit ef4c900b8f
3 changed files with 520 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/include/86box/snd_ad1848.h
View File

@@ -1,10 +1,29 @@
/*
* 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* Definitions for AD1848 / CS4248 / CS4231 (Windows Sound System) codec emulation.
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* TheCollector1995, <mariogplayer@gmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2018-2020 TheCollector1995.
*/
#define AD1848_TYPE_DEFAULT 0 #define AD1848_TYPE_DEFAULT 0
#define AD1848_TYPE_CS4248 1 #define AD1848_TYPE_CS4248 1
#define AD1848_TYPE_CS4231 2 #define AD1848_TYPE_CS4231 2
#define AD1848_TYPE_CS4236 3 #define AD1848_TYPE_CS4236 3
typedef struct ad1848_t
{ typedef struct {
int index; int index;
uint8_t regs[32]; /* 16 original + 16 CS4231A extensions */ uint8_t regs[32]; /* 16 original + 16 CS4231A extensions */
uint8_t status; uint8_t status;
@@ -33,13 +52,14 @@ typedef struct ad1848_t
int type; int type;
} ad1848_t; } ad1848_t;
void ad1848_setirq(ad1848_t *ad1848, int irq);
void ad1848_setdma(ad1848_t *ad1848, int dma);
uint8_t ad1848_read(uint16_t addr, void *p); extern void ad1848_setirq(ad1848_t *ad1848, int irq);
void ad1848_write(uint16_t addr, uint8_t val, void *p); extern void ad1848_setdma(ad1848_t *ad1848, int dma);
void ad1848_update(ad1848_t *ad1848); extern uint8_t ad1848_read(uint16_t addr, void *p);
void ad1848_speed_changed(ad1848_t *ad1848); extern void ad1848_write(uint16_t addr, uint8_t val, void *p);
void ad1848_init(ad1848_t *ad1848, int type); extern void ad1848_update(ad1848_t *ad1848);
extern void ad1848_speed_changed(ad1848_t *ad1848);
extern void ad1848_init(ad1848_t *ad1848, int type);

112
src/sound/snd_ad1848.c
View File

@@ -1,6 +1,21 @@
/* /*
AD1848 / CS4248 / CS4231 CODEC emulation (Windows Sound System compatible)*/ * 86Box A hypervisor and IBM PC system emulator that specializes in
* running old operating systems and software designed for IBM
* PC systems and compatibles from 1981 through fairly recent
* system designs based on the PCI bus.
*
* This file is part of the 86Box distribution.
*
* AD1848 / CS4248 / CS4231 (Windows Sound System) codec emulation.
*
*
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* TheCollector1995, <mariogplayer@gmail.com>
*
* Copyright 2008-2020 Sarah Walker.
* Copyright 2018-2020 TheCollector1995.
*/
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@@ -13,52 +28,63 @@
#include <86box/sound.h> #include <86box/sound.h>
#include <86box/snd_ad1848.h> #include <86box/snd_ad1848.h>
#define CS4231 0x80 #define CS4231 0x80
#define CS4236 0x03 #define CS4236 0x03
static int ad1848_vols_6bits[64]; static int ad1848_vols_6bits[64];
static double ad1848_vols_5bits_aux_gain[32]; static double ad1848_vols_5bits_aux_gain[32];
void ad1848_setirq(ad1848_t *ad1848, int irq) void
ad1848_setirq(ad1848_t *ad1848, int irq)
{ {
ad1848->irq = irq; ad1848->irq = irq;
} }
void ad1848_setdma(ad1848_t *ad1848, int dma)
void
ad1848_setdma(ad1848_t *ad1848, int dma)
{ {
ad1848->dma = dma; ad1848->dma = dma;
} }
uint8_t ad1848_read(uint16_t addr, void *p)
{ uint8_t
ad1848_t *ad1848 = (ad1848_t *)p; ad1848_read(uint16_t addr, void *priv)
uint8_t temp = 0xff;
switch (addr & 3)
{ {
ad1848_t *ad1848 = (ad1848_t *) priv;
uint8_t ret = 0xff;
switch (addr & 3) {
case 0: /*Index*/ case 0: /*Index*/
temp = ad1848->index | ad1848->trd | ad1848->mce; ret = ad1848->index | ad1848->trd | ad1848->mce;
break; break;
case 1: case 1:
temp = ad1848->regs[ad1848->index]; ret = ad1848->regs[ad1848->index];
if (ad1848->index == 0x0b) { if (ad1848->index == 0x0b) {
temp ^= 0x20; ret ^= 0x20;
ad1848->regs[ad1848->index] = temp; ad1848->regs[ad1848->index] = ret;
} }
break; break;
case 2: case 2:
temp = ad1848->status; ret = ad1848->status;
break; break;
} }
return temp;
}
void ad1848_write(uint16_t addr, uint8_t val, void *p) return ret;
}
void
ad1848_write(uint16_t addr, uint8_t val, void *priv)
{ {
ad1848_t *ad1848 = (ad1848_t *)p; ad1848_t *ad1848 = (ad1848_t *) priv;
double freq; double freq;
switch (addr & 3) switch (addr & 3) {
{
case 0: /* Index */ case 0: /* Index */
if ((ad1848->regs[12] & 0x40) && (ad1848->type >= AD1848_TYPE_CS4231)) if ((ad1848->regs[12] & 0x40) && (ad1848->type >= AD1848_TYPE_CS4231))
ad1848->index = val & 0x1f; /* cs4231a extended mode enabled */ ad1848->index = val & 0x1f; /* cs4231a extended mode enabled */
@@ -67,13 +93,12 @@ void ad1848_write(uint16_t addr, uint8_t val, void *p)
ad1848->trd = val & 0x20; ad1848->trd = val & 0x20;
ad1848->mce = val & 0x40; ad1848->mce = val & 0x40;
break; break;
case 1: case 1:
switch (ad1848->index) switch (ad1848->index) {
{
case 8: case 8:
freq = (val & 1) ? 16934400LL : 24576000LL; freq = (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;
@@ -101,7 +126,6 @@ void ad1848_write(uint16_t addr, uint8_t val, void *p)
} }
break; break;
case 11: case 11:
break; break;
@@ -135,29 +159,35 @@ void ad1848_write(uint16_t addr, uint8_t val, void *p)
ad1848->cd_vol_r = ad1848_vols_5bits_aux_gain[ad1848->regs[0x13] & 0x1f]; ad1848->cd_vol_r = ad1848_vols_5bits_aux_gain[ad1848->regs[0x13] & 0x1f];
} }
break; break;
case 2: case 2:
ad1848->status &= 0xfe; ad1848->status &= 0xfe;
break; break;
} }
} }
void ad1848_speed_changed(ad1848_t *ad1848)
void
ad1848_speed_changed(ad1848_t *ad1848)
{ {
ad1848->timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) ad1848->freq)); ad1848->timer_latch = (uint64_t) ((double) TIMER_USEC * (1000000.0 / (double) ad1848->freq));
} }
void ad1848_update(ad1848_t *ad1848)
{ void
for (; ad1848->pos < sound_pos_global; ad1848->pos++) ad1848_update(ad1848_t *ad1848)
{ {
for (; ad1848->pos < sound_pos_global; ad1848->pos++) {
ad1848->buffer[ad1848->pos*2] = ad1848->out_l; ad1848->buffer[ad1848->pos*2] = ad1848->out_l;
ad1848->buffer[ad1848->pos*2 + 1] = ad1848->out_r; ad1848->buffer[ad1848->pos*2 + 1] = ad1848->out_r;
} }
} }
static void ad1848_poll(void *p)
static void
ad1848_poll(void *priv)
{ {
ad1848_t *ad1848 = (ad1848_t *)p; ad1848_t *ad1848 = (ad1848_t *) priv;
if (ad1848->timer_latch) if (ad1848->timer_latch)
timer_advance_u64(&ad1848->timer_count, ad1848->timer_latch); timer_advance_u64(&ad1848->timer_count, ad1848->timer_latch);
@@ -166,12 +196,10 @@ static void ad1848_poll(void *p)
ad1848_update(ad1848); ad1848_update(ad1848);
if (ad1848->enable) if (ad1848->enable) {
{
int32_t temp; int32_t temp;
switch (ad1848->regs[8] & 0x70) switch (ad1848->regs[8] & 0x70) {
{
case 0x00: /*Mono, 8-bit PCM*/ case 0x00: /*Mono, 8-bit PCM*/
ad1848->out_l = ad1848->out_r = (dma_channel_read(ad1848->dma) ^ 0x80) * 256; ad1848->out_l = ad1848->out_r = (dma_channel_read(ad1848->dma) ^ 0x80) * 256;
break; break;
@@ -214,17 +242,17 @@ static void ad1848_poll(void *p)
} }
ad1848->count--; ad1848->count--;
} } else {
else
{
ad1848->out_l = ad1848->out_r = 0; ad1848->out_l = ad1848->out_r = 0;
ad1848->cd_vol_l = ad1848->cd_vol_r = 0; ad1848->cd_vol_l = ad1848->cd_vol_r = 0;
} }
} }
static void ad1848_filter_cd_audio(int channel, double *buffer, void *p)
static void
ad1848_filter_cd_audio(int channel, double *buffer, void *priv)
{ {
ad1848_t *ad1848 = (ad1848_t *)p; ad1848_t *ad1848 = (ad1848_t *) priv;
double c; double c;
double volume = channel ? ad1848->cd_vol_r : ad1848->cd_vol_l; double volume = channel ? ad1848->cd_vol_r : ad1848->cd_vol_l;
@@ -232,7 +260,9 @@ static void ad1848_filter_cd_audio(int channel, double *buffer, void *p)
*buffer = c; *buffer = c;
} }
void ad1848_init(ad1848_t *ad1848, int type)
void
ad1848_init(ad1848_t *ad1848, int type)
{ {
int c; int c;
double attenuation; double attenuation;

98
src/sound/snd_wss.c
View File

@@ -34,22 +34,23 @@
#include <86box/snd_opl.h> #include <86box/snd_opl.h>
/*530, 11, 3 - 530=23*/ /* 530, 11, 3 - 530=23
/*530, 11, 1 - 530=22*/ * 530, 11, 1 - 530=22
/*530, 11, 0 - 530=21*/ * 530, 11, 0 - 530=21
/*530, 10, 1 - 530=1a*/ * 530, 10, 1 - 530=1a
/*530, 9, 1 - 530=12*/ * 530, 9, 1 - 530=12
/*530, 7, 1 - 530=0a*/ * 530, 7, 1 - 530=0a
/*604, 11, 1 - 530=22*/ * 604, 11, 1 - 530=22
/*e80, 11, 1 - 530=22*/ * e80, 11, 1 - 530=22
/*f40, 11, 1 - 530=22*/ * f40, 11, 1 - 530=22
*/
static int wss_dma[4] = {0, 0, 1, 3}; static const int wss_dma[4] = {0, 0, 1, 3};
static int wss_irq[8] = {5, 7, 9, 10, 11, 12, 14, 15}; /*W95 only uses 7-9, others may be wrong*/ static const int wss_irq[8] = {5, 7, 9, 10, 11, 12, 14, 15}; /* W95 only uses 7-9, others may be wrong */
typedef struct wss_t
{ typedef struct wss_t {
uint8_t config; uint8_t config;
ad1848_t ad1848; ad1848_t ad1848;
@@ -59,26 +60,29 @@ typedef struct wss_t
uint8_t pos_regs[8]; uint8_t pos_regs[8];
} wss_t; } wss_t;
uint8_t wss_read(uint16_t addr, void *p)
{ uint8_t
wss_t *wss = (wss_t *)p; wss_read(uint16_t addr, void *priv) {
uint8_t temp; wss_t *wss = (wss_t *) priv;
temp = 4 | (wss->config & 0x40); return 4 | (wss->config & 0x40);
return temp;
} }
void wss_write(uint16_t addr, uint8_t val, void *p)
void
wss_write(uint16_t addr, uint8_t val, void *priv)
{ {
wss_t *wss = (wss_t *)p; wss_t *wss = (wss_t *) priv;
wss->config = val; wss->config = val;
ad1848_setdma(&wss->ad1848, wss_dma[val & 3]); ad1848_setdma(&wss->ad1848, wss_dma[val & 3]);
ad1848_setirq(&wss->ad1848, wss_irq[(val >> 3) & 7]); ad1848_setirq(&wss->ad1848, wss_irq[(val >> 3) & 7]);
} }
static void wss_get_buffer(int32_t *buffer, int len, void *p)
static void
wss_get_buffer(int32_t *buffer, int len, void *priv)
{ {
wss_t *wss = (wss_t *)p; wss_t *wss = (wss_t *) priv;
int c; int c;
opl3_update(&wss->opl); opl3_update(&wss->opl);
@@ -92,7 +96,9 @@ static void wss_get_buffer(int32_t *buffer, int len, void *p)
wss->ad1848.pos = 0; wss->ad1848.pos = 0;
} }
void *wss_init(const device_t *info)
void *
wss_init(const device_t *info)
{ {
wss_t *wss = malloc(sizeof(wss_t)); wss_t *wss = malloc(sizeof(wss_t));
memset(wss, 0, sizeof(wss_t)); memset(wss, 0, sizeof(wss_t));
@@ -119,16 +125,19 @@ void *wss_init(const device_t *info)
return wss; return wss;
} }
static uint8_t ncr_audio_mca_read(int port, void *p)
{
wss_t *wss = (wss_t *)p;
static uint8_t
ncr_audio_mca_read(int port, void *priv)
{
wss_t *wss = (wss_t *) priv;
return wss->pos_regs[port & 7]; return wss->pos_regs[port & 7];
} }
static void ncr_audio_mca_write(int port, uint8_t val, void *p)
static void
ncr_audio_mca_write(int port, uint8_t val, void *priv)
{ {
wss_t *wss = (wss_t *)p; wss_t *wss = (wss_t *) priv;
uint16_t ports[4] = {0x530, 0xE80, 0xF40, 0x604}; uint16_t ports[4] = {0x530, 0xE80, 0xF40, 0x604};
uint16_t addr; uint16_t addr;
@@ -155,17 +164,19 @@ static void ncr_audio_mca_write(int port, uint8_t val, void *p)
} }
} }
static uint8_t ncr_audio_mca_feedb(void *p)
{
wss_t *wss = (wss_t *)p;
static uint8_t
ncr_audio_mca_feedb(void *priv)
{
wss_t *wss = (wss_t *) priv;
return (wss->pos_regs[2] & 1); return (wss->pos_regs[2] & 1);
} }
void *ncr_audio_init(const device_t *info)
void *
ncr_audio_init(const device_t *info)
{ {
wss_t *wss = malloc(sizeof(wss_t)); wss_t *wss = malloc(sizeof(wss_t));
memset(wss, 0, sizeof(wss_t)); memset(wss, 0, sizeof(wss_t));
opl3_init(&wss->opl); opl3_init(&wss->opl);
@@ -183,22 +194,24 @@ void *ncr_audio_init(const device_t *info)
return wss; return wss;
} }
void wss_close(void *p)
{
wss_t *wss = (wss_t *)p;
void
wss_close(void *priv)
{
wss_t *wss = (wss_t *) priv;
free(wss); free(wss);
} }
void wss_speed_changed(void *p)
{
wss_t *wss = (wss_t *)p;
void
wss_speed_changed(void *priv)
{
wss_t *wss = (wss_t *) priv;
ad1848_speed_changed(&wss->ad1848); ad1848_speed_changed(&wss->ad1848);
} }
static const device_config_t wss_config[] =
{ static const device_config_t wss_config[] = {
{ {
"base", "Address", CONFIG_HEX16, "", 0x530, "", { 0 }, "base", "Address", CONFIG_HEX16, "", 0x530, "", { 0 },
{ {
@@ -227,6 +240,7 @@ static const device_config_t wss_config[] =
} }
}; };
const device_t wss_device = const device_t wss_device =
{ {
"Windows Sound System", "Windows Sound System",