aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2017-04-26 00:37:16 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-05-04 09:16:03 +0200
commit2004429e9bf458b6415df497c19847cb4d27844c (patch)
tree5d7494246467dba8d771f18e855db18e2d4c4f30
parentb6c6919e21ec856bc8f28836ab372644d44f884e (diff)
audio: Remove YM3526 support
It was never compiled in. Signed-off-by: Juan Quintela <quintela@redhat.com> Message-id: 20170425223739.6703-4-quintela@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/audio/fmopl.c4
-rw-r--r--hw/audio/fmopl.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 29f6d3c5a4..1e05efca8a 100644
--- a/hw/audio/fmopl.c
+++ b/hw/audio/fmopl.c
@@ -981,7 +981,7 @@ static void OPL_UnLockTable(void)
OPLCloseTable();
}
-#if (BUILD_YM3812 || BUILD_YM3526)
+#if BUILD_YM3812
/*******************************************************************************/
/* YM3812 local section */
/*******************************************************************************/
@@ -1044,7 +1044,7 @@ void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
}
#endif
}
-#endif /* (BUILD_YM3812 || BUILD_YM3526) */
+#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 96d958ac72..b254968b6a 100644
--- a/hw/audio/fmopl.h
+++ b/hw/audio/fmopl.h
@@ -3,7 +3,6 @@
/* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812)
-//#define BUILD_YM3526 (HAS_YM3526)
/* --- system optimize --- */
/* select bit size of output : 8 or 16 */
@@ -135,7 +134,6 @@ typedef struct fm_opl_f {
} FM_OPL;
/* ---------- Generic interface section ---------- */
-#define OPL_TYPE_YM3526 (0)
#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
FM_OPL *OPLCreate(int type, int clock, int rate);