Revision 99a0949b hw/mips_jazz.c

b/hw/mips_jazz.c
47 47
    cpu_reset(env);
48 48
}
49 49

  
50
static uint32_t rtc_readb(void *opaque, target_phys_addr_t addr)
50
static uint32_t rtc_readb(void *opaque, a_target_phys_addr addr)
51 51
{
52 52
    return cpu_inw(0x71);
53 53
}
54 54

  
55
static void rtc_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
55
static void rtc_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
56 56
{
57 57
    cpu_outw(0x71, val & 0xff);
58 58
}
......
69 69
    rtc_writeb,
70 70
};
71 71

  
72
static void dma_dummy_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
72
static void dma_dummy_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
73 73
{
74 74
    /* Nothing to do. That is only to ensure that
75 75
     * the current DMA acknowledge cycle is completed. */
......
113 113
#define MAGNUM_BIOS_SIZE (BIOS_SIZE < MAGNUM_BIOS_SIZE_MAX ? BIOS_SIZE : MAGNUM_BIOS_SIZE_MAX)
114 114

  
115 115
static
116
void mips_jazz_init (ram_addr_t ram_size,
116
void mips_jazz_init (a_ram_addr ram_size,
117 117
                     const char *cpu_model,
118 118
                     enum jazz_model_e jazz_model)
119 119
{
......
128 128
    PITState *pit;
129 129
    BlockDriverState *fds[MAX_FD];
130 130
    qemu_irq esp_reset;
131
    ram_addr_t ram_offset;
132
    ram_addr_t bios_offset;
131
    a_ram_addr ram_offset;
132
    a_ram_addr bios_offset;
133 133

  
134 134
    /* init CPUs */
135 135
    if (cpu_model == NULL) {
......
271 271
}
272 272

  
273 273
static
274
void mips_magnum_init (ram_addr_t ram_size,
274
void mips_magnum_init (a_ram_addr ram_size,
275 275
                       const char *boot_device,
276 276
                       const char *kernel_filename, const char *kernel_cmdline,
277 277
                       const char *initrd_filename, const char *cpu_model)
......
280 280
}
281 281

  
282 282
static
283
void mips_pica61_init (ram_addr_t ram_size,
283
void mips_pica61_init (a_ram_addr ram_size,
284 284
                       const char *boot_device,
285 285
                       const char *kernel_filename, const char *kernel_cmdline,
286 286
                       const char *initrd_filename, const char *cpu_model)

Also available in: Unified diff