From patchwork Thu Oct 22 14:36:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36675 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 C64E1B7BB2 for ; Fri, 23 Oct 2009 01:42:49 +1100 (EST) Received: from localhost ([127.0.0.1]:44049 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ysI-00017k-R9 for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 10:42:46 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0ymV-0007ag-Uh 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 1N0ymQ-0007XO-LN for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:46 -0400 Received: from [199.232.76.173] (port=46166 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ymQ-0007XE-DI for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13247) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0ymP-0007ED-VN for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:42 -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 n9MEaf3C010251 for ; Thu, 22 Oct 2009 10:36:41 -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 n9MEaaiU026416; Thu, 22 Oct 2009 10:36:40 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 16:36:16 +0200 Message-Id: <626b98860a5002e8e7330e870b3962352a42494f.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 03/20] sb16: remove IO_READ_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 | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sb16.c b/hw/sb16.c index 8654b7d..f4f96d1 100644 --- a/hw/sb16.c +++ b/hw/sb16.c @@ -40,8 +40,6 @@ #define ldebug(...) #endif -#define IO_READ_PROTO(name) \ - uint32_t name (void *opaque, uint32_t nport) #define IO_WRITE_PROTO(name) \ void name (void *opaque, uint32_t nport, uint32_t val) @@ -961,7 +959,7 @@ static IO_WRITE_PROTO (dsp_write) } } -static IO_READ_PROTO (dsp_read) +static uint32_t dsp_read (void *opaque, uint32_t nport) { SB16State *s = opaque; int iport, retval, ack = 0; @@ -1129,7 +1127,7 @@ static IO_WRITE_PROTO (mixer_write_indexw) mixer_write_datab (opaque, nport, (val >> 8) & 0xff); } -static IO_READ_PROTO (mixer_read) +static uint32_t mixer_read (void *opaque, uint32_t nport) { SB16State *s = opaque;