From nobody Mon Feb 9 14:37:56 2026 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 1493882943032381.0402472945914; Thu, 4 May 2017 00:29:03 -0700 (PDT) Received: from localhost ([::1]:40085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6BC9-0002fo-JJ for importer@patchew.org; Thu, 04 May 2017 03:29:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34679) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6B1v-0001UU-1G for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6B1r-0004aP-Sz for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33120) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d6B1r-0004ZQ-KW for qemu-devel@nongnu.org; Thu, 04 May 2017 03:18:23 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ACB484E047 for ; Thu, 4 May 2017 07:18:22 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00BAF7EDA8; Thu, 4 May 2017 07:18:21 +0000 (UTC) Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 7E0F3810D2; Thu, 4 May 2017 09:18:16 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ACB484E047 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ACB484E047 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 4 May 2017 09:17:58 +0200 Message-Id: <20170504071811.3547-18-kraxel@redhat.com> In-Reply-To: <20170504071811.3547-1-kraxel@redhat.com> References: <20170504071811.3547-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 04 May 2017 07:18:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 17/30] audio: Remove type field 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: Gerd Hoffmann , Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Juan Quintela It was not used anymore as now there is only one type of devices. Signed-off-by: Juan Quintela Message-id: 20170425223739.6703-14-quintela@redhat.com Signed-off-by: Gerd Hoffmann --- hw/audio/fmopl.h | 7 +------ hw/audio/adlib.c | 2 +- hw/audio/fmopl.c | 20 ++++++++------------ 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/hw/audio/fmopl.h b/hw/audio/fmopl.h index 8ef0b3e3c3..df790a0b7d 100644 --- a/hw/audio/fmopl.h +++ b/hw/audio/fmopl.h @@ -11,8 +11,6 @@ typedef unsigned char (*OPL_PORTHANDLER_R)(int param); =20 /* !!!!! here is private section , do not access there member direct !!!!!= */ =20 -#define OPL_TYPE_WAVESEL 0x01 /* waveform select */ - /* Saving is necessary for member of the 'R' mark for suspend/resume */ /* ---------- OPL one of slot ---------- */ typedef struct fm_opl_slot { @@ -62,7 +60,6 @@ typedef struct fm_opl_channel { =20 /* OPL state */ typedef struct fm_opl_f { - uint8_t type; /* chip type */ int clock; /* master clock (Hz) */ int rate; /* sampling rate (Hz) */ double freqbase; /* frequency base */ @@ -108,9 +105,7 @@ typedef struct fm_opl_f { } FM_OPL; =20 /* ---------- Generic interface section ---------- */ -#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL) - -FM_OPL *OPLCreate(int type, int clock, int rate); +FM_OPL *OPLCreate(int clock, int rate); void OPLDestroy(FM_OPL *OPL); void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int chan= nelOffset); void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param); diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c index f9adcd709a..09b8248cda 100644 --- a/hw/audio/adlib.c +++ b/hw/audio/adlib.c @@ -265,7 +265,7 @@ static void adlib_realizefn (DeviceState *dev, Error **= errp) } glob_adlib =3D s; =20 - s->opl =3D OPLCreate (OPL_TYPE_YM3812, 3579545, s->freq); + s->opl =3D OPLCreate (3579545, s->freq); if (!s->opl) { error_setg (errp, "OPLCreate %d failed", s->freq); return; diff --git a/hw/audio/fmopl.c b/hw/audio/fmopl.c index 9171001030..48db828a49 100644 --- a/hw/audio/fmopl.c +++ b/hw/audio/fmopl.c @@ -761,18 +761,15 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v) { case 0x01: /* wave selector enable */ - if(OPL->type&OPL_TYPE_WAVESEL) + OPL->wavesel =3D v&0x20; + if(!OPL->wavesel) { - OPL->wavesel =3D v&0x20; - if(!OPL->wavesel) + /* preset compatible mode */ + int c; + for(c=3D0;cmax_ch;c++) { - /* preset compatible mode */ - int c; - for(c=3D0;cmax_ch;c++) - { - OPL->P_CH[c].SLOT[SLOT1].wavetable =3D &SIN_TABLE[0]; - OPL->P_CH[c].SLOT[SLOT2].wavetable =3D &SIN_TABLE[0]; - } + OPL->P_CH[c].SLOT[SLOT1].wavetable =3D &SIN_TABLE[0]; + OPL->P_CH[c].SLOT[SLOT2].wavetable =3D &SIN_TABLE[0]; } } return; @@ -1076,7 +1073,7 @@ void OPLResetChip(FM_OPL *OPL) =20 /* ---------- Create one of vietual YM3812 ---------- */ /* 'rate' is sampling rate and 'bufsiz' is the size of the */ -FM_OPL *OPLCreate(int type, int clock, int rate) +FM_OPL *OPLCreate(int clock, int rate) { char *ptr; FM_OPL *OPL; @@ -1095,7 +1092,6 @@ FM_OPL *OPLCreate(int type, int clock, int rate) OPL =3D (FM_OPL *)ptr; ptr+=3Dsizeof(FM_OPL); OPL->P_CH =3D (OPL_CH *)ptr; ptr+=3Dsizeof(OPL_CH)*max_ch; /* set channel state pointer */ - OPL->type =3D type; OPL->clock =3D clock; OPL->rate =3D rate; OPL->max_ch =3D max_ch; --=20 2.9.3