diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-06-21 14:58:06 +1000 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-09-05 15:38:04 +0200 |
| commit | 77bfcf28f1ee92bbc9e077abb9a494b12406846f (patch) | |
| tree | 49a45a6d029ac0074a106f048c123195c7bea8c7 | |
| parent | 43c7d8bd449d1c0f435775aefe391666a4b86dd6 (diff) | |
| download | qemu-77bfcf28f1ee92bbc9e077abb9a494b12406846f.zip qemu-77bfcf28f1ee92bbc9e077abb9a494b12406846f.tar.gz qemu-77bfcf28f1ee92bbc9e077abb9a494b12406846f.tar.bz2 | |
console: Remove unused QEMU_BIG_ENDIAN_FLAG
If we need to, we should use the pixman formats instead but for
now this is unused except in commented out code so take it out
to avoid further confusion about surface endianness.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
| -rw-r--r-- | include/ui/console.h | 3 | ||||
| -rw-r--r-- | ui/console.c | 7 | ||||
| -rw-r--r-- | ui/vnc-enc-tight.c | 12 |
3 files changed, 5 insertions, 17 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index 58a7d4b..cde0faf 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -102,8 +102,7 @@ struct QemuConsoleClass { ObjectClass parent_class; }; -#define QEMU_BIG_ENDIAN_FLAG 0x01 -#define QEMU_ALLOCATED_FLAG 0x02 +#define QEMU_ALLOCATED_FLAG 0x01 struct PixelFormat { uint8_t bits_per_pixel; diff --git a/ui/console.c b/ui/console.c index d1342ca..5d73d81 100644 --- a/ui/console.c +++ b/ui/console.c @@ -1237,9 +1237,6 @@ static void qemu_alloc_display(DisplaySurface *surface, int width, int height) assert(surface->image != NULL); surface->flags = QEMU_ALLOCATED_FLAG; -#ifdef HOST_WORDS_BIGENDIAN - surface->flags |= QEMU_BIG_ENDIAN_FLAG; -#endif } DisplaySurface *qemu_create_displaysurface(int width, int height) @@ -1264,10 +1261,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, (void *)data, linesize); assert(surface->image != NULL); -#ifdef HOST_WORDS_BIGENDIAN - surface->flags = QEMU_BIG_ENDIAN_FLAG; -#endif - return surface; } diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c index f02352c..3d1b5cd 100644 --- a/ui/vnc-enc-tight.c +++ b/ui/vnc-enc-tight.c @@ -220,8 +220,7 @@ tight_detect_smooth_image24(VncState *vs, int w, int h) unsigned int errors; \ unsigned char *buf = vs->tight.tight.buffer; \ \ - endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \ - (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \ + endian = 0; /* FIXME */ \ \ \ max[0] = vs->client_pf.rmax; \ @@ -563,8 +562,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) buf32 = (uint32_t *)buf; memset(vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); - if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) == - (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) { + if (1 /* FIXME */) { shift[0] = vs->client_pf.rshift; shift[1] = vs->client_pf.gshift; shift[2] = vs->client_pf.bshift; @@ -621,8 +619,7 @@ tight_filter_gradient24(VncState *vs, uint8_t *buf, int w, int h) \ memset (vs->tight.gradient.buffer, 0, w * 3 * sizeof(int)); \ \ - endian = 0; /* FIXME: ((vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) != \ - (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG)); */ \ + endian = 0; /* FIXME */ \ \ max[0] = vs->client_pf.rmax; \ max[1] = vs->client_pf.gmax; \ @@ -898,8 +895,7 @@ static void tight_pack24(VncState *vs, uint8_t *buf, size_t count, size_t *ret) buf32 = (uint32_t *)buf; - if (1 /* FIXME: (vs->clientds.flags & QEMU_BIG_ENDIAN_FLAG) == - (vs->ds->surface->flags & QEMU_BIG_ENDIAN_FLAG) */) { + if (1 /* FIXME */) { rshift = vs->client_pf.rshift; gshift = vs->client_pf.gshift; bshift = vs->client_pf.bshift; |