Revision a8170e5e hw/slavio_misc.c

b/hw/slavio_misc.c
107 107
    slavio_misc_update_irq(s);
108 108
}
109 109

  
110
static void slavio_cfg_mem_writeb(void *opaque, target_phys_addr_t addr,
110
static void slavio_cfg_mem_writeb(void *opaque, hwaddr addr,
111 111
                                  uint64_t val, unsigned size)
112 112
{
113 113
    MiscState *s = opaque;
......
117 117
    slavio_misc_update_irq(s);
118 118
}
119 119

  
120
static uint64_t slavio_cfg_mem_readb(void *opaque, target_phys_addr_t addr,
120
static uint64_t slavio_cfg_mem_readb(void *opaque, hwaddr addr,
121 121
                                     unsigned size)
122 122
{
123 123
    MiscState *s = opaque;
......
138 138
    },
139 139
};
140 140

  
141
static void slavio_diag_mem_writeb(void *opaque, target_phys_addr_t addr,
141
static void slavio_diag_mem_writeb(void *opaque, hwaddr addr,
142 142
                                   uint64_t val, unsigned size)
143 143
{
144 144
    MiscState *s = opaque;
......
147 147
    s->diag = val & 0xff;
148 148
}
149 149

  
150
static uint64_t slavio_diag_mem_readb(void *opaque, target_phys_addr_t addr,
150
static uint64_t slavio_diag_mem_readb(void *opaque, hwaddr addr,
151 151
                                      unsigned size)
152 152
{
153 153
    MiscState *s = opaque;
......
168 168
    },
169 169
};
170 170

  
171
static void slavio_mdm_mem_writeb(void *opaque, target_phys_addr_t addr,
171
static void slavio_mdm_mem_writeb(void *opaque, hwaddr addr,
172 172
                                  uint64_t val, unsigned size)
173 173
{
174 174
    MiscState *s = opaque;
......
177 177
    s->mctrl = val & 0xff;
178 178
}
179 179

  
180
static uint64_t slavio_mdm_mem_readb(void *opaque, target_phys_addr_t addr,
180
static uint64_t slavio_mdm_mem_readb(void *opaque, hwaddr addr,
181 181
                                     unsigned size)
182 182
{
183 183
    MiscState *s = opaque;
......
198 198
    },
199 199
};
200 200

  
201
static void slavio_aux1_mem_writeb(void *opaque, target_phys_addr_t addr,
201
static void slavio_aux1_mem_writeb(void *opaque, hwaddr addr,
202 202
                                   uint64_t val, unsigned size)
203 203
{
204 204
    MiscState *s = opaque;
......
215 215
    s->aux1 = val & 0xff;
216 216
}
217 217

  
218
static uint64_t slavio_aux1_mem_readb(void *opaque, target_phys_addr_t addr,
218
static uint64_t slavio_aux1_mem_readb(void *opaque, hwaddr addr,
219 219
                                      unsigned size)
220 220
{
221 221
    MiscState *s = opaque;
......
236 236
    },
237 237
};
238 238

  
239
static void slavio_aux2_mem_writeb(void *opaque, target_phys_addr_t addr,
239
static void slavio_aux2_mem_writeb(void *opaque, hwaddr addr,
240 240
                                   uint64_t val, unsigned size)
241 241
{
242 242
    MiscState *s = opaque;
......
252 252
    slavio_misc_update_irq(s);
253 253
}
254 254

  
255
static uint64_t slavio_aux2_mem_readb(void *opaque, target_phys_addr_t addr,
255
static uint64_t slavio_aux2_mem_readb(void *opaque, hwaddr addr,
256 256
                                      unsigned size)
257 257
{
258 258
    MiscState *s = opaque;
......
273 273
    },
274 274
};
275 275

  
276
static void apc_mem_writeb(void *opaque, target_phys_addr_t addr,
276
static void apc_mem_writeb(void *opaque, hwaddr addr,
277 277
                           uint64_t val, unsigned size)
278 278
{
279 279
    APCState *s = opaque;
......
282 282
    qemu_irq_raise(s->cpu_halt);
283 283
}
284 284

  
285
static uint64_t apc_mem_readb(void *opaque, target_phys_addr_t addr,
285
static uint64_t apc_mem_readb(void *opaque, hwaddr addr,
286 286
                              unsigned size)
287 287
{
288 288
    uint32_t ret = 0;
......
301 301
    }
302 302
};
303 303

  
304
static uint64_t slavio_sysctrl_mem_readl(void *opaque, target_phys_addr_t addr,
304
static uint64_t slavio_sysctrl_mem_readl(void *opaque, hwaddr addr,
305 305
                                         unsigned size)
306 306
{
307 307
    MiscState *s = opaque;
......
318 318
    return ret;
319 319
}
320 320

  
321
static void slavio_sysctrl_mem_writel(void *opaque, target_phys_addr_t addr,
321
static void slavio_sysctrl_mem_writel(void *opaque, hwaddr addr,
322 322
                                      uint64_t val, unsigned size)
323 323
{
324 324
    MiscState *s = opaque;
......
346 346
    },
347 347
};
348 348

  
349
static uint64_t slavio_led_mem_readw(void *opaque, target_phys_addr_t addr,
349
static uint64_t slavio_led_mem_readw(void *opaque, hwaddr addr,
350 350
                                     unsigned size)
351 351
{
352 352
    MiscState *s = opaque;
......
363 363
    return ret;
364 364
}
365 365

  
366
static void slavio_led_mem_writew(void *opaque, target_phys_addr_t addr,
366
static void slavio_led_mem_writew(void *opaque, hwaddr addr,
367 367
                                  uint64_t val, unsigned size)
368 368
{
369 369
    MiscState *s = opaque;

Also available in: Unified diff