Commit 77bfcf28 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Gerd Hoffmann
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 43c7d8bd

include/ui/console.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

ui/console.c

+0 −7
Original line number Diff line number Diff line
@@ -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;

}

ui/vnc-enc-tight.c

+4 −8
Original line number Diff line number Diff line
@@ -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;