OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/display/omap_lcdc: Expand out macros in template header

Browse Source 
The omap_lcdc template header is already only included once, for
DEPTH==32, but it still has all the macro-driven parameterization
for other depths. Expand out all the macros in the header.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20210215103215.4944-6-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-02-15 10:32:11 +00:00
parent 0dc51b0024
commit 52b8ac590d
1 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
hw/display/omap_lcd_template.h
View File

@ -27,18 +27,11 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#if DEPTH == 32
# define BPP 4
# define PIXEL_TYPE uint32_t
#else
# error unsupport depth
#endif
/* /*
* 2-bit colour * 2-bit colour
*/ */
static void glue(draw_line2_, DEPTH)(void *opaque, static void draw_line2_32(void *opaque, uint8_t *d, const uint8_t *s,
uint8_t *d, const uint8_t *s, int width, int deststep) int width, int deststep)
{ {
uint16_t *pal = opaque; uint16_t *pal = opaque;
uint8_t v, r, g, b; uint8_t v, r, g, b;
@ -48,26 +41,26 @@ static void glue(draw_line2_, DEPTH)(void *opaque,
r = (pal[v & 3] >> 4) & 0xf0; r = (pal[v & 3] >> 4) & 0xf0;
g = pal[v & 3] & 0xf0; g = pal[v & 3] & 0xf0;
b = (pal[v & 3] << 4) & 0xf0; b = (pal[v & 3] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
v >>= 2; v >>= 2;
r = (pal[v & 3] >> 4) & 0xf0; r = (pal[v & 3] >> 4) & 0xf0;
g = pal[v & 3] & 0xf0; g = pal[v & 3] & 0xf0;
b = (pal[v & 3] << 4) & 0xf0; b = (pal[v & 3] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
v >>= 2; v >>= 2;
r = (pal[v & 3] >> 4) & 0xf0; r = (pal[v & 3] >> 4) & 0xf0;
g = pal[v & 3] & 0xf0; g = pal[v & 3] & 0xf0;
b = (pal[v & 3] << 4) & 0xf0; b = (pal[v & 3] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
v >>= 2; v >>= 2;
r = (pal[v & 3] >> 4) & 0xf0; r = (pal[v & 3] >> 4) & 0xf0;
g = pal[v & 3] & 0xf0; g = pal[v & 3] & 0xf0;
b = (pal[v & 3] << 4) & 0xf0; b = (pal[v & 3] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
s ++; s ++;
width -= 4; width -= 4;
} while (width > 0); } while (width > 0);
@ -76,8 +69,8 @@ static void glue(draw_line2_, DEPTH)(void *opaque,
/* /*
* 4-bit colour * 4-bit colour
*/ */
static void glue(draw_line4_, DEPTH)(void *opaque, static void draw_line4_32(void *opaque, uint8_t *d, const uint8_t *s,
uint8_t *d, const uint8_t *s, int width, int deststep) int width, int deststep)
{ {
uint16_t *pal = opaque; uint16_t *pal = opaque;
uint8_t v, r, g, b; uint8_t v, r, g, b;
@ -87,14 +80,14 @@ static void glue(draw_line4_, DEPTH)(void *opaque,
r = (pal[v & 0xf] >> 4) & 0xf0; r = (pal[v & 0xf] >> 4) & 0xf0;
g = pal[v & 0xf] & 0xf0; g = pal[v & 0xf] & 0xf0;
b = (pal[v & 0xf] << 4) & 0xf0; b = (pal[v & 0xf] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
v >>= 4; v >>= 4;
r = (pal[v & 0xf] >> 4) & 0xf0; r = (pal[v & 0xf] >> 4) & 0xf0;
g = pal[v & 0xf] & 0xf0; g = pal[v & 0xf] & 0xf0;
b = (pal[v & 0xf] << 4) & 0xf0; b = (pal[v & 0xf] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
d += BPP; d += 4;
s ++; s ++;
width -= 2; width -= 2;
} while (width > 0); } while (width > 0);
@ -103,8 +96,8 @@ static void glue(draw_line4_, DEPTH)(void *opaque,
/* /*
* 8-bit colour * 8-bit colour
*/ */
static void glue(draw_line8_, DEPTH)(void *opaque, static void draw_line8_32(void *opaque, uint8_t *d, const uint8_t *s,
uint8_t *d, const uint8_t *s, int width, int deststep) int width, int deststep)
{ {
uint16_t *pal = opaque; uint16_t *pal = opaque;
uint8_t v, r, g, b; uint8_t v, r, g, b;
@ -114,17 +107,17 @@ static void glue(draw_line8_, DEPTH)(void *opaque,
r = (pal[v] >> 4) & 0xf0; r = (pal[v] >> 4) & 0xf0;
g = pal[v] & 0xf0; g = pal[v] & 0xf0;
b = (pal[v] << 4) & 0xf0; b = (pal[v] << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
s ++; s ++;
d += BPP; d += 4;
} while (-- width != 0); } while (-- width != 0);
} }
/* /*
* 12-bit colour * 12-bit colour
*/ */
static void glue(draw_line12_, DEPTH)(void *opaque, static void draw_line12_32(void *opaque, uint8_t *d, const uint8_t *s,
uint8_t *d, const uint8_t *s, int width, int deststep) int width, int deststep)
{ {
uint16_t v; uint16_t v;
uint8_t r, g, b; uint8_t r, g, b;
@ -134,17 +127,17 @@ static void glue(draw_line12_, DEPTH)(void *opaque,
r = (v >> 4) & 0xf0; r = (v >> 4) & 0xf0;
g = v & 0xf0; g = v & 0xf0;
b = (v << 4) & 0xf0; b = (v << 4) & 0xf0;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
s += 2; s += 2;
d += BPP; d += 4;
} while (-- width != 0); } while (-- width != 0);
} }
/* /*
* 16-bit colour * 16-bit colour
*/ */
static void glue(draw_line16_, DEPTH)(void *opaque, static void draw_line16_32(void *opaque, uint8_t *d, const uint8_t *s,
uint8_t *d, const uint8_t *s, int width, int deststep) int width, int deststep)
{ {
#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN) #if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
memcpy(d, s, width * 2); memcpy(d, s, width * 2);
@ -157,13 +150,9 @@ static void glue(draw_line16_, DEPTH)(void *opaque,
r = (v >> 8) & 0xf8; r = (v >> 8) & 0xf8;
g = (v >> 3) & 0xfc; g = (v >> 3) & 0xfc;
b = (v << 3) & 0xf8; b = (v << 3) & 0xf8;
((PIXEL_TYPE *) d)[0] = glue(rgb_to_pixel, DEPTH)(r, g, b); ((uint32_t *) d)[0] = rgb_to_pixel32(r, g, b);
s += 2; s += 2;
d += BPP; d += 4;
} while (-- width != 0); } while (-- width != 0);
#endif #endif
} }
#undef DEPTH
#undef BPP
#undef PIXEL_TYPE