From 5aca8c3b2fbada188ff86781fba24685d346cef9 Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Sat, 26 May 2007 17:39:43 +0000 Subject: Split DMA controller in two Fix register size related bugs git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2869 c046a42c-6fe2-441c-8c8c-71466251a162 --- vl.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'vl.h') diff --git a/vl.h b/vl.h index 497cf8d..6d90aeb 100644 --- a/vl.h +++ b/vl.h @@ -1046,7 +1046,6 @@ void pci_rtl8139_init(PCIBus *bus, NICInfo *nd, int devfn); /* pcnet.c */ void pci_pcnet_init(PCIBus *bus, NICInfo *nd, int devfn); -void pcnet_h_reset(void *opaque); void *lance_init(NICInfo *nd, target_phys_addr_t leaddr, void *dma_opaque, qemu_irq irq); @@ -1265,11 +1264,9 @@ void slavio_set_power_fail(void *opaque, int power_failing); void esp_scsi_attach(void *opaque, BlockDriverState *bd, int id); void *esp_init(BlockDriverState **bd, target_phys_addr_t espaddr, void *dma_opaque); -void esp_reset(void *opaque); /* sparc32_dma.c */ -void *sparc32_dma_init(target_phys_addr_t daddr, qemu_irq espirq, - qemu_irq leirq, void *iommu); +void *sparc32_dma_init(target_phys_addr_t daddr, qemu_irq irq, void *iommu); void ledma_set_irq(void *opaque, int isr); void ledma_memory_read(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int do_bswap); @@ -1279,8 +1276,8 @@ void espdma_raise_irq(void *opaque); void espdma_clear_irq(void *opaque); void espdma_memory_read(void *opaque, uint8_t *buf, int len); void espdma_memory_write(void *opaque, uint8_t *buf, int len); -void sparc32_dma_set_reset_data(void *opaque, void *esp_opaque, - void *lance_opaque); +void sparc32_dma_set_reset_data(void *opaque, void (*dev_reset)(void *opaque), + void *dev_opaque); /* cs4231.c */ void cs_init(target_phys_addr_t base, int irq, void *intctl); -- cgit v1.1