/* Notify the slave of a bus state change. */
typedef void (*i2c_event_cb)(i2c_slave *s, enum i2c_event event);
-typedef void (*i2c_slave_initfn)(i2c_slave *dev);
+typedef int (*i2c_slave_initfn)(i2c_slave *dev);
typedef struct {
+ DeviceInfo qdev;
+
/* Callbacks provided by the device. */
i2c_slave_initfn init;
i2c_event_cb event;
{
DeviceState qdev;
I2CSlaveInfo *info;
- /* FIXME: These 3 should go away once all devices have been converted. */
- i2c_event_cb event;
- i2c_recv_cb recv;
- i2c_send_cb send;
/* Remaining fields for internal use by the I2C code. */
- int address;
- void *next;
- i2c_bus *bus;
+ uint8_t address;
};
-i2c_bus *i2c_init_bus(void);
-i2c_slave *i2c_slave_init(i2c_bus *bus, int address, int size);
-void i2c_set_slave_address(i2c_slave *dev, int address);
+i2c_bus *i2c_init_bus(DeviceState *parent, const char *name);
+void i2c_set_slave_address(i2c_slave *dev, uint8_t address);
int i2c_bus_busy(i2c_bus *bus);
-int i2c_start_transfer(i2c_bus *bus, int address, int recv);
+int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv);
void i2c_end_transfer(i2c_bus *bus);
void i2c_nack(i2c_bus *bus);
int i2c_send(i2c_bus *bus, uint8_t data);
int i2c_recv(i2c_bus *bus);
-void i2c_slave_save(QEMUFile *f, i2c_slave *dev);
-void i2c_slave_load(QEMUFile *f, i2c_slave *dev);
#define I2C_SLAVE_FROM_QDEV(dev) DO_UPCAST(i2c_slave, qdev, dev)
#define FROM_I2C_SLAVE(type, dev) DO_UPCAST(type, i2c, dev)
-void i2c_register_slave(const char *name, int size, I2CSlaveInfo *type);
+void i2c_register_slave(I2CSlaveInfo *type);
-DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, int addr);
-
-/* max111x.c */
-typedef struct MAX111xState MAX111xState;
-uint32_t max111x_read(void *opaque);
-void max111x_write(void *opaque, uint32_t value);
-MAX111xState *max1110_init(qemu_irq cb);
-MAX111xState *max1111_init(qemu_irq cb);
-void max111x_set_input(MAX111xState *s, int line, uint8_t value);
-
-/* max7310.c */
-void max7310_reset(i2c_slave *i2c);
-qemu_irq *max7310_gpio_in_get(i2c_slave *i2c);
-void max7310_gpio_out_set(i2c_slave *i2c, int line, qemu_irq handler);
+DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr);
/* wm8750.c */
-i2c_slave *wm8750_init(i2c_bus *bus);
-void wm8750_reset(i2c_slave *i2c);
-void wm8750_data_req_set(i2c_slave *i2c,
+void wm8750_data_req_set(DeviceState *dev,
void (*data_req)(void *, int, int), void *opaque);
void wm8750_dac_dat(void *opaque, uint32_t sample);
uint32_t wm8750_adc_dat(void *opaque);
void wm8750_dac_commit(void *opaque);
void wm8750_set_bclk_in(void *opaque, int new_hz);
-/* twl92230.c */
-i2c_slave *twl92230_init(i2c_bus *bus, qemu_irq irq);
-qemu_irq *twl92230_gpio_in_get(i2c_slave *i2c);
-void twl92230_gpio_out_set(i2c_slave *i2c, int line, qemu_irq handler);
-
/* tmp105.c */
void tmp105_set(i2c_slave *i2c, int temp);