← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to hw/omap_lcd_template.h

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/omap_lcd_template.h
43
43
/*
44
44
 * 2-bit colour
45
45
 */
46
 
static void glue(draw_line2_, DEPTH)(
47
 
                uint8_t *d, const uint8_t *s, int width, const uint16_t *pal)
 
46
static void glue(draw_line2_, DEPTH)(void *opaque,
 
47
                uint8_t *d, const uint8_t *s, int width, int deststep)
48
48
{
 
49
    uint16_t *pal = opaque;
49
50
    uint8_t v, r, g, b;
50
51
 
51
52
    do {
81
82
/*
82
83
 * 4-bit colour
83
84
 */
84
 
static void glue(draw_line4_, DEPTH)(
85
 
                uint8_t *d, const uint8_t *s, int width, const uint16_t *pal)
 
85
static void glue(draw_line4_, DEPTH)(void *opaque,
 
86
                uint8_t *d, const uint8_t *s, int width, int deststep)
86
87
{
 
88
    uint16_t *pal = opaque;
87
89
    uint8_t v, r, g, b;
88
90
 
89
91
    do {
107
109
/*
108
110
 * 8-bit colour
109
111
 */
110
 
static void glue(draw_line8_, DEPTH)(
111
 
                uint8_t *d, const uint8_t *s, int width, const uint16_t *pal)
 
112
static void glue(draw_line8_, DEPTH)(void *opaque,
 
113
                uint8_t *d, const uint8_t *s, int width, int deststep)
112
114
{
 
115
    uint16_t *pal = opaque;
113
116
    uint8_t v, r, g, b;
114
117
 
115
118
    do {
126
129
/*
127
130
 * 12-bit colour
128
131
 */
129
 
static void glue(draw_line12_, DEPTH)(
130
 
                uint8_t *d, const uint8_t *s, int width, const uint16_t *pal)
 
132
static void glue(draw_line12_, DEPTH)(void *opaque,
 
133
                uint8_t *d, const uint8_t *s, int width, int deststep)
131
134
{
132
135
    uint16_t v;
133
136
    uint8_t r, g, b;
146
149
/*
147
150
 * 16-bit colour
148
151
 */
149
 
static void glue(draw_line16_, DEPTH)(
150
 
                uint8_t *d, const uint8_t *s, int width, const uint16_t *pal)
 
152
static void glue(draw_line16_, DEPTH)(void *opaque,
 
153
                uint8_t *d, const uint8_t *s, int width, int deststep)
151
154
{
152
 
#if DEPTH == 16 && defined(WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
 
155
#if DEPTH == 16 && defined(HOST_WORDS_BIGENDIAN) == defined(TARGET_WORDS_BIGENDIAN)
153
156
    memcpy(d, s, width * 2);
154
157
#else
155
158
    uint16_t v;