ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vmware_vga: Remove uselss casts from void * 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-14 17:49:08 +02:00 committed by Anthony Liguori
parent c89507f76c
commit 467d44b2f4
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/vmware_vga.c
View File

@ -630,20 +630,20 @@ 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 = (struct vmsvga_state_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 = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
s->index = index; s->index = index;
} }
static uint32_t vmsvga_value_read(void *opaque, uint32_t address) static uint32_t vmsvga_value_read(void *opaque, uint32_t address)
{ {
uint32_t caps; uint32_t caps;
struct vmsvga_state_s *s = (struct vmsvga_state_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;
@ -761,7 +761,7 @@ 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 = (struct vmsvga_state_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)
@ -892,7 +892,7 @@ static inline void vmsvga_size(struct vmsvga_state_s *s)
static void vmsvga_update_display(void *opaque) static void vmsvga_update_display(void *opaque)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (!s->enable) { if (!s->enable) {
#ifdef EMBED_STDVGA #ifdef EMBED_STDVGA
s->vga.update(&s->vga); s->vga.update(&s->vga);
@ -960,7 +960,7 @@ static void vmsvga_reset(struct vmsvga_state_s *s)
static void vmsvga_invalidate_display(void *opaque) static void vmsvga_invalidate_display(void *opaque)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (!s->enable) { if (!s->enable) {
#ifdef EMBED_STDVGA #ifdef EMBED_STDVGA
s->vga.invalidate(&s->vga); s->vga.invalidate(&s->vga);
@ -975,7 +975,7 @@ static void vmsvga_invalidate_display(void *opaque)
available */ available */
static void vmsvga_screen_dump(void *opaque, const char *filename) static void vmsvga_screen_dump(void *opaque, const char *filename)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (!s->enable) { if (!s->enable) {
#ifdef EMBED_STDVGA #ifdef EMBED_STDVGA
s->vga.screen_dump(&s->vga, filename); s->vga.screen_dump(&s->vga, filename);
@ -993,7 +993,7 @@ static void vmsvga_screen_dump(void *opaque, const char *filename)
static void vmsvga_text_update(void *opaque, console_ch_t *chardata) static void vmsvga_text_update(void *opaque, console_ch_t *chardata)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_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);
@ -1002,7 +1002,7 @@ static void vmsvga_text_update(void *opaque, console_ch_t *chardata)
#ifdef DIRECT_VRAM #ifdef DIRECT_VRAM
static uint32_t vmsvga_vram_readb(void *opaque, target_phys_addr_t addr) static uint32_t vmsvga_vram_readb(void *opaque, target_phys_addr_t addr)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
return *(uint8_t *) (ds_get_data(s->ds) + addr); return *(uint8_t *) (ds_get_data(s->ds) + addr);
else else
@ -1011,7 +1011,7 @@ static uint32_t vmsvga_vram_readb(void *opaque, target_phys_addr_t addr)
static uint32_t vmsvga_vram_readw(void *opaque, target_phys_addr_t addr) static uint32_t vmsvga_vram_readw(void *opaque, target_phys_addr_t addr)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
return *(uint16_t *) (ds_get_data(s->ds) + addr); return *(uint16_t *) (ds_get_data(s->ds) + addr);
else else
@ -1020,7 +1020,7 @@ static uint32_t vmsvga_vram_readw(void *opaque, target_phys_addr_t addr)
static uint32_t vmsvga_vram_readl(void *opaque, target_phys_addr_t addr) static uint32_t vmsvga_vram_readl(void *opaque, target_phys_addr_t addr)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
return *(uint32_t *) (ds_get_data(s->ds) + addr); return *(uint32_t *) (ds_get_data(s->ds) + addr);
else else
@ -1030,7 +1030,7 @@ static uint32_t vmsvga_vram_readl(void *opaque, target_phys_addr_t addr)
static void vmsvga_vram_writeb(void *opaque, target_phys_addr_t addr, static void vmsvga_vram_writeb(void *opaque, target_phys_addr_t addr,
uint32_t value) uint32_t value)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
*(uint8_t *) (ds_get_data(s->ds) + addr) = value; *(uint8_t *) (ds_get_data(s->ds) + addr) = value;
else else
@ -1040,7 +1040,7 @@ static void vmsvga_vram_writeb(void *opaque, target_phys_addr_t addr,
static void vmsvga_vram_writew(void *opaque, target_phys_addr_t addr, static void vmsvga_vram_writew(void *opaque, target_phys_addr_t addr,
uint32_t value) uint32_t value)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
*(uint16_t *) (ds_get_data(s->ds) + addr) = value; *(uint16_t *) (ds_get_data(s->ds) + addr) = value;
else else
@ -1050,7 +1050,7 @@ static void vmsvga_vram_writew(void *opaque, target_phys_addr_t addr,
static void vmsvga_vram_writel(void *opaque, target_phys_addr_t addr, static void vmsvga_vram_writel(void *opaque, target_phys_addr_t addr,
uint32_t value) uint32_t value)
{ {
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; struct vmsvga_state_s *s = opaque;
if (addr < s->fb_size) if (addr < s->fb_size)
*(uint32_t *) (ds_get_data(s->ds) + addr) = value; *(uint32_t *) (ds_get_data(s->ds) + addr) = value;
else else
@ -1152,14 +1152,14 @@ static void vmsvga_init(struct vmsvga_state_s *s, int vga_ram_size)
static void pci_vmsvga_save(QEMUFile *f, void *opaque) static void pci_vmsvga_save(QEMUFile *f, void *opaque)
{ {
struct pci_vmsvga_state_s *s = (struct pci_vmsvga_state_s *) opaque; struct pci_vmsvga_state_s *s = opaque;
pci_device_save(&s->card, f); pci_device_save(&s->card, f);
vmsvga_save(&s->chip, f); vmsvga_save(&s->chip, f);
} }
static int pci_vmsvga_load(QEMUFile *f, void *opaque, int version_id) static int pci_vmsvga_load(QEMUFile *f, void *opaque, int version_id)
{ {
struct pci_vmsvga_state_s *s = (struct pci_vmsvga_state_s *) opaque; struct pci_vmsvga_state_s *s = opaque;
int ret; int ret;
ret = pci_device_load(&s->card, f); ret = pci_device_load(&s->card, f);