Revision 8da3ff18 hw/m48t59.c

b/hw/m48t59.c
46 46
    /* Hardware parameters */
47 47
    qemu_irq IRQ;
48 48
    int mem_index;
49
    target_phys_addr_t mem_base;
50 49
    uint32_t io_base;
51 50
    uint16_t size;
52 51
    /* RTC management */
......
514 513
{
515 514
    m48t59_t *NVRAM = opaque;
516 515

  
517
    addr -= NVRAM->mem_base;
518 516
    m48t59_write(NVRAM, addr, value & 0xff);
519 517
}
520 518

  
......
522 520
{
523 521
    m48t59_t *NVRAM = opaque;
524 522

  
525
    addr -= NVRAM->mem_base;
526 523
    m48t59_write(NVRAM, addr, (value >> 8) & 0xff);
527 524
    m48t59_write(NVRAM, addr + 1, value & 0xff);
528 525
}
......
531 528
{
532 529
    m48t59_t *NVRAM = opaque;
533 530

  
534
    addr -= NVRAM->mem_base;
535 531
    m48t59_write(NVRAM, addr, (value >> 24) & 0xff);
536 532
    m48t59_write(NVRAM, addr + 1, (value >> 16) & 0xff);
537 533
    m48t59_write(NVRAM, addr + 2, (value >> 8) & 0xff);
......
543 539
    m48t59_t *NVRAM = opaque;
544 540
    uint32_t retval;
545 541

  
546
    addr -= NVRAM->mem_base;
547 542
    retval = m48t59_read(NVRAM, addr);
548 543
    return retval;
549 544
}
......
553 548
    m48t59_t *NVRAM = opaque;
554 549
    uint32_t retval;
555 550

  
556
    addr -= NVRAM->mem_base;
557 551
    retval = m48t59_read(NVRAM, addr) << 8;
558 552
    retval |= m48t59_read(NVRAM, addr + 1);
559 553
    return retval;
......
564 558
    m48t59_t *NVRAM = opaque;
565 559
    uint32_t retval;
566 560

  
567
    addr -= NVRAM->mem_base;
568 561
    retval = m48t59_read(NVRAM, addr) << 24;
569 562
    retval |= m48t59_read(NVRAM, addr + 1) << 16;
570 563
    retval |= m48t59_read(NVRAM, addr + 2) << 8;
......
636 629
    }
637 630
    s->IRQ = IRQ;
638 631
    s->size = size;
639
    s->mem_base = mem_base;
640 632
    s->io_base = io_base;
641 633
    s->addr = 0;
642 634
    s->type = type;

Also available in: Unified diff