From patchwork Wed Jun 21 04:34:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 778630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wssLv6NHpz9s2s for ; Wed, 21 Jun 2017 14:34:47 +1000 (AEST) Received: from localhost ([::1]:51790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dNXLo-0007GZ-Us for incoming@patchwork.ozlabs.org; Wed, 21 Jun 2017 00:34:44 -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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Hervé Poussineau --- 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; -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) static void timer_handler (void *opaque, int c, double interval_Sec) { - AdlibState *s = glob_adlib; + AdlibState *s = opaque; unsigned n = c & 1; #ifdef DEBUG double interval; @@ -259,19 +257,13 @@ static void adlib_realizefn (DeviceState *dev, Error **errp) AdlibState *s = ADLIB(dev); struct audsettings as; - if (glob_adlib) { - error_setg (errp, "Cannot create more than 1 adlib device"); - return; - } - glob_adlib = s; - s->opl = 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 = 1; }