Revision c227f099 hw/ppc_prep.c

b/hw/ppc_prep.c
112 112
/* PCI intack register */
113 113
/* Read-only register (?) */
114 114
static void _PPC_intack_write (void *opaque,
115
                               a_target_phys_addr addr, uint32_t value)
115
                               target_phys_addr_t addr, uint32_t value)
116 116
{
117 117
#if 0
118 118
    printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr,
......
120 120
#endif
121 121
}
122 122

  
123
static inline uint32_t _PPC_intack_read(a_target_phys_addr addr)
123
static inline uint32_t _PPC_intack_read(target_phys_addr_t addr)
124 124
{
125 125
    uint32_t retval = 0;
126 126

  
......
134 134
    return retval;
135 135
}
136 136

  
137
static uint32_t PPC_intack_readb (void *opaque, a_target_phys_addr addr)
137
static uint32_t PPC_intack_readb (void *opaque, target_phys_addr_t addr)
138 138
{
139 139
    return _PPC_intack_read(addr);
140 140
}
141 141

  
142
static uint32_t PPC_intack_readw (void *opaque, a_target_phys_addr addr)
142
static uint32_t PPC_intack_readw (void *opaque, target_phys_addr_t addr)
143 143
{
144 144
#ifdef TARGET_WORDS_BIGENDIAN
145 145
    return bswap16(_PPC_intack_read(addr));
......
148 148
#endif
149 149
}
150 150

  
151
static uint32_t PPC_intack_readl (void *opaque, a_target_phys_addr addr)
151
static uint32_t PPC_intack_readl (void *opaque, target_phys_addr_t addr)
152 152
{
153 153
#ifdef TARGET_WORDS_BIGENDIAN
154 154
    return bswap32(_PPC_intack_read(addr));
......
197 197
} XCSR;
198 198

  
199 199
static void PPC_XCSR_writeb (void *opaque,
200
                             a_target_phys_addr addr, uint32_t value)
200
                             target_phys_addr_t addr, uint32_t value)
201 201
{
202 202
    printf("%s: 0x" TARGET_FMT_plx " => 0x%08" PRIx32 "\n", __func__, addr,
203 203
           value);
204 204
}
205 205

  
206 206
static void PPC_XCSR_writew (void *opaque,
207
                             a_target_phys_addr addr, uint32_t value)
207
                             target_phys_addr_t addr, uint32_t value)
208 208
{
209 209
#ifdef TARGET_WORDS_BIGENDIAN
210 210
    value = bswap16(value);
......
214 214
}
215 215

  
216 216
static void PPC_XCSR_writel (void *opaque,
217
                             a_target_phys_addr addr, uint32_t value)
217
                             target_phys_addr_t addr, uint32_t value)
218 218
{
219 219
#ifdef TARGET_WORDS_BIGENDIAN
220 220
    value = bswap32(value);
......
223 223
           value);
224 224
}
225 225

  
226
static uint32_t PPC_XCSR_readb (void *opaque, a_target_phys_addr addr)
226
static uint32_t PPC_XCSR_readb (void *opaque, target_phys_addr_t addr)
227 227
{
228 228
    uint32_t retval = 0;
229 229

  
......
233 233
    return retval;
234 234
}
235 235

  
236
static uint32_t PPC_XCSR_readw (void *opaque, a_target_phys_addr addr)
236
static uint32_t PPC_XCSR_readw (void *opaque, target_phys_addr_t addr)
237 237
{
238 238
    uint32_t retval = 0;
239 239

  
......
246 246
    return retval;
247 247
}
248 248

  
249
static uint32_t PPC_XCSR_readl (void *opaque, a_target_phys_addr addr)
249
static uint32_t PPC_XCSR_readl (void *opaque, target_phys_addr_t addr)
250 250
{
251 251
    uint32_t retval = 0;
252 252

  
......
273 273
#endif
274 274

  
275 275
/* Fake super-io ports for PREP platform (Intel 82378ZB) */
276
typedef struct sysctrl {
276
typedef struct sysctrl_t {
277 277
    qemu_irq reset_irq;
278
    a_m48t59 *nvram;
278
    m48t59_t *nvram;
279 279
    uint8_t state;
280 280
    uint8_t syscontrol;
281 281
    uint8_t fake_io[2];
282 282
    int contiguous_map;
283 283
    int endian;
284
} a_sysctrl;
284
} sysctrl_t;
285 285

  
286 286
enum {
287 287
    STATE_HARDFILE = 0x01,
288 288
};
289 289

  
290
static a_sysctrl *sysctrl;
290
static sysctrl_t *sysctrl;
291 291

  
292 292
static void PREP_io_write (void *opaque, uint32_t addr, uint32_t val)
293 293
{
294
    a_sysctrl *sysctrl = opaque;
294
    sysctrl_t *sysctrl = opaque;
295 295

  
296 296
    PPC_IO_DPRINTF("0x%08" PRIx32 " => 0x%02" PRIx32 "\n", addr - PPC_IO_BASE,
297 297
                   val);
......
300 300

  
301 301
static uint32_t PREP_io_read (void *opaque, uint32_t addr)
302 302
{
303
    a_sysctrl *sysctrl = opaque;
303
    sysctrl_t *sysctrl = opaque;
304 304

  
305 305
    PPC_IO_DPRINTF("0x%08" PRIx32 " <= 0x%02" PRIx32 "\n", addr - PPC_IO_BASE,
306 306
                   sysctrl->fake_io[addr - 0x0398]);
......
309 309

  
310 310
static void PREP_io_800_writeb (void *opaque, uint32_t addr, uint32_t val)
311 311
{
312
    a_sysctrl *sysctrl = opaque;
312
    sysctrl_t *sysctrl = opaque;
313 313

  
314 314
    PPC_IO_DPRINTF("0x%08" PRIx32 " => 0x%02" PRIx32 "\n",
315 315
                   addr - PPC_IO_BASE, val);
......
376 376

  
377 377
static uint32_t PREP_io_800_readb (void *opaque, uint32_t addr)
378 378
{
379
    a_sysctrl *sysctrl = opaque;
379
    sysctrl_t *sysctrl = opaque;
380 380
    uint32_t retval = 0xFF;
381 381

  
382 382
    switch (addr) {
......
440 440
    return retval;
441 441
}
442 442

  
443
static inline a_target_phys_addr prep_IO_address(a_sysctrl *sysctrl,
444
                                                 a_target_phys_addr addr)
443
static inline target_phys_addr_t prep_IO_address(sysctrl_t *sysctrl,
444
                                                 target_phys_addr_t addr)
445 445
{
446 446
    if (sysctrl->contiguous_map == 0) {
447 447
        /* 64 KB contiguous space for IOs */
......
454 454
    return addr;
455 455
}
456 456

  
457
static void PPC_prep_io_writeb (void *opaque, a_target_phys_addr addr,
457
static void PPC_prep_io_writeb (void *opaque, target_phys_addr_t addr,
458 458
                                uint32_t value)
459 459
{
460
    a_sysctrl *sysctrl = opaque;
460
    sysctrl_t *sysctrl = opaque;
461 461

  
462 462
    addr = prep_IO_address(sysctrl, addr);
463 463
    cpu_outb(addr, value);
464 464
}
465 465

  
466
static uint32_t PPC_prep_io_readb (void *opaque, a_target_phys_addr addr)
466
static uint32_t PPC_prep_io_readb (void *opaque, target_phys_addr_t addr)
467 467
{
468
    a_sysctrl *sysctrl = opaque;
468
    sysctrl_t *sysctrl = opaque;
469 469
    uint32_t ret;
470 470

  
471 471
    addr = prep_IO_address(sysctrl, addr);
......
474 474
    return ret;
475 475
}
476 476

  
477
static void PPC_prep_io_writew (void *opaque, a_target_phys_addr addr,
477
static void PPC_prep_io_writew (void *opaque, target_phys_addr_t addr,
478 478
                                uint32_t value)
479 479
{
480
    a_sysctrl *sysctrl = opaque;
480
    sysctrl_t *sysctrl = opaque;
481 481

  
482 482
    addr = prep_IO_address(sysctrl, addr);
483 483
#ifdef TARGET_WORDS_BIGENDIAN
......
487 487
    cpu_outw(addr, value);
488 488
}
489 489

  
490
static uint32_t PPC_prep_io_readw (void *opaque, a_target_phys_addr addr)
490
static uint32_t PPC_prep_io_readw (void *opaque, target_phys_addr_t addr)
491 491
{
492
    a_sysctrl *sysctrl = opaque;
492
    sysctrl_t *sysctrl = opaque;
493 493
    uint32_t ret;
494 494

  
495 495
    addr = prep_IO_address(sysctrl, addr);
......
502 502
    return ret;
503 503
}
504 504

  
505
static void PPC_prep_io_writel (void *opaque, a_target_phys_addr addr,
505
static void PPC_prep_io_writel (void *opaque, target_phys_addr_t addr,
506 506
                                uint32_t value)
507 507
{
508
    a_sysctrl *sysctrl = opaque;
508
    sysctrl_t *sysctrl = opaque;
509 509

  
510 510
    addr = prep_IO_address(sysctrl, addr);
511 511
#ifdef TARGET_WORDS_BIGENDIAN
......
515 515
    cpu_outl(addr, value);
516 516
}
517 517

  
518
static uint32_t PPC_prep_io_readl (void *opaque, a_target_phys_addr addr)
518
static uint32_t PPC_prep_io_readl (void *opaque, target_phys_addr_t addr)
519 519
{
520
    a_sysctrl *sysctrl = opaque;
520
    sysctrl_t *sysctrl = opaque;
521 521
    uint32_t ret;
522 522

  
523 523
    addr = prep_IO_address(sysctrl, addr);
......
545 545
#define NVRAM_SIZE        0x2000
546 546

  
547 547
/* PowerPC PREP hardware initialisation */
548
static void ppc_prep_init (a_ram_addr ram_size,
548
static void ppc_prep_init (ram_addr_t ram_size,
549 549
                           const char *boot_device,
550 550
                           const char *kernel_filename,
551 551
                           const char *kernel_cmdline,
......
554 554
{
555 555
    CPUState *env = NULL, *envs[MAX_CPUS];
556 556
    char *filename;
557
    a_nvram nvram;
558
    a_m48t59 *m48t59;
557
    nvram_t nvram;
558
    m48t59_t *m48t59;
559 559
    int PPC_io_memory;
560 560
    int linux_boot, i, nb_nics1, bios_size;
561
    a_ram_addr ram_offset, bios_offset;
561
    ram_addr_t ram_offset, bios_offset;
562 562
    uint32_t kernel_base, kernel_size, initrd_base, initrd_size;
563 563
    PCIBus *pci_bus;
564 564
    qemu_irq *i8259;
......
567 567
    DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
568 568
    BlockDriverState *fd[MAX_FD];
569 569

  
570
    sysctrl = qemu_mallocz(sizeof(a_sysctrl));
570
    sysctrl = qemu_mallocz(sizeof(sysctrl_t));
571 571

  
572 572
    linux_boot = (kernel_filename != NULL);
573 573

  
......
606 606
        bios_size = -1;
607 607
    }
608 608
    if (bios_size > 0 && bios_size <= BIOS_SIZE) {
609
        a_target_phys_addr bios_addr;
609
        target_phys_addr_t bios_addr;
610 610
        bios_size = (bios_size + 0xfff) & ~0xfff;
611 611
        bios_addr = (uint32_t)(-bios_size);
612 612
        cpu_register_physical_memory(bios_addr, bios_size,

Also available in: Unified diff