Revision c227f099 hw/tc6393xb.c

b/hw/tc6393xb.c
122 122
    ECCState ecc;
123 123

  
124 124
    DisplayState *ds;
125
    a_ram_addr vram_addr;
125
    ram_addr_t vram_addr;
126 126
    uint16_t *vram_ptr;
127 127
    uint32_t scr_width, scr_height; /* in pixels */
128 128
    qemu_irq l3v;
......
211 211
    case SCR_ ##N(1): return s->scr.N[1];       \
212 212
    case SCR_ ##N(2): return s->scr.N[2]
213 213

  
214
static uint32_t tc6393xb_scr_readb(TC6393xbState *s, a_target_phys_addr addr)
214
static uint32_t tc6393xb_scr_readb(TC6393xbState *s, target_phys_addr_t addr)
215 215
{
216 216
    switch (addr) {
217 217
        case SCR_REVID:
......
272 272
    case SCR_ ##N(1): s->scr.N[1] = value; return;   \
273 273
    case SCR_ ##N(2): s->scr.N[2] = value; return
274 274

  
275
static void tc6393xb_scr_writeb(TC6393xbState *s, a_target_phys_addr addr, uint32_t value)
275
static void tc6393xb_scr_writeb(TC6393xbState *s, target_phys_addr_t addr, uint32_t value)
276 276
{
277 277
    switch (addr) {
278 278
        SCR_REG_B(ISR);
......
323 323
            (s->nand.imr & 0x80) && (s->nand.imr & s->nand.isr));
324 324
}
325 325

  
326
static uint32_t tc6393xb_nand_cfg_readb(TC6393xbState *s, a_target_phys_addr addr) {
326
static uint32_t tc6393xb_nand_cfg_readb(TC6393xbState *s, target_phys_addr_t addr) {
327 327
    switch (addr) {
328 328
        case NAND_CFG_COMMAND:
329 329
            return s->nand_enable ? 2 : 0;
......
336 336
    fprintf(stderr, "tc6393xb_nand_cfg: unhandled read at %08x\n", (uint32_t) addr);
337 337
    return 0;
338 338
}
339
static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, a_target_phys_addr addr, uint32_t value) {
339
static void tc6393xb_nand_cfg_writeb(TC6393xbState *s, target_phys_addr_t addr, uint32_t value) {
340 340
    switch (addr) {
341 341
        case NAND_CFG_COMMAND:
342 342
            s->nand_enable = (value & 0x2);
......
353 353
					(uint32_t) addr, value & 0xff);
354 354
}
355 355

  
356
static uint32_t tc6393xb_nand_readb(TC6393xbState *s, a_target_phys_addr addr) {
356
static uint32_t tc6393xb_nand_readb(TC6393xbState *s, target_phys_addr_t addr) {
357 357
    switch (addr) {
358 358
        case NAND_DATA + 0:
359 359
        case NAND_DATA + 1:
......
372 372
    fprintf(stderr, "tc6393xb_nand: unhandled read at %08x\n", (uint32_t) addr);
373 373
    return 0;
374 374
}
375
static void tc6393xb_nand_writeb(TC6393xbState *s, a_target_phys_addr addr, uint32_t value) {
375
static void tc6393xb_nand_writeb(TC6393xbState *s, target_phys_addr_t addr, uint32_t value) {
376 376
//    fprintf(stderr, "tc6393xb_nand: write at %08x: %02x\n",
377 377
//					(uint32_t) addr, value & 0xff);
378 378
    switch (addr) {
......
495 495
}
496 496

  
497 497

  
498
static uint32_t tc6393xb_readb(void *opaque, a_target_phys_addr addr) {
498
static uint32_t tc6393xb_readb(void *opaque, target_phys_addr_t addr) {
499 499
    TC6393xbState *s = opaque;
500 500

  
501 501
    switch (addr >> 8) {
......
516 516
    return 0;
517 517
}
518 518

  
519
static void tc6393xb_writeb(void *opaque, a_target_phys_addr addr, uint32_t value) {
519
static void tc6393xb_writeb(void *opaque, target_phys_addr_t addr, uint32_t value) {
520 520
    TC6393xbState *s = opaque;
521 521

  
522 522
    switch (addr >> 8) {
......
535 535
					(uint32_t) addr, value & 0xff);
536 536
}
537 537

  
538
static uint32_t tc6393xb_readw(void *opaque, a_target_phys_addr addr)
538
static uint32_t tc6393xb_readw(void *opaque, target_phys_addr_t addr)
539 539
{
540 540
    return (tc6393xb_readb(opaque, addr) & 0xff) |
541 541
        (tc6393xb_readb(opaque, addr + 1) << 8);
542 542
}
543 543

  
544
static uint32_t tc6393xb_readl(void *opaque, a_target_phys_addr addr)
544
static uint32_t tc6393xb_readl(void *opaque, target_phys_addr_t addr)
545 545
{
546 546
    return (tc6393xb_readb(opaque, addr) & 0xff) |
547 547
        ((tc6393xb_readb(opaque, addr + 1) & 0xff) << 8) |
......
549 549
        ((tc6393xb_readb(opaque, addr + 3) & 0xff) << 24);
550 550
}
551 551

  
552
static void tc6393xb_writew(void *opaque, a_target_phys_addr addr, uint32_t value)
552
static void tc6393xb_writew(void *opaque, target_phys_addr_t addr, uint32_t value)
553 553
{
554 554
    tc6393xb_writeb(opaque, addr, value);
555 555
    tc6393xb_writeb(opaque, addr + 1, value >> 8);
556 556
}
557 557

  
558
static void tc6393xb_writel(void *opaque, a_target_phys_addr addr, uint32_t value)
558
static void tc6393xb_writel(void *opaque, target_phys_addr_t addr, uint32_t value)
559 559
{
560 560
    tc6393xb_writeb(opaque, addr, value);
561 561
    tc6393xb_writeb(opaque, addr + 1, value >> 8);

Also available in: Unified diff