From patchwork Thu Oct 22 14:36:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36676 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 95820B7BB2 for ; Fri, 23 Oct 2009 01:44:24 +1100 (EST) Received: from localhost ([127.0.0.1]:44760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ytp-0001fU-Ep for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 10:44:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0ymW-0007bS-Os for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:48 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0ymR-0007Yk-QD for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:48 -0400 Received: from [199.232.76.173] (port=46167 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ymR-0007YX-Im for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61586) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0ymR-0007EI-4o for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:43 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9MEagRs015108 for ; Thu, 22 Oct 2009 10:36:42 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9MEaaiV026416; Thu, 22 Oct 2009 10:36:41 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 16:36:17 +0200 Message-Id: <8705124945b3d74f662bc7074e0e3c8cb0803595.1256221008.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 04/20] sb16: remove IO_WRITE_PROTO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/sb16.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hw/sb16.c b/hw/sb16.c index f4f96d1..e461970 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -40,9 +40,6 @@ #define ldebug(...) #endif -#define IO_WRITE_PROTO(name) \ - void name (void *opaque, uint32_t nport, uint32_t val) - static const char e3[] = "COPYRIGHT (C) CREATIVE TECHNOLOGY LTD, 1992."; typedef struct SB16State { @@ -874,7 +871,7 @@ static void reset (SB16State *s) legacy_reset (s); } -static IO_WRITE_PROTO (dsp_write) +static void dsp_write (void *opaque, uint32_t nport, uint32_t val) { SB16State *s = opaque; int iport; @@ -1058,14 +1055,14 @@ static void reset_mixer (SB16State *s) } } -static IO_WRITE_PROTO (mixer_write_indexb) +static void mixer_write_indexb (void *opaque, uint32_t nport, uint32_t val) { SB16State *s = opaque; (void) nport; s->mixer_nreg = val; } -static IO_WRITE_PROTO (mixer_write_datab) +static void mixer_write_datab (void *opaque, uint32_t nport, uint32_t val) { SB16State *s = opaque; @@ -1121,7 +1118,7 @@ static IO_WRITE_PROTO (mixer_write_datab) s->mixer_regs[s->mixer_nreg] = val; } -static IO_WRITE_PROTO (mixer_write_indexw) +static void mixer_write_indexw (void *opaque, uint32_t nport, uint32_t val) { mixer_write_indexb (opaque, nport, val & 0xff); mixer_write_datab (opaque, nport, (val >> 8) & 0xff);