Revision c227f099 hw/vga.c

b/hw/vga.c
702 702
#endif
703 703

  
704 704
/* called for accesses between 0xa0000 and 0xc0000 */
705
uint32_t vga_mem_readb(void *opaque, a_target_phys_addr addr)
705
uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr)
706 706
{
707 707
    VGACommonState *s = opaque;
708 708
    int memory_map_mode, plane;
......
758 758
    return ret;
759 759
}
760 760

  
761
static uint32_t vga_mem_readw(void *opaque, a_target_phys_addr addr)
761
static uint32_t vga_mem_readw(void *opaque, target_phys_addr_t addr)
762 762
{
763 763
    uint32_t v;
764 764
#ifdef TARGET_WORDS_BIGENDIAN
......
771 771
    return v;
772 772
}
773 773

  
774
static uint32_t vga_mem_readl(void *opaque, a_target_phys_addr addr)
774
static uint32_t vga_mem_readl(void *opaque, target_phys_addr_t addr)
775 775
{
776 776
    uint32_t v;
777 777
#ifdef TARGET_WORDS_BIGENDIAN
......
789 789
}
790 790

  
791 791
/* called for accesses between 0xa0000 and 0xc0000 */
792
void vga_mem_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
792
void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
793 793
{
794 794
    VGACommonState *s = opaque;
795 795
    int memory_map_mode, plane, write_mode, b, func_select, mask;
......
923 923
    }
924 924
}
925 925

  
926
static void vga_mem_writew(void *opaque, a_target_phys_addr addr, uint32_t val)
926
static void vga_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val)
927 927
{
928 928
#ifdef TARGET_WORDS_BIGENDIAN
929 929
    vga_mem_writeb(opaque, addr, (val >> 8) & 0xff);
......
934 934
#endif
935 935
}
936 936

  
937
static void vga_mem_writel(void *opaque, a_target_phys_addr addr, uint32_t val)
937
static void vga_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
938 938
{
939 939
#ifdef TARGET_WORDS_BIGENDIAN
940 940
    vga_mem_writeb(opaque, addr, (val >> 24) & 0xff);
......
1583 1583
{
1584 1584
    int y1, y, update, linesize, y_start, double_scan, mask, depth;
1585 1585
    int width, height, shift_control, line_offset, bwidth, bits;
1586
    a_ram_addr page0, page1, page_min, page_max;
1586
    ram_addr_t page0, page1, page_min, page_max;
1587 1587
    int disp_width, multi_scan, multi_run;
1588 1588
    uint8_t *d;
1589 1589
    uint32_t v, addr1, addr;
......
1947 1947
        ((v & 0x00000800) << 10) | ((v & 0x00007000) >> 1))
1948 1948
/* relay text rendering to the display driver
1949 1949
 * instead of doing a full vga_update_display() */
1950
static void vga_update_text(void *opaque, a_console_ch *chardata)
1950
static void vga_update_text(void *opaque, console_ch_t *chardata)
1951 1951
{
1952 1952
    VGACommonState *s =  opaque;
1953 1953
    int graphic_mode, i, cursor_offset, cursor_visible;
1954 1954
    int cw, cheight, width, height, size, c_min, c_max;
1955 1955
    uint32_t *src;
1956
    a_console_ch *dst, val;
1956
    console_ch_t *dst, val;
1957 1957
    char msg_buffer[80];
1958 1958
    int full_update = 0;
1959 1959

  

Also available in: Unified diff