jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
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>
authored by
Pooja Dhannawat
and committed by
Peter Maydell
ea644cf3
5c87c408
+7
-51
+2
-8
hw/display/omap_lcd_template.h
+2
-8
hw/display/omap_lcd_template.h
···
27
27
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
28
*/
29
29
30
-
#if DEPTH == 8
31
-
# define BPP 1
32
-
# define PIXEL_TYPE uint8_t
33
-
#elif DEPTH == 15 || DEPTH == 16
34
-
# define BPP 2
35
-
# define PIXEL_TYPE uint16_t
36
-
#elif DEPTH == 32
30
+
#if DEPTH == 32
37
31
# define BPP 4
38
32
# define PIXEL_TYPE uint32_t
39
33
#else
···
152
146
static void glue(draw_line16_, DEPTH)(void *opaque,
153
147
uint8_t *d, const uint8_t *s, int width, int deststep)
154
148
{
155
-
#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
149
+
#if defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
156
150
memcpy(d, s, width * 2);
157
151
#else
158
152
uint16_t v;
+5
-43
hw/display/omap_lcdc.c
+5
-43
hw/display/omap_lcdc.c
···
71
71
72
72
#define draw_line_func drawfn
73
73
74
-
#define DEPTH 8
75
-
#include "omap_lcd_template.h"
76
-
#define DEPTH 15
77
-
#include "omap_lcd_template.h"
78
-
#define DEPTH 16
79
-
#include "omap_lcd_template.h"
80
74
#define DEPTH 32
81
75
#include "omap_lcd_template.h"
82
76
83
-
static draw_line_func draw_line_table2[33] = {
84
-
[0 ... 32] = NULL,
85
-
[8] = draw_line2_8,
86
-
[15] = draw_line2_15,
87
-
[16] = draw_line2_16,
88
-
[32] = draw_line2_32,
89
-
}, draw_line_table4[33] = {
90
-
[0 ... 32] = NULL,
91
-
[8] = draw_line4_8,
92
-
[15] = draw_line4_15,
93
-
[16] = draw_line4_16,
94
-
[32] = draw_line4_32,
95
-
}, draw_line_table8[33] = {
96
-
[0 ... 32] = NULL,
97
-
[8] = draw_line8_8,
98
-
[15] = draw_line8_15,
99
-
[16] = draw_line8_16,
100
-
[32] = draw_line8_32,
101
-
}, draw_line_table12[33] = {
102
-
[0 ... 32] = NULL,
103
-
[8] = draw_line12_8,
104
-
[15] = draw_line12_15,
105
-
[16] = draw_line12_16,
106
-
[32] = draw_line12_32,
107
-
}, draw_line_table16[33] = {
108
-
[0 ... 32] = NULL,
109
-
[8] = draw_line16_8,
110
-
[15] = draw_line16_15,
111
-
[16] = draw_line16_16,
112
-
[32] = draw_line16_32,
113
-
};
114
-
115
77
static void omap_update_display(void *opaque)
116
78
{
117
79
struct omap_lcd_panel_s *omap_lcd = (struct omap_lcd_panel_s *) opaque;
···
143
105
/* Colour depth */
144
106
switch ((omap_lcd->palette[0] >> 12) & 7) {
145
107
case 1:
146
-
draw_line = draw_line_table2[surface_bits_per_pixel(surface)];
108
+
draw_line = draw_line2_32;
147
109
bpp = 2;
148
110
break;
149
111
150
112
case 2:
151
-
draw_line = draw_line_table4[surface_bits_per_pixel(surface)];
113
+
draw_line = draw_line4_32;
152
114
bpp = 4;
153
115
break;
154
116
155
117
case 3:
156
-
draw_line = draw_line_table8[surface_bits_per_pixel(surface)];
118
+
draw_line = draw_line8_32;
157
119
bpp = 8;
158
120
break;
159
121
160
122
case 4 ... 7:
161
123
if (!omap_lcd->tft)
162
-
draw_line = draw_line_table12[surface_bits_per_pixel(surface)];
124
+
draw_line = draw_line12_32;
163
125
else
164
-
draw_line = draw_line_table16[surface_bits_per_pixel(surface)];
126
+
draw_line = draw_line16_32;
165
127
bpp = 16;
166
128
break;
167
129