Revision 2cdaca90

b/hw/display/blizzard_template.h
18 18
 * with this program; if not, see <http://www.gnu.org/licenses/>.
19 19
 */
20 20

  
21
#define SKIP_PIXEL(to)		to += deststep
21
#define SKIP_PIXEL(to)         (to += deststep)
22 22
#if DEPTH == 8
23
# define PIXEL_TYPE		uint8_t
24
# define COPY_PIXEL(to, from)	*to = from; SKIP_PIXEL(to)
25
# define COPY_PIXEL1(to, from)	*to ++ = from
23
# define PIXEL_TYPE            uint8_t
24
# define COPY_PIXEL(to, from)  do { *to = from; SKIP_PIXEL(to); } while (0)
25
# define COPY_PIXEL1(to, from) (*to++ = from)
26 26
#elif DEPTH == 15 || DEPTH == 16
27
# define PIXEL_TYPE		uint16_t
28
# define COPY_PIXEL(to, from)	*to = from; SKIP_PIXEL(to)
29
# define COPY_PIXEL1(to, from)	*to ++ = from
27
# define PIXEL_TYPE            uint16_t
28
# define COPY_PIXEL(to, from)  do { *to = from; SKIP_PIXEL(to); } while (0)
29
# define COPY_PIXEL1(to, from) (*to++ = from)
30 30
#elif DEPTH == 24
31
# define PIXEL_TYPE		uint8_t
32
# define COPY_PIXEL(to, from)	\
33
    to[0] = from; to[1] = (from) >> 8; to[2] = (from) >> 16; SKIP_PIXEL(to)
34
# define COPY_PIXEL1(to, from)	\
35
    *to ++ = from; *to ++ = (from) >> 8; *to ++ = (from) >> 16
31
# define PIXEL_TYPE            uint8_t
32
# define COPY_PIXEL(to, from) \
33
    do {                      \
34
        to[0] = from;         \
35
        to[1] = (from) >> 8;  \
36
        to[2] = (from) >> 16; \
37
        SKIP_PIXEL(to);       \
38
    } while (0)
39

  
40
# define COPY_PIXEL1(to, from) \
41
    do {                       \
42
        *to++ = from;          \
43
        *to++ = (from) >> 8;   \
44
        *to++ = (from) >> 16;  \
45
    } while (0)
36 46
#elif DEPTH == 32
37
# define PIXEL_TYPE		uint32_t
38
# define COPY_PIXEL(to, from)	*to = from; SKIP_PIXEL(to)
39
# define COPY_PIXEL1(to, from)	*to ++ = from
47
# define PIXEL_TYPE            uint32_t
48
# define COPY_PIXEL(to, from)  do { *to = from; SKIP_PIXEL(to); } while (0)
49
# define COPY_PIXEL1(to, from) (*to++ = from)
40 50
#else
41 51
# error unknown bit depth
42 52
#endif
b/hw/display/pl110_template.h
14 14
#if BITS == 8
15 15
#define COPY_PIXEL(to, from) *(to++) = from
16 16
#elif BITS == 15 || BITS == 16
17
#define COPY_PIXEL(to, from) *(uint16_t *)to = from; to += 2;
17
#define COPY_PIXEL(to, from) do { *(uint16_t *)to = from; to += 2; } while (0)
18 18
#elif BITS == 24
19
#define COPY_PIXEL(to, from) \
20
  *(to++) = from; *(to++) = (from) >> 8; *(to++) = (from) >> 16
19
#define COPY_PIXEL(to, from)    \
20
    do {                        \
21
        *(to++) = from;         \
22
        *(to++) = (from) >> 8;  \
23
        *(to++) = (from) >> 16; \
24
    } while (0)
21 25
#elif BITS == 32
22
#define COPY_PIXEL(to, from) *(uint32_t *)to = from; to += 4;
26
#define COPY_PIXEL(to, from) do { *(uint32_t *)to = from; to += 4; } while (0)
23 27
#else
24 28
#error unknown bit depth
25 29
#endif
b/hw/display/pxa2xx_template.h
11 11

  
12 12
# define SKIP_PIXEL(to)		to += deststep
13 13
#if BITS == 8
14
# define COPY_PIXEL(to, from)	*to = from; SKIP_PIXEL(to)
14
# define COPY_PIXEL(to, from)  do { *to = from; SKIP_PIXEL(to); } while (0)
15 15
#elif BITS == 15 || BITS == 16
16
# define COPY_PIXEL(to, from)	*(uint16_t *) to = from; SKIP_PIXEL(to)
16
# define COPY_PIXEL(to, from)    \
17
    do {                         \
18
        *(uint16_t *) to = from; \
19
        SKIP_PIXEL(to);          \
20
    } while (0)
17 21
#elif BITS == 24
18
# define COPY_PIXEL(to, from)	\
19
	*(uint16_t *) to = from; *(to + 2) = (from) >> 16; SKIP_PIXEL(to)
22
# define COPY_PIXEL(to, from)     \
23
    do {                          \
24
        *(uint16_t *) to = from;  \
25
        *(to + 2) = (from) >> 16; \
26
        SKIP_PIXEL(to);           \
27
    } while (0)
20 28
#elif BITS == 32
21
# define COPY_PIXEL(to, from)	*(uint32_t *) to = from; SKIP_PIXEL(to)
29
# define COPY_PIXEL(to, from)    \
30
    do {                         \
31
        *(uint32_t *) to = from; \
32
        SKIP_PIXEL(to);          \
33
    } while (0)
22 34
#else
23 35
# error unknown bit depth
24 36
#endif
b/hw/display/tc6393xb_template.h
22 22
 */
23 23

  
24 24
#if BITS == 8
25
# define SET_PIXEL(addr, color)	*(uint8_t*)addr = color;
25
# define SET_PIXEL(addr, color)  (*(uint8_t *)addr = color)
26 26
#elif BITS == 15 || BITS == 16
27
# define SET_PIXEL(addr, color)	*(uint16_t*)addr = color;
27
# define SET_PIXEL(addr, color)  (*(uint16_t *)addr = color)
28 28
#elif BITS == 24
29
# define SET_PIXEL(addr, color)	\
30
    addr[0] = color; addr[1] = (color) >> 8; addr[2] = (color) >> 16;
29
# define SET_PIXEL(addr, color)  \
30
    do {                         \
31
        addr[0] = color;         \
32
        addr[1] = (color) >> 8;  \
33
        addr[2] = (color) >> 16; \
34
    } while (0)
31 35
#elif BITS == 32
32
# define SET_PIXEL(addr, color)	*(uint32_t*)addr = color;
36
# define SET_PIXEL(addr, color)  (*(uint32_t *)addr = color)
33 37
#else
34 38
# error unknown bit depth
35 39
#endif

Also available in: Unified diff