ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move qemu_irq typedef out of qemu-common.h 

It's necessary for making CPU child of DEVICE without
causing circular header deps.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
[ehabkost: re-added the typedef to hw/irq.h after rebasing]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Igor Mammedov 2012-10-16 03:57:21 +02:00 committed by Andreas Färber
parent 04509ad939
commit 5202ef942f
8 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/arm-misc.h
View File

@ -12,6 +12,7 @@
#define ARM_MISC_H 1 #define ARM_MISC_H 1
#include "memory.h" #include "memory.h"
#include "hw/irq.h"
/* The CPU is also modeled as an interrupt controller. */ /* The CPU is also modeled as an interrupt controller. */
#define ARM_PIC_CPU_IRQ 0 #define ARM_PIC_CPU_IRQ 0

2
hw/bt.h
View File

@ -23,6 +23,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "hw/irq.h"
/* BD Address */ /* BD Address */
typedef struct { typedef struct {
uint8_t b[6]; uint8_t b[6];

2
hw/devices.h
View File

@ -1,6 +1,8 @@
#ifndef QEMU_DEVICES_H #ifndef QEMU_DEVICES_H
#define QEMU_DEVICES_H #define QEMU_DEVICES_H
#include "hw/irq.h"
/* ??? Not all users of this file can include cpu-common.h. */ /* ??? Not all users of this file can include cpu-common.h. */
struct MemoryRegion; struct MemoryRegion;

2
hw/irq.h
View File

@ -3,6 +3,8 @@
/* Generic IRQ/GPIO pin infrastructure. */ /* Generic IRQ/GPIO pin infrastructure. */
typedef struct IRQState *qemu_irq;
typedef void (*qemu_irq_handler)(void *opaque, int n, int level); typedef void (*qemu_irq_handler)(void *opaque, int n, int level);
void qemu_set_irq(qemu_irq irq, int level); void qemu_set_irq(qemu_irq irq, int level);

1
hw/omap.h
View File

@ -19,6 +19,7 @@
#ifndef hw_omap_h #ifndef hw_omap_h
#include "memory.h" #include "memory.h"
# define hw_omap_h "omap.h" # define hw_omap_h "omap.h"
#include "hw/irq.h"
# define OMAP_EMIFS_BASE 0x00000000 # define OMAP_EMIFS_BASE 0x00000000
# define OMAP2_Q0_BASE 0x00000000 # define OMAP2_Q0_BASE 0x00000000

1
hw/soc_dma.h
View File

@ -19,6 +19,7 @@
*/ */
#include "memory.h" #include "memory.h"
#include "hw/irq.h"
struct soc_dma_s; struct soc_dma_s;
struct soc_dma_ch_s; struct soc_dma_ch_s;

1
hw/xen.h
View File

@ -8,6 +8,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "hw/irq.h"
#include "qemu-common.h" #include "qemu-common.h"
/* xen-machine.c */ /* xen-machine.c */

1
qemu-common.h
View File

@ -292,7 +292,6 @@ typedef struct PCIEPort PCIEPort;
typedef struct PCIESlot PCIESlot; typedef struct PCIESlot PCIESlot;
typedef struct MSIMessage MSIMessage; typedef struct MSIMessage MSIMessage;
typedef struct SerialState SerialState; typedef struct SerialState SerialState;
typedef struct IRQState *qemu_irq;
typedef struct PCMCIACardState PCMCIACardState; typedef struct PCMCIACardState PCMCIACardState;
typedef struct MouseTransformInfo MouseTransformInfo; typedef struct MouseTransformInfo MouseTransformInfo;
typedef struct uWireSlave uWireSlave; typedef struct uWireSlave uWireSlave;