Revision 1eed09cb hw/omap1.c
b/hw/omap1.c | ||
---|---|---|
425 | 425 |
|
426 | 426 |
omap_inth_reset(s); |
427 | 427 |
|
428 |
iomemtype = cpu_register_io_memory(0, omap_inth_readfn,
|
|
428 |
iomemtype = cpu_register_io_memory(omap_inth_readfn, |
|
429 | 429 |
omap_inth_writefn, s); |
430 | 430 |
cpu_register_physical_memory(base, size, iomemtype); |
431 | 431 |
|
... | ... | |
645 | 645 |
|
646 | 646 |
omap_inth_reset(s); |
647 | 647 |
|
648 |
iomemtype = cpu_register_io_memory(0, omap2_inth_readfn,
|
|
648 |
iomemtype = cpu_register_io_memory(omap2_inth_readfn, |
|
649 | 649 |
omap2_inth_writefn, s); |
650 | 650 |
cpu_register_physical_memory(base, size, iomemtype); |
651 | 651 |
|
... | ... | |
834 | 834 |
omap_mpu_timer_reset(s); |
835 | 835 |
omap_timer_clk_setup(s); |
836 | 836 |
|
837 |
iomemtype = cpu_register_io_memory(0, omap_mpu_timer_readfn,
|
|
837 |
iomemtype = cpu_register_io_memory(omap_mpu_timer_readfn, |
|
838 | 838 |
omap_mpu_timer_writefn, s); |
839 | 839 |
cpu_register_physical_memory(base, 0x100, iomemtype); |
840 | 840 |
|
... | ... | |
957 | 957 |
omap_wd_timer_reset(s); |
958 | 958 |
omap_timer_clk_setup(&s->timer); |
959 | 959 |
|
960 |
iomemtype = cpu_register_io_memory(0, omap_wd_timer_readfn,
|
|
960 |
iomemtype = cpu_register_io_memory(omap_wd_timer_readfn, |
|
961 | 961 |
omap_wd_timer_writefn, s); |
962 | 962 |
cpu_register_physical_memory(base, 0x100, iomemtype); |
963 | 963 |
|
... | ... | |
1059 | 1059 |
omap_os_timer_reset(s); |
1060 | 1060 |
omap_timer_clk_setup(&s->timer); |
1061 | 1061 |
|
1062 |
iomemtype = cpu_register_io_memory(0, omap_os_timer_readfn,
|
|
1062 |
iomemtype = cpu_register_io_memory(omap_os_timer_readfn, |
|
1063 | 1063 |
omap_os_timer_writefn, s); |
1064 | 1064 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
1065 | 1065 |
|
... | ... | |
1286 | 1286 |
static void omap_ulpd_pm_init(target_phys_addr_t base, |
1287 | 1287 |
struct omap_mpu_state_s *mpu) |
1288 | 1288 |
{ |
1289 |
int iomemtype = cpu_register_io_memory(0, omap_ulpd_pm_readfn,
|
|
1289 |
int iomemtype = cpu_register_io_memory(omap_ulpd_pm_readfn, |
|
1290 | 1290 |
omap_ulpd_pm_writefn, mpu); |
1291 | 1291 |
|
1292 | 1292 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
... | ... | |
1501 | 1501 |
static void omap_pin_cfg_init(target_phys_addr_t base, |
1502 | 1502 |
struct omap_mpu_state_s *mpu) |
1503 | 1503 |
{ |
1504 |
int iomemtype = cpu_register_io_memory(0, omap_pin_cfg_readfn,
|
|
1504 |
int iomemtype = cpu_register_io_memory(omap_pin_cfg_readfn, |
|
1505 | 1505 |
omap_pin_cfg_writefn, mpu); |
1506 | 1506 |
|
1507 | 1507 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
... | ... | |
1571 | 1571 |
|
1572 | 1572 |
static void omap_id_init(struct omap_mpu_state_s *mpu) |
1573 | 1573 |
{ |
1574 |
int iomemtype = cpu_register_io_memory(0, omap_id_readfn,
|
|
1574 |
int iomemtype = cpu_register_io_memory(omap_id_readfn, |
|
1575 | 1575 |
omap_id_writefn, mpu); |
1576 | 1576 |
cpu_register_physical_memory_offset(0xfffe1800, 0x800, iomemtype, 0xfffe1800); |
1577 | 1577 |
cpu_register_physical_memory_offset(0xfffed400, 0x100, iomemtype, 0xfffed400); |
... | ... | |
1654 | 1654 |
static void omap_mpui_init(target_phys_addr_t base, |
1655 | 1655 |
struct omap_mpu_state_s *mpu) |
1656 | 1656 |
{ |
1657 |
int iomemtype = cpu_register_io_memory(0, omap_mpui_readfn,
|
|
1657 |
int iomemtype = cpu_register_io_memory(omap_mpui_readfn, |
|
1658 | 1658 |
omap_mpui_writefn, mpu); |
1659 | 1659 |
|
1660 | 1660 |
cpu_register_physical_memory(base, 0x100, iomemtype); |
... | ... | |
1763 | 1763 |
s->abort = abort_irq; |
1764 | 1764 |
omap_tipb_bridge_reset(s); |
1765 | 1765 |
|
1766 |
iomemtype = cpu_register_io_memory(0, omap_tipb_bridge_readfn,
|
|
1766 |
iomemtype = cpu_register_io_memory(omap_tipb_bridge_readfn, |
|
1767 | 1767 |
omap_tipb_bridge_writefn, s); |
1768 | 1768 |
cpu_register_physical_memory(base, 0x100, iomemtype); |
1769 | 1769 |
|
... | ... | |
1869 | 1869 |
static void omap_tcmi_init(target_phys_addr_t base, |
1870 | 1870 |
struct omap_mpu_state_s *mpu) |
1871 | 1871 |
{ |
1872 |
int iomemtype = cpu_register_io_memory(0, omap_tcmi_readfn,
|
|
1872 |
int iomemtype = cpu_register_io_memory(omap_tcmi_readfn, |
|
1873 | 1873 |
omap_tcmi_writefn, mpu); |
1874 | 1874 |
|
1875 | 1875 |
cpu_register_physical_memory(base, 0x100, iomemtype); |
... | ... | |
1942 | 1942 |
static void omap_dpll_init(struct dpll_ctl_s *s, target_phys_addr_t base, |
1943 | 1943 |
omap_clk clk) |
1944 | 1944 |
{ |
1945 |
int iomemtype = cpu_register_io_memory(0, omap_dpll_readfn,
|
|
1945 |
int iomemtype = cpu_register_io_memory(omap_dpll_readfn, |
|
1946 | 1946 |
omap_dpll_writefn, s); |
1947 | 1947 |
|
1948 | 1948 |
s->dpll = clk; |
... | ... | |
2089 | 2089 |
target_phys_addr_t base = omap_l4_attach(ta, 0, 0); |
2090 | 2090 |
struct omap_uart_s *s = omap_uart_init(base, irq, |
2091 | 2091 |
fclk, iclk, txdma, rxdma, chr); |
2092 |
int iomemtype = cpu_register_io_memory(0, omap_uart_readfn,
|
|
2092 |
int iomemtype = cpu_register_io_memory(omap_uart_readfn, |
|
2093 | 2093 |
omap_uart_writefn, s); |
2094 | 2094 |
|
2095 | 2095 |
s->ta = ta; |
... | ... | |
2504 | 2504 |
target_phys_addr_t dsp_base, struct omap_mpu_state_s *s) |
2505 | 2505 |
{ |
2506 | 2506 |
int iomemtype[2] = { |
2507 |
cpu_register_io_memory(0, omap_clkm_readfn, omap_clkm_writefn, s),
|
|
2508 |
cpu_register_io_memory(0, omap_clkdsp_readfn, omap_clkdsp_writefn, s),
|
|
2507 |
cpu_register_io_memory(omap_clkm_readfn, omap_clkm_writefn, s), |
|
2508 |
cpu_register_io_memory(omap_clkdsp_readfn, omap_clkdsp_writefn, s), |
|
2509 | 2509 |
}; |
2510 | 2510 |
|
2511 | 2511 |
s->clkm.arm_idlect1 = 0x03ff; |
... | ... | |
2758 | 2758 |
s->in = qemu_allocate_irqs(omap_mpuio_set, s, 16); |
2759 | 2759 |
omap_mpuio_reset(s); |
2760 | 2760 |
|
2761 |
iomemtype = cpu_register_io_memory(0, omap_mpuio_readfn,
|
|
2761 |
iomemtype = cpu_register_io_memory(omap_mpuio_readfn, |
|
2762 | 2762 |
omap_mpuio_writefn, s); |
2763 | 2763 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
2764 | 2764 |
|
... | ... | |
2954 | 2954 |
s->in = qemu_allocate_irqs(omap_gpio_set, s, 16); |
2955 | 2955 |
omap_gpio_reset(s); |
2956 | 2956 |
|
2957 |
iomemtype = cpu_register_io_memory(0, omap_gpio_readfn,
|
|
2957 |
iomemtype = cpu_register_io_memory(omap_gpio_readfn, |
|
2958 | 2958 |
omap_gpio_writefn, s); |
2959 | 2959 |
cpu_register_physical_memory(base, 0x1000, iomemtype); |
2960 | 2960 |
|
... | ... | |
3124 | 3124 |
s->txdrq = dma; |
3125 | 3125 |
omap_uwire_reset(s); |
3126 | 3126 |
|
3127 |
iomemtype = cpu_register_io_memory(0, omap_uwire_readfn,
|
|
3127 |
iomemtype = cpu_register_io_memory(omap_uwire_readfn, |
|
3128 | 3128 |
omap_uwire_writefn, s); |
3129 | 3129 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
3130 | 3130 |
|
... | ... | |
3225 | 3225 |
|
3226 | 3226 |
omap_pwl_reset(s); |
3227 | 3227 |
|
3228 |
iomemtype = cpu_register_io_memory(0, omap_pwl_readfn,
|
|
3228 |
iomemtype = cpu_register_io_memory(omap_pwl_readfn, |
|
3229 | 3229 |
omap_pwl_writefn, s); |
3230 | 3230 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
3231 | 3231 |
|
... | ... | |
3320 | 3320 |
s->pwt.clk = clk; |
3321 | 3321 |
omap_pwt_reset(s); |
3322 | 3322 |
|
3323 |
iomemtype = cpu_register_io_memory(0, omap_pwt_readfn,
|
|
3323 |
iomemtype = cpu_register_io_memory(omap_pwt_readfn, |
|
3324 | 3324 |
omap_pwt_writefn, s); |
3325 | 3325 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
3326 | 3326 |
} |
... | ... | |
3743 | 3743 |
|
3744 | 3744 |
omap_rtc_reset(s); |
3745 | 3745 |
|
3746 |
iomemtype = cpu_register_io_memory(0, omap_rtc_readfn,
|
|
3746 |
iomemtype = cpu_register_io_memory(omap_rtc_readfn, |
|
3747 | 3747 |
omap_rtc_writefn, s); |
3748 | 3748 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
3749 | 3749 |
|
... | ... | |
4263 | 4263 |
s->source_timer = qemu_new_timer(vm_clock, omap_mcbsp_source_tick, s); |
4264 | 4264 |
omap_mcbsp_reset(s); |
4265 | 4265 |
|
4266 |
iomemtype = cpu_register_io_memory(0, omap_mcbsp_readfn,
|
|
4266 |
iomemtype = cpu_register_io_memory(omap_mcbsp_readfn, |
|
4267 | 4267 |
omap_mcbsp_writefn, s); |
4268 | 4268 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
4269 | 4269 |
|
... | ... | |
4435 | 4435 |
|
4436 | 4436 |
omap_lpg_reset(s); |
4437 | 4437 |
|
4438 |
iomemtype = cpu_register_io_memory(0, omap_lpg_readfn,
|
|
4438 |
iomemtype = cpu_register_io_memory(omap_lpg_readfn, |
|
4439 | 4439 |
omap_lpg_writefn, s); |
4440 | 4440 |
cpu_register_physical_memory(base, 0x800, iomemtype); |
4441 | 4441 |
|
... | ... | |
4468 | 4468 |
|
4469 | 4469 |
static void omap_setup_mpui_io(struct omap_mpu_state_s *mpu) |
4470 | 4470 |
{ |
4471 |
int iomemtype = cpu_register_io_memory(0, omap_mpui_io_readfn,
|
|
4471 |
int iomemtype = cpu_register_io_memory(omap_mpui_io_readfn, |
|
4472 | 4472 |
omap_mpui_io_writefn, mpu); |
4473 | 4473 |
cpu_register_physical_memory(OMAP_MPUI_BASE, 0x7fff, iomemtype); |
4474 | 4474 |
} |
Also available in: Unified diff