ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement PL110 byte order config bit (original patch by Richard Purdie). 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3330 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2007-10-04 23:45:31 +00:00
parent 4d043a0900
commit e9c05b42e3
2 changed files with 97 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/pl110.c
View File

@ -10,6 +10,7 @@
#include "vl.h" #include "vl.h"
#define PL110_CR_EN 0x001 #define PL110_CR_EN 0x001
#define PL110_CR_BGR 0x100
#define PL110_CR_BEBO 0x200 #define PL110_CR_BEBO 0x200
#define PL110_CR_BEPO 0x400 #define PL110_CR_BEPO 0x400
#define PL110_CR_PWR 0x800 #define PL110_CR_PWR 0x800
@ -114,6 +115,7 @@ static void pl110_update_display(void *opaque)
int first, last = 0; int first, last = 0;
int dirty, new_dirty; int dirty, new_dirty;
int i; int i;
int bpp_offset;
if (!pl110_enabled(s)) if (!pl110_enabled(s))
return; return;
@ -145,12 +147,17 @@ static void pl110_update_display(void *opaque)
fprintf(stderr, "pl110: Bad color depth\n"); fprintf(stderr, "pl110: Bad color depth\n");
exit(1); exit(1);
} }
if (s->cr & PL110_CR_BEBO) if (s->cr & PL110_CR_BGR)
fn = fntable[s->bpp + 6]; bpp_offset = 0;
else if (s->cr & PL110_CR_BEPO)
fn = fntable[s->bpp + 12];
else else
fn = fntable[s->bpp]; bpp_offset = 18;
if (s->cr & PL110_CR_BEBO)
fn = fntable[s->bpp + 6 + bpp_offset];
else if (s->cr & PL110_CR_BEPO)
fn = fntable[s->bpp + 12 + bpp_offset];
else
fn = fntable[s->bpp + bpp_offset];
src_width = s->cols; src_width = s->cols;
switch (s->bpp) { switch (s->bpp) {

119
hw/pl110_template.h
View File

@ -24,35 +24,68 @@
#error unknown bit depth #error unknown bit depth
#endif #endif
#undef RGB
#define BORDER bgr
#define ORDER 0 #define ORDER 0
#include "pl110_template.h" #include "pl110_template.h"
#define ORDER 1 #define ORDER 1
#include "pl110_template.h" #include "pl110_template.h"
#define ORDER 2 #define ORDER 2
#include "pl110_template.h" #include "pl110_template.h"
#undef BORDER
#define RGB
#define BORDER rgb
#define ORDER 0
#include "pl110_template.h"
#define ORDER 1
#include "pl110_template.h"
#define ORDER 2
#include "pl110_template.h"
#undef BORDER
static drawfn glue(pl110_draw_fn_,BITS)[18] = static drawfn glue(pl110_draw_fn_,BITS)[36] =
{ {
glue(pl110_draw_line1_lblp,BITS), glue(pl110_draw_line1_lblp_bgr,BITS),
glue(pl110_draw_line2_lblp,BITS), glue(pl110_draw_line2_lblp_bgr,BITS),
glue(pl110_draw_line4_lblp,BITS), glue(pl110_draw_line4_lblp_bgr,BITS),
glue(pl110_draw_line8_lblp,BITS), glue(pl110_draw_line8_lblp_bgr,BITS),
glue(pl110_draw_line16_lblp,BITS), glue(pl110_draw_line16_lblp_bgr,BITS),
glue(pl110_draw_line32_lblp,BITS), glue(pl110_draw_line32_lblp_bgr,BITS),
glue(pl110_draw_line1_bbbp,BITS), glue(pl110_draw_line1_bbbp_bgr,BITS),
glue(pl110_draw_line2_bbbp,BITS), glue(pl110_draw_line2_bbbp_bgr,BITS),
glue(pl110_draw_line4_bbbp,BITS), glue(pl110_draw_line4_bbbp_bgr,BITS),
glue(pl110_draw_line8_bbbp,BITS), glue(pl110_draw_line8_bbbp_bgr,BITS),
glue(pl110_draw_line16_bbbp,BITS), glue(pl110_draw_line16_bbbp_bgr,BITS),
glue(pl110_draw_line32_bbbp,BITS), glue(pl110_draw_line32_bbbp_bgr,BITS),
glue(pl110_draw_line1_lbbp,BITS), glue(pl110_draw_line1_lbbp_bgr,BITS),
glue(pl110_draw_line2_lbbp,BITS), glue(pl110_draw_line2_lbbp_bgr,BITS),
glue(pl110_draw_line4_lbbp,BITS), glue(pl110_draw_line4_lbbp_bgr,BITS),
glue(pl110_draw_line8_lbbp,BITS), glue(pl110_draw_line8_lbbp_bgr,BITS),
glue(pl110_draw_line16_lbbp,BITS), glue(pl110_draw_line16_lbbp_bgr,BITS),
glue(pl110_draw_line32_lbbp,BITS) glue(pl110_draw_line32_lbbp_bgr,BITS),
glue(pl110_draw_line1_lblp_rgb,BITS),
glue(pl110_draw_line2_lblp_rgb,BITS),
glue(pl110_draw_line4_lblp_rgb,BITS),
glue(pl110_draw_line8_lblp_rgb,BITS),
glue(pl110_draw_line16_lblp_rgb,BITS),
glue(pl110_draw_line32_lblp_rgb,BITS),
glue(pl110_draw_line1_bbbp_rgb,BITS),
glue(pl110_draw_line2_bbbp_rgb,BITS),
glue(pl110_draw_line4_bbbp_rgb,BITS),
glue(pl110_draw_line8_bbbp_rgb,BITS),
glue(pl110_draw_line16_bbbp_rgb,BITS),
glue(pl110_draw_line32_bbbp_rgb,BITS),
glue(pl110_draw_line1_lbbp_rgb,BITS),
glue(pl110_draw_line2_lbbp_rgb,BITS),
glue(pl110_draw_line4_lbbp_rgb,BITS),
glue(pl110_draw_line8_lbbp_rgb,BITS),
glue(pl110_draw_line16_lbbp_rgb,BITS),
glue(pl110_draw_line32_lbbp_rgb,BITS),
}; };
#undef BITS #undef BITS
@ -61,18 +94,18 @@ static drawfn glue(pl110_draw_fn_,BITS)[18] =
#else #else
#if ORDER == 0 #if ORDER == 0
#define NAME glue(lblp, BITS) #define NAME glue(glue(lblp_, BORDER), BITS)
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#define SWAP_WORDS 1 #define SWAP_WORDS 1
#endif #endif
#elif ORDER == 1 #elif ORDER == 1
#define NAME glue(bbbp, BITS) #define NAME glue(glue(bbbp_, BORDER), BITS)
#ifndef WORDS_BIGENDIAN #ifndef WORDS_BIGENDIAN
#define SWAP_WORDS 1 #define SWAP_WORDS 1
#endif #endif
#else #else
#define SWAP_PIXELS 1 #define SWAP_PIXELS 1
#define NAME glue(lbbp, BITS) #define NAME glue(glue(lbbp_, BORDER), BITS)
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
#define SWAP_WORDS 1 #define SWAP_WORDS 1
#endif #endif
@ -195,29 +228,38 @@ static void glue(pl110_draw_line16_,NAME)(uint32_t *pallette, uint8_t *d, const
#ifdef SWAP_WORDS #ifdef SWAP_WORDS
data = bswap32(data); data = bswap32(data);
#endif #endif
#ifdef RGB
#define LSB r
#define MSB b
#else
#define LSB b
#define MSB r
#endif
#if 0 #if 0
r = data & 0x1f; LSB = data & 0x1f;
data >>= 5; data >>= 5;
g = data & 0x3f; g = data & 0x3f;
data >>= 6; data >>= 6;
b = data & 0x1f; MSB = data & 0x1f;
data >>= 5; data >>= 5;
#else #else
r = (data & 0x1f) << 3; LSB = (data & 0x1f) << 3;
data >>= 5; data >>= 5;
g = (data & 0x3f) << 2; g = (data & 0x3f) << 2;
data >>= 6; data >>= 6;
b = (data & 0x1f) << 3; MSB = (data & 0x1f) << 3;
data >>= 5; data >>= 5;
#endif #endif
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
r = (data & 0x1f) << 3; LSB = (data & 0x1f) << 3;
data >>= 5; data >>= 5;
g = (data & 0x3f) << 2; g = (data & 0x3f) << 2;
data >>= 6; data >>= 6;
b = (data & 0x1f) << 3; MSB = (data & 0x1f) << 3;
data >>= 5; data >>= 5;
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
#undef MSB
#undef LSB
width -= 2; width -= 2;
src += 4; src += 4;
} }
@ -229,16 +271,25 @@ static void glue(pl110_draw_line32_,NAME)(uint32_t *pallette, uint8_t *d, const
unsigned int r, g, b; unsigned int r, g, b;
while (width > 0) { while (width > 0) {
data = *(uint32_t *)src; data = *(uint32_t *)src;
#ifdef SWAP_WORDS #ifdef RGB
r = data & 0xff; #define LSB r
g = (data >> 8) & 0xff; #define MSB b
b = (data >> 16) & 0xff;
#else #else
r = (data >> 24) & 0xff; #define LSB b
#define MSB r
#endif
#ifdef SWAP_WORDS
LSB = data & 0xff;
g = (data >> 8) & 0xff;
MSB = (data >> 16) & 0xff;
#else
LSB = (data >> 24) & 0xff;
g = (data >> 16) & 0xff; g = (data >> 16) & 0xff;
b = (data >> 8) & 0xff; MSB = (data >> 8) & 0xff;
#endif #endif
COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b)); COPY_PIXEL(d, glue(rgb_to_pixel,BITS)(r, g, b));
#undef MSB
#undef LSB
width--; width--;
src += 4; src += 4;
} }