From patchwork Thu Oct 22 14:36:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36679 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 A51F7B7BB0 for ; Fri, 23 Oct 2009 01:49:40 +1100 (EST) Received: from localhost ([127.0.0.1]:38628 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0yyv-0003by-8Z for incoming@patchwork.ozlabs.org; Thu, 22 Oct 2009 10:49:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N0ymb-0007e7-Mk for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:53 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N0ymW-0007ap-49 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:52 -0400 Received: from [199.232.76.173] (port=46171 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N0ymV-0007aV-F5 for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18760) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N0ymU-0007F4-QL for qemu-devel@nongnu.org; Thu, 22 Oct 2009 10:36:47 -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 n9MEakco020132 for ; Thu, 22 Oct 2009 10:36:46 -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 n9MEaaiY026416; Thu, 22 Oct 2009 10:36:45 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 22 Oct 2009 16:36:20 +0200 Message-Id: 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 07/20] es1370: 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/es1370.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/es1370.c b/hw/es1370.c index fe98267..6f0995a 100644 --- a/hw/es1370.c +++ b/hw/es1370.c @@ -156,9 +156,6 @@ static const unsigned dac1_samplerate[] = { 5512, 11025, 22050, 44100 }; #define DAC2_CHANNEL 1 #define ADC_CHANNEL 2 -#define IO_WRITE_PROTO(n) \ -static void n (void *opaque, uint32_t addr, uint32_t val) - static void es1370_dac1_callback (void *opaque, int free); static void es1370_dac2_callback (void *opaque, int free); static void es1370_adc_callback (void *opaque, int avail); @@ -470,7 +467,7 @@ static inline uint32_t es1370_fixup (ES1370State *s, uint32_t addr) return addr; } -IO_WRITE_PROTO (es1370_writeb) +static void es1370_writeb (void *opaque, uint32_t addr, uint32_t val) { ES1370State *s = opaque; uint32_t shift, mask; @@ -508,7 +505,7 @@ IO_WRITE_PROTO (es1370_writeb) } } -IO_WRITE_PROTO (es1370_writew) +static void es1370_writew (void *opaque, uint32_t addr, uint32_t val) { ES1370State *s = opaque; addr = es1370_fixup (s, addr); @@ -545,7 +542,7 @@ IO_WRITE_PROTO (es1370_writew) } } -IO_WRITE_PROTO (es1370_writel) +static void es1370_writel (void *opaque, uint32_t addr, uint32_t val) { ES1370State *s = opaque; struct chan *d = &s->chan[0];