usb-redir: Get rid of local shadow copy of packet headers

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

diff --git a/hw/arm-misc.h b/hw/arm-misc.h
index a147254287db88b80a951d619e3183eb828e84e1..bdd8fecc99e56ed090a9da79833c3da47004a779 100644 (file)
--- a/hw/arm-misc.h
+++ b/hw/arm-misc.h
@@ -4,44 +4,65 @@
  * Copyright (c) 2006 CodeSourcery.
  * Written by Paul Brook
  *
  * Copyright (c) 2006 CodeSourcery.
  * Written by Paul Brook
  *

- * This code is licenced under the LGPL.
+ * This code is licensed under the LGPL.

  *
  */
 
 #ifndef ARM_MISC_H
 #define ARM_MISC_H 1
 
  *
  */
 
 #ifndef ARM_MISC_H
 #define ARM_MISC_H 1
 

+#include "memory.h"
+

 /* The CPU is also modeled as an interrupt controller.  */
 #define ARM_PIC_CPU_IRQ 0
 #define ARM_PIC_CPU_FIQ 1
 /* The CPU is also modeled as an interrupt controller.  */
 #define ARM_PIC_CPU_IRQ 0
 #define ARM_PIC_CPU_FIQ 1

-qemu_irq *arm_pic_init_cpu(CPUState *env);
+qemu_irq *arm_pic_init_cpu(ARMCPU *cpu);

 
 /* armv7m.c */
 
 /* armv7m.c */

-qemu_irq *armv7m_init(int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *address_space_mem,
+                      int flash_size, int sram_size,

                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */
 struct arm_boot_info {
                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */
 struct arm_boot_info {

-    int ram_size;
+    uint64_t ram_size;

     const char *kernel_filename;
     const char *kernel_cmdline;
     const char *initrd_filename;
     const char *kernel_filename;
     const char *kernel_cmdline;
     const char *initrd_filename;

+    const char *dtb_filename;

     target_phys_addr_t loader_start;
     target_phys_addr_t loader_start;

+    /* multicore boards that use the default secondary core boot functions
+     * need to put the address of the secondary boot code, the boot reg,
+     * and the GIC address in the next 3 values, respectively. boards that
+     * have their own boot functions can use these values as they want.
+     */
+    target_phys_addr_t smp_loader_start;
+    target_phys_addr_t smp_bootreg_addr;
+    target_phys_addr_t gic_cpu_if_addr;

     int nb_cpus;
     int board_id;
     int nb_cpus;
     int board_id;

-    int (*atag_board)(struct arm_boot_info *info, void *p);
+    int (*atag_board)(const struct arm_boot_info *info, void *p);
+    /* multicore boards that use the default secondary core boot functions
+     * can ignore these two function calls. If the default functions won't
+     * work, then write_secondary_boot() should write a suitable blob of
+     * code mimicking the secondary CPU startup process used by the board's
+     * boot loader/boot ROM code, and secondary_cpu_reset_hook() should
+     * perform any necessary CPU reset handling and set the PC for the
+     * secondary CPUs to point at this boot blob.
+     */
+    void (*write_secondary_boot)(ARMCPU *cpu,
+                                 const struct arm_boot_info *info);
+    void (*secondary_cpu_reset_hook)(ARMCPU *cpu,
+                                     const struct arm_boot_info *info);
+    /* Used internally by arm_boot.c */
+    int is_linux;
+    target_phys_addr_t initrd_size;
+    target_phys_addr_t entry;

 };
 };

-void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
-
-/* armv7m_nvic.c */
+void arm_load_kernel(ARMCPU *cpu, struct arm_boot_info *info);

 
 /* Multiplication factor to convert from system clock ticks to qemu timer
    ticks.  */
 extern int system_clock_scale;
 
 /* Multiplication factor to convert from system clock ticks to qemu timer
    ticks.  */
 extern int system_clock_scale;

-qemu_irq *armv7m_nvic_init(CPUState *env);
-
-/* stellaris_enent.c */
-void stellaris_enet_init(NICInfo *nd, uint32_t base, qemu_irq irq);

 
 #endif /* !ARM_MISC_H */
 
 #endif /* !ARM_MISC_H */

-