[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/26] audio: YM3812 was always defined
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 04/26] audio: YM3812 was always defined |
Date: |
Wed, 26 Apr 2017 00:37:17 +0200 |
So, remove the ifdefs.
Signed-off-by: Juan Quintela <address@hidden>
---
hw/audio/fmopl.c | 4 ----
hw/audio/fmopl.h | 4 ----
2 files changed, 8 deletions(-)
diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c
index 1e05efc..282662a 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 b254968..e476497 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
--
2.9.3
- [Qemu-devel] [PATCH 00/26] Audio Cleanup, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 01/26] adlib: Remove support for YMF262, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 03/26] audio: Remove YM3526 support, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 02/26] audio: remove Y8950 configuration, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 04/26] audio: YM3812 was always defined,
Juan Quintela <=
- [Qemu-devel] [PATCH 05/26] audio: Remove UINT8, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 06/26] audio: remove UINT16, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 07/26] audio: remove UINT32, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 08/26] audio: Remove INT8, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 09/26] audio: remove INT16, Juan Quintela, 2017/04/25
- [Qemu-devel] [PATCH 10/26] audio: Remove INT32, Juan Quintela, 2017/04/25