[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/30] adlib: Remove support for YMF262
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 05/30] adlib: Remove support for YMF262 |
Date: |
Thu, 4 May 2017 09:17:46 +0200 |
From: Juan Quintela <address@hidden>
Notice that the code was supposed to be in the file ymf262.h, that has
never been on qemu source tree.
Signed-off-by: Juan Quintela <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/audio/adlib.c | 45 +--------------------------------------------
1 file changed, 1 insertion(+), 44 deletions(-)
diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 7836446fc8..f9adcd709a 100644
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -33,11 +33,7 @@
#define ADLIB_KILL_TIMERS 1
-#ifdef HAS_YMF262
-#define ADLIB_DESC "Yamaha YMF262 (OPL3)"
-#else
#define ADLIB_DESC "Yamaha YM3812 (OPL2)"
-#endif
#ifdef DEBUG
#include "qemu/timer.h"
@@ -50,14 +46,8 @@
#define ldebug(...)
#endif
-#ifdef HAS_YMF262
-#include "ymf262.h"
-void YMF262UpdateOneQEMU (int which, INT16 *dst, int length);
-#define SHIFT 2
-#else
#include "fmopl.h"
#define SHIFT 1
-#endif
#define TYPE_ADLIB "adlib"
#define ADLIB(obj) OBJECT_CHECK(AdlibState, (obj), TYPE_ADLIB)
@@ -80,9 +70,7 @@ typedef struct {
SWVoiceOut *voice;
int left, pos, samples;
QEMUAudioTimeStamp ats;
-#ifndef HAS_YMF262
FM_OPL *opl;
-#endif
PortioList port_list;
} AdlibState;
@@ -90,11 +78,7 @@ static AdlibState *glob_adlib;
static void adlib_stop_opl_timer (AdlibState *s, size_t n)
{
-#ifdef HAS_YMF262
- YMF262TimerOver (0, n);
-#else
OPLTimerOver (s->opl, n);
-#endif
s->ticking[n] = 0;
}
@@ -131,11 +115,7 @@ static void adlib_write(void *opaque, uint32_t nport,
uint32_t val)
adlib_kill_timers (s);
-#ifdef HAS_YMF262
- YMF262Write (0, a, val);
-#else
OPLWrite (s->opl, a, val);
-#endif
}
static uint32_t adlib_read(void *opaque, uint32_t nport)
@@ -145,12 +125,8 @@ static uint32_t adlib_read(void *opaque, uint32_t nport)
int a = nport & 3;
adlib_kill_timers (s);
-
-#ifdef HAS_YMF262
- data = YMF262Read (0, a);
-#else
data = OPLRead (s->opl, a);
-#endif
+
return data;
}
@@ -240,11 +216,7 @@ static void adlib_callback (void *opaque, int free)
return;
}
-#ifdef HAS_YMF262
- YMF262UpdateOneQEMU (0, s->mixbuf + s->pos * 2, samples);
-#else
YM3812UpdateOne (s->opl, s->mixbuf + s->pos, samples);
-#endif
while (samples) {
written = write_audio (s, samples);
@@ -263,14 +235,10 @@ static void adlib_callback (void *opaque, int free)
static void Adlib_fini (AdlibState *s)
{
-#ifdef HAS_YMF262
- YMF262Shutdown ();
-#else
if (s->opl) {
OPLDestroy (s->opl);
s->opl = NULL;
}
-#endif
g_free(s->mixbuf);
@@ -297,16 +265,6 @@ static void adlib_realizefn (DeviceState *dev, Error
**errp)
}
glob_adlib = s;
-#ifdef HAS_YMF262
- if (YMF262Init (1, 14318180, s->freq)) {
- error_setg (errp, "YMF262Init %d failed", s->freq);
- return;
- }
- else {
- YMF262SetTimerHandler (0, timer_handler, 0);
- s->enabled = 1;
- }
-#else
s->opl = OPLCreate (OPL_TYPE_YM3812, 3579545, s->freq);
if (!s->opl) {
error_setg (errp, "OPLCreate %d failed", s->freq);
@@ -316,7 +274,6 @@ static void adlib_realizefn (DeviceState *dev, Error **errp)
OPLSetTimerHandler (s->opl, timer_handler, 0);
s->enabled = 1;
}
-#endif
as.freq = s->freq;
as.nchannels = SHIFT;
--
2.9.3
- [Qemu-devel] [PULL 18/30] audio: Remove unused fields, (continued)
- [Qemu-devel] [PULL 18/30] audio: Remove unused fields, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 15/30] audio: Unfold OPLSAMPLE, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 21/30] audio: GUSword is uint16_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 13/30] audio: remove INT16, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 10/30] audio: remove UINT16, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 24/30] audio: OPLSetIRQHandler is not used anywhere, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 16/30] audio: Remove Unused OPL_TYPE_*, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 26/30] audio: IRQHandler is not used anymore, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 23/30] audio: GUSsample is int16_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 22/30] audio: GUSword is uint16_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 05/30] adlib: Remove support for YMF262,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 29/30] audio: un-export OPLResetChip, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 19/30] audio: GUSbyte is uint8_t, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 25/30] audio: OPLSetUpdateHandler is not used anywhere, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 30/30] audio: Use ARRAY_SIZE from qemu/osdep.h, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 20/30] audio: remove GUSchar, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 06/30] audio: remove Y8950 configuration, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 08/30] audio: YM3812 was always defined, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 14/30] audio: Remove INT32, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 28/30] audio: Remove unused typedefs, Gerd Hoffmann, 2017/05/04
- [Qemu-devel] [PULL 09/30] audio: Remove UINT8, Gerd Hoffmann, 2017/05/04