aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authoraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-07 22:46:42 +0000
committeraurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>2008-12-07 22:46:42 +0000
commitb79e175259bd3591cc3abd1ebe8551573927cd56 (patch)
tree43af753b0577802934a2ea3a50a257fc02619b72 /hw
parentd8299bccf265b72db967a064e8151660b78cdfae (diff)
SH4: kill a few warnings
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5938 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/ide.c1
-rw-r--r--hw/pci.h4
-rw-r--r--hw/r2d.c4
-rw-r--r--hw/sh_intc.c2
-rw-r--r--hw/sm501.c1
5 files changed, 9 insertions, 3 deletions
diff --git a/hw/ide.c b/hw/ide.c
index 4a1213d30f..32cfe20dbb 100644
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -31,6 +31,7 @@
#include "qemu-timer.h"
#include "sysemu.h"
#include "ppc_mac.h"
+#include "sh.h"
/* debug IDE devices */
//#define DEBUG_IDE
diff --git a/hw/pci.h b/hw/pci.h
index e870987fe9..ae5f8d3146 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -139,4 +139,8 @@ PCIBus *pci_prep_init(qemu_irq *pic);
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
diff --git a/hw/r2d.c b/hw/r2d.c
index 78fc197940..5d5eb1e498 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -240,8 +240,8 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
/* 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);
diff --git a/hw/sh_intc.c b/hw/sh_intc.c
index 7d738d16ca..136e7dd216 100644
--- a/hw/sh_intc.c
+++ b/hw/sh_intc.c
@@ -73,7 +73,7 @@ void sh_intc_toggle_source(struct intc_source *source,
}
}
-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]);
diff --git a/hw/sm501.c b/hw/sm501.c
index 1704ddef51..54d176b83f 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -27,6 +27,7 @@
#include "hw.h"
#include "pc.h"
#include "console.h"
+#include "devices.h"
/*
* Status: 2008/11/02