aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-01-03 23:28:27 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-01-03 23:28:27 +0000
commit62a46c616811461fd06f6321a966c55d8a30c33a (patch)
treefe7fed33e988b07aaa5ce7052321a4baff1fc258 /hw
parent574bbf7b0d59f7973cd7a11cb0e370a6d415dcae (diff)
suppressed warnings in 64 bit case
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1184 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/fdc.c30
1 files changed, 23 insertions, 7 deletions
diff --git a/hw/fdc.c b/hw/fdc.c
index ee07328481..fc6b50257f 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -95,9 +95,14 @@ typedef struct fdrive_t {
} fdrive_t;
#ifdef TARGET_SPARC
+/* XXX: suppress those hacks */
#define DMA_read_memory(a,b,c,d)
#define DMA_write_memory(a,b,c,d)
-#define DMA_register_channel(a,b,c)
+void DMA_register_channel (int nchan,
+ DMA_transfer_handler transfer_handler,
+ void *opaque)
+{
+}
#define DMA_hold_DREQ(a)
#define DMA_release_DREQ(a)
#define DMA_get_channel_mode(a) (0)
@@ -469,16 +474,27 @@ static void fdctrl_write (void *opaque, uint32_t reg, uint32_t value)
}
}
+static uint32_t fdctrl_read_mem (void *opaque, target_phys_addr_t reg)
+{
+ return fdctrl_read(opaque, reg);
+}
+
+static void fdctrl_write_mem (void *opaque,
+ target_phys_addr_t reg, uint32_t value)
+{
+ fdctrl_write(opaque, reg, value);
+}
+
static CPUReadMemoryFunc *fdctrl_mem_read[3] = {
- fdctrl_read,
- fdctrl_read,
- fdctrl_read,
+ fdctrl_read_mem,
+ fdctrl_read_mem,
+ fdctrl_read_mem,
};
static CPUWriteMemoryFunc *fdctrl_mem_write[3] = {
- fdctrl_write,
- fdctrl_write,
- fdctrl_write,
+ fdctrl_write_mem,
+ fdctrl_write_mem,
+ fdctrl_write_mem,
};
static void fd_change_cb (void *opaque)