Revision 73d74342 hw/sun4m.c
| b/hw/sun4m.c | ||
|---|---|---|
| 810 | 810 |
void *iommu, *espdma, *ledma, *nvram; |
| 811 | 811 |
qemu_irq *cpu_irqs[MAX_CPUS], slavio_irq[32], slavio_cpu_irq[MAX_CPUS], |
| 812 | 812 |
espdma_irq, ledma_irq; |
| 813 |
qemu_irq esp_reset; |
|
| 813 |
qemu_irq esp_reset, dma_enable;
|
|
| 814 | 814 |
qemu_irq fdc_tc; |
| 815 | 815 |
qemu_irq *cpu_halt; |
| 816 | 816 |
unsigned long kernel_size; |
| ... | ... | |
| 930 | 930 |
exit(1); |
| 931 | 931 |
} |
| 932 | 932 |
|
| 933 |
esp_reset = qdev_get_gpio_in(espdma, 0); |
|
| 934 | 933 |
esp_init(hwdef->esp_base, 2, |
| 935 | 934 |
espdma_memory_read, espdma_memory_write, |
| 936 |
espdma, espdma_irq, &esp_reset); |
|
| 935 |
espdma, espdma_irq, &esp_reset, &dma_enable);
|
|
| 937 | 936 |
|
| 937 |
qdev_connect_gpio_out(espdma, 0, esp_reset); |
|
| 938 |
qdev_connect_gpio_out(espdma, 1, dma_enable); |
|
| 938 | 939 |
|
| 939 | 940 |
if (hwdef->cs_base) {
|
| 940 | 941 |
sysbus_create_simple("SUNW,CS4231", hwdef->cs_base,
|
| ... | ... | |
| 1494 | 1495 |
void *iounits[MAX_IOUNITS], *espdma, *ledma, *nvram; |
| 1495 | 1496 |
qemu_irq *cpu_irqs[MAX_CPUS], sbi_irq[32], sbi_cpu_irq[MAX_CPUS], |
| 1496 | 1497 |
espdma_irq, ledma_irq; |
| 1497 |
qemu_irq esp_reset; |
|
| 1498 |
qemu_irq esp_reset, dma_enable;
|
|
| 1498 | 1499 |
unsigned long kernel_size; |
| 1499 | 1500 |
void *fw_cfg; |
| 1500 | 1501 |
DeviceState *dev; |
| ... | ... | |
| 1561 | 1562 |
exit(1); |
| 1562 | 1563 |
} |
| 1563 | 1564 |
|
| 1564 |
esp_reset = qdev_get_gpio_in(espdma, 0); |
|
| 1565 | 1565 |
esp_init(hwdef->esp_base, 2, |
| 1566 | 1566 |
espdma_memory_read, espdma_memory_write, |
| 1567 |
espdma, espdma_irq, &esp_reset); |
|
| 1567 |
espdma, espdma_irq, &esp_reset, &dma_enable); |
|
| 1568 |
|
|
| 1569 |
qdev_connect_gpio_out(espdma, 0, esp_reset); |
|
| 1570 |
qdev_connect_gpio_out(espdma, 1, dma_enable); |
|
| 1568 | 1571 |
|
| 1569 | 1572 |
kernel_size = sun4m_load_kernel(kernel_filename, initrd_filename, |
| 1570 | 1573 |
RAM_size); |
| ... | ... | |
| 1683 | 1686 |
{
|
| 1684 | 1687 |
void *iommu, *espdma, *ledma, *nvram; |
| 1685 | 1688 |
qemu_irq *cpu_irqs, slavio_irq[8], espdma_irq, ledma_irq; |
| 1686 |
qemu_irq esp_reset; |
|
| 1689 |
qemu_irq esp_reset, dma_enable;
|
|
| 1687 | 1690 |
qemu_irq fdc_tc; |
| 1688 | 1691 |
unsigned long kernel_size; |
| 1689 | 1692 |
DriveInfo *fd[MAX_FD]; |
| ... | ... | |
| 1751 | 1754 |
exit(1); |
| 1752 | 1755 |
} |
| 1753 | 1756 |
|
| 1754 |
esp_reset = qdev_get_gpio_in(espdma, 0); |
|
| 1755 | 1757 |
esp_init(hwdef->esp_base, 2, |
| 1756 | 1758 |
espdma_memory_read, espdma_memory_write, |
| 1757 |
espdma, espdma_irq, &esp_reset); |
|
| 1759 |
espdma, espdma_irq, &esp_reset, &dma_enable); |
|
| 1760 |
|
|
| 1761 |
qdev_connect_gpio_out(espdma, 0, esp_reset); |
|
| 1762 |
qdev_connect_gpio_out(espdma, 1, dma_enable); |
|
| 1758 | 1763 |
|
| 1759 | 1764 |
kernel_size = sun4m_load_kernel(kernel_filename, initrd_filename, |
| 1760 | 1765 |
RAM_size); |
Also available in: Unified diff