Revision a8170e5e hw/sh7750.c

b/hw/sh7750.c
197 197
 Memory
198 198
**********************************************************************/
199 199

  
200
static void error_access(const char *kind, target_phys_addr_t addr)
200
static void error_access(const char *kind, hwaddr addr)
201 201
{
202 202
    fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") not supported\n",
203 203
	    kind, regname(addr), addr);
204 204
}
205 205

  
206
static void ignore_access(const char *kind, target_phys_addr_t addr)
206
static void ignore_access(const char *kind, hwaddr addr)
207 207
{
208 208
    fprintf(stderr, "%s to %s (0x" TARGET_FMT_plx ") ignored\n",
209 209
	    kind, regname(addr), addr);
210 210
}
211 211

  
212
static uint32_t sh7750_mem_readb(void *opaque, target_phys_addr_t addr)
212
static uint32_t sh7750_mem_readb(void *opaque, hwaddr addr)
213 213
{
214 214
    switch (addr) {
215 215
    default:
......
218 218
    }
219 219
}
220 220

  
221
static uint32_t sh7750_mem_readw(void *opaque, target_phys_addr_t addr)
221
static uint32_t sh7750_mem_readw(void *opaque, hwaddr addr)
222 222
{
223 223
    SH7750State *s = opaque;
224 224

  
......
252 252
    }
253 253
}
254 254

  
255
static uint32_t sh7750_mem_readl(void *opaque, target_phys_addr_t addr)
255
static uint32_t sh7750_mem_readl(void *opaque, hwaddr addr)
256 256
{
257 257
    SH7750State *s = opaque;
258 258

  
......
301 301

  
302 302
#define is_in_sdrmx(a, x) (a >= SH7750_SDMR ## x ## _A7 \
303 303
			&& a <= (SH7750_SDMR ## x ## _A7 + SH7750_SDMR ## x ## _REGNB))
304
static void sh7750_mem_writeb(void *opaque, target_phys_addr_t addr,
304
static void sh7750_mem_writeb(void *opaque, hwaddr addr,
305 305
			      uint32_t mem_value)
306 306
{
307 307

  
......
314 314
    abort();
315 315
}
316 316

  
317
static void sh7750_mem_writew(void *opaque, target_phys_addr_t addr,
317
static void sh7750_mem_writew(void *opaque, hwaddr addr,
318 318
			      uint32_t mem_value)
319 319
{
320 320
    SH7750State *s = opaque;
......
366 366
    }
367 367
}
368 368

  
369
static void sh7750_mem_writel(void *opaque, target_phys_addr_t addr,
369
static void sh7750_mem_writel(void *opaque, hwaddr addr,
370 370
			      uint32_t mem_value)
371 371
{
372 372
    SH7750State *s = opaque;
......
624 624
#define MM_UTLB_DATA     (7)
625 625
#define MM_REGION_TYPE(addr)  ((addr & MM_REGION_MASK) >> 24)
626 626

  
627
static uint64_t invalid_read(void *opaque, target_phys_addr_t addr)
627
static uint64_t invalid_read(void *opaque, hwaddr addr)
628 628
{
629 629
    abort();
630 630

  
631 631
    return 0;
632 632
}
633 633

  
634
static uint64_t sh7750_mmct_read(void *opaque, target_phys_addr_t addr,
634
static uint64_t sh7750_mmct_read(void *opaque, hwaddr addr,
635 635
                                 unsigned size)
636 636
{
637 637
    SH7750State *s = opaque;
......
669 669
    return ret;
670 670
}
671 671

  
672
static void invalid_write(void *opaque, target_phys_addr_t addr,
672
static void invalid_write(void *opaque, hwaddr addr,
673 673
                          uint64_t mem_value)
674 674
{
675 675
    abort();
676 676
}
677 677

  
678
static void sh7750_mmct_write(void *opaque, target_phys_addr_t addr,
678
static void sh7750_mmct_write(void *opaque, hwaddr addr,
679 679
                              uint64_t mem_value, unsigned size)
680 680
{
681 681
    SH7750State *s = opaque;

Also available in: Unified diff