From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1L9SOj-0007pP-P9 for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:46:45 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1L9SOi-0007p8-Qw for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:46:45 -0500 Received: from [199.232.76.173] (port=43743 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1L9SOi-0007p4-FO for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:46:44 -0500 Received: from savannah.gnu.org ([199.232.41.3]:55593 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 1L9SOh-0002PM-PS for qemu-devel@nongnu.org; Sun, 07 Dec 2008 17:46:44 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1L9SOg-0007Hk-Tz for qemu-devel@nongnu.org; Sun, 07 Dec 2008 22:46:42 +0000 Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1L9SOg-0007Hd-Hu for qemu-devel@nongnu.org; Sun, 07 Dec 2008 22:46:42 +0000 MIME-Version: 1.0 Errors-To: aurel32 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Aurelien Jarno Message-Id: Date: Sun, 07 Dec 2008 22:46:42 +0000 Subject: [Qemu-devel] [5938] SH4: kill a few warnings 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: 5938 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5938 Author: aurel32 Date: 2008-12-07 22:46:42 +0000 (Sun, 07 Dec 2008) Log Message: ----------- SH4: kill a few warnings Signed-off-by: Aurelien Jarno Modified Paths: -------------- trunk/hw/ide.c trunk/hw/pci.h trunk/hw/r2d.c trunk/hw/sh_intc.c trunk/hw/sm501.c trunk/target-sh4/translate.c Modified: trunk/hw/ide.c =================================================================== --- trunk/hw/ide.c 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/hw/ide.c 2008-12-07 22:46:42 UTC (rev 5938) @@ -31,6 +31,7 @@ #include "qemu-timer.h" #include "sysemu.h" #include "ppc_mac.h" +#include "sh.h" /* debug IDE devices */ //#define DEBUG_IDE Modified: trunk/hw/pci.h =================================================================== --- trunk/hw/pci.h 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/hw/pci.h 2008-12-07 22:46:42 UTC (rev 5938) @@ -139,4 +139,8 @@ PCIBus *pci_apb_init(target_phys_addr_t special_base, target_phys_addr_t mem_base, qemu_irq *pic); +/* sh_pci.c */ +PCIBus *sh_pci_register_bus(pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, + qemu_irq *pic, int devfn_min, int nirq); + #endif Modified: trunk/hw/r2d.c =================================================================== --- trunk/hw/r2d.c 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/hw/r2d.c 2008-12-07 22:46:42 UTC (rev 5938) @@ -240,8 +240,8 @@ /* initialization which should be done by firmware */ uint32_t bcr1 = 1 << 3; /* cs3 SDRAM */ uint16_t bcr2 = 3 << (3 * 2); /* cs3 32-bit */ - cpu_physical_memory_write(SH7750_BCR1_A7, &bcr1, 4); - cpu_physical_memory_write(SH7750_BCR2_A7, &bcr2, 2); + cpu_physical_memory_write(SH7750_BCR1_A7, (uint8_t *)&bcr1, 4); + cpu_physical_memory_write(SH7750_BCR2_A7, (uint8_t *)&bcr2, 2); kernel_size = load_image(kernel_filename, phys_ram_base); Modified: trunk/hw/sh_intc.c =================================================================== --- trunk/hw/sh_intc.c 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/hw/sh_intc.c 2008-12-07 22:46:42 UTC (rev 5938) @@ -73,7 +73,7 @@ } } -void sh_intc_set_irq (void *opaque, int n, int level) +static void sh_intc_set_irq (void *opaque, int n, int level) { struct intc_desc *desc = opaque; struct intc_source *source = &(desc->sources[n]); Modified: trunk/hw/sm501.c =================================================================== --- trunk/hw/sm501.c 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/hw/sm501.c 2008-12-07 22:46:42 UTC (rev 5938) @@ -27,6 +27,7 @@ #include "hw.h" #include "pc.h" #include "console.h" +#include "devices.h" /* * Status: 2008/11/02 Modified: trunk/target-sh4/translate.c =================================================================== --- trunk/target-sh4/translate.c 2008-12-07 22:46:31 UTC (rev 5937) +++ trunk/target-sh4/translate.c 2008-12-07 22:46:42 UTC (rev 5938) @@ -71,7 +71,7 @@ static TCGv cpu_gregs[24]; static TCGv cpu_pc, cpu_sr, cpu_ssr, cpu_spc, cpu_gbr; static TCGv cpu_vbr, cpu_sgr, cpu_dbr, cpu_mach, cpu_macl; -static TCGv cpu_pr, cpu_fpscr, cpu_fpul, cpu_flags; +static TCGv cpu_pr, cpu_fpscr, cpu_fpul; static TCGv cpu_fregs[32]; /* internal register indexes */ @@ -181,7 +181,7 @@ } } -void cpu_sh4_reset(CPUSH4State * env) +static void cpu_sh4_reset(CPUSH4State * env) { #if defined(CONFIG_USER_ONLY) env->sr = SR_FD; /* FD - kernel does lazy fpu context switch */