Revision 714fa308 hw/pl110_template.h

b/hw/pl110_template.h
115 115
#define FN_4(x, y) FN_2(x, y) FN_2(x+2, y)
116 116
#define FN_8(y) FN_4(0, y) FN_4(4, y)
117 117

  
118
static void glue(pl110_draw_line1_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
118
static void glue(pl110_draw_line1_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
119 119
{
120
    uint32_t *pallette = opaque;
120 121
    uint32_t data;
121 122
    while (width > 0) {
122 123
        data = *(uint32_t *)src;
......
142 143
    }
143 144
}
144 145

  
145
static void glue(pl110_draw_line2_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
146
static void glue(pl110_draw_line2_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
146 147
{
148
    uint32_t *pallette = opaque;
147 149
    uint32_t data;
148 150
    while (width > 0) {
149 151
        data = *(uint32_t *)src;
......
169 171
    }
170 172
}
171 173

  
172
static void glue(pl110_draw_line4_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
174
static void glue(pl110_draw_line4_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
173 175
{
176
    uint32_t *pallette = opaque;
174 177
    uint32_t data;
175 178
    while (width > 0) {
176 179
        data = *(uint32_t *)src;
......
196 199
    }
197 200
}
198 201

  
199
static void glue(pl110_draw_line8_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
202
static void glue(pl110_draw_line8_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
200 203
{
204
    uint32_t *pallette = opaque;
201 205
    uint32_t data;
202 206
    while (width > 0) {
203 207
        data = *(uint32_t *)src;
......
219 223
    }
220 224
}
221 225

  
222
static void glue(pl110_draw_line16_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
226
static void glue(pl110_draw_line16_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
223 227
{
224 228
    uint32_t data;
225 229
    unsigned int r, g, b;
......
265 269
    }
266 270
}
267 271

  
268
static void glue(pl110_draw_line32_,NAME)(uint32_t *pallette, uint8_t *d, const uint8_t *src, int width)
272
static void glue(pl110_draw_line32_,NAME)(void *opaque, uint8_t *d, const uint8_t *src, int width, int deststep)
269 273
{
270 274
    uint32_t data;
271 275
    unsigned int r, g, b;

Also available in: Unified diff