Merge remote branch 'kwolf/for-anthony' into staging

[qemu.git] / hw / ssi.h

diff --git a/hw/ssi.h b/hw/ssi.h
index aab740fc56f1c1013432abadf25a48c0ca0cc5d5..24610a80cba500196014dfecfa9909f823f458ee 100644 (file)
--- a/hw/ssi.h
+++ b/hw/ssi.h
@@ -17,7 +17,8 @@ typedef struct SSISlave SSISlave;
 
 /* Slave devices.  */
 typedef struct {
-    void (*init)(SSISlave *dev);
+    DeviceInfo qdev;
+    int (*init)(SSISlave *dev);
     uint32_t (*transfer)(SSISlave *dev, uint32_t val);
 } SSISlaveInfo;
 
@@ -29,12 +30,12 @@ struct SSISlave {
 #define SSI_SLAVE_FROM_QDEV(dev) DO_UPCAST(SSISlave, qdev, dev)
 #define FROM_SSI_SLAVE(type, dev) DO_UPCAST(type, ssidev, dev)
 
-void ssi_register_slave(const char *name, int size, SSISlaveInfo *info);
+void ssi_register_slave(SSISlaveInfo *info);
 
 DeviceState *ssi_create_slave(SSIBus *bus, const char *name);
 
 /* Master interface.  */
-SSIBus *ssi_create_bus(void);
+SSIBus *ssi_create_bus(DeviceState *parent, const char *name);
 
 uint32_t ssi_transfer(SSIBus *bus, uint32_t val);