Revision 714fa308 hw/pxa2xx_template.h

b/hw/pxa2xx_template.h
30 30
#define FN_2(x)		FN(x + 1) FN(x)
31 31
#define FN_4(x)		FN_2(x + 2) FN_2(x)
32 32

  
33
static void glue(pxa2xx_draw_line2_, BITS)(uint32_t *palette,
33
static void glue(pxa2xx_draw_line2_, BITS)(void *opaque,
34 34
                uint8_t *dest, const uint8_t *src, int width, int deststep)
35 35
{
36
    uint32_t *palette = opaque;
36 37
    uint32_t data;
37 38
    while (width > 0) {
38 39
        data = *(uint32_t *) src;
......
54 55
    }
55 56
}
56 57

  
57
static void glue(pxa2xx_draw_line4_, BITS)(uint32_t *palette,
58
static void glue(pxa2xx_draw_line4_, BITS)(void *opaque,
58 59
                uint8_t *dest, const uint8_t *src, int width, int deststep)
59 60
{
61
    uint32_t *palette = opaque;
60 62
    uint32_t data;
61 63
    while (width > 0) {
62 64
        data = *(uint32_t *) src;
......
78 80
    }
79 81
}
80 82

  
81
static void glue(pxa2xx_draw_line8_, BITS)(uint32_t *palette,
83
static void glue(pxa2xx_draw_line8_, BITS)(void *opaque,
82 84
                uint8_t *dest, const uint8_t *src, int width, int deststep)
83 85
{
86
    uint32_t *palette = opaque;
84 87
    uint32_t data;
85 88
    while (width > 0) {
86 89
        data = *(uint32_t *) src;
......
102 105
    }
103 106
}
104 107

  
105
static void glue(pxa2xx_draw_line16_, BITS)(uint32_t *palette,
108
static void glue(pxa2xx_draw_line16_, BITS)(void *opaque,
106 109
                uint8_t *dest, const uint8_t *src, int width, int deststep)
107 110
{
108 111
    uint32_t data;
......
130 133
    }
131 134
}
132 135

  
133
static void glue(pxa2xx_draw_line16t_, BITS)(uint32_t *palette,
136
static void glue(pxa2xx_draw_line16t_, BITS)(void *opaque,
134 137
                uint8_t *dest, const uint8_t *src, int width, int deststep)
135 138
{
136 139
    uint32_t data;
......
166 169
    }
167 170
}
168 171

  
169
static void glue(pxa2xx_draw_line18_, BITS)(uint32_t *palette,
172
static void glue(pxa2xx_draw_line18_, BITS)(void *opaque,
170 173
                uint8_t *dest, const uint8_t *src, int width, int deststep)
171 174
{
172 175
    uint32_t data;
......
188 191
}
189 192

  
190 193
/* The wicked packed format */
191
static void glue(pxa2xx_draw_line18p_, BITS)(uint32_t *palette,
194
static void glue(pxa2xx_draw_line18p_, BITS)(void *opaque,
192 195
                uint8_t *dest, const uint8_t *src, int width, int deststep)
193 196
{
194 197
    uint32_t data[3];
......
236 239
    }
237 240
}
238 241

  
239
static void glue(pxa2xx_draw_line19_, BITS)(uint32_t *palette,
242
static void glue(pxa2xx_draw_line19_, BITS)(void *opaque,
240 243
                uint8_t *dest, const uint8_t *src, int width, int deststep)
241 244
{
242 245
    uint32_t data;
......
262 265
}
263 266

  
264 267
/* The wicked packed format */
265
static void glue(pxa2xx_draw_line19p_, BITS)(uint32_t *palette,
268
static void glue(pxa2xx_draw_line19p_, BITS)(void *opaque,
266 269
                uint8_t *dest, const uint8_t *src, int width, int deststep)
267 270
{
268 271
    uint32_t data[3];
......
326 329
    }
327 330
}
328 331

  
329
static void glue(pxa2xx_draw_line24_, BITS)(uint32_t *palette,
332
static void glue(pxa2xx_draw_line24_, BITS)(void *opaque,
330 333
                uint8_t *dest, const uint8_t *src, int width, int deststep)
331 334
{
332 335
    uint32_t data;
......
347 350
    }
348 351
}
349 352

  
350
static void glue(pxa2xx_draw_line24t_, BITS)(uint32_t *palette,
353
static void glue(pxa2xx_draw_line24t_, BITS)(void *opaque,
351 354
                uint8_t *dest, const uint8_t *src, int width, int deststep)
352 355
{
353 356
    uint32_t data;
......
372 375
    }
373 376
}
374 377

  
375
static void glue(pxa2xx_draw_line25_, BITS)(uint32_t *palette,
378
static void glue(pxa2xx_draw_line25_, BITS)(void *opaque,
376 379
                uint8_t *dest, const uint8_t *src, int width, int deststep)
377 380
{
378 381
    uint32_t data;

Also available in: Unified diff