diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-26 00:37:17 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2017-05-04 09:16:03 +0200 |
| commit | 882ab9d615e438b1298cda90193f81624dbbd632 (patch) | |
| tree | 72d45ca156c78edd7a32beb9754865c789eac67f /hw/audio | |
| parent | 2004429e9bf458b6415df497c19847cb4d27844c (diff) | |
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>
Diffstat (limited to 'hw/audio')
| -rw-r--r-- | hw/audio/fmopl.c | 4 | ||||
| -rw-r--r-- | hw/audio/fmopl.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 1e05efca8a..282662a858 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -30,8 +30,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#define HAS_YM3812 1 - #include "qemu/osdep.h" #include <math.h> //#include "driver.h" /* use M.A.M.E. */ @@ -981,7 +979,6 @@ static void OPL_UnLockTable(void) OPLCloseTable(); } -#if BUILD_YM3812 /*******************************************************************************/ /* YM3812 local section */ /*******************************************************************************/ @@ -1044,7 +1041,6 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length) } #endif } -#endif /* BUILD_YM3812 */ /* ---------- reset one of chip ---------- */ void OPLResetChip(FM_OPL *OPL) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index b254968b6a..e476497275 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -1,9 +1,6 @@ #ifndef FMOPL_H #define FMOPL_H -/* --- select emulation chips --- */ -#define BUILD_YM3812 (HAS_YM3812) - /* --- system optimize --- */ /* select bit size of output : 8 or 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); int OPLTimerOver(FM_OPL *OPL,int c); -/* YM3626/YM3812 local section */ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length); #endif |