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

omap_lcdc: Remove support for DEPTH != 32 

surface_bits_per_pixel() always returns 32
so, removing other dead code which is
based on DEPTH !== 32

Signed-off-by: Pooja Dhannawat <dhannawatpooja1@gmail.com>
Message-id: 1459260142-9144-1-git-send-email-dhannawatpooja1@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
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 5c87c4089a
commit ea644cf343
2 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/display/omap_lcd_template.h
View File

@ -27,13 +27,7 @@
* 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 == 8 #if DEPTH == 32
# define BPP 1
# define PIXEL_TYPE uint8_t
#elif DEPTH == 15 || DEPTH == 16
# define BPP 2
# define PIXEL_TYPE uint16_t
#elif DEPTH == 32
# define BPP 4 # define BPP 4
# define PIXEL_TYPE uint32_t # define PIXEL_TYPE uint32_t
#else #else
@ -152,7 +146,7 @@ static void glue(draw_line12_, DEPTH)(void *opaque,
static void glue(draw_line16_, DEPTH)(void *opaque, static void glue(draw_line16_, DEPTH)(void *opaque,
uint8_t *d, const uint8_t *s, int width, int deststep) uint8_t *d, const uint8_t *s, int width, int deststep)
{ {
#if DEPTH == 16 && 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);
#else #else
uint16_t v; uint16_t v;

48
hw/display/omap_lcdc.c
View File

@ -71,47 +71,9 @@ static void omap_lcd_interrupts(struct omap_lcd_panel_s *s)
#define draw_line_func drawfn #define draw_line_func drawfn
#define DEPTH 8
#include "omap_lcd_template.h"
#define DEPTH 15
#include "omap_lcd_template.h"
#define DEPTH 16
#include "omap_lcd_template.h"
#define DEPTH 32 #define DEPTH 32
#include "omap_lcd_template.h" #include "omap_lcd_template.h"
static draw_line_func draw_line_table2[33] = {
[0 ... 32] = NULL,
[8] = draw_line2_8,
[15] = draw_line2_15,
[16] = draw_line2_16,
[32] = draw_line2_32,
}, draw_line_table4[33] = {
[0 ... 32] = NULL,
[8] = draw_line4_8,
[15] = draw_line4_15,
[16] = draw_line4_16,
[32] = draw_line4_32,
}, draw_line_table8[33] = {
[0 ... 32] = NULL,
[8] = draw_line8_8,
[15] = draw_line8_15,
[16] = draw_line8_16,
[32] = draw_line8_32,
}, draw_line_table12[33] = {
[0 ... 32] = NULL,
[8] = draw_line12_8,
[15] = draw_line12_15,
[16] = draw_line12_16,
[32] = draw_line12_32,
}, draw_line_table16[33] = {
[0 ... 32] = NULL,
[8] = draw_line16_8,
[15] = draw_line16_15,
[16] = draw_line16_16,
[32] = draw_line16_32,
};
static void omap_update_display(void *opaque) static void omap_update_display(void *opaque)
{ {
struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque; struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque;
@ -143,25 +105,25 @@ static void omap_update_display(void *opaque)
/* Colour depth */ /* Colour depth */
switch ((omap_lcd->palette[0] >> 12) & 7) { switch ((omap_lcd->palette[0] >> 12) & 7) {
case 1: case 1:
draw_line = draw_line_table2[surface_bits_per_pixel(surface)]; draw_line = draw_line2_32;
bpp = 2; bpp = 2;
break; break;
case 2: case 2:
draw_line = draw_line_table4[surface_bits_per_pixel(surface)]; draw_line = draw_line4_32;
bpp = 4; bpp = 4;
break; break;
case 3: case 3:
draw_line = draw_line_table8[surface_bits_per_pixel(surface)]; draw_line = draw_line8_32;
bpp = 8; bpp = 8;
break; break;
case 4 ... 7: case 4 ... 7:
if (!omap_lcd->tft) if (!omap_lcd->tft)
draw_line = draw_line_table12[surface_bits_per_pixel(surface)]; draw_line = draw_line12_32;
else else
draw_line = draw_line_table16[surface_bits_per_pixel(surface)]; draw_line = draw_line16_32;
bpp = 16; bpp = 16;
break; break;