diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2014-12-04 15:52:55 +0000 |
|---|---|---|
| committer | Greg Bellows <greg.bellows@linaro.org> | 2015-01-15 16:18:34 -0600 |
| commit | 1f60cb262f0765521eaad1802963c00180740991 (patch) | |
| tree | e57cba899e30f3663752174ccf8ae45be2308b92 | |
| parent | fd7249b4a4804e37ccdfb9d8e4f10a23c06f4410 (diff) | |
goldfish_fb: remove SET_ROTATION support
This is DEPRECATED functionality from the original bring-up. As this
will confuse/complicate the current emulator triggered rotation we no
longer handle it. This bumps the version of save/load format.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
| -rw-r--r-- | hw/display/goldfish_fb.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/hw/display/goldfish_fb.c b/hw/display/goldfish_fb.c index bdd898771..136a15dec 100644 --- a/hw/display/goldfish_fb.c +++ b/hw/display/goldfish_fb.c @@ -36,7 +36,7 @@ enum { FB_INT_STATUS = 0x08, FB_INT_ENABLE = 0x0c, FB_SET_BASE = 0x10, - FB_SET_ROTATION = 0x14, + FB_SET_ROTATION = 0x14, /* DEPRECATED */ FB_SET_BLANK = 0x18, FB_GET_PHYS_WIDTH = 0x1c, FB_GET_PHYS_HEIGHT = 0x20, @@ -56,7 +56,6 @@ struct goldfish_fb_state { uint32_t base_valid : 1; uint32_t need_update : 1; uint32_t need_int : 1; - uint32_t set_rotation : 2; uint32_t blank : 1; uint32_t int_status; uint32_t int_enable; @@ -64,7 +63,7 @@ struct goldfish_fb_state { int dpi; }; -#define GOLDFISH_FB_SAVE_VERSION 2 +#define GOLDFISH_FB_SAVE_VERSION 3 static void goldfish_fb_save(QEMUFile* f, void* opaque) { @@ -81,7 +80,6 @@ static void goldfish_fb_save(QEMUFile* f, void* opaque) qemu_put_byte(f, s->base_valid); qemu_put_byte(f, s->need_update); qemu_put_byte(f, s->need_int); - qemu_put_byte(f, s->set_rotation); qemu_put_byte(f, s->blank); qemu_put_be32(f, s->int_status); qemu_put_be32(f, s->int_enable); @@ -119,7 +117,6 @@ static int goldfish_fb_load(QEMUFile* f, void* opaque, int version_id) s->base_valid = qemu_get_byte(f); s->need_update = qemu_get_byte(f); s->need_int = qemu_get_byte(f); - s->set_rotation = qemu_get_byte(f); s->blank = qemu_get_byte(f); s->int_status = qemu_get_be32(f); s->int_enable = qemu_get_be32(f); @@ -320,10 +317,6 @@ static void goldfish_fb_write(void *opaque, hwaddr offset, uint64_t val, s->need_update = 1; s->need_int = 1; s->base_valid = 1; - if(s->set_rotation != s->rotation) { - //printf("FB_SET_BASE: rotation : %d => %d\n", s->rotation, s->set_rotation); - s->rotation = s->set_rotation; - } /* The guest is waiting for us to complete an update cycle * and notify it, so make sure we do a redraw immediately. */ @@ -331,7 +324,7 @@ static void goldfish_fb_write(void *opaque, hwaddr offset, uint64_t val, qemu_set_irq(s->irq, s->int_status & s->int_enable); break; case FB_SET_ROTATION: - s->set_rotation = val; + error_report("%s: use of deprecated FB_SET_ROTATION %ld", __func__, val); break; case FB_SET_BLANK: s->blank = val; |