Revision c227f099 hw/vmware_vga.c
| b/hw/vmware_vga.c | ||
|---|---|---|
| 58 | 58 |
#ifndef EMBED_STDVGA |
| 59 | 59 |
DisplayState *ds; |
| 60 | 60 |
int vram_size; |
| 61 |
a_ram_addr vram_offset;
|
|
| 61 |
ram_addr_t vram_offset;
|
|
| 62 | 62 |
uint8_t *vram_ptr; |
| 63 | 63 |
#endif |
| 64 |
a_target_phys_addr vram_base;
|
|
| 64 |
target_phys_addr_t vram_base;
|
|
| 65 | 65 |
|
| 66 | 66 |
int index; |
| 67 | 67 |
int scratch_size; |
| ... | ... | |
| 991 | 991 |
} |
| 992 | 992 |
} |
| 993 | 993 |
|
| 994 |
static void vmsvga_text_update(void *opaque, a_console_ch *chardata)
|
|
| 994 |
static void vmsvga_text_update(void *opaque, console_ch_t *chardata)
|
|
| 995 | 995 |
{
|
| 996 | 996 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 997 | 997 |
|
| ... | ... | |
| 1000 | 1000 |
} |
| 1001 | 1001 |
|
| 1002 | 1002 |
#ifdef DIRECT_VRAM |
| 1003 |
static uint32_t vmsvga_vram_readb(void *opaque, a_target_phys_addr addr)
|
|
| 1003 |
static uint32_t vmsvga_vram_readb(void *opaque, target_phys_addr_t addr)
|
|
| 1004 | 1004 |
{
|
| 1005 | 1005 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1006 | 1006 |
if (addr < s->fb_size) |
| ... | ... | |
| 1009 | 1009 |
return *(uint8_t *) (s->vram_ptr + addr); |
| 1010 | 1010 |
} |
| 1011 | 1011 |
|
| 1012 |
static uint32_t vmsvga_vram_readw(void *opaque, a_target_phys_addr addr)
|
|
| 1012 |
static uint32_t vmsvga_vram_readw(void *opaque, target_phys_addr_t addr)
|
|
| 1013 | 1013 |
{
|
| 1014 | 1014 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1015 | 1015 |
if (addr < s->fb_size) |
| ... | ... | |
| 1018 | 1018 |
return *(uint16_t *) (s->vram_ptr + addr); |
| 1019 | 1019 |
} |
| 1020 | 1020 |
|
| 1021 |
static uint32_t vmsvga_vram_readl(void *opaque, a_target_phys_addr addr)
|
|
| 1021 |
static uint32_t vmsvga_vram_readl(void *opaque, target_phys_addr_t addr)
|
|
| 1022 | 1022 |
{
|
| 1023 | 1023 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| 1024 | 1024 |
if (addr < s->fb_size) |
| ... | ... | |
| 1027 | 1027 |
return *(uint32_t *) (s->vram_ptr + addr); |
| 1028 | 1028 |
} |
| 1029 | 1029 |
|
| 1030 |
static void vmsvga_vram_writeb(void *opaque, a_target_phys_addr addr,
|
|
| 1030 |
static void vmsvga_vram_writeb(void *opaque, target_phys_addr_t addr,
|
|
| 1031 | 1031 |
uint32_t value) |
| 1032 | 1032 |
{
|
| 1033 | 1033 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| ... | ... | |
| 1037 | 1037 |
*(uint8_t *) (s->vram_ptr + addr) = value; |
| 1038 | 1038 |
} |
| 1039 | 1039 |
|
| 1040 |
static void vmsvga_vram_writew(void *opaque, a_target_phys_addr addr,
|
|
| 1040 |
static void vmsvga_vram_writew(void *opaque, target_phys_addr_t addr,
|
|
| 1041 | 1041 |
uint32_t value) |
| 1042 | 1042 |
{
|
| 1043 | 1043 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| ... | ... | |
| 1047 | 1047 |
*(uint16_t *) (s->vram_ptr + addr) = value; |
| 1048 | 1048 |
} |
| 1049 | 1049 |
|
| 1050 |
static void vmsvga_vram_writel(void *opaque, a_target_phys_addr addr,
|
|
| 1050 |
static void vmsvga_vram_writel(void *opaque, target_phys_addr_t addr,
|
|
| 1051 | 1051 |
uint32_t value) |
| 1052 | 1052 |
{
|
| 1053 | 1053 |
struct vmsvga_state_s *s = (struct vmsvga_state_s *) opaque; |
| ... | ... | |
| 1198 | 1198 |
{
|
| 1199 | 1199 |
struct pci_vmsvga_state_s *d = (struct pci_vmsvga_state_s *) pci_dev; |
| 1200 | 1200 |
struct vmsvga_state_s *s = &d->chip; |
| 1201 |
a_ram_addr iomemtype;
|
|
| 1201 |
ram_addr_t iomemtype;
|
|
| 1202 | 1202 |
|
| 1203 | 1203 |
s->vram_base = addr; |
| 1204 | 1204 |
#ifdef DIRECT_VRAM |
Also available in: Unified diff