Merge branch 'master' of /home/nchip/public_html/qemu into garage-push

[qemu] / hw / etraxfs.h

diff --git a/hw/etraxfs.h b/hw/etraxfs.h
index 17dca29..9cc30be 100644 (file)
--- a/hw/etraxfs.h
+++ b/hw/etraxfs.h
@@ -24,19 +24,6 @@
 
 #include "etraxfs_dma.h"
 
-struct etraxfs_pic
-{
-    qemu_irq *irq;
-    qemu_irq *nmi;
-    qemu_irq *guru;
-
-    void *internal;
-};
-
-struct etraxfs_pic *etraxfs_pic_init(CPUState *env, target_phys_addr_t base);
-void etraxfs_timer_init(CPUState *env, qemu_irq *irqs, qemu_irq *nmi,
-                        target_phys_addr_t base);
+qemu_irq *cris_pic_init_cpu(CPUState *env);
 void *etraxfs_eth_init(NICInfo *nd, CPUState *env,
-                       qemu_irq *irq, target_phys_addr_t base, int phyaddr);
-void etraxfs_ser_init(CPUState *env, qemu_irq *irq, CharDriverState *chr,
-                      target_phys_addr_t base);
+                       target_phys_addr_t base, int phyaddr);