diff options
author | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
---|---|---|
committer | malc <av1474@comtv.ru> | 2011-08-22 14:41:12 +0400 |
commit | 1afa194a0a3384c5a8fd150e4335d332c22883cf (patch) | |
tree | 87d1ca2dbfb03128e628e344a713297131bad7f7 /hw/tcx.c | |
parent | 157f2662fb4dd8f02885027e47f79fbee83c7b94 (diff) | |
parent | f1a7104a5f435a1bf2a1158e6f737dbd89e8c153 (diff) |
Merge branch 'master' of git://git.qemu.org/qemu
Diffstat (limited to 'hw/tcx.c')
-rw-r--r-- | hw/tcx.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -42,9 +42,9 @@ typedef struct TCXState { uint32_t *vram24, *cplane; ram_addr_t vram_offset, vram24_offset, cplane_offset; uint32_t vram_size; - uint16_t width, height, depth; - uint8_t r[256], g[256], b[256]; uint32_t palette[256]; + uint8_t r[256], g[256], b[256]; + uint16_t width, height, depth; uint8_t dac_index, dac_state; } TCXState; |