qdev: add return value to init() callbacks.

[qemu.git] / hw / sbi.c

diff --git a/hw/sbi.c b/hw/sbi.c
index 4350b6ef9531cd8a8e17bfcec51964fce541ba96..bad9afd7b2e3d82ef93b3ad44ce5e3c7a6a1863c 100644 (file)
--- a/hw/sbi.c
+++ b/hw/sbi.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "hw.h"
 #include "sun4m.h"
 #include "console.h"
+#include "sysbus.h"
 
 //#define DEBUG_IRQ
 
@@ -39,26 +41,19 @@
 #define SBI_NREGS 16
 
 typedef struct SBIState {
+    SysBusDevice busdev;
     uint32_t regs[SBI_NREGS];
     uint32_t intreg_pending[MAX_CPUS];
-    qemu_irq *cpu_irqs[MAX_CPUS];
+    qemu_irq cpu_irqs[MAX_CPUS];
     uint32_t pil_out[MAX_CPUS];
 } SBIState;
 
 #define SBI_SIZE (SBI_NREGS * 4)
 
-static void sbi_check_interrupts(void *opaque)
-{
-}
-
 static void sbi_set_irq(void *opaque, int irq, int level)
 {
 }
 
-static void sbi_set_timer_irq_cpu(void *opaque, int cpu, int level)
-{
-}
-
 static uint32_t sbi_mem_readl(void *opaque, target_phys_addr_t addr)
 {
     SBIState *s = opaque;
@@ -89,13 +84,13 @@ static void sbi_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
     }
 }
 
-static CPUReadMemoryFunc *sbi_mem_read[3] = {
+static CPUReadMemoryFunc * const sbi_mem_read[3] = {
     NULL,
     NULL,
     sbi_mem_readl,
 };
 
-static CPUWriteMemoryFunc *sbi_mem_write[3] = {
+static CPUWriteMemoryFunc * const sbi_mem_write[3] = {
     NULL,
     NULL,
     sbi_mem_writel,
@@ -122,7 +117,6 @@ static int sbi_load(QEMUFile *f, void *opaque, int version_id)
     for (i = 0; i < MAX_CPUS; i++) {
         qemu_get_be32s(f, &s->intreg_pending[i]);
     }
-    sbi_check_interrupts(s);
 
     return 0;
 }
@@ -135,30 +129,37 @@ static void sbi_reset(void *opaque)
     for (i = 0; i < MAX_CPUS; i++) {
         s->intreg_pending[i] = 0;
     }
-    sbi_check_interrupts(s);
 }
 
-void *sbi_init(target_phys_addr_t addr, qemu_irq **irq, qemu_irq **cpu_irq,
-               qemu_irq **parent_irq)
+static int sbi_init1(SysBusDevice *dev)
 {
-    unsigned int i;
+    SBIState *s = FROM_SYSBUS(SBIState, dev);
     int sbi_io_memory;
-    SBIState *s;
-
-    s = qemu_mallocz(sizeof(SBIState));
+    unsigned int i;
 
+    qdev_init_gpio_in(&dev->qdev, sbi_set_irq, 32 + MAX_CPUS);
     for (i = 0; i < MAX_CPUS; i++) {
-        s->cpu_irqs[i] = parent_irq[i];
+        sysbus_init_irq(dev, &s->cpu_irqs[i]);
     }
 
     sbi_io_memory = cpu_register_io_memory(sbi_mem_read, sbi_mem_write, s);
-    cpu_register_physical_memory(addr, SBI_SIZE, sbi_io_memory);
+    sysbus_init_mmio(dev, SBI_SIZE, sbi_io_memory);
 
-    register_savevm("sbi", addr, 1, sbi_save, sbi_load, s);
-    qemu_register_reset(sbi_reset, 0, s);
-    *irq = qemu_allocate_irqs(sbi_set_irq, s, 32);
-    *cpu_irq = qemu_allocate_irqs(sbi_set_timer_irq_cpu, s, MAX_CPUS);
+    register_savevm("sbi", -1, 1, sbi_save, sbi_load, s);
+    qemu_register_reset(sbi_reset, s);
     sbi_reset(s);
+    return 0;
+}
 
-    return s;
+static SysBusDeviceInfo sbi_info = {
+    .init = sbi_init1,
+    .qdev.name  = "sbi",
+    .qdev.size  = sizeof(SBIState),
+};
+
+static void sbi_register_devices(void)
+{
+    sysbus_register_withprop(&sbi_info);
 }
+
+device_init(sbi_register_devices)