Compile pflash_cfi02 only once

[qemu.git] / hw / smbus_eeprom.c

diff --git a/hw/smbus_eeprom.c b/hw/smbus_eeprom.c
index ce5f5f273ea2a20221cb016479b37293b1ae8510..52463e0f8667cb6c6e07110b8693ed90b818bf21 100644 (file)
--- a/hw/smbus_eeprom.c
+++ b/hw/smbus_eeprom.c
@@ -29,8 +29,8 @@
 //#define DEBUG
 
 typedef struct SMBusEEPROMDevice {
-    SMBusDevice dev;
-    uint8_t *data;
+    SMBusDevice smbusdev;
+    void *data;
     uint8_t offset;
 } SMBusEEPROMDevice;
 
@@ -54,7 +54,8 @@ static void eeprom_send_byte(SMBusDevice *dev, uint8_t val)
 static uint8_t eeprom_receive_byte(SMBusDevice *dev)
 {
     SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *) dev;
-    uint8_t val = eeprom->data[eeprom->offset++];
+    uint8_t *data = eeprom->data;
+    uint8_t val = data[eeprom->offset++];
 #ifdef DEBUG
     printf("eeprom_receive_byte: addr=0x%02x val=0x%02x\n",
            dev->i2c.address, val);
@@ -95,18 +96,32 @@ static uint8_t eeprom_read_data(SMBusDevice *dev, uint8_t cmd, int n)
     return eeprom_receive_byte(dev);
 }
 
-void smbus_eeprom_device_init(i2c_bus *bus, uint8_t addr, uint8_t *buf)
+static int smbus_eeprom_init(SMBusDevice *dev)
 {
-    SMBusEEPROMDevice *eeprom;
+    SMBusEEPROMDevice *eeprom = (SMBusEEPROMDevice *)dev;
 
-    eeprom = (SMBusEEPROMDevice *)smbus_device_init(bus, addr,
-        sizeof(SMBusEEPROMDevice));
-
-    eeprom->dev.quick_cmd = eeprom_quick_cmd;
-    eeprom->dev.send_byte = eeprom_send_byte;
-    eeprom->dev.receive_byte = eeprom_receive_byte;
-    eeprom->dev.write_data = eeprom_write_data;
-    eeprom->dev.read_data = eeprom_read_data;
-    eeprom->data = buf;
     eeprom->offset = 0;
+    return 0;
+}
+
+static SMBusDeviceInfo smbus_eeprom_info = {
+    .i2c.qdev.name = "smbus-eeprom",
+    .i2c.qdev.size = sizeof(SMBusEEPROMDevice),
+    .i2c.qdev.props = (Property[]) {
+        DEFINE_PROP_PTR("data", SMBusEEPROMDevice, data),
+        DEFINE_PROP_END_OF_LIST(),
+    },
+    .init = smbus_eeprom_init,
+    .quick_cmd = eeprom_quick_cmd,
+    .send_byte = eeprom_send_byte,
+    .receive_byte = eeprom_receive_byte,
+    .write_data = eeprom_write_data,
+    .read_data = eeprom_read_data
+};
+
+static void smbus_eeprom_register_devices(void)
+{
+    smbus_register_device(&smbus_eeprom_info);
 }
+
+device_init(smbus_eeprom_register_devices)