Revision a8170e5e hw/omap.h

b/hw/omap.h
65 65
/* OMAP2 l4 Interconnect */
66 66
struct omap_l4_s;
67 67
struct omap_l4_region_s {
68
    target_phys_addr_t offset;
68
    hwaddr offset;
69 69
    size_t size;
70 70
    int access;
71 71
};
......
80 80
    struct omap_l4_s *bus;
81 81
    int regions;
82 82
    const struct omap_l4_region_s *start;
83
    target_phys_addr_t base;
83
    hwaddr base;
84 84
    uint32_t component;
85 85
    uint32_t control;
86 86
    uint32_t status;
87 87
};
88 88
struct omap_l4_s *omap_l4_init(MemoryRegion *address_space,
89
                               target_phys_addr_t base, int ta_num);
89
                               hwaddr base, int ta_num);
90 90

  
91 91
struct omap_target_agent_s;
92 92
struct omap_target_agent_s *omap_l4ta_get(
......
94 94
    const struct omap_l4_region_s *regions,
95 95
    const struct omap_l4_agent_info_s *agents,
96 96
    int cs);
97
target_phys_addr_t omap_l4_attach(struct omap_target_agent_s *ta,
97
hwaddr omap_l4_attach(struct omap_target_agent_s *ta,
98 98
                                         int region, MemoryRegion *mr);
99
target_phys_addr_t omap_l4_region_base(struct omap_target_agent_s *ta,
99
hwaddr omap_l4_region_base(struct omap_target_agent_s *ta,
100 100
                                       int region);
101
target_phys_addr_t omap_l4_region_size(struct omap_target_agent_s *ta,
101
hwaddr omap_l4_region_size(struct omap_target_agent_s *ta,
102 102
                                       int region);
103 103

  
104 104
/* OMAP2 SDRAM controller */
105 105
struct omap_sdrc_s;
106 106
struct omap_sdrc_s *omap_sdrc_init(MemoryRegion *sysmem,
107
                                   target_phys_addr_t base);
107
                                   hwaddr base);
108 108
void omap_sdrc_reset(struct omap_sdrc_s *s);
109 109

  
110 110
/* OMAP2 general purpose memory controller */
111 111
struct omap_gpmc_s;
112 112
struct omap_gpmc_s *omap_gpmc_init(struct omap_mpu_state_s *mpu,
113
                                   target_phys_addr_t base,
113
                                   hwaddr base,
114 114
                                   qemu_irq irq, qemu_irq drq);
115 115
void omap_gpmc_reset(struct omap_gpmc_s *s);
116 116
void omap_gpmc_attach(struct omap_gpmc_s *s, int cs, MemoryRegion *iomem);
......
433 433
};
434 434

  
435 435
struct soc_dma_s;
436
struct soc_dma_s *omap_dma_init(target_phys_addr_t base, qemu_irq *irqs,
436
struct soc_dma_s *omap_dma_init(hwaddr base, qemu_irq *irqs,
437 437
                MemoryRegion *sysmem,
438 438
                qemu_irq lcd_irq, struct omap_mpu_state_s *mpu, omap_clk clk,
439 439
                enum omap_dma_model model);
440
struct soc_dma_s *omap_dma4_init(target_phys_addr_t base, qemu_irq *irqs,
440
struct soc_dma_s *omap_dma4_init(hwaddr base, qemu_irq *irqs,
441 441
                MemoryRegion *sysmem,
442 442
                struct omap_mpu_state_s *mpu, int fifo,
443 443
                int chans, omap_clk iclk, omap_clk fclk);
......
469 469
/* Only used in OMAP DMA 3.x gigacells */
470 470
struct omap_dma_lcd_channel_s {
471 471
    enum omap_dma_port src;
472
    target_phys_addr_t src_f1_top;
473
    target_phys_addr_t src_f1_bottom;
474
    target_phys_addr_t src_f2_top;
475
    target_phys_addr_t src_f2_bottom;
472
    hwaddr src_f1_top;
473
    hwaddr src_f1_bottom;
474
    hwaddr src_f2_top;
475
    hwaddr src_f2_bottom;
476 476

  
477 477
    /* Used in OMAP DMA 3.2 gigacell */
478 478
    unsigned char brust_f1;
......
508 508
    int dual;
509 509

  
510 510
    int current_frame;
511
    target_phys_addr_t phys_framebuffer[2];
511
    hwaddr phys_framebuffer[2];
512 512
    qemu_irq irq;
513 513
    struct omap_mpu_state_s *mpu;
514 514
} *omap_dma_get_lcdch(struct soc_dma_s *s);
......
659 659
void omap_synctimer_reset(struct omap_synctimer_s *s);
660 660

  
661 661
struct omap_uart_s;
662
struct omap_uart_s *omap_uart_init(target_phys_addr_t base,
662
struct omap_uart_s *omap_uart_init(hwaddr base,
663 663
                qemu_irq irq, omap_clk fclk, omap_clk iclk,
664 664
                qemu_irq txdma, qemu_irq rxdma,
665 665
                const char *label, CharDriverState *chr);
......
728 728
struct omap_lcd_panel_s;
729 729
void omap_lcdc_reset(struct omap_lcd_panel_s *s);
730 730
struct omap_lcd_panel_s *omap_lcdc_init(MemoryRegion *sysmem,
731
                                        target_phys_addr_t base,
731
                                        hwaddr base,
732 732
                                        qemu_irq irq,
733 733
                                        struct omap_dma_lcd_channel_s *dma,
734 734
                                        omap_clk clk);
......
744 744
void omap_dss_reset(struct omap_dss_s *s);
745 745
struct omap_dss_s *omap_dss_init(struct omap_target_agent_s *ta,
746 746
                MemoryRegion *sysmem,
747
                target_phys_addr_t l3_base,
747
                hwaddr l3_base,
748 748
                qemu_irq irq, qemu_irq drq,
749 749
                omap_clk fck1, omap_clk fck2, omap_clk ck54m,
750 750
                omap_clk ick1, omap_clk ick2);
......
752 752

  
753 753
/* omap_mmc.c */
754 754
struct omap_mmc_s;
755
struct omap_mmc_s *omap_mmc_init(target_phys_addr_t base,
755
struct omap_mmc_s *omap_mmc_init(hwaddr base,
756 756
                MemoryRegion *sysmem,
757 757
                BlockDriverState *bd,
758 758
                qemu_irq irq, qemu_irq dma[], omap_clk clk);
......
829 829

  
830 830
    struct omap_dma_port_if_s {
831 831
        uint32_t (*read[3])(struct omap_mpu_state_s *s,
832
                        target_phys_addr_t offset);
832
                        hwaddr offset);
833 833
        void (*write[3])(struct omap_mpu_state_s *s,
834
                        target_phys_addr_t offset, uint32_t value);
834
                        hwaddr offset, uint32_t value);
835 835
        int (*addr_valid)(struct omap_mpu_state_s *s,
836
                        target_phys_addr_t addr);
836
                        hwaddr addr);
837 837
    } port[__omap_dma_port_last];
838 838

  
839 839
    unsigned long sdram_size;
......
942 942
                unsigned long sdram_size,
943 943
                const char *core);
944 944

  
945
#define OMAP_FMT_plx "%#08" TARGET_PRIxPHYS
945
#define OMAP_FMT_plx "%#08" HWADDR_PRIx
946 946

  
947
uint32_t omap_badwidth_read8(void *opaque, target_phys_addr_t addr);
948
void omap_badwidth_write8(void *opaque, target_phys_addr_t addr,
947
uint32_t omap_badwidth_read8(void *opaque, hwaddr addr);
948
void omap_badwidth_write8(void *opaque, hwaddr addr,
949 949
                uint32_t value);
950
uint32_t omap_badwidth_read16(void *opaque, target_phys_addr_t addr);
951
void omap_badwidth_write16(void *opaque, target_phys_addr_t addr,
950
uint32_t omap_badwidth_read16(void *opaque, hwaddr addr);
951
void omap_badwidth_write16(void *opaque, hwaddr addr,
952 952
                uint32_t value);
953
uint32_t omap_badwidth_read32(void *opaque, target_phys_addr_t addr);
954
void omap_badwidth_write32(void *opaque, target_phys_addr_t addr,
953
uint32_t omap_badwidth_read32(void *opaque, hwaddr addr);
954
void omap_badwidth_write32(void *opaque, hwaddr addr,
955 955
                uint32_t value);
956 956

  
957 957
void omap_mpu_wakeup(void *opaque, int irq, int req);

Also available in: Unified diff