Revision 99a0949b hw/integratorcp.c

b/hw/integratorcp.c
37 37
   0xe, 4, 0x1c, 1, 2, 0x20, 0xc0, 0, 0, 0, 0, 0x30, 0x28, 0x30, 0x28, 0x40
38 38
};
39 39

  
40
static uint32_t integratorcm_read(void *opaque, target_phys_addr_t offset)
40
static uint32_t integratorcm_read(void *opaque, a_target_phys_addr offset)
41 41
{
42 42
    integratorcm_state *s = (integratorcm_state *)opaque;
43 43
    if (offset >= 0x100 && offset < 0x200) {
......
138 138
        hw_error("Core module interrupt\n");
139 139
}
140 140

  
141
static void integratorcm_write(void *opaque, target_phys_addr_t offset,
141
static void integratorcm_write(void *opaque, a_target_phys_addr offset,
142 142
                               uint32_t value)
143 143
{
144 144
    integratorcm_state *s = (integratorcm_state *)opaque;
......
296 296
    icp_pic_update(s);
297 297
}
298 298

  
299
static uint32_t icp_pic_read(void *opaque, target_phys_addr_t offset)
299
static uint32_t icp_pic_read(void *opaque, a_target_phys_addr offset)
300 300
{
301 301
    icp_pic_state *s = (icp_pic_state *)opaque;
302 302

  
......
324 324
    }
325 325
}
326 326

  
327
static void icp_pic_write(void *opaque, target_phys_addr_t offset,
327
static void icp_pic_write(void *opaque, a_target_phys_addr offset,
328 328
                          uint32_t value)
329 329
{
330 330
    icp_pic_state *s = (icp_pic_state *)opaque;
......
388 388
}
389 389

  
390 390
/* CP control registers.  */
391
static uint32_t icp_control_read(void *opaque, target_phys_addr_t offset)
391
static uint32_t icp_control_read(void *opaque, a_target_phys_addr offset)
392 392
{
393 393
    switch (offset >> 2) {
394 394
    case 0: /* CP_IDFIELD */
......
405 405
    }
406 406
}
407 407

  
408
static void icp_control_write(void *opaque, target_phys_addr_t offset,
408
static void icp_control_write(void *opaque, a_target_phys_addr offset,
409 409
                          uint32_t value)
410 410
{
411 411
    switch (offset >> 2) {
......
448 448
    .board_id = 0x113,
449 449
};
450 450

  
451
static void integratorcp_init(ram_addr_t ram_size,
451
static void integratorcp_init(a_ram_addr ram_size,
452 452
                     const char *boot_device,
453 453
                     const char *kernel_filename, const char *kernel_cmdline,
454 454
                     const char *initrd_filename, const char *cpu_model)
455 455
{
456 456
    CPUState *env;
457
    ram_addr_t ram_offset;
457
    a_ram_addr ram_offset;
458 458
    qemu_irq pic[32];
459 459
    qemu_irq *cpu_pic;
460 460
    DeviceState *dev;

Also available in: Unified diff