Commit 8f7e2c2c authored by Juan Quintela's avatar Juan Quintela Committed by Gerd Hoffmann
Browse files

audio: Remove type field 



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

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-14-quintela@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 7852b53a

hw/audio/adlib.c

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) 
    }

    glob_adlib = s;



    s->opl = OPLCreate (OPL_TYPE_YM3812, 3579545, s->freq);

    s->opl = OPLCreate (3579545, s->freq);

    if (!s->opl) {

        error_setg (errp, "OPLCreate %d failed", s->freq);

        return;

hw/audio/fmopl.c

+8 −12
Original line number Diff line number Diff line
@@ -761,8 +761,6 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) 
		{

		case 0x01:

			/* wave selector enable */

			if(OPL->type&OPL_TYPE_WAVESEL)

			{

			OPL->wavesel = v&0x20;

                        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];

				}

			}

			}

			return;

		case 0x02:	/* Timer 1 */

			OPL->T[0] = (256-v)*4;
@@ -1076,7 +1073,7 @@ void OPLResetChip(FM_OPL *OPL) 


/* ----------  Create one of vietual YM3812 ----------       */

/* '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;

	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->P_CH  = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch;

	/* set channel state pointer */

	OPL->type  = type;

	OPL->clock = clock;

	OPL->rate  = rate;

	OPL->max_ch = max_ch;

hw/audio/fmopl.h

+1 −6
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param); 


/* !!!!! 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 */

/* ---------- OPL one of slot  ---------- */

typedef struct fm_opl_slot {
@@ -62,7 +60,6 @@ typedef struct fm_opl_channel { 


/* OPL state */

typedef struct fm_opl_f {

	uint8_t type;			/* chip type                         */

	int clock;			/* master clock  (Hz)                */

	int rate;			/* sampling rate (Hz)                */

	double freqbase;	/* frequency base                    */
@@ -108,9 +105,7 @@ typedef struct fm_opl_f { 
} FM_OPL;



/* ---------- Generic interface section ---------- */

#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)



FM_OPL *OPLCreate(int type, int clock, int rate);

FM_OPL *OPLCreate(int clock, int rate);

void OPLDestroy(FM_OPL *OPL);

void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset);

void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param);