Revision 99a0949b hw/sm501.c

b/hw/sm501.c
451 451
    DisplayState *ds;
452 452

  
453 453
    /* status & internal resources */
454
    target_phys_addr_t base;
454
    a_target_phys_addr base;
455 455
    uint32_t local_mem_size_index;
456 456
    uint8_t * local_mem;
457
    ram_addr_t local_mem_offset;
457
    a_ram_addr local_mem_offset;
458 458
    uint32_t last_width;
459 459
    uint32_t last_height;
460 460

  
......
526 526
    return index;
527 527
}
528 528

  
529
static uint32_t sm501_system_config_read(void *opaque, target_phys_addr_t addr)
529
static uint32_t sm501_system_config_read(void *opaque, a_target_phys_addr addr)
530 530
{
531 531
    SM501State * s = (SM501State *)opaque;
532 532
    uint32_t ret = 0;
......
579 579
}
580 580

  
581 581
static void sm501_system_config_write(void *opaque,
582
				      target_phys_addr_t addr, uint32_t value)
582
				      a_target_phys_addr addr, uint32_t value)
583 583
{
584 584
    SM501State * s = (SM501State *)opaque;
585 585
    SM501_DPRINTF("sm501 system config regs : write addr=%x, val=%x\n",
......
638 638
    &sm501_system_config_write,
639 639
};
640 640

  
641
static uint32_t sm501_palette_read(void *opaque, target_phys_addr_t addr)
641
static uint32_t sm501_palette_read(void *opaque, a_target_phys_addr addr)
642 642
{
643 643
    SM501State * s = (SM501State *)opaque;
644 644
    SM501_DPRINTF("sm501 palette read addr=%x\n", (int)addr);
......
651 651
}
652 652

  
653 653
static void sm501_palette_write(void *opaque,
654
				target_phys_addr_t addr, uint32_t value)
654
				a_target_phys_addr addr, uint32_t value)
655 655
{
656 656
    SM501State * s = (SM501State *)opaque;
657 657
    SM501_DPRINTF("sm501 palette write addr=%x, val=%x\n",
......
664 664
    *(uint32_t*)&s->dc_palette[addr] = value;
665 665
}
666 666

  
667
static uint32_t sm501_disp_ctrl_read(void *opaque, target_phys_addr_t addr)
667
static uint32_t sm501_disp_ctrl_read(void *opaque, a_target_phys_addr addr)
668 668
{
669 669
    SM501State * s = (SM501State *)opaque;
670 670
    uint32_t ret = 0;
......
759 759
}
760 760

  
761 761
static void sm501_disp_ctrl_write(void *opaque,
762
					   target_phys_addr_t addr,
762
					   a_target_phys_addr addr,
763 763
					   uint32_t value)
764 764
{
765 765
    SM501State * s = (SM501State *)opaque;
......
972 972
    int y_start = -1;
973 973
    int page_min = 0x7fffffff;
974 974
    int page_max = -1;
975
    ram_addr_t offset = s->local_mem_offset;
975
    a_ram_addr offset = s->local_mem_offset;
976 976

  
977 977
    /* choose draw_line function */
978 978
    switch (s->dc_crt_control & 3) {
......
1006 1006
    /* draw each line according to conditions */
1007 1007
    for (y = 0; y < height; y++) {
1008 1008
	int update = full_update;
1009
	ram_addr_t page0 = offset & TARGET_PAGE_MASK;
1010
	ram_addr_t page1 = (offset + width * src_bpp - 1) & TARGET_PAGE_MASK;
1011
	ram_addr_t page;
1009
	a_ram_addr page0 = offset & TARGET_PAGE_MASK;
1010
	a_ram_addr page1 = (offset + width * src_bpp - 1) & TARGET_PAGE_MASK;
1011
	a_ram_addr page;
1012 1012

  
1013 1013
	/* check dirty flags for each line */
1014 1014
	for (page = page0; page <= page1; page += TARGET_PAGE_SIZE)

Also available in: Unified diff