From nobody Tue Apr 30 13:56:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498019811362292.0958021987715; Tue, 20 Jun 2017 21:36:51 -0700 (PDT) Received: from localhost ([::1]:51801 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNXNp-0000Ey-Sq for importer@patchew.org; Wed, 21 Jun 2017 00:36:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNXLH-0007Fq-R5 for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNXLE-0003OU-Of for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:11 -0400 Received: from smtp2-g21.free.fr ([212.27.42.2]:64758) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dNXLE-0003N4-G2 for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:08 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id DC75B2003AE; Wed, 21 Jun 2017 06:34:03 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Wed, 21 Jun 2017 06:34:00 +0200 Message-Id: <20170621043401.19842-2-hpoussin@reactos.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170621043401.19842-1-hpoussin@reactos.org> References: <20170621043401.19842-1-hpoussin@reactos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 212.27.42.2 Subject: [Qemu-devel] [PATCH 1/2] audio/fmopl: modify timer callback to give opaque and channel parameters in two arguments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/adlib.c | 2 +- hw/audio/fmopl.c | 18 +++++++++++++----- hw/audio/fmopl.h | 7 ++++--- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index c6e0f10c16..be4203476a 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -130,7 +130,7 @@ static uint32_t adlib_read(void *opaque, uint32_t nport) return data; } =20 -static void timer_handler (int c, double interval_Sec) +static void timer_handler (void *opaque, int c, double interval_Sec) { AdlibState *s =3D glob_adlib; unsigned n =3D c & 1; diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 202f752c5d..5cfb6a96dd 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -788,14 +788,18 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) { double interval =3D st2 ? (double)OPL->T[1]*OPL->TimerBase : 0.0; OPL->st[1] =3D st2; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+1,interval= ); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, 1, interval); + } } /* timer 1 */ if(OPL->st[0] !=3D st1) { double interval =3D st1 ? (double)OPL->T[0]*OPL->TimerBase : 0.0; OPL->st[0] =3D st1; - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+0,interval= ); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, 0, interval); + } } } return; @@ -1128,10 +1132,11 @@ void OPLDestroy(FM_OPL *OPL) =20 /* ---------- Option handlers ---------- */ =20 -void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int chan= nelOffset) +void OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler, + void *param) { OPL->TimerHandler =3D TimerHandler; - OPL->TimerParam =3D channelOffset; + OPL->TimerParam =3D param; } =20 /* ---------- YM3812 I/O interface ---------- */ @@ -1197,6 +1202,9 @@ int OPLTimerOver(FM_OPL *OPL,int c) } } /* reload timer */ - if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL-= >T[c]*OPL->TimerBase); + if (OPL->TimerHandler) { + (OPL->TimerHandler)(OPL->TimerParam, c, + (double)OPL->T[c] * OPL->TimerBase); + } return OPL->status>>7; } diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index fc9f16b58a..f4065f425c 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -3,7 +3,7 @@ =20 #include =20 -typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec); +typedef void (*OPL_TIMERHANDLER)(void *param, int channel, double interval= _Sec); =20 /* !!!!! here is private section , do not access there member direct !!!!!= */ =20 @@ -87,13 +87,14 @@ typedef struct fm_opl_f { uint8_t wavesel; /* external event callback handler */ OPL_TIMERHANDLER TimerHandler; /* TIMER handler */ - int TimerParam; /* TIMER parameter */ + void *TimerParam; /* TIMER parameter */ } FM_OPL; =20 /* ---------- Generic interface section ---------- */ FM_OPL *OPLCreate(int clock, int rate); void OPLDestroy(FM_OPL *OPL); -void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int chan= nelOffset); +void OPLSetTimerHandler(FM_OPL *OPL, OPL_TIMERHANDLER TimerHandler, + void *param); =20 int OPLWrite(FM_OPL *OPL,int a,int v); unsigned char OPLRead(FM_OPL *OPL,int a); --=20 2.11.0 From nobody Tue Apr 30 13:56:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1498019735797341.8556702565493; Tue, 20 Jun 2017 21:35:35 -0700 (PDT) Received: from localhost ([::1]:51799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNXMa-0007tz-GR for importer@patchew.org; Wed, 21 Jun 2017 00:35:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNXLH-0007Fp-Nj for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dNXLE-0003OI-LG for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:11 -0400 Received: from smtp2-g21.free.fr ([2a01:e0c:1:1599::11]:30075) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dNXLE-0003N9-G5 for qemu-devel@nongnu.org; Wed, 21 Jun 2017 00:34:08 -0400 Received: from localhost.localdomain (unknown [82.227.227.196]) by smtp2-g21.free.fr (Postfix) with ESMTP id 401C1200351; Wed, 21 Jun 2017 06:34:04 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Wed, 21 Jun 2017 06:34:01 +0200 Message-Id: <20170621043401.19842-3-hpoussin@reactos.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170621043401.19842-1-hpoussin@reactos.org> References: <20170621043401.19842-1-hpoussin@reactos.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 2a01:e0c:1:1599::11 Subject: [Qemu-devel] [PATCH 2/2] audio/adlib: remove limitation of one adlib card X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/audio/adlib.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index be4203476a..6a5d39a8c8 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -74,8 +74,6 @@ typedef struct { PortioList port_list; } AdlibState; =20 -static AdlibState *glob_adlib; - static void adlib_stop_opl_timer (AdlibState *s, size_t n) { OPLTimerOver (s->opl, n); @@ -132,7 +130,7 @@ static uint32_t adlib_read(void *opaque, uint32_t nport) =20 static void timer_handler (void *opaque, int c, double interval_Sec) { - AdlibState *s =3D glob_adlib; + AdlibState *s =3D opaque; unsigned n =3D c & 1; #ifdef DEBUG double interval; @@ -259,19 +257,13 @@ static void adlib_realizefn (DeviceState *dev, Error = **errp) AdlibState *s =3D ADLIB(dev); struct audsettings as; =20 - if (glob_adlib) { - error_setg (errp, "Cannot create more than 1 adlib device"); - return; - } - glob_adlib =3D s; - s->opl =3D OPLCreate (3579545, s->freq); if (!s->opl) { error_setg (errp, "OPLCreate %d failed", s->freq); return; } else { - OPLSetTimerHandler (s->opl, timer_handler, 0); + OPLSetTimerHandler(s->opl, timer_handler, s); s->enabled =3D 1; } =20 --=20 2.11.0