Revision 1eed09cb hw/omap2.c

b/hw/omap2.c
483 483
    omap_gp_timer_reset(s);
484 484
    omap_gp_timer_clk_setup(s);
485 485

  
486
    iomemtype = l4_register_io_memory(0, omap_gp_timer_readfn,
486
    iomemtype = l4_register_io_memory(omap_gp_timer_readfn,
487 487
                    omap_gp_timer_writefn, s);
488 488
    omap_l4_attach(ta, 0, iomemtype);
489 489

  
......
554 554
    struct omap_synctimer_s *s = &mpu->synctimer;
555 555

  
556 556
    omap_synctimer_reset(s);
557
    omap_l4_attach(ta, 0, l4_register_io_memory(0,
557
    omap_l4_attach(ta, 0, l4_register_io_memory(
558 558
                      omap_synctimer_readfn, omap_synctimer_writefn, s));
559 559
}
560 560

  
......
952 952
    s->wkup = wkup;
953 953
    s->in = qemu_allocate_irqs(omap_gpio_module_set, s, 32);
954 954

  
955
    iomemtype = l4_register_io_memory(0, omap_gpio_module_readfn,
955
    iomemtype = l4_register_io_memory(omap_gpio_module_readfn,
956 956
                    omap_gpio_module_writefn, s);
957 957
    omap_l4_attach(ta, region, iomemtype);
958 958
}
......
1060 1060

  
1061 1061
    omap_gpif_reset(s);
1062 1062

  
1063
    iomemtype = l4_register_io_memory(0, omap_gpif_top_readfn,
1063
    iomemtype = l4_register_io_memory(omap_gpif_top_readfn,
1064 1064
                    omap_gpif_top_writefn, s);
1065 1065
    omap_l4_attach(ta, 1, iomemtype);
1066 1066

  
......
1386 1386
    }
1387 1387
    omap_mcspi_reset(s);
1388 1388

  
1389
    iomemtype = l4_register_io_memory(0, omap_mcspi_readfn,
1389
    iomemtype = l4_register_io_memory(omap_mcspi_readfn,
1390 1390
                    omap_mcspi_writefn, s);
1391 1391
    omap_l4_attach(ta, 0, iomemtype);
1392 1392

  
......
1975 1975
#ifdef HAS_AUDIO
1976 1976
    AUD_register_card("OMAP EAC", &s->codec.card);
1977 1977

  
1978
    iomemtype = cpu_register_io_memory(0, omap_eac_readfn,
1978
    iomemtype = cpu_register_io_memory(omap_eac_readfn,
1979 1979
                    omap_eac_writefn, s);
1980 1980
    omap_l4_attach(ta, 0, iomemtype);
1981 1981
#endif
......
2160 2160

  
2161 2161
    s->chr = chr ?: qemu_chr_open("null", "null", NULL);
2162 2162

  
2163
    iomemtype = l4_register_io_memory(0, omap_sti_readfn,
2163
    iomemtype = l4_register_io_memory(omap_sti_readfn,
2164 2164
                    omap_sti_writefn, s);
2165 2165
    omap_l4_attach(ta, 0, iomemtype);
2166 2166

  
2167
    iomemtype = cpu_register_io_memory(0, omap_sti_fifo_readfn,
2167
    iomemtype = cpu_register_io_memory(omap_sti_fifo_readfn,
2168 2168
                    omap_sti_fifo_writefn, s);
2169 2169
    cpu_register_physical_memory(channel_base, 0x10000, iomemtype);
2170 2170

  
......
2204 2204
static CPUWriteMemoryFunc **omap_l4_io_writew_fn;
2205 2205
static void **omap_l4_io_opaque;
2206 2206

  
2207
int l4_register_io_memory(int io_index, CPUReadMemoryFunc **mem_read,
2207
int l4_register_io_memory(CPUReadMemoryFunc **mem_read,
2208 2208
                CPUWriteMemoryFunc **mem_write, void *opaque)
2209 2209
{
2210 2210
    omap_l4_io_entry[omap_l4_io_entries].mem_read = mem_read;
......
2285 2285
    omap_l4_io_entry = qemu_mallocz(125 * sizeof(*omap_l4_io_entry));
2286 2286

  
2287 2287
    omap_cpu_io_entry =
2288
            cpu_register_io_memory(0, omap_l4_io_readfn,
2288
            cpu_register_io_memory(omap_l4_io_readfn,
2289 2289
                            omap_l4_io_writefn, bus);
2290 2290
# define L4_PAGES	(0xb4000 / TARGET_PAGE_SIZE)
2291 2291
    omap_l4_io_readb_fn = qemu_mallocz(sizeof(void *) * L4_PAGES);
......
2578 2578
    ta->status = 0x00000000;
2579 2579
    ta->control = 0x00000200;	/* XXX 01000200 for L4TAO */
2580 2580

  
2581
    iomemtype = l4_register_io_memory(0, omap_l4ta_readfn,
2581
    iomemtype = l4_register_io_memory(omap_l4ta_readfn,
2582 2582
                    omap_l4ta_writefn, ta);
2583 2583
    ta->base = omap_l4_attach(ta, info->ta_region, iomemtype);
2584 2584

  
......
2708 2708
void omap_tap_init(struct omap_target_agent_s *ta,
2709 2709
                struct omap_mpu_state_s *mpu)
2710 2710
{
2711
    omap_l4_attach(ta, 0, l4_register_io_memory(0,
2711
    omap_l4_attach(ta, 0, l4_register_io_memory(
2712 2712
                            omap_tap_readfn, omap_tap_writefn, mpu));
2713 2713
}
2714 2714

  
......
3521 3521
    s->mpu = mpu;
3522 3522
    omap_prcm_coldreset(s);
3523 3523

  
3524
    iomemtype = l4_register_io_memory(0, omap_prcm_readfn,
3524
    iomemtype = l4_register_io_memory(omap_prcm_readfn,
3525 3525
                    omap_prcm_writefn, s);
3526 3526
    omap_l4_attach(ta, 0, iomemtype);
3527 3527
    omap_l4_attach(ta, 1, iomemtype);
......
3891 3891
    s->mpu = mpu;
3892 3892
    omap_sysctl_reset(s);
3893 3893

  
3894
    iomemtype = l4_register_io_memory(0, omap_sysctl_readfn,
3894
    iomemtype = l4_register_io_memory(omap_sysctl_readfn,
3895 3895
                    omap_sysctl_writefn, s);
3896 3896
    omap_l4_attach(ta, 0, iomemtype);
3897 3897

  
......
4035 4035

  
4036 4036
    omap_sdrc_reset(s);
4037 4037

  
4038
    iomemtype = cpu_register_io_memory(0, omap_sdrc_readfn,
4038
    iomemtype = cpu_register_io_memory(omap_sdrc_readfn,
4039 4039
                    omap_sdrc_writefn, s);
4040 4040
    cpu_register_physical_memory(base, 0x1000, iomemtype);
4041 4041

  
......
4409 4409

  
4410 4410
    omap_gpmc_reset(s);
4411 4411

  
4412
    iomemtype = cpu_register_io_memory(0, omap_gpmc_readfn,
4412
    iomemtype = cpu_register_io_memory(omap_gpmc_readfn,
4413 4413
                    omap_gpmc_writefn, s);
4414 4414
    cpu_register_physical_memory(base, 0x1000, iomemtype);
4415 4415

  

Also available in: Unified diff