Get rid of _t suffix

[qemu.git] / hw / arm-misc.h

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index 9c9537974c43621aeb23d68b12ef5f4d64853b55..bc67ebde152b936813c3be6b1970d00c422c0ddc 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -21,14 +21,21 @@ qemu_irq *armv7m_init(int flash_size, int sram_size,
                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */
-
-void arm_load_kernel(CPUState *env, int ram_size, const char *kernel_filename,
-                     const char *kernel_cmdline, const char *initrd_filename,
-                     int board_id, target_phys_addr_t loader_start);
-
-/* armv7m_nvic.c */
-int system_clock_scale;
-qemu_irq *armv7m_nvic_init(CPUState *env);
+struct arm_boot_info {
+    int ram_size;
+    const char *kernel_filename;
+    const char *kernel_cmdline;
+    const char *initrd_filename;
+    a_target_phys_addr loader_start;
+    a_target_phys_addr smp_loader_start;
+    int nb_cpus;
+    int board_id;
+    int (*atag_board)(struct arm_boot_info *info, void *p);
+};
+void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
+
+/* Multiplication factor to convert from system clock ticks to qemu timer
+   ticks.  */
+extern int system_clock_scale;
 
 #endif /* !ARM_MISC_H */
-