Revision 81a322d4 hw/musicpal.c
| b/hw/musicpal.c | ||
|---|---|---|
| 365 | 365 |
qemu_free(s); |
| 366 | 366 |
} |
| 367 | 367 |
|
| 368 |
static void mv88w8618_eth_init(SysBusDevice *dev)
|
|
| 368 |
static int mv88w8618_eth_init(SysBusDevice *dev)
|
|
| 369 | 369 |
{
|
| 370 | 370 |
mv88w8618_eth_state *s = FROM_SYSBUS(mv88w8618_eth_state, dev); |
| 371 | 371 |
|
| ... | ... | |
| 376 | 376 |
s->mmio_index = cpu_register_io_memory(mv88w8618_eth_readfn, |
| 377 | 377 |
mv88w8618_eth_writefn, s); |
| 378 | 378 |
sysbus_init_mmio(dev, MP_ETH_SIZE, s->mmio_index); |
| 379 |
return 0; |
|
| 379 | 380 |
} |
| 380 | 381 |
|
| 381 | 382 |
/* LCD register offsets */ |
| ... | ... | |
| 544 | 545 |
musicpal_lcd_write |
| 545 | 546 |
}; |
| 546 | 547 |
|
| 547 |
static void musicpal_lcd_init(SysBusDevice *dev)
|
|
| 548 |
static int musicpal_lcd_init(SysBusDevice *dev)
|
|
| 548 | 549 |
{
|
| 549 | 550 |
musicpal_lcd_state *s = FROM_SYSBUS(musicpal_lcd_state, dev); |
| 550 | 551 |
int iomemtype; |
| ... | ... | |
| 560 | 561 |
qemu_console_resize(s->ds, 128*3, 64*3); |
| 561 | 562 |
|
| 562 | 563 |
qdev_init_gpio_in(&dev->qdev, musicpal_lcd_gpio_brigthness_in, 3); |
| 564 |
|
|
| 565 |
return 0; |
|
| 563 | 566 |
} |
| 564 | 567 |
|
| 565 | 568 |
/* PIC register offsets */ |
| ... | ... | |
| 642 | 645 |
mv88w8618_pic_write |
| 643 | 646 |
}; |
| 644 | 647 |
|
| 645 |
static void mv88w8618_pic_init(SysBusDevice *dev)
|
|
| 648 |
static int mv88w8618_pic_init(SysBusDevice *dev)
|
|
| 646 | 649 |
{
|
| 647 | 650 |
mv88w8618_pic_state *s = FROM_SYSBUS(mv88w8618_pic_state, dev); |
| 648 | 651 |
int iomemtype; |
| ... | ... | |
| 654 | 657 |
sysbus_init_mmio(dev, MP_PIC_SIZE, iomemtype); |
| 655 | 658 |
|
| 656 | 659 |
qemu_register_reset(mv88w8618_pic_reset, s); |
| 660 |
return 0; |
|
| 657 | 661 |
} |
| 658 | 662 |
|
| 659 | 663 |
/* PIT register offsets */ |
| ... | ... | |
| 761 | 765 |
mv88w8618_pit_write |
| 762 | 766 |
}; |
| 763 | 767 |
|
| 764 |
static void mv88w8618_pit_init(SysBusDevice *dev)
|
|
| 768 |
static int mv88w8618_pit_init(SysBusDevice *dev)
|
|
| 765 | 769 |
{
|
| 766 | 770 |
int iomemtype; |
| 767 | 771 |
mv88w8618_pit_state *s = FROM_SYSBUS(mv88w8618_pit_state, dev); |
| ... | ... | |
| 776 | 780 |
iomemtype = cpu_register_io_memory(mv88w8618_pit_readfn, |
| 777 | 781 |
mv88w8618_pit_writefn, s); |
| 778 | 782 |
sysbus_init_mmio(dev, MP_PIT_SIZE, iomemtype); |
| 783 |
return 0; |
|
| 779 | 784 |
} |
| 780 | 785 |
|
| 781 | 786 |
/* Flash config register offsets */ |
| ... | ... | |
| 824 | 829 |
mv88w8618_flashcfg_write |
| 825 | 830 |
}; |
| 826 | 831 |
|
| 827 |
static void mv88w8618_flashcfg_init(SysBusDevice *dev)
|
|
| 832 |
static int mv88w8618_flashcfg_init(SysBusDevice *dev)
|
|
| 828 | 833 |
{
|
| 829 | 834 |
int iomemtype; |
| 830 | 835 |
mv88w8618_flashcfg_state *s = FROM_SYSBUS(mv88w8618_flashcfg_state, dev); |
| ... | ... | |
| 833 | 838 |
iomemtype = cpu_register_io_memory(mv88w8618_flashcfg_readfn, |
| 834 | 839 |
mv88w8618_flashcfg_writefn, s); |
| 835 | 840 |
sysbus_init_mmio(dev, MP_FLASHCFG_SIZE, iomemtype); |
| 841 |
return 0; |
|
| 836 | 842 |
} |
| 837 | 843 |
|
| 838 | 844 |
/* Misc register offsets */ |
| ... | ... | |
| 913 | 919 |
mv88w8618_wlan_write, |
| 914 | 920 |
}; |
| 915 | 921 |
|
| 916 |
static void mv88w8618_wlan_init(SysBusDevice *dev)
|
|
| 922 |
static int mv88w8618_wlan_init(SysBusDevice *dev)
|
|
| 917 | 923 |
{
|
| 918 | 924 |
int iomemtype; |
| 919 | 925 |
|
| 920 | 926 |
iomemtype = cpu_register_io_memory(mv88w8618_wlan_readfn, |
| 921 | 927 |
mv88w8618_wlan_writefn, NULL); |
| 922 | 928 |
sysbus_init_mmio(dev, MP_WLAN_SIZE, iomemtype); |
| 929 |
return 0; |
|
| 923 | 930 |
} |
| 924 | 931 |
|
| 925 | 932 |
/* GPIO register offsets */ |
| ... | ... | |
| 1120 | 1127 |
s->isr = 0; |
| 1121 | 1128 |
} |
| 1122 | 1129 |
|
| 1123 |
static void musicpal_gpio_init(SysBusDevice *dev)
|
|
| 1130 |
static int musicpal_gpio_init(SysBusDevice *dev)
|
|
| 1124 | 1131 |
{
|
| 1125 | 1132 |
musicpal_gpio_state *s = FROM_SYSBUS(musicpal_gpio_state, dev); |
| 1126 | 1133 |
int iomemtype; |
| ... | ... | |
| 1137 | 1144 |
qdev_init_gpio_out(&dev->qdev, s->out, 5); |
| 1138 | 1145 |
/* 10 gpio button input + 1 I2C data input */ |
| 1139 | 1146 |
qdev_init_gpio_in(&dev->qdev, musicpal_gpio_irq, 11); |
| 1147 |
|
|
| 1148 |
return 0; |
|
| 1140 | 1149 |
} |
| 1141 | 1150 |
|
| 1142 | 1151 |
/* Keyboard codes & masks */ |
| ... | ... | |
| 1244 | 1253 |
s->kbd_extended = 0; |
| 1245 | 1254 |
} |
| 1246 | 1255 |
|
| 1247 |
static void musicpal_key_init(SysBusDevice *dev)
|
|
| 1256 |
static int musicpal_key_init(SysBusDevice *dev)
|
|
| 1248 | 1257 |
{
|
| 1249 | 1258 |
musicpal_key_state *s = FROM_SYSBUS(musicpal_key_state, dev); |
| 1250 | 1259 |
|
| ... | ... | |
| 1257 | 1266 |
qdev_init_gpio_out(&dev->qdev, s->out, 10); |
| 1258 | 1267 |
|
| 1259 | 1268 |
qemu_add_kbd_event_handler(musicpal_key_event, s); |
| 1269 |
|
|
| 1270 |
return 0; |
|
| 1260 | 1271 |
} |
| 1261 | 1272 |
|
| 1262 | 1273 |
static struct arm_boot_info musicpal_binfo = {
|
Also available in: Unified diff