Revision 47b43a1f hw/display/cirrus_vga.c
b/hw/display/cirrus_vga.c | ||
---|---|---|
29 | 29 |
#include "hw/hw.h" |
30 | 30 |
#include "hw/pci/pci.h" |
31 | 31 |
#include "ui/console.h" |
32 |
#include "hw/vga_int.h"
|
|
32 |
#include "vga_int.h" |
|
33 | 33 |
#include "hw/loader.h" |
34 | 34 |
|
35 | 35 |
/* |
... | ... | |
288 | 288 |
|
289 | 289 |
#define ROP_NAME 0 |
290 | 290 |
#define ROP_FN(d, s) 0 |
291 |
#include "hw/cirrus_vga_rop.h"
|
|
291 |
#include "cirrus_vga_rop.h" |
|
292 | 292 |
|
293 | 293 |
#define ROP_NAME src_and_dst |
294 | 294 |
#define ROP_FN(d, s) (s) & (d) |
295 |
#include "hw/cirrus_vga_rop.h"
|
|
295 |
#include "cirrus_vga_rop.h" |
|
296 | 296 |
|
297 | 297 |
#define ROP_NAME src_and_notdst |
298 | 298 |
#define ROP_FN(d, s) (s) & (~(d)) |
299 |
#include "hw/cirrus_vga_rop.h"
|
|
299 |
#include "cirrus_vga_rop.h" |
|
300 | 300 |
|
301 | 301 |
#define ROP_NAME notdst |
302 | 302 |
#define ROP_FN(d, s) ~(d) |
303 |
#include "hw/cirrus_vga_rop.h"
|
|
303 |
#include "cirrus_vga_rop.h" |
|
304 | 304 |
|
305 | 305 |
#define ROP_NAME src |
306 | 306 |
#define ROP_FN(d, s) s |
307 |
#include "hw/cirrus_vga_rop.h"
|
|
307 |
#include "cirrus_vga_rop.h" |
|
308 | 308 |
|
309 | 309 |
#define ROP_NAME 1 |
310 | 310 |
#define ROP_FN(d, s) ~0 |
311 |
#include "hw/cirrus_vga_rop.h"
|
|
311 |
#include "cirrus_vga_rop.h" |
|
312 | 312 |
|
313 | 313 |
#define ROP_NAME notsrc_and_dst |
314 | 314 |
#define ROP_FN(d, s) (~(s)) & (d) |
315 |
#include "hw/cirrus_vga_rop.h"
|
|
315 |
#include "cirrus_vga_rop.h" |
|
316 | 316 |
|
317 | 317 |
#define ROP_NAME src_xor_dst |
318 | 318 |
#define ROP_FN(d, s) (s) ^ (d) |
319 |
#include "hw/cirrus_vga_rop.h"
|
|
319 |
#include "cirrus_vga_rop.h" |
|
320 | 320 |
|
321 | 321 |
#define ROP_NAME src_or_dst |
322 | 322 |
#define ROP_FN(d, s) (s) | (d) |
323 |
#include "hw/cirrus_vga_rop.h"
|
|
323 |
#include "cirrus_vga_rop.h" |
|
324 | 324 |
|
325 | 325 |
#define ROP_NAME notsrc_or_notdst |
326 | 326 |
#define ROP_FN(d, s) (~(s)) | (~(d)) |
327 |
#include "hw/cirrus_vga_rop.h"
|
|
327 |
#include "cirrus_vga_rop.h" |
|
328 | 328 |
|
329 | 329 |
#define ROP_NAME src_notxor_dst |
330 | 330 |
#define ROP_FN(d, s) ~((s) ^ (d)) |
331 |
#include "hw/cirrus_vga_rop.h"
|
|
331 |
#include "cirrus_vga_rop.h" |
|
332 | 332 |
|
333 | 333 |
#define ROP_NAME src_or_notdst |
334 | 334 |
#define ROP_FN(d, s) (s) | (~(d)) |
335 |
#include "hw/cirrus_vga_rop.h"
|
|
335 |
#include "cirrus_vga_rop.h" |
|
336 | 336 |
|
337 | 337 |
#define ROP_NAME notsrc |
338 | 338 |
#define ROP_FN(d, s) (~(s)) |
339 |
#include "hw/cirrus_vga_rop.h"
|
|
339 |
#include "cirrus_vga_rop.h" |
|
340 | 340 |
|
341 | 341 |
#define ROP_NAME notsrc_or_dst |
342 | 342 |
#define ROP_FN(d, s) (~(s)) | (d) |
343 |
#include "hw/cirrus_vga_rop.h"
|
|
343 |
#include "cirrus_vga_rop.h" |
|
344 | 344 |
|
345 | 345 |
#define ROP_NAME notsrc_and_notdst |
346 | 346 |
#define ROP_FN(d, s) (~(s)) & (~(d)) |
347 |
#include "hw/cirrus_vga_rop.h"
|
|
347 |
#include "cirrus_vga_rop.h" |
|
348 | 348 |
|
349 | 349 |
static const cirrus_bitblt_rop_t cirrus_fwd_rop[16] = { |
350 | 350 |
cirrus_bitblt_rop_fwd_0, |
... | ... | |
2166 | 2166 |
} |
2167 | 2167 |
|
2168 | 2168 |
#define DEPTH 8 |
2169 |
#include "hw/cirrus_vga_template.h"
|
|
2169 |
#include "cirrus_vga_template.h" |
|
2170 | 2170 |
|
2171 | 2171 |
#define DEPTH 16 |
2172 |
#include "hw/cirrus_vga_template.h"
|
|
2172 |
#include "cirrus_vga_template.h" |
|
2173 | 2173 |
|
2174 | 2174 |
#define DEPTH 32 |
2175 |
#include "hw/cirrus_vga_template.h"
|
|
2175 |
#include "cirrus_vga_template.h" |
|
2176 | 2176 |
|
2177 | 2177 |
static void cirrus_cursor_draw_line(VGACommonState *s1, uint8_t *d1, int scr_y) |
2178 | 2178 |
{ |
Also available in: Unified diff