Merge remote-tracking branch 'spice/spice.v39' into staging

[qemu.git] / hw / tmp105.c

diff --git a/hw/tmp105.c b/hw/tmp105.c
index 0877e126fcf05818a0352114c1e9120de6866261..f7e6f2b9095871f04ed848dff58c30a89426b251 100644 (file)
--- a/hw/tmp105.c
+++ b/hw/tmp105.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "hw.h"
@@ -24,7 +23,7 @@
 
 typedef struct {
     i2c_slave i2c;
-    int len;
+    uint8_t len;
     uint8_t buf[2];
     qemu_irq pin;
 
@@ -33,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)
@@ -174,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);
-}
+    TMP105State *s = opaque;
 
-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]);
-
-    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;
 }
 
-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(i2c_slave *i2c)
 {
     TMP105State *s = (TMP105State *) i2c;
 
@@ -227,19 +215,30 @@ void tmp105_reset(i2c_slave *i2c)
     tmp105_interrupt_update(s);
 }
 
-struct i2c_slave *tmp105_init(i2c_bus *bus, qemu_irq alarm)
+static int tmp105_init(i2c_slave *i2c)
 {
-    TMP105State *s = (TMP105State *)
-            i2c_slave_init(bus, 0, sizeof(TMP105State));
+    TMP105State *s = FROM_I2C_SLAVE(TMP105State, i2c);
 
-    s->i2c.event = tmp105_event;
-    s->i2c.recv = tmp105_rx;
-    s->i2c.send = tmp105_tx;
-    s->pin = alarm;
+    qdev_init_gpio_out(&i2c->qdev, &s->pin, 1);
 
     tmp105_reset(&s->i2c);
 
-    register_savevm("TMP105", -1, 0, tmp105_save, tmp105_load, s);
+    return 0;
+}
 
-    return &s->i2c;
+static I2CSlaveInfo tmp105_info = {
+    .qdev.name = "tmp105",
+    .qdev.size = sizeof(TMP105State),
+    .qdev.vmsd = &vmstate_tmp105,
+    .init = tmp105_init,
+    .event = tmp105_event,
+    .recv = tmp105_rx,
+    .send = tmp105_tx
+};
+
+static void tmp105_register_devices(void)
+{
+    i2c_register_slave(&tmp105_info);
 }
+
+device_init(tmp105_register_devices)