From patchwork Wed Jun 13 04:46:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peter A. G. Crosthwaite" X-Patchwork-Id: 164534 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 4E430B6FC8 for ; Wed, 13 Jun 2012 15:23:15 +1000 (EST) Received: from localhost ([::1]:53590 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Seg2z-00041x-Fe for incoming@patchwork.ozlabs.org; Wed, 13 Jun 2012 01:23:13 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35659) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLj-0007aK-LN for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SefLh-00084e-OR for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:31 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:42162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SefLh-0007uz-CP for qemu-devel@nongnu.org; Wed, 13 Jun 2012 00:38:29 -0400 Received: by mail-pb0-f45.google.com with SMTP id ro12so1836767pbb.4 for ; Tue, 12 Jun 2012 21:38:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :in-reply-to:references:x-gm-message-state; bh=oR46i7crUNlLdxyfkYEY8GHqC0c+4jfdQnME60Zfdlo=; b=K5JTCt2l3vGLbgoxlleQrXPF0PU6Pm7m5Vbu6Who92Gjh5N9mfK5a1n4jqBa02BUL+ BSg1T9X01jwTsXlXvT4537iNJYl/Uby6ieHprVH3ZEQLhIQ5OscQUNvQQl5s54IT0y0c 0O3q+AF8N7zVp2wY5aDOo2hgH+6rjWjua0wqMlUme7R8MyShsLCZ0smbtgzYGshG8S1w YEMi2V5WaVt63BYMbc58F2d5bYw3VYYQ++gtwjTR6WFXsYD7gr3i9M1sfJ0rmuJrEwkc 7Jy/5hPIKQB43HnPqrIXLmwrL9meDp7J3yQayX3UajTt7TnmMaK3gCIg6jJKn45kjvIG MHyA== Received: by 10.68.191.106 with SMTP id gx10mr45504935pbc.37.1339562308288; Tue, 12 Jun 2012 21:38:28 -0700 (PDT) Received: from localhost ([124.148.20.9]) by mx.google.com with ESMTPS id py5sm4395560pbb.1.2012.06.12.21.38.24 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 21:38:27 -0700 (PDT) From: "Peter A. G. Crosthwaite" To: edgar.iglesias@gmail.com, qemu-devel@nongnu.org Date: Wed, 13 Jun 2012 14:46:48 +1000 Message-Id: X-Mailer: git-send-email 1.7.3.2 In-Reply-To: References: In-Reply-To: References: X-Gm-Message-State: ALoCoQm2a07IIK9eTRkk2ONhEAU1agc4oCFTxO3YlQhaxWL5i8I9eOFMitM6zmyLj+R+N/Wwfe9O X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.crosthwaite@petalogix.com, monstr@monstr.eu, john.williams@petalogix.com Subject: [Qemu-devel] [PATCH v2 08/11] xilinx_axienet: droped the c_ on parameters 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 Even though the xilinx tools do have C_ on all params by default, drop this for consistency with all the other xilinx IP (I.E. param names are the xilinx names without the C_ prefix) Signed-off-by: Peter A. G. Crosthwaite --- hw/xilinx.h | 4 ++-- hw/xilinx_axienet.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/xilinx.h b/hw/xilinx.h index 5f7c5e9..5108cf5 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -58,8 +58,8 @@ xilinx_axiethernet_create(void *dmach, dev = qdev_create(NULL, "xilinx,axienet"); qdev_set_nic_properties(dev, nd); - qdev_prop_set_uint32(dev, "c_rxmem", rxmem); - qdev_prop_set_uint32(dev, "c_txmem", txmem); + qdev_prop_set_uint32(dev, "rxmem", rxmem); + qdev_prop_set_uint32(dev, "txmem", txmem); qdev_prop_set_ptr(dev, "dmach", dmach); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); diff --git a/hw/xilinx_axienet.c b/hw/xilinx_axienet.c index 7526273..d383aee 100644 --- a/hw/xilinx_axienet.c +++ b/hw/xilinx_axienet.c @@ -872,8 +872,8 @@ static int xilinx_enet_init(SysBusDevice *dev) static Property xilinx_enet_properties[] = { DEFINE_PROP_UINT32("phyaddr", struct XilinxAXIEnet, c_phyaddr, 7), - DEFINE_PROP_UINT32("c_rxmem", struct XilinxAXIEnet, c_rxmem, 0x1000), - DEFINE_PROP_UINT32("c_txmem", struct XilinxAXIEnet, c_txmem, 0x1000), + DEFINE_PROP_UINT32("rxmem", struct XilinxAXIEnet, c_rxmem, 0x1000), + DEFINE_PROP_UINT32("txmem", struct XilinxAXIEnet, c_txmem, 0x1000), DEFINE_PROP_PTR("dmach", struct XilinxAXIEnet, dmach), DEFINE_NIC_PROPERTIES(struct XilinxAXIEnet, conf), DEFINE_PROP_END_OF_LIST(),