From patchwork Tue Apr 16 00:21:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 236780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 943BD2C00C4 for ; Tue, 16 Apr 2013 10:26:35 +1000 (EST) Received: from localhost ([::1]:56399 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtjF-00054Y-MV for incoming@patchwork.ozlabs.org; Mon, 15 Apr 2013 20:26:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtgS-000147-VB for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:23:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1URtgR-0007RZ-W0 for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:23:40 -0400 Received: from mail-da0-x22b.google.com ([2607:f8b0:400e:c00::22b]:44408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1URtgR-0007RV-Pa for qemu-devel@nongnu.org; Mon, 15 Apr 2013 20:23:39 -0400 Received: by mail-da0-f43.google.com with SMTP id u36so2313801dak.30 for ; Mon, 15 Apr 2013 17:23:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=MkF9QcTnA+CAfgYquIQ8kk7+cscwV8bpCi5KD7Sd3CQ=; b=IalqKGxXShQnFuqOcPJfc7RBimUno14ZE8JKLEgeyWmJkL9zwuSgki+ocpOIUUt/ZT QWlOtv4HjGa1r5J1C31OKNsrCTNU3AMw+tmR926l/orRFZ6H8io0awX4BmODh5Bma1w0 lb2w2czPbDj0urSgvWRMSjv1wWhy1iizCWzdIu1fP4lf9Evy5zZ/YAcIGFRQpJrbd92C VyREvb6nzu+cFxk6QvswSLQBDHXA5VuEQMww+8pnktPBKPmyEbym2yGO3RMyaEhqLzp/ XPtRrQNEaIMuXt5G2xGcPNSCfOSoMG85sChkwR6DqZVxDpIG5AHJOvXAxLCWcQDa8KS7 WlLg== X-Received: by 10.66.255.41 with SMTP id an9mr627896pad.44.1366071818959; Mon, 15 Apr 2013 17:23:38 -0700 (PDT) Received: from localhost ([149.199.62.254]) by mx.google.com with ESMTPS id qh4sm98701pac.8.2013.04.15.17.23.36 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Mon, 15 Apr 2013 17:23:38 -0700 (PDT) From: peter.crosthwaite@xilinx.com To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 10:21:23 +1000 Message-Id: <49260fc345d725d6e5726ad89349d919224c908e.1366069170.git.peter.crosthwaite@xilinx.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: X-Gm-Message-State: ALoCoQk96iUqMAY9O036ZPy9UfXwxzo29q4PE4l4ds1+beVHRomFmsBoRCjgoYCu54eE1/FqwunX X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c00::22b Cc: edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v6 05/16] xilinx_axidma: typedef XilinxAXIDMA struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Peter Crosthwaite Typedef xilinx_axidma's object state struct to shorten the repeated usages of struct XilinxAXIDMA. Signed-off-by: Peter Crosthwaite Acked-by: Edgar E. Iglesias --- hw/dma/xilinx_axidma.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 8db1a74..4dd8a6b 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -38,6 +38,8 @@ #define R_TAILDESC (0x10 / 4) #define R_MAX (0x30 / 4) +typedef struct XilinxAXIDMA XilinxAXIDMA; + enum { DMACR_RUNSTOP = 1, DMACR_TAILPTR_MODE = 2, @@ -353,7 +355,7 @@ static void stream_process_s2mem(struct Stream *s, static void axidma_push(StreamSlave *obj, unsigned char *buf, size_t len, uint32_t *app) { - struct XilinxAXIDMA *d = FROM_SYSBUS(typeof(*d), SYS_BUS_DEVICE(obj)); + XilinxAXIDMA *d = FROM_SYSBUS(typeof(*d), SYS_BUS_DEVICE(obj)); struct Stream *s = &d->streams[1]; if (!app) { @@ -366,7 +368,7 @@ axidma_push(StreamSlave *obj, unsigned char *buf, size_t len, uint32_t *app) static uint64_t axidma_read(void *opaque, hwaddr addr, unsigned size) { - struct XilinxAXIDMA *d = opaque; + XilinxAXIDMA *d = opaque; struct Stream *s; uint32_t r = 0; int sid; @@ -401,7 +403,7 @@ static uint64_t axidma_read(void *opaque, hwaddr addr, static void axidma_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { - struct XilinxAXIDMA *d = opaque; + XilinxAXIDMA *d = opaque; struct Stream *s; int sid; @@ -459,7 +461,7 @@ static const MemoryRegionOps axidma_ops = { static int xilinx_axidma_init(SysBusDevice *dev) { - struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev); + XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), dev); int i; sysbus_init_irq(dev, &s->streams[0].irq); @@ -481,14 +483,14 @@ static int xilinx_axidma_init(SysBusDevice *dev) static void xilinx_axidma_initfn(Object *obj) { - struct XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj)); + XilinxAXIDMA *s = FROM_SYSBUS(typeof(*s), SYS_BUS_DEVICE(obj)); object_property_add_link(obj, "axistream-connected", TYPE_STREAM_SLAVE, (Object **) &s->tx_dev, NULL); } static Property axidma_properties[] = { - DEFINE_PROP_UINT32("freqhz", struct XilinxAXIDMA, freqhz, 50000000), + DEFINE_PROP_UINT32("freqhz", XilinxAXIDMA, freqhz, 50000000), DEFINE_PROP_END_OF_LIST(), }; @@ -506,7 +508,7 @@ static void axidma_class_init(ObjectClass *klass, void *data) static const TypeInfo axidma_info = { .name = "xlnx.axi-dma", .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(struct XilinxAXIDMA), + .instance_size = sizeof(XilinxAXIDMA), .class_init = axidma_class_init, .instance_init = xilinx_axidma_initfn, .interfaces = (InterfaceInfo[]) {