OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmware_vga: Coding style cleanup

Browse Source 
Fix coding style as suggested by checkpatch.pl

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
BALATON Zoltan 2012-11-03 12:47:08 +01:00 committed by Blue Swirl
parent ef84755ebb
commit 0d7937974c
1 changed files with 149 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
hw/vmware_vga.c
View File

@ -299,28 +299,27 @@ static inline void vmsvga_update_rect(struct vmsvga_state_s *s,
if (x + w > s->width) { if (x + w > s->width) {
fprintf(stderr, "%s: update width too large x: %d, w: %d\n", fprintf(stderr, "%s: update width too large x: %d, w: %d\n",
__FUNCTION__, x, w); __func__, x, w);
x = MIN(x, s->width); x = MIN(x, s->width);
w = s->width - x; w = s->width - x;
} }
if (y + h > s->height) { if (y + h > s->height) {
fprintf(stderr, "%s: update height too large y: %d, h: %d\n", fprintf(stderr, "%s: update height too large y: %d, h: %d\n",
__FUNCTION__, y, h); __func__, y, h);
y = MIN(y, s->height); y = MIN(y, s->height);
h = s->height - y; h = s->height - y;
} }
line = h;
bypl = s->bypp * s->width; bypl = s->bypp * s->width;
width = s->bypp * w; width = s->bypp * w;
start = s->bypp * x + bypl * y; start = s->bypp * x + bypl * y;
src = s->vga.vram_ptr + start; src = s->vga.vram_ptr + start;
dst = ds_get_data(s->vga.ds) + start; dst = ds_get_data(s->vga.ds) + start;
for (; line > 0; line --, src += bypl, dst += bypl) for (line = h; line > 0; line--, src += bypl, dst += bypl) {
memcpy(dst, src, width); memcpy(dst, src, width);
}
dpy_gfx_update(s->vga.ds, x, y, w, h); dpy_gfx_update(s->vga.ds, x, y, w, h);
} }
@ -334,7 +333,8 @@ static inline void vmsvga_update_screen(struct vmsvga_state_s *s)
static inline void vmsvga_update_rect_delayed(struct vmsvga_state_s *s, static inline void vmsvga_update_rect_delayed(struct vmsvga_state_s *s,
int x, int y, int w, int h) int x, int y, int w, int h)
{ {
struct vmsvga_rect_s *rect = &s->redraw_fifo[s->redraw_fifo_last ++]; struct vmsvga_rect_s *rect = &s->redraw_fifo[s->redraw_fifo_last++];
s->redraw_fifo_last &= REDRAW_FIFO_LEN - 1; s->redraw_fifo_last &= REDRAW_FIFO_LEN - 1;
rect->x = x; rect->x = x;
rect->y = y; rect->y = y;
@ -345,6 +345,7 @@ static inline void vmsvga_update_rect_delayed(struct vmsvga_state_s *s,
static inline void vmsvga_update_rect_flush(struct vmsvga_state_s *s) static inline void vmsvga_update_rect_flush(struct vmsvga_state_s *s)
{ {
struct vmsvga_rect_s *rect; struct vmsvga_rect_s *rect;
if (s->invalidated) { if (s->invalidated) {
s->redraw_fifo_first = s->redraw_fifo_last; s->redraw_fifo_first = s->redraw_fifo_last;
return; return;
@ -352,7 +353,7 @@ static inline void vmsvga_update_rect_flush(struct vmsvga_state_s *s)
/* Overlapping region updates can be optimised out here - if someone /* Overlapping region updates can be optimised out here - if someone
* knows a smart algorithm to do that, please share. */ * knows a smart algorithm to do that, please share. */
while (s->redraw_fifo_first != s->redraw_fifo_last) { while (s->redraw_fifo_first != s->redraw_fifo_last) {
rect = &s->redraw_fifo[s->redraw_fifo_first ++]; rect = &s->redraw_fifo[s->redraw_fifo_first++];
s->redraw_fifo_first &= REDRAW_FIFO_LEN - 1; s->redraw_fifo_first &= REDRAW_FIFO_LEN - 1;
vmsvga_update_rect(s, rect->x, rect->y, rect->w, rect->h); vmsvga_update_rect(s, rect->x, rect->y, rect->w, rect->h);
} }
@ -452,16 +453,16 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,
qc->hot_y = c->hot_y; qc->hot_y = c->hot_y;
switch (c->bpp) { switch (c->bpp) {
case 1: case 1:
cursor_set_mono(qc, 0xffffff, 0x000000, (void*)c->image, cursor_set_mono(qc, 0xffffff, 0x000000, (void *)c->image,
1, (void*)c->mask); 1, (void *)c->mask);
#ifdef DEBUG #ifdef DEBUG
cursor_print_ascii_art(qc, "vmware/mono"); cursor_print_ascii_art(qc, "vmware/mono");
#endif #endif
break; break;
case 32: case 32:
/* fill alpha channel from mask, set color to zero */ /* fill alpha channel from mask, set color to zero */
cursor_set_mono(qc, 0x000000, 0x000000, (void*)c->mask, cursor_set_mono(qc, 0x000000, 0x000000, (void *)c->mask,
1, (void*)c->mask); 1, (void *)c->mask);
/* add in rgb values */ /* add in rgb values */
pixels = c->width * c->height; pixels = c->width * c->height;
for (i = 0; i < pixels; i++) { for (i = 0; i < pixels; i++) {
@ -473,7 +474,7 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,
break; break;
default: default:
fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n", fprintf(stderr, "%s: unhandled bpp %d, using fallback cursor\n",
__FUNCTION__, c->bpp); __func__, c->bpp);
cursor_put(qc); cursor_put(qc);
qc = cursor_builtin_left_ptr(); qc = cursor_builtin_left_ptr();
} }
@ -488,20 +489,25 @@ static inline void vmsvga_cursor_define(struct vmsvga_state_s *s,
static inline int vmsvga_fifo_length(struct vmsvga_state_s *s) static inline int vmsvga_fifo_length(struct vmsvga_state_s *s)
{ {
int num; int num;
if (!s->config || !s->enable)
if (!s->config || !s->enable) {
return 0; return 0;
}
num = CMD(next_cmd) - CMD(stop); num = CMD(next_cmd) - CMD(stop);
if (num < 0) if (num < 0) {
num += CMD(max) - CMD(min); num += CMD(max) - CMD(min);
}
return num >> 2; return num >> 2;
} }
static inline uint32_t vmsvga_fifo_read_raw(struct vmsvga_state_s *s) static inline uint32_t vmsvga_fifo_read_raw(struct vmsvga_state_s *s)
{ {
uint32_t cmd = s->fifo[CMD(stop) >> 2]; uint32_t cmd = s->fifo[CMD(stop) >> 2];
s->cmd->stop = cpu_to_le32(CMD(stop) + 4); s->cmd->stop = cpu_to_le32(CMD(stop) + 4);
if (CMD(stop) >= CMD(max)) if (CMD(stop) >= CMD(max)) {
s->cmd->stop = s->cmd->min; s->cmd->stop = s->cmd->min;
}
return cmd; return cmd;
} }
@ -527,8 +533,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
case SVGA_CMD_UPDATE: case SVGA_CMD_UPDATE:
case SVGA_CMD_UPDATE_VERBOSE: case SVGA_CMD_UPDATE_VERBOSE:
len -= 5; len -= 5;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
x = vmsvga_fifo_read(s); x = vmsvga_fifo_read(s);
y = vmsvga_fifo_read(s); y = vmsvga_fifo_read(s);
@ -539,8 +546,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
case SVGA_CMD_RECT_FILL: case SVGA_CMD_RECT_FILL:
len -= 6; len -= 6;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
colour = vmsvga_fifo_read(s); colour = vmsvga_fifo_read(s);
x = vmsvga_fifo_read(s); x = vmsvga_fifo_read(s);
@ -557,8 +565,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
case SVGA_CMD_RECT_COPY: case SVGA_CMD_RECT_COPY:
len -= 7; len -= 7;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
x = vmsvga_fifo_read(s); x = vmsvga_fifo_read(s);
y = vmsvga_fifo_read(s); y = vmsvga_fifo_read(s);
@ -576,8 +585,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
case SVGA_CMD_DEFINE_CURSOR: case SVGA_CMD_DEFINE_CURSOR:
len -= 8; len -= 8;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
cursor.id = vmsvga_fifo_read(s); cursor.id = vmsvga_fifo_read(s);
cursor.hot_x = vmsvga_fifo_read(s); cursor.hot_x = vmsvga_fifo_read(s);
@ -589,17 +599,21 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp); args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp);
if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask || if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask ||
SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) {
goto badcmd; goto badcmd;
}
len -= args; len -= args;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
for (args = 0; args < SVGA_BITMAP_SIZE(x, y); args ++) for (args = 0; args < SVGA_BITMAP_SIZE(x, y); args++) {
cursor.mask[args] = vmsvga_fifo_read_raw(s); cursor.mask[args] = vmsvga_fifo_read_raw(s);
for (args = 0; args < SVGA_PIXMAP_SIZE(x, y, cursor.bpp); args ++) }
for (args = 0; args < SVGA_PIXMAP_SIZE(x, y, cursor.bpp); args++) {
cursor.image[args] = vmsvga_fifo_read_raw(s); cursor.image[args] = vmsvga_fifo_read_raw(s);
}
#ifdef HW_MOUSE_ACCEL #ifdef HW_MOUSE_ACCEL
vmsvga_cursor_define(s, &cursor); vmsvga_cursor_define(s, &cursor);
break; break;
@ -614,9 +628,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
*/ */
case SVGA_CMD_DEFINE_ALPHA_CURSOR: case SVGA_CMD_DEFINE_ALPHA_CURSOR:
len -= 6; len -= 6;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
@ -632,9 +646,9 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
goto badcmd; goto badcmd;
case SVGA_CMD_DRAW_GLYPH_CLIPPED: case SVGA_CMD_DRAW_GLYPH_CLIPPED:
len -= 4; len -= 4;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
}
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
args = 7 + (vmsvga_fifo_read(s) >> 2); args = 7 + (vmsvga_fifo_read(s) >> 2);
@ -658,12 +672,14 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
args = 0; args = 0;
badcmd: badcmd:
len -= args; len -= args;
if (len < 0) if (len < 0) {
goto rewind; goto rewind;
while (args --) }
while (args--) {
vmsvga_fifo_read(s); vmsvga_fifo_read(s);
}
printf("%s: Unknown command 0x%02x in SVGA command FIFO\n", printf("%s: Unknown command 0x%02x in SVGA command FIFO\n",
__FUNCTION__, cmd); __func__, cmd);
break; break;
rewind: rewind:
@ -678,12 +694,14 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
static uint32_t vmsvga_index_read(void *opaque, uint32_t address) static uint32_t vmsvga_index_read(void *opaque, uint32_t address)
{ {
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
return s->index; return s->index;
} }
static void vmsvga_index_write(void *opaque, uint32_t address, uint32_t index) static void vmsvga_index_write(void *opaque, uint32_t address, uint32_t index)
{ {
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
s->index = index; s->index = index;
} }
@ -691,6 +709,7 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
{ {
uint32_t caps; uint32_t caps;
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
switch (s->index) { switch (s->index) {
case SVGA_REG_ID: case SVGA_REG_ID:
return s->svgaid; return s->svgaid;
@ -805,9 +824,10 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
default: default:
if (s->index >= SVGA_SCRATCH_BASE && if (s->index >= SVGA_SCRATCH_BASE &&
s->index < SVGA_SCRATCH_BASE + s->scratch_size) s->index < SVGA_SCRATCH_BASE + s->scratch_size) {
return s->scratch[s->index - SVGA_SCRATCH_BASE]; return s->scratch[s->index - SVGA_SCRATCH_BASE];
printf("%s: Bad register %02x\n", __FUNCTION__, s->index); }
printf("%s: Bad register %02x\n", __func__, s->index);
} }
return 0; return 0;
@ -816,10 +836,12 @@ static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
{ {
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
switch (s->index) { switch (s->index) {
case SVGA_REG_ID: case SVGA_REG_ID:
if (value == SVGA_ID_2 || value == SVGA_ID_1 || value == SVGA_ID_0) if (value == SVGA_ID_2 || value == SVGA_ID_1 || value == SVGA_ID_0) {
s->svgaid = value; s->svgaid = value;
}
break; break;
case SVGA_REG_ENABLE: case SVGA_REG_ENABLE:
@ -850,7 +872,7 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
case SVGA_REG_DEPTH: case SVGA_REG_DEPTH:
case SVGA_REG_BITS_PER_PIXEL: case SVGA_REG_BITS_PER_PIXEL:
if (value != s->depth) { if (value != s->depth) {
printf("%s: Bad colour depth: %i bits\n", __FUNCTION__, value); printf("%s: Bad colour depth: %i bits\n", __func__, value);
s->config = 0; s->config = 0;
} }
break; break;
@ -859,16 +881,19 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
if (value) { if (value) {
s->fifo = (uint32_t *) s->fifo_ptr; s->fifo = (uint32_t *) s->fifo_ptr;
/* Check range and alignment. */ /* Check range and alignment. */
if ((CMD(min) | CMD(max) | if ((CMD(min) | CMD(max) | CMD(next_cmd) | CMD(stop)) & 3) {
CMD(next_cmd) | CMD(stop)) & 3)
break; break;
if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) }
if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) {
break; break;
if (CMD(max) > SVGA_FIFO_SIZE) }
if (CMD(max) > SVGA_FIFO_SIZE) {
break; break;
if (CMD(max) < CMD(min) + 10 * 1024) }
if (CMD(max) < CMD(min) + 10 * 1024) {
break; break;
} }
}
s->config = !!value; s->config = !!value;
break; break;
@ -881,9 +906,10 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
s->guest = value; s->guest = value;
#ifdef VERBOSE #ifdef VERBOSE
if (value >= GUEST_OS_BASE && value < GUEST_OS_BASE + if (value >= GUEST_OS_BASE && value < GUEST_OS_BASE +
ARRAY_SIZE(vmsvga_guest_id)) ARRAY_SIZE(vmsvga_guest_id)) {
printf("%s: guest runs %s.\n", __FUNCTION__, printf("%s: guest runs %s.\n", __func__,
vmsvga_guest_id[value - GUEST_OS_BASE]); vmsvga_guest_id[value - GUEST_OS_BASE]);
}
#endif #endif
break; break;
@ -921,20 +947,19 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value)
s->scratch[s->index - SVGA_SCRATCH_BASE] = value; s->scratch[s->index - SVGA_SCRATCH_BASE] = value;
break; break;
} }
printf("%s: Bad register %02x\n", __FUNCTION__, s->index); printf("%s: Bad register %02x\n", __func__, s->index);
} }
} }
static uint32_t vmsvga_bios_read(void *opaque, uint32_t address) static uint32_t vmsvga_bios_read(void *opaque, uint32_t address)
{ {
printf("%s: what are we supposed to return?\n", __FUNCTION__); printf("%s: what are we supposed to return?\n", __func__);
return 0xcafe; return 0xcafe;
} }
static void vmsvga_bios_write(void *opaque, uint32_t address, uint32_t data) static void vmsvga_bios_write(void *opaque, uint32_t address, uint32_t data)
{ {
printf("%s: what are we supposed to do with (%08x)?\n", printf("%s: what are we supposed to do with (%08x)?\n", __func__, data);
__FUNCTION__, data);
} }
static inline void vmsvga_size(struct vmsvga_state_s *s) static inline void vmsvga_size(struct vmsvga_state_s *s)
@ -1024,8 +1049,9 @@ static void vmsvga_text_update(void *opaque, console_ch_t *chardata)
{ {
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
if (s->vga.text_update) if (s->vga.text_update) {
s->vga.text_update(&s->vga, chardata); s->vga.text_update(&s->vga, chardata);
}
} }
static int vmsvga_post_load(void *opaque, int version_id) static int vmsvga_post_load(void *opaque, int version_id)
@ -1033,9 +1059,9 @@ static int vmsvga_post_load(void *opaque, int version_id)
struct vmsvga_state_s *s = opaque; struct vmsvga_state_s *s = opaque;
s->invalidated = 1; s->invalidated = 1;
if (s->config) if (s->config) {
s->fifo = (uint32_t *) s->fifo_ptr; s->fifo = (uint32_t *) s->fifo_ptr;
}
return 0; return 0;
} }
@ -1045,7 +1071,7 @@ static const VMStateDescription vmstate_vmware_vga_internal = {
.minimum_version_id = 0, .minimum_version_id = 0,
.minimum_version_id_old = 0, .minimum_version_id_old = 0,
.post_load = vmsvga_post_load, .post_load = vmsvga_post_load,
.fields = (VMStateField []) { .fields = (VMStateField[]) {
VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s), VMSTATE_INT32_EQUAL(depth, struct vmsvga_state_s),
VMSTATE_INT32(enable, struct vmsvga_state_s), VMSTATE_INT32(enable, struct vmsvga_state_s),
VMSTATE_INT32(config, struct vmsvga_state_s), VMSTATE_INT32(config, struct vmsvga_state_s),
@ -1071,7 +1097,7 @@ static const VMStateDescription vmstate_vmware_vga = {
.version_id = 0, .version_id = 0,
.minimum_version_id = 0, .minimum_version_id = 0,
.minimum_version_id_old = 0, .minimum_version_id_old = 0,
.fields = (VMStateField []) { .fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(card, struct pci_vmsvga_state_s), VMSTATE_PCI_DEVICE(card, struct pci_vmsvga_state_s),
VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0, VMSTATE_STRUCT(chip, struct pci_vmsvga_state_s, 0,
vmstate_vmware_vga_internal, struct vmsvga_state_s), vmstate_vmware_vga_internal, struct vmsvga_state_s),