diff options
| author | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-02-19 12:31:32 +0000 |
|---|---|---|
| committer | pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162> | 2006-02-19 12:31:32 +0000 |
| commit | be9d365723740a8bf4f11d2eb3e9099c99019a57 (patch) | |
| tree | c48ede8837e3ceb99500516031a74b6c3a214f0e /hw/pl110_template.h | |
| parent | 242011157f0d454bf5a57541ebeba2c17611298e (diff) | |
PL110 byteswapping fix.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1763 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/pl110_template.h')
| -rw-r--r-- | hw/pl110_template.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/pl110_template.h b/hw/pl110_template.h index 1ab77777cd..db05035b01 100644 --- a/hw/pl110_template.h +++ b/hw/pl110_template.h @@ -92,7 +92,7 @@ static void glue(pl110_draw_line1_,NAME)(uint32_t *pallette, uint8_t *d, const u #else #define FN(x, y) COPY_PIXEL(d, pallette[(data >> ((x) + y)) & 1]); #endif -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS FN_8(24) FN_8(16) FN_8(8) @@ -119,7 +119,7 @@ static void glue(pl110_draw_line2_,NAME)(uint32_t *pallette, uint8_t *d, const u #else #define FN(x, y) COPY_PIXEL(d, pallette[(data >> ((x)*2 + y)) & 3]); #endif -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS FN_4(0, 24) FN_4(0, 16) FN_4(0, 8) @@ -146,7 +146,7 @@ static void glue(pl110_draw_line4_,NAME)(uint32_t *pallette, uint8_t *d, const u #else #define FN(x, y) COPY_PIXEL(d, pallette[(data >> ((x)*4 + y)) & 0xf]); #endif -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS FN_2(0, 24) FN_2(0, 16) FN_2(0, 8) @@ -169,7 +169,7 @@ static void glue(pl110_draw_line8_,NAME)(uint32_t *pallette, uint8_t *d, const u while (width > 0) { data = *(uint32_t *)src; #define FN(x) COPY_PIXEL(d, pallette[(data >> (x)) & 0xff]); -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS FN(24) FN(16) FN(8) @@ -192,7 +192,7 @@ static void glue(pl110_draw_line16_,NAME)(uint32_t *pallette, uint8_t *d, const unsigned int r, g, b; while (width > 0) { data = *(uint32_t *)src; -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS data = bswap32(data); #endif #if 0 @@ -229,7 +229,7 @@ static void glue(pl110_draw_line32_,NAME)(uint32_t *pallette, uint8_t *d, const unsigned int r, g, b; while (width > 0) { data = *(uint32_t *)src; -#ifdef SWAP_BYTES +#ifdef SWAP_WORDS r = data & 0xff; g = (data >> 8) & 0xff; b = (data >> 16) & 0xff; |