From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JnzLH-0000UE-KQ for qemu-devel@nongnu.org; Mon, 21 Apr 2008 12:58:11 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JnzLE-0000Tq-W5 for qemu-devel@nongnu.org; Mon, 21 Apr 2008 12:58:10 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JnzLE-0000Tm-Oi for qemu-devel@nongnu.org; Mon, 21 Apr 2008 12:58:08 -0400 Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1JnzLC-0007Ji-I9 for qemu-devel@nongnu.org; Mon, 21 Apr 2008 12:58:08 -0400 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1JnzJ8-0007NR-Rr for qemu-devel@nongnu.org; Mon, 21 Apr 2008 16:55:58 +0000 Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1JnzJ8-0007NK-In for qemu-devel@nongnu.org; Mon, 21 Apr 2008 16:55:58 +0000 MIME-Version: 1.0 Errors-To: blueswir1 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Blue Swirl Message-Id: Date: Mon, 21 Apr 2008 16:55:58 +0000 Subject: [Qemu-devel] [4229] Remove duplicate definitions Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 4229 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4229 Author: blueswir1 Date: 2008-04-21 16:55:57 +0000 (Mon, 21 Apr 2008) Log Message: ----------- Remove duplicate definitions Modified Paths: -------------- trunk/hw/sun4m.h Modified: trunk/hw/sun4m.h =================================================================== --- trunk/hw/sun4m.h 2008-04-20 21:10:41 UTC (rev 4228) +++ trunk/hw/sun4m.h 2008-04-21 16:55:57 UTC (rev 4229) @@ -63,14 +63,7 @@ void cs_init(target_phys_addr_t base, int irq, void *intctl); /* sparc32_dma.c */ -void *sparc32_dma_init(target_phys_addr_t daddr, qemu_irq parent_irq, - void *iommu, qemu_irq **dev_irq, qemu_irq **reset); -void ledma_memory_read(void *opaque, target_phys_addr_t addr, - uint8_t *buf, int len, int do_bswap); -void ledma_memory_write(void *opaque, target_phys_addr_t addr, - uint8_t *buf, int len, int do_bswap); -void espdma_memory_read(void *opaque, uint8_t *buf, int len); -void espdma_memory_write(void *opaque, uint8_t *buf, int len); +#include "sparc32_dma.h" /* pcnet.c */ void lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque,