OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio: remove Y8950 configuration

Browse Source 
Include file has never been on qemu and it has been undefined from the very beginning.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-3-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-26 00:37:15 +02:00 committed by Gerd Hoffmann
parent 68883a4078
commit b6c6919e21
3 changed files with 0 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/audio/Makefile.objs
View File

@ -14,5 +14,3 @@ common-obj-$(CONFIG_PL041) += pl041.o lm4549.o
common-obj-$(CONFIG_CS4231) += cs4231.o common-obj-$(CONFIG_CS4231) += cs4231.o
common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o common-obj-$(CONFIG_MARVELL_88W8618) += marvell_88w8618.o
common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o common-obj-$(CONFIG_MILKYMIST) += milkymist-ac97.o
$(obj)/adlib.o $(obj)/fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0

146
hw/audio/fmopl.c
View File

@ -812,57 +812,6 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
} }
} }
return; return;
#if BUILD_Y8950
case 0x06: /* Key Board OUT */
if(OPL->type&OPL_TYPE_KEYBOARD)
{
if(OPL->keyboardhandler_w)
OPL->keyboardhandler_w(OPL->keyboard_param,v);
else
LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
}
return;
case 0x07: /* DELTA-T control : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
if(OPL->type&OPL_TYPE_ADPCM)
YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
return;
case 0x08: /* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
OPL->mode = v;
v&=0x1f; /* for DELTA-T unit */
case 0x09: /* START ADD */
case 0x0a:
case 0x0b: /* STOP ADD */
case 0x0c:
case 0x0d: /* PRESCALE */
case 0x0e:
case 0x0f: /* ADPCM data */
case 0x10: /* DELTA-N */
case 0x11: /* DELTA-N */
case 0x12: /* EG-CTRL */
if(OPL->type&OPL_TYPE_ADPCM)
YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
return;
#if 0
case 0x15: /* DAC data */
case 0x16:
case 0x17: /* SHIFT */
return;
case 0x18: /* I/O CTRL (Direction) */
if(OPL->type&OPL_TYPE_IO)
OPL->portDirection = v&0x0f;
return;
case 0x19: /* I/O DATA */
if(OPL->type&OPL_TYPE_IO)
{
OPL->portLatch = v;
if(OPL->porthandler_w)
OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
}
return;
case 0x1a: /* PCM data */
return;
#endif
#endif
} }
break; break;
case 0x20: /* am,vib,ksr,eg type,mul */ case 0x20: /* am,vib,ksr,eg type,mul */
@ -1097,68 +1046,6 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
} }
#endif /* (BUILD_YM3812 || BUILD_YM3526) */ #endif /* (BUILD_YM3812 || BUILD_YM3526) */
#if BUILD_Y8950
void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
{
int i;
int data;
OPLSAMPLE *buf = buffer;
UINT32 amsCnt = OPL->amsCnt;
UINT32 vibCnt = OPL->vibCnt;
UINT8 rhythm = OPL->rhythm&0x20;
OPL_CH *CH,*R_CH;
YM_DELTAT *DELTAT = OPL->deltat;
/* setup DELTA-T unit */
YM_DELTAT_DECODE_PRESET(DELTAT);
if( (void *)OPL != cur_chip ){
cur_chip = (void *)OPL;
/* channel pointers */
S_CH = OPL->P_CH;
E_CH = &S_CH[9];
/* rhythm slot */
SLOT7_1 = &S_CH[7].SLOT[SLOT1];
SLOT7_2 = &S_CH[7].SLOT[SLOT2];
SLOT8_1 = &S_CH[8].SLOT[SLOT1];
SLOT8_2 = &S_CH[8].SLOT[SLOT2];
/* LFO state */
amsIncr = OPL->amsIncr;
vibIncr = OPL->vibIncr;
ams_table = OPL->ams_table;
vib_table = OPL->vib_table;
}
R_CH = rhythm ? &S_CH[6] : E_CH;
for( i=0; i < length ; i++ )
{
/* channel A channel B channel C */
/* LFO */
ams = ams_table[(amsCnt+=amsIncr)>>AMS_SHIFT];
vib = vib_table[(vibCnt+=vibIncr)>>VIB_SHIFT];
outd[0] = 0;
/* deltaT ADPCM */
if( DELTAT->portstate )
YM_DELTAT_ADPCM_CALC(DELTAT);
/* FM part */
for(CH=S_CH ; CH < R_CH ; CH++)
OPL_CALC_CH(CH);
/* Rythn part */
if(rhythm)
OPL_CALC_RH(S_CH);
/* limit check */
data = Limit( outd[0] , OPL_MAXOUT, OPL_MINOUT );
/* store to sound buffer */
buf[i] = data >> OPL_OUTSB;
}
OPL->amsCnt = amsCnt;
OPL->vibCnt = vibCnt;
/* deltaT START flag */
if( !DELTAT->portstate )
OPL->status &= 0xfe;
}
#endif
/* ---------- reset one of chip ---------- */ /* ---------- reset one of chip ---------- */
void OPLResetChip(FM_OPL *OPL) void OPLResetChip(FM_OPL *OPL)
{ {
@ -1189,18 +1076,6 @@ void OPLResetChip(FM_OPL *OPL)
CH->SLOT[s].evs = 0; CH->SLOT[s].evs = 0;
} }
} }
#if BUILD_Y8950
if(OPL->type&OPL_TYPE_ADPCM)
{
YM_DELTAT *DELTAT = OPL->deltat;
DELTAT->freqbase = OPL->freqbase;
DELTAT->output_pointer = outd;
DELTAT->portshift = 5;
DELTAT->output_range = DELTAT_MIXING_LEVEL<<TL_BITS;
YM_DELTAT_ADPCM_Reset(DELTAT,0);
}
#endif
} }
/* ---------- Create one of vietual YM3812 ---------- */ /* ---------- Create one of vietual YM3812 ---------- */
@ -1216,9 +1091,6 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
/* allocate OPL state space */ /* allocate OPL state space */
state_size = sizeof(FM_OPL); state_size = sizeof(FM_OPL);
state_size += sizeof(OPL_CH)*max_ch; state_size += sizeof(OPL_CH)*max_ch;
#if BUILD_Y8950
if(type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
#endif
/* allocate memory block */ /* allocate memory block */
ptr = malloc(state_size); ptr = malloc(state_size);
if(ptr==NULL) return NULL; if(ptr==NULL) return NULL;
@ -1226,9 +1098,6 @@ FM_OPL *OPLCreate(int type, int clock, int rate)
memset(ptr,0,state_size); memset(ptr,0,state_size);
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;
#if BUILD_Y8950
if(type&OPL_TYPE_ADPCM) OPL->deltat = (YM_DELTAT *)ptr; ptr+=sizeof(YM_DELTAT);
#endif
/* set channel state pointer */ /* set channel state pointer */
OPL->type = type; OPL->type = type;
OPL->clock = clock; OPL->clock = clock;
@ -1290,21 +1159,6 @@ void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param)
OPL->UpdateHandler = UpdateHandler; OPL->UpdateHandler = UpdateHandler;
OPL->UpdateParam = param; OPL->UpdateParam = param;
} }
#if BUILD_Y8950
void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param)
{
OPL->porthandler_w = PortHandler_w;
OPL->porthandler_r = PortHandler_r;
OPL->port_param = param;
}
void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param)
{
OPL->keyboardhandler_w = KeyboardHandler_w;
OPL->keyboardhandler_r = KeyboardHandler_r;
OPL->keyboard_param = param;
}
#endif
/* ---------- YM3812 I/O interface ---------- */ /* ---------- YM3812 I/O interface ---------- */
int OPLWrite(FM_OPL *OPL,int a,int v) int OPLWrite(FM_OPL *OPL,int a,int v)
{ {

20
hw/audio/fmopl.h
View File

@ -4,7 +4,6 @@
/* --- select emulation chips --- */ /* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812) #define BUILD_YM3812 (HAS_YM3812)
//#define BUILD_YM3526 (HAS_YM3526) //#define BUILD_YM3526 (HAS_YM3526)
//#define BUILD_Y8950 (HAS_Y8950)
/* --- system optimize --- */ /* --- system optimize --- */
/* select bit size of output : 8 or 16 */ /* select bit size of output : 8 or 16 */
@ -28,11 +27,6 @@ typedef INT16 OPLSAMPLE;
typedef unsigned char OPLSAMPLE; typedef unsigned char OPLSAMPLE;
#endif #endif
#if BUILD_Y8950
#include "ymdeltat.h"
#endif
typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec);
typedef void (*OPL_IRQHANDLER)(int param,int irq); typedef void (*OPL_IRQHANDLER)(int param,int irq);
typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us); typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);
@ -112,13 +106,6 @@ typedef struct fm_opl_f {
int max_ch; /* maximum channel */ int max_ch; /* maximum channel */
/* Rhythm sention */ /* Rhythm sention */
UINT8 rhythm; /* Rhythm mode , key flag */ UINT8 rhythm; /* Rhythm mode , key flag */
#if BUILD_Y8950
/* Delta-T ADPCM unit (Y8950) */
YM_DELTAT *deltat; /* DELTA-T ADPCM */
#endif
/* Keyboard / I/O interface unit (Y8950) */
UINT8 portDirection;
UINT8 portLatch;
OPL_PORTHANDLER_R porthandler_r; OPL_PORTHANDLER_R porthandler_r;
OPL_PORTHANDLER_W porthandler_w; OPL_PORTHANDLER_W porthandler_w;
int port_param; int port_param;
@ -150,16 +137,12 @@ typedef struct fm_opl_f {
/* ---------- Generic interface section ---------- */ /* ---------- Generic interface section ---------- */
#define OPL_TYPE_YM3526 (0) #define OPL_TYPE_YM3526 (0)
#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL) #define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
FM_OPL *OPLCreate(int type, 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);
void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param); void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param);
/* Y8950 port handlers */
void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param);
void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param);
void OPLResetChip(FM_OPL *OPL); void OPLResetChip(FM_OPL *OPL);
int OPLWrite(FM_OPL *OPL,int a,int v); int OPLWrite(FM_OPL *OPL,int a,int v);
@ -168,7 +151,4 @@ int OPLTimerOver(FM_OPL *OPL,int c);
/* YM3626/YM3812 local section */ /* YM3626/YM3812 local section */
void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length);
void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length);
#endif #endif