Revision a8170e5e hw/musicpal.c

b/hw/musicpal.c
266 266
    } while (desc_addr != s->tx_queue[queue_index]);
267 267
}
268 268

  
269
static uint64_t mv88w8618_eth_read(void *opaque, target_phys_addr_t offset,
269
static uint64_t mv88w8618_eth_read(void *opaque, hwaddr offset,
270 270
                                   unsigned size)
271 271
{
272 272
    mv88w8618_eth_state *s = opaque;
......
308 308
    }
309 309
}
310 310

  
311
static void mv88w8618_eth_write(void *opaque, target_phys_addr_t offset,
311
static void mv88w8618_eth_write(void *opaque, hwaddr offset,
312 312
                                uint64_t value, unsigned size)
313 313
{
314 314
    mv88w8618_eth_state *s = opaque;
......
540 540
    s->brightness |= level << irq;
541 541
}
542 542

  
543
static uint64_t musicpal_lcd_read(void *opaque, target_phys_addr_t offset,
543
static uint64_t musicpal_lcd_read(void *opaque, hwaddr offset,
544 544
                                  unsigned size)
545 545
{
546 546
    musicpal_lcd_state *s = opaque;
......
554 554
    }
555 555
}
556 556

  
557
static void musicpal_lcd_write(void *opaque, target_phys_addr_t offset,
557
static void musicpal_lcd_write(void *opaque, hwaddr offset,
558 558
                               uint64_t value, unsigned size)
559 559
{
560 560
    musicpal_lcd_state *s = opaque;
......
682 682
    mv88w8618_pic_update(s);
683 683
}
684 684

  
685
static uint64_t mv88w8618_pic_read(void *opaque, target_phys_addr_t offset,
685
static uint64_t mv88w8618_pic_read(void *opaque, hwaddr offset,
686 686
                                   unsigned size)
687 687
{
688 688
    mv88w8618_pic_state *s = opaque;
......
696 696
    }
697 697
}
698 698

  
699
static void mv88w8618_pic_write(void *opaque, target_phys_addr_t offset,
699
static void mv88w8618_pic_write(void *opaque, hwaddr offset,
700 700
                                uint64_t value, unsigned size)
701 701
{
702 702
    mv88w8618_pic_state *s = opaque;
......
815 815
    s->ptimer = ptimer_init(bh);
816 816
}
817 817

  
818
static uint64_t mv88w8618_pit_read(void *opaque, target_phys_addr_t offset,
818
static uint64_t mv88w8618_pit_read(void *opaque, hwaddr offset,
819 819
                                   unsigned size)
820 820
{
821 821
    mv88w8618_pit_state *s = opaque;
......
831 831
    }
832 832
}
833 833

  
834
static void mv88w8618_pit_write(void *opaque, target_phys_addr_t offset,
834
static void mv88w8618_pit_write(void *opaque, hwaddr offset,
835 835
                                uint64_t value, unsigned size)
836 836
{
837 837
    mv88w8618_pit_state *s = opaque;
......
957 957
} mv88w8618_flashcfg_state;
958 958

  
959 959
static uint64_t mv88w8618_flashcfg_read(void *opaque,
960
                                        target_phys_addr_t offset,
960
                                        hwaddr offset,
961 961
                                        unsigned size)
962 962
{
963 963
    mv88w8618_flashcfg_state *s = opaque;
......
971 971
    }
972 972
}
973 973

  
974
static void mv88w8618_flashcfg_write(void *opaque, target_phys_addr_t offset,
974
static void mv88w8618_flashcfg_write(void *opaque, hwaddr offset,
975 975
                                     uint64_t value, unsigned size)
976 976
{
977 977
    mv88w8618_flashcfg_state *s = opaque;
......
1032 1032

  
1033 1033
#define MP_BOARD_REVISION       0x31
1034 1034

  
1035
static uint64_t musicpal_misc_read(void *opaque, target_phys_addr_t offset,
1035
static uint64_t musicpal_misc_read(void *opaque, hwaddr offset,
1036 1036
                                   unsigned size)
1037 1037
{
1038 1038
    switch (offset) {
......
1044 1044
    }
1045 1045
}
1046 1046

  
1047
static void musicpal_misc_write(void *opaque, target_phys_addr_t offset,
1047
static void musicpal_misc_write(void *opaque, hwaddr offset,
1048 1048
                                uint64_t value, unsigned size)
1049 1049
{
1050 1050
}
......
1068 1068
#define MP_WLAN_MAGIC1          0x11c
1069 1069
#define MP_WLAN_MAGIC2          0x124
1070 1070

  
1071
static uint64_t mv88w8618_wlan_read(void *opaque, target_phys_addr_t offset,
1071
static uint64_t mv88w8618_wlan_read(void *opaque, hwaddr offset,
1072 1072
                                    unsigned size)
1073 1073
{
1074 1074
    switch (offset) {
......
1084 1084
    }
1085 1085
}
1086 1086

  
1087
static void mv88w8618_wlan_write(void *opaque, target_phys_addr_t offset,
1087
static void mv88w8618_wlan_write(void *opaque, hwaddr offset,
1088 1088
                                 uint64_t value, unsigned size)
1089 1089
{
1090 1090
}
......
1202 1202
    }
1203 1203
}
1204 1204

  
1205
static uint64_t musicpal_gpio_read(void *opaque, target_phys_addr_t offset,
1205
static uint64_t musicpal_gpio_read(void *opaque, hwaddr offset,
1206 1206
                                   unsigned size)
1207 1207
{
1208 1208
    musicpal_gpio_state *s = opaque;
......
1241 1241
    }
1242 1242
}
1243 1243

  
1244
static void musicpal_gpio_write(void *opaque, target_phys_addr_t offset,
1244
static void musicpal_gpio_write(void *opaque, hwaddr offset,
1245 1245
                                uint64_t value, unsigned size)
1246 1246
{
1247 1247
    musicpal_gpio_state *s = opaque;

Also available in: Unified diff