From 02e2da45c4601909d5105838323d5c529ec7010b Mon Sep 17 00:00:00 2001 From: Paul Brook Date: Sat, 23 May 2009 00:05:19 +0100 Subject: Add common BusState Implement and use a common device bus state. The main side-effect is that creating a bus and attaching it to a parent device are no longer separate operations. For legacy code we allow a NULL parent, but that should go away eventually. Also tweak creation code to veriry theat a device in on the right bus. Signed-off-by: Paul Brook --- hw/ssi.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'hw/ssi.h') diff --git a/hw/ssi.h b/hw/ssi.h index aab740f..861c484 100644 --- a/hw/ssi.h +++ b/hw/ssi.h @@ -17,6 +17,7 @@ typedef struct SSISlave SSISlave; /* Slave devices. */ typedef struct { + DeviceInfo qdev; void (*init)(SSISlave *dev); uint32_t (*transfer)(SSISlave *dev, uint32_t val); } SSISlaveInfo; @@ -34,7 +35,7 @@ void ssi_register_slave(const char *name, int size, 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); -- cgit v1.1