Revision a8170e5e hw/integratorcp.c

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

  
41
static uint64_t integratorcm_read(void *opaque, target_phys_addr_t offset,
41
static uint64_t integratorcm_read(void *opaque, hwaddr offset,
42 42
                                  unsigned size)
43 43
{
44 44
    integratorcm_state *s = (integratorcm_state *)opaque;
......
141 141
        hw_error("Core module interrupt\n");
142 142
}
143 143

  
144
static void integratorcm_write(void *opaque, target_phys_addr_t offset,
144
static void integratorcm_write(void *opaque, hwaddr offset,
145 145
                               uint64_t value, unsigned size)
146 146
{
147 147
    integratorcm_state *s = (integratorcm_state *)opaque;
......
295 295
    icp_pic_update(s);
296 296
}
297 297

  
298
static uint64_t icp_pic_read(void *opaque, target_phys_addr_t offset,
298
static uint64_t icp_pic_read(void *opaque, hwaddr offset,
299 299
                             unsigned size)
300 300
{
301 301
    icp_pic_state *s = (icp_pic_state *)opaque;
......
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, hwaddr offset,
328 328
                          uint64_t value, unsigned size)
329 329
{
330 330
    icp_pic_state *s = (icp_pic_state *)opaque;
......
381 381

  
382 382
/* CP control registers.  */
383 383

  
384
static uint64_t icp_control_read(void *opaque, target_phys_addr_t offset,
384
static uint64_t icp_control_read(void *opaque, hwaddr offset,
385 385
                                 unsigned size)
386 386
{
387 387
    switch (offset >> 2) {
......
399 399
    }
400 400
}
401 401

  
402
static void icp_control_write(void *opaque, target_phys_addr_t offset,
402
static void icp_control_write(void *opaque, hwaddr offset,
403 403
                          uint64_t value, unsigned size)
404 404
{
405 405
    switch (offset >> 2) {
......
419 419
    .endianness = DEVICE_NATIVE_ENDIAN,
420 420
};
421 421

  
422
static void icp_control_init(target_phys_addr_t base)
422
static void icp_control_init(hwaddr base)
423 423
{
424 424
    MemoryRegion *io;
425 425

  

Also available in: Unified diff