Merge remote-tracking branch 'qmp/queue/qmp' into staging

[qemu.git] / hw / sh.h

diff --git a/hw/sh.h b/hw/sh.h
index 57a2485cba8eacd955467469669a8417d6b9daac..d30e9f5b6c7d16af31cf7b69f0736499757a5b3c 100644 (file)
--- a/hw/sh.h
+++ b/hw/sh.h
@@ -2,6 +2,11 @@
 #define QEMU_SH_H
 /* Definitions for SH board emulation.  */
 
+#include "sh_intc.h"
+
+#define A7ADDR(x) ((x) & 0x1fffffff)
+#define P4ADDR(x) ((x) | 0xe0000000)
+
 /* sh7750.c */
 struct SH7750State;
 
@@ -25,14 +30,25 @@ int sh7750_register_io_device(struct SH7750State *s,
 #define TMU012_FEAT_TOCR   (1 << 0)
 #define TMU012_FEAT_3CHAN  (1 << 1)
 #define TMU012_FEAT_EXTCLK (1 << 2)
-void tmu012_init(uint32_t base, int feat, uint32_t freq);
+void tmu012_init(target_phys_addr_t base, int feat, uint32_t freq,
+                qemu_irq ch0_irq, qemu_irq ch1_irq,
+                qemu_irq ch2_irq0, qemu_irq ch2_irq1);
+
 
 /* sh_serial.c */
 #define SH_SERIAL_FEAT_SCIF (1 << 0)
 void sh_serial_init (target_phys_addr_t base, int feat,
-                    uint32_t freq, CharDriverState *chr);
+                    uint32_t freq, CharDriverState *chr,
+                    qemu_irq eri_source,
+                    qemu_irq rxi_source,
+                    qemu_irq txi_source,
+                    qemu_irq tei_source,
+                    qemu_irq bri_source);
+
+/* sh7750.c */
+qemu_irq sh7750_irl(struct SH7750State *s);
 
 /* tc58128.c */
-int tc58128_init(struct SH7750State *s, char *zone1, char *zone2);
+int tc58128_init(struct SH7750State *s, const char *zone1, const char *zone2);
 
 #endif