vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: Remove type field 

It was not used anymore as now there is only one type of devices.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-14-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
master
Juan Quintela 2017-04-26 00:37:26 +02:00 committed by Gerd Hoffmann
parent 7852b53acc
commit 8f7e2c2cb7
3 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/audio/adlib.c
View File

@ -265,7 +265,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
} }
glob_adlib = s; glob_adlib = s;
s->opl = OPLCreate (OPL_TYPE_YM3812, 3579545, s->freq); s->opl = OPLCreate (3579545, s->freq);
if (!s->opl) { if (!s->opl) {
error_setg (errp, "OPLCreate %d failed", s->freq); error_setg (errp, "OPLCreate %d failed", s->freq);
return; return;

6
hw/audio/fmopl.c
View File

@ -761,8 +761,6 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
{ {
case 0x01: case 0x01:
/* wave selector enable */ /* wave selector enable */
if(OPL->type&OPL_TYPE_WAVESEL)
{
OPL->wavesel = v&0x20; OPL->wavesel = v&0x20;
if(!OPL->wavesel) if(!OPL->wavesel)
{ {
@ -774,7 +772,6 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0]; OPL->P_CH[c].SLOT[SLOT2].wavetable = &SIN_TABLE[0];
} }
} }
}
return; return;
case 0x02: /* Timer 1 */ case 0x02: /* Timer 1 */
OPL->T[0] = (256-v)*4; OPL->T[0] = (256-v)*4;
@ -1076,7 +1073,7 @@ void OPLResetChip(FM_OPL *OPL)
/* ---------- Create one of vietual YM3812 ---------- */ /* ---------- Create one of vietual YM3812 ---------- */
/* 'rate' is sampling rate and 'bufsiz' is the size of the */ /* 'rate' is sampling rate and 'bufsiz' is the size of the */
FM_OPL *OPLCreate(int type, int clock, int rate) FM_OPL *OPLCreate(int clock, int rate)
{ {
char *ptr; char *ptr;
FM_OPL *OPL; FM_OPL *OPL;
@ -1095,7 +1092,6 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
OPL = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL); OPL = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL);
OPL->P_CH = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch; OPL->P_CH = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch;
/* set channel state pointer */ /* set channel state pointer */
OPL->type = type;
OPL->clock = clock; OPL->clock = clock;
OPL->rate = rate; OPL->rate = rate;
OPL->max_ch = max_ch; OPL->max_ch = max_ch;

7
hw/audio/fmopl.h
View File

@ -11,8 +11,6 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param);
/* !!!!! here is private section , do not access there member direct !!!!! */ /* !!!!! here is private section , do not access there member direct !!!!! */
#define OPL_TYPE_WAVESEL 0x01 /* waveform select */
/* Saving is necessary for member of the 'R' mark for suspend/resume */ /* Saving is necessary for member of the 'R' mark for suspend/resume */
/* ---------- OPL one of slot ---------- */ /* ---------- OPL one of slot ---------- */
typedef struct fm_opl_slot { typedef struct fm_opl_slot {
@ -62,7 +60,6 @@ typedef struct fm_opl_channel {
/* OPL state */ /* OPL state */
typedef struct fm_opl_f { typedef struct fm_opl_f {
uint8_t type; /* chip type */
int clock; /* master clock (Hz) */ int clock; /* master clock (Hz) */
int rate; /* sampling rate (Hz) */ int rate; /* sampling rate (Hz) */
double freqbase; /* frequency base */ double freqbase; /* frequency base */
@ -108,9 +105,7 @@ typedef struct fm_opl_f {
} FM_OPL; } FM_OPL;
/* ---------- Generic interface section ---------- */ /* ---------- Generic interface section ---------- */
#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL) FM_OPL *OPLCreate(int clock, int rate);
FM_OPL *OPLCreate(int type, int clock, int rate);
void OPLDestroy(FM_OPL *OPL); void OPLDestroy(FM_OPL *OPL);
void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset); void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset);
void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param); void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param);