Commit 602dafcf43d8a35ff77e33377c1f258515812e5b
1 parent
61f14e10
Use pixel_ops.h
Signed-off-by: Paul Brook <paul@codesourcery.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6964 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
1 additions
and
24 deletions
hw/pl110.c
| @@ -59,30 +59,7 @@ static const unsigned char pl110_versatile_id[] = | @@ -59,30 +59,7 @@ static const unsigned char pl110_versatile_id[] = | ||
| 59 | #define pl110_versatile_id pl110_id | 59 | #define pl110_versatile_id pl110_id |
| 60 | #endif | 60 | #endif |
| 61 | 61 | ||
| 62 | -static inline uint32_t rgb_to_pixel8(unsigned int r, unsigned int g, unsigned b) | ||
| 63 | -{ | ||
| 64 | - return ((r >> 5) << 5) | ((g >> 5) << 2) | (b >> 6); | ||
| 65 | -} | ||
| 66 | - | ||
| 67 | -static inline uint32_t rgb_to_pixel15(unsigned int r, unsigned int g, unsigned b) | ||
| 68 | -{ | ||
| 69 | - return ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3); | ||
| 70 | -} | ||
| 71 | - | ||
| 72 | -static inline uint32_t rgb_to_pixel16(unsigned int r, unsigned int g, unsigned b) | ||
| 73 | -{ | ||
| 74 | - return ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3); | ||
| 75 | -} | ||
| 76 | - | ||
| 77 | -static inline uint32_t rgb_to_pixel24(unsigned int r, unsigned int g, unsigned b) | ||
| 78 | -{ | ||
| 79 | - return (r << 16) | (g << 8) | b; | ||
| 80 | -} | ||
| 81 | - | ||
| 82 | -static inline uint32_t rgb_to_pixel32(unsigned int r, unsigned int g, unsigned b) | ||
| 83 | -{ | ||
| 84 | - return (r << 16) | (g << 8) | b; | ||
| 85 | -} | 62 | +#include "pixel_ops.h" |
| 86 | 63 | ||
| 87 | typedef void (*drawfn)(uint32_t *, uint8_t *, const uint8_t *, int); | 64 | typedef void (*drawfn)(uint32_t *, uint8_t *, const uint8_t *, int); |
| 88 | 65 |