Compile some MIPS devices only once

Move CPU specific declarations to a separate file.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

9 files changed, 22 insertions, 13 deletions

diff --git a/hw/mips.h b/hw/mips.h
index 9484ea7d96..30791a8614 100644
--- a/hw/mips.h
+++ b/hw/mips.h
@@ -20,16 +20,6 @@ void mipsnet_init(int base, qemu_irq irq, NICInfo *nd);
 /* jazz_led.c */
 extern void jazz_led_init(target_phys_addr_t base);
 
-/* mips_addr.c */
-uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr);
-uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr);
-
-/* mips_int.c */
-extern void cpu_mips_irq_init_cpu(CPUState *env);
-
-/* mips_timer.c */
-extern void cpu_mips_clock_init(CPUState *);
-
 /* rc4030.c */
 typedef struct rc4030DMAState *rc4030_dma;
 void rc4030_dma_memory_rw(void *opaque, target_phys_addr_t addr, uint8_t *buf, int len, int is_write);
diff --git a/hw/mips_addr.c b/hw/mips_addr.c
index b96fea0314..aa1c7d84d6 100644
--- a/hw/mips_addr.c
+++ b/hw/mips_addr.c
@@ -21,7 +21,7 @@
  */
 
 #include "hw.h"
-#include "mips.h"
+#include "mips_cpudevs.h"
 
 uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr)
 {
diff --git a/hw/mips_cpudevs.h b/hw/mips_cpudevs.h
new file mode 100644
index 0000000000..db82b4105c
--- /dev/null
+++ b/hw/mips_cpudevs.h
@@ -0,0 +1,15 @@
+#ifndef HW_MIPS_CPUDEVS_H
+#define HW_MIPS_CPUDEVS_H
+/* Definitions for MIPS CPU internal devices.  */
+
+/* mips_addr.c */
+uint64_t cpu_mips_kseg0_to_phys(void *opaque, uint64_t addr);
+uint64_t cpu_mips_phys_to_kseg0(void *opaque, uint64_t addr);
+
+/* mips_int.c */
+void cpu_mips_irq_init_cpu(CPUState *env);
+
+/* mips_timer.c */
+void cpu_mips_clock_init(CPUState *);
+
+#endif
diff --git a/hw/mips_int.c b/hw/mips_int.c
index 87204ee19c..c30954caaf 100644
--- a/hw/mips_int.c
+++ b/hw/mips_int.c
@@ -21,7 +21,7 @@
  */
 
 #include "hw.h"
-#include "mips.h"
+#include "mips_cpudevs.h"
 #include "cpu.h"
 
 /* Raise IRQ to CPU if necessary. It must be called every time the active
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index e8a81b122c..560959777b 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -24,6 +24,7 @@
 
 #include "hw.h"
 #include "mips.h"
+#include "mips_cpudevs.h"
 #include "pc.h"
 #include "isa.h"
 #include "fdc.h"
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index 96e3bc0324..9a35d0c340 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -31,6 +31,7 @@
 #include "block.h"
 #include "flash.h"
 #include "mips.h"
+#include "mips_cpudevs.h"
 #include "pci.h"
 #include "usb-uhci.h"
 #include "vmware_vga.h"
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index 98d1a01119..a747de596c 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -26,6 +26,7 @@
  */
 #include "hw.h"
 #include "mips.h"
+#include "mips_cpudevs.h"
 #include "pc.h"
 #include "isa.h"
 #include "net.h"
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index c29615c6bf..34b45062c4 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -9,6 +9,7 @@
 */
 #include "hw.h"
 #include "mips.h"
+#include "mips_cpudevs.h"
 #include "pc.h"
 #include "isa.h"
 #include "net.h"
diff --git a/hw/mips_timer.c b/hw/mips_timer.c
index 4e03435ede..e3beee8281 100644
--- a/hw/mips_timer.c
+++ b/hw/mips_timer.c
@@ -21,7 +21,7 @@
  */
 
 #include "hw.h"
-#include "mips.h"
+#include "mips_cpudevs.h"
 #include "qemu-timer.h"
 
 #define TIMER_FREQ	100 * 1000 * 1000