[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 42/58] vmstate: port stellaris gamepad
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 42/58] vmstate: port stellaris gamepad |
Date: |
Thu, 24 Feb 2011 18:57:39 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/stellaris_input.c | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/hw/stellaris_input.c b/hw/stellaris_input.c
index 16aae96..b5b3bd7 100644
--- a/hw/stellaris_input.c
+++ b/hw/stellaris_input.c
@@ -13,7 +13,7 @@
typedef struct {
qemu_irq irq;
int keycode;
- int pressed;
+ uint8_t pressed;
} gamepad_button;
typedef struct {
@@ -47,30 +47,29 @@ static void stellaris_gamepad_put_key(void * opaque, int
keycode)
s->extension = 0;
}
-static void stellaris_gamepad_save(QEMUFile *f, void *opaque)
-{
- gamepad_state *s = (gamepad_state *)opaque;
- int i;
-
- qemu_put_be32(f, s->extension);
- for (i = 0; i < s->num_buttons; i++)
- qemu_put_byte(f, s->buttons[i].pressed);
-}
-
-static int stellaris_gamepad_load(QEMUFile *f, void *opaque, int version_id)
-{
- gamepad_state *s = (gamepad_state *)opaque;
- int i;
-
- if (version_id != 1)
- return -EINVAL;
-
- s->extension = qemu_get_be32(f);
- for (i = 0; i < s->num_buttons; i++)
- s->buttons[i].pressed = qemu_get_byte(f);
+static const VMStateDescription vmstate_stellaris_button = {
+ .name = "stellaris_button",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT8(pressed, gamepad_button),
+ VMSTATE_END_OF_LIST()
+ }
+};
- return 0;
-}
+static const VMStateDescription vmstate_stellaris_gamepad = {
+ .name = "stellaris_gamepad",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .minimum_version_id_old = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_INT32(extension, gamepad_state),
+ VMSTATE_STRUCT_VARRAY_INT32(buttons, gamepad_state, num_buttons, 0,
+ vmstate_stellaris_button, gamepad_button),
+ VMSTATE_END_OF_LIST()
+ }
+};
/* Returns an array 5 ouput slots. */
void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode)
@@ -86,6 +85,5 @@ void stellaris_gamepad_init(int n, qemu_irq *irq, const int
*keycode)
}
s->num_buttons = n;
qemu_add_kbd_event_handler(stellaris_gamepad_put_key, s);
- register_savevm(NULL, "stellaris_gamepad", -1, 1,
- stellaris_gamepad_save, stellaris_gamepad_load, s);
+ vmstate_register(NULL, -1, &vmstate_stellaris_gamepad, s);
}
--
1.7.4
- [Qemu-devel] [PATCH 22/58] vmstate: port pl011, (continued)
- [Qemu-devel] [PATCH 22/58] vmstate: port pl011, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 26/58] vmstate: port stellaris sys, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 27/58] vmstate: port pl022 ssp, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 30/58] vmstate: port stellaris gptm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 47/58] pxa2xx_lcd: up field is used as a bool and migrated as an uint8_t, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 01/58] vmstate: add VMSTATE_UINT32_EQUAL, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 09/58] vmstate: move timers to use test instead of version, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 23/58] vmstate: port armv7m nvic, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 03/58] vmstate: add UINT32 VARRAYS, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 32/58] vmstate: port pxa2xx_cm, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 42/58] vmstate: port stellaris gamepad,
Juan Quintela <=
- [Qemu-devel] [PATCH 41/58] vmstate: port syborg_keyboard, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 24/58] vmstate: port stellaris i2c, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 29/58] vmstate: port cuda, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 39/58] vmstate: port stellaris_adc, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 35/58] vmstate: port pxa2xx_rtc, Juan Quintela, 2011/02/24
- [Qemu-devel] [PATCH 11/58] vmstate: port adb_mouse, Juan Quintela, 2011/02/24
- Re: [Qemu-devel] [PATCH 00/58] VMState: Port several non-pc devices, Blue Swirl, 2011/02/26