ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: YM3812 was always defined 

So, remove the ifdefs.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-5-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-26 00:37:17 +02:00 committed by Gerd Hoffmann
parent 2004429e9b
commit 882ab9d615
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/audio/fmopl.c
View File

@ -30,8 +30,6 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#define HAS_YM3812 1
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <math.h> #include <math.h>
//#include "driver.h" /* use M.A.M.E. */ //#include "driver.h" /* use M.A.M.E. */
@ -981,7 +979,6 @@ static void OPL_UnLockTable(void)
OPLCloseTable(); OPLCloseTable();
} }
#if BUILD_YM3812
/*******************************************************************************/ /*******************************************************************************/
/* YM3812 local section */ /* YM3812 local section */
/*******************************************************************************/ /*******************************************************************************/
@ -1044,7 +1041,6 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
} }
#endif #endif
} }
#endif /* BUILD_YM3812 */
/* ---------- reset one of chip ---------- */ /* ---------- reset one of chip ---------- */
void OPLResetChip(FM_OPL *OPL) void OPLResetChip(FM_OPL *OPL)

4
hw/audio/fmopl.h
View File

@ -1,9 +1,6 @@
#ifndef FMOPL_H #ifndef FMOPL_H
#define FMOPL_H #define FMOPL_H
/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)
/* --- system optimize --- */ /* --- system optimize --- */
/* select bit size of output : 8 or 16 */ /* select bit size of output : 8 or 16 */
#define OPL_OUTPUT_BIT 16 #define OPL_OUTPUT_BIT 16
@ -147,6 +144,5 @@ int OPLWrite(FM_OPL *OPL,int a,int v);
unsigned char OPLRead(FM_OPL *OPL,int a); unsigned char OPLRead(FM_OPL *OPL,int a);
int OPLTimerOver(FM_OPL *OPL,int c); int OPLTimerOver(FM_OPL *OPL,int c);
/* YM3626/YM3812 local section */
void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length);
#endif #endif