Revision 99a0949b hw/e1000.c

b/hw/e1000.c
478 478
}
479 479

  
480 480
static uint32_t
481
txdesc_writeback(target_phys_addr_t base, struct e1000_tx_desc *dp)
481
txdesc_writeback(a_target_phys_addr base, struct e1000_tx_desc *dp)
482 482
{
483 483
    uint32_t txd_upper, txd_lower = le32_to_cpu(dp->lower.data);
484 484

  
......
495 495
static void
496 496
start_xmit(E1000State *s)
497 497
{
498
    target_phys_addr_t base;
498
    a_target_phys_addr base;
499 499
    struct e1000_tx_desc desc;
500 500
    uint32_t tdh_start = s->mac_reg[TDH], cause = E1000_ICS_TXQE;
501 501

  
......
613 613
{
614 614
    E1000State *s = vc->opaque;
615 615
    struct e1000_rx_desc desc;
616
    target_phys_addr_t base;
616
    a_target_phys_addr base;
617 617
    unsigned int n, rdt;
618 618
    uint32_t rdh_start;
619 619
    uint16_t vlan_special = 0;
......
814 814
enum { NWRITEOPS = ARRAY_SIZE(macreg_writeops) };
815 815

  
816 816
static void
817
e1000_mmio_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
817
e1000_mmio_writel(void *opaque, a_target_phys_addr addr, uint32_t val)
818 818
{
819 819
    E1000State *s = opaque;
820 820
    unsigned int index = (addr & 0x1ffff) >> 2;
......
832 832
}
833 833

  
834 834
static void
835
e1000_mmio_writew(void *opaque, target_phys_addr_t addr, uint32_t val)
835
e1000_mmio_writew(void *opaque, a_target_phys_addr addr, uint32_t val)
836 836
{
837 837
    // emulate hw without byte enables: no RMW
838 838
    e1000_mmio_writel(opaque, addr & ~3,
......
840 840
}
841 841

  
842 842
static void
843
e1000_mmio_writeb(void *opaque, target_phys_addr_t addr, uint32_t val)
843
e1000_mmio_writeb(void *opaque, a_target_phys_addr addr, uint32_t val)
844 844
{
845 845
    // emulate hw without byte enables: no RMW
846 846
    e1000_mmio_writel(opaque, addr & ~3,
......
848 848
}
849 849

  
850 850
static uint32_t
851
e1000_mmio_readl(void *opaque, target_phys_addr_t addr)
851
e1000_mmio_readl(void *opaque, a_target_phys_addr addr)
852 852
{
853 853
    E1000State *s = opaque;
854 854
    unsigned int index = (addr & 0x1ffff) >> 2;
......
866 866
}
867 867

  
868 868
static uint32_t
869
e1000_mmio_readb(void *opaque, target_phys_addr_t addr)
869
e1000_mmio_readb(void *opaque, a_target_phys_addr addr)
870 870
{
871 871
    return ((e1000_mmio_readl(opaque, addr & ~3)) >>
872 872
            (8 * (addr & 3))) & 0xff;
873 873
}
874 874

  
875 875
static uint32_t
876
e1000_mmio_readw(void *opaque, target_phys_addr_t addr)
876
e1000_mmio_readw(void *opaque, a_target_phys_addr addr)
877 877
{
878 878
    return ((e1000_mmio_readl(opaque, addr & ~3)) >>
879 879
            (8 * (addr & 3))) & 0xffff;

Also available in: Unified diff