uhci: Use only one queue for ctrl endpoints

[qemu.git] / hw / tmp105.c

diff --git a/hw/tmp105.c b/hw/tmp105.c
index c9756c5e96722169b6b29e2eb272c6c00577b36c..8e8dbd94eba1876f211bdd891f9375c864c814a9 100644 (file)
--- a/hw/tmp105.c
+++ b/hw/tmp105.c
@@ -22,8 +22,8 @@
 #include "i2c.h"
 
 typedef struct {
-    i2c_slave i2c;
-    int len;
+    I2CSlave i2c;
+    uint8_t len;
     uint8_t buf[2];
     qemu_irq pin;
 
@@ -32,7 +32,7 @@ typedef struct {
     int16_t temperature;
     int16_t limit[2];
     int faults;
-    int alarm;
+    uint8_t alarm;
 } TMP105State;
 
 static void tmp105_interrupt_update(TMP105State *s)
@@ -65,7 +65,7 @@ static void tmp105_alarm_update(TMP105State *s)
 }
 
 /* Units are 0.001 centigrades relative to 0 C.  */
-void tmp105_set(i2c_slave *i2c, int temp)
+void tmp105_set(I2CSlave *i2c, int temp)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -138,7 +138,7 @@ static void tmp105_write(TMP105State *s)
     }
 }
 
-static int tmp105_rx(i2c_slave *i2c)
+static int tmp105_rx(I2CSlave *i2c)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -148,7 +148,7 @@ static int tmp105_rx(i2c_slave *i2c)
         return 0xff;
 }
 
-static int tmp105_tx(i2c_slave *i2c, uint8_t data)
+static int tmp105_tx(I2CSlave *i2c, uint8_t data)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -163,7 +163,7 @@ static int tmp105_tx(i2c_slave *i2c, uint8_t data)
     return 0;
 }
 
-static void tmp105_event(i2c_slave *i2c, enum i2c_event event)
+static void tmp105_event(I2CSlave *i2c, enum i2c_event event)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -173,47 +173,36 @@ static void tmp105_event(i2c_slave *i2c, enum i2c_event event)
     s->len = 0;
 }
 
-static void tmp105_save(QEMUFile *f, void *opaque)
+static int tmp105_post_load(void *opaque, int version_id)
 {
-    TMP105State *s = (TMP105State *) opaque;
-
-    qemu_put_byte(f, s->len);
-    qemu_put_8s(f, &s->buf[0]);
-    qemu_put_8s(f, &s->buf[1]);
-
-    qemu_put_8s(f, &s->pointer);
-    qemu_put_8s(f, &s->config);
-    qemu_put_sbe16s(f, &s->temperature);
-    qemu_put_sbe16s(f, &s->limit[0]);
-    qemu_put_sbe16s(f, &s->limit[1]);
-    qemu_put_byte(f, s->alarm);
-    s->faults = tmp105_faultq[(s->config >> 3) & 3];           /* F */
-
-    i2c_slave_save(f, &s->i2c);
-}
-
-static int tmp105_load(QEMUFile *f, void *opaque, int version_id)
-{
-    TMP105State *s = (TMP105State *) opaque;
-
-    s->len = qemu_get_byte(f);
-    qemu_get_8s(f, &s->buf[0]);
-    qemu_get_8s(f, &s->buf[1]);
+    TMP105State *s = opaque;
 
-    qemu_get_8s(f, &s->pointer);
-    qemu_get_8s(f, &s->config);
-    qemu_get_sbe16s(f, &s->temperature);
-    qemu_get_sbe16s(f, &s->limit[0]);
-    qemu_get_sbe16s(f, &s->limit[1]);
-    s->alarm = qemu_get_byte(f);
+    s->faults = tmp105_faultq[(s->config >> 3) & 3];           /* F */
 
     tmp105_interrupt_update(s);
-
-    i2c_slave_load(f, &s->i2c);
     return 0;
 }
 
-static void tmp105_reset(i2c_slave *i2c)
+static const VMStateDescription vmstate_tmp105 = {
+    .name = "TMP105",
+    .version_id = 0,
+    .minimum_version_id = 0,
+    .minimum_version_id_old = 0,
+    .post_load = tmp105_post_load,
+    .fields      = (VMStateField []) {
+        VMSTATE_UINT8(len, TMP105State),
+        VMSTATE_UINT8_ARRAY(buf, TMP105State, 2),
+        VMSTATE_UINT8(pointer, TMP105State),
+        VMSTATE_UINT8(config, TMP105State),
+        VMSTATE_INT16(temperature, TMP105State),
+        VMSTATE_INT16_ARRAY(limit, TMP105State, 2),
+        VMSTATE_UINT8(alarm, TMP105State),
+        VMSTATE_I2C_SLAVE(i2c, TMP105State),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
+static void tmp105_reset(I2CSlave *i2c)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -226,7 +215,7 @@ static void tmp105_reset(i2c_slave *i2c)
     tmp105_interrupt_update(s);
 }
 
-static void tmp105_init(i2c_slave *i2c)
+static int tmp105_init(I2CSlave *i2c)
 {
     TMP105State *s = FROM_I2C_SLAVE(TMP105State, i2c);
 
@@ -234,21 +223,31 @@ static void tmp105_init(i2c_slave *i2c)
 
     tmp105_reset(&s->i2c);
 
-    register_savevm("TMP105", -1, 0, tmp105_save, tmp105_load, s);
+    return 0;
+}
+
+static void tmp105_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    I2CSlaveClass *k = I2C_SLAVE_CLASS(klass);
+
+    k->init = tmp105_init;
+    k->event = tmp105_event;
+    k->recv = tmp105_rx;
+    k->send = tmp105_tx;
+    dc->vmsd = &vmstate_tmp105;
 }
 
-static I2CSlaveInfo tmp105_info = {
-    .qdev.name = "tmp105",
-    .qdev.size = sizeof(TMP105State),
-    .init = tmp105_init,
-    .event = tmp105_event,
-    .recv = tmp105_rx,
-    .send = tmp105_tx
+static TypeInfo tmp105_info = {
+    .name          = "tmp105",
+    .parent        = TYPE_I2C_SLAVE,
+    .instance_size = sizeof(TMP105State),
+    .class_init    = tmp105_class_init,
 };
 
-static void tmp105_register_devices(void)
+static void tmp105_register_types(void)
 {
-    i2c_register_slave(&tmp105_info);
+    type_register_static(&tmp105_info);
 }
 
-device_init(tmp105_register_devices)
+type_init(tmp105_register_types)