Fix sparc.ld

[qemu] / hw / pl181.c

diff --git a/hw/pl181.c b/hw/pl181.c
index 12f4ca7..7282053 100644 (file)
--- a/hw/pl181.c
+++ b/hw/pl181.c
@@ -409,13 +409,13 @@ static void pl181_write(void *opaque, target_phys_addr_t offset,
     pl181_update(s);
 }
 
-static CPUReadMemoryFunc *pl181_readfn[] = {
+static CPUReadMemoryFunc * const pl181_readfn[] = {
    pl181_read,
    pl181_read,
    pl181_read
 };
 
-static CPUWriteMemoryFunc *pl181_writefn[] = {
+static CPUWriteMemoryFunc * const pl181_writefn[] = {
    pl181_write,
    pl181_write,
    pl181_write
@@ -445,7 +445,7 @@ static void pl181_reset(void *opaque)
     s->mask[1] = 0;
 }
 
-static void pl181_init(SysBusDevice *dev)
+static int pl181_init(SysBusDevice *dev)
 {
     int iomemtype;
     pl181_state *s = FROM_SYSBUS(pl181_state, dev);
@@ -458,9 +458,10 @@ static void pl181_init(SysBusDevice *dev)
     sysbus_init_irq(dev, &s->irq[1]);
     bd = qdev_init_bdrv(&dev->qdev, IF_SD);
     s->card = sd_init(bd, 0);
-    qemu_register_reset(pl181_reset, 0, s);
+    qemu_register_reset(pl181_reset, s);
     pl181_reset(s);
     /* ??? Save/restore.  */
+    return 0;
 }
 
 static void pl181_register_devices(void)