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

blizzard: Remove support for DEPTH != 32 

Removing support for DEPTH != 32 from blizzard template header
and file that includes it, as macro DEPTH == 32 only used.

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Pooja Dhannawat <dhannawatpooja1@gmail.com>
Message-id: 1458971873-2768-1-git-send-email-dhannawatpooja1@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Pooja Dhannawat 2016-05-12 13:22:24 +01:00 committed by Peter Maydell
parent 26617924e9
commit 5c87c4089a
2 changed files with 5 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/display/blizzard.c
View File

@ -925,14 +925,6 @@ static void blizzard_update_display(void *opaque)
s->my[1] = 0; s->my[1] = 0;
} }
#define DEPTH 8
#include "blizzard_template.h"
#define DEPTH 15
#include "blizzard_template.h"
#define DEPTH 16
#include "blizzard_template.h"
#define DEPTH 24
#include "blizzard_template.h"
#define DEPTH 32 #define DEPTH 32
#include "blizzard_template.h" #include "blizzard_template.h"
@ -951,35 +943,10 @@ void *s1d13745_init(qemu_irq gpio_int)
s->con = graphic_console_init(NULL, 0, &blizzard_ops, s); s->con = graphic_console_init(NULL, 0, &blizzard_ops, s);
surface = qemu_console_surface(s->con); surface = qemu_console_surface(s->con);
switch (surface_bits_per_pixel(surface)) { assert(surface_bits_per_pixel(surface) == 32);
case 0:
s->line_fn_tab[0] = s->line_fn_tab[1] = s->line_fn_tab[0] = blizzard_draw_fn_32;
g_malloc0(sizeof(blizzard_fn_t) * 0x10); s->line_fn_tab[1] = blizzard_draw_fn_r_32;
break;
case 8:
s->line_fn_tab[0] = blizzard_draw_fn_8;
s->line_fn_tab[1] = blizzard_draw_fn_r_8;
break;
case 15:
s->line_fn_tab[0] = blizzard_draw_fn_15;
s->line_fn_tab[1] = blizzard_draw_fn_r_15;
break;
case 16:
s->line_fn_tab[0] = blizzard_draw_fn_16;
s->line_fn_tab[1] = blizzard_draw_fn_r_16;
break;
case 24:
s->line_fn_tab[0] = blizzard_draw_fn_24;
s->line_fn_tab[1] = blizzard_draw_fn_r_24;
break;
case 32:
s->line_fn_tab[0] = blizzard_draw_fn_32;
s->line_fn_tab[1] = blizzard_draw_fn_r_32;
break;
default:
fprintf(stderr, "%s: Bad color depth\n", __FUNCTION__);
exit(1);
}
blizzard_reset(s); blizzard_reset(s);

30
hw/display/blizzard_template.h
View File

@ -19,31 +19,7 @@
*/ */
#define SKIP_PIXEL(to) (to += deststep) #define SKIP_PIXEL(to) (to += deststep)
#if DEPTH == 8 #if DEPTH == 32
# define PIXEL_TYPE uint8_t
# define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0)
# define COPY_PIXEL1(to, from) (*to++ = from)
#elif DEPTH == 15 || DEPTH == 16
# define PIXEL_TYPE uint16_t
# define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0)
# define COPY_PIXEL1(to, from) (*to++ = from)
#elif DEPTH == 24
# define PIXEL_TYPE uint8_t
# define COPY_PIXEL(to, from) \
do { \
to[0] = from; \
to[1] = (from) >> 8; \
to[2] = (from) >> 16; \
SKIP_PIXEL(to); \
} while (0)
# define COPY_PIXEL1(to, from) \
do { \
*to++ = from; \
*to++ = (from) >> 8; \
*to++ = (from) >> 16; \
} while (0)
#elif DEPTH == 32
# define PIXEL_TYPE uint32_t # define PIXEL_TYPE uint32_t
# define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0) # define COPY_PIXEL(to, from) do { *to = from; SKIP_PIXEL(to); } while (0)
# define COPY_PIXEL1(to, from) (*to++ = from) # define COPY_PIXEL1(to, from) (*to++ = from)
@ -58,9 +34,6 @@
static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest, static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest,
const uint16_t *src, unsigned int width) const uint16_t *src, unsigned int width)
{ {
#if !defined(SWAP_WORDS) && DEPTH == 16
memcpy(dest, src, width);
#else
uint16_t data; uint16_t data;
unsigned int r, g, b; unsigned int r, g, b;
const uint16_t *end = (const void *) src + width; const uint16_t *end = (const void *) src + width;
@ -74,7 +47,6 @@ static void glue(blizzard_draw_line16_, DEPTH)(PIXEL_TYPE *dest,
data >>= 5; data >>= 5;
COPY_PIXEL1(dest, glue(rgb_to_pixel, DEPTH)(r, g, b)); COPY_PIXEL1(dest, glue(rgb_to_pixel, DEPTH)(r, g, b));
} }
#endif
} }
static void glue(blizzard_draw_line24mode1_, DEPTH)(PIXEL_TYPE *dest, static void glue(blizzard_draw_line24mode1_, DEPTH)(PIXEL_TYPE *dest,