| Message ID | 1319814456-8158-10-git-send-email-anthony.perard@citrix.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 28 Oct 2011, Anthony PERARD wrote: > This patch move the msi definition from apic.c to apic-msidef.h. So it can be > used also by other .c files. you should CC Michael on this one > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > --- > hw/apic-msidef.h | 28 ++++++++++++++++++++++++++++ > hw/apic.c | 11 +---------- > 2 files changed, 29 insertions(+), 10 deletions(-) > create mode 100644 hw/apic-msidef.h > > diff --git a/hw/apic-msidef.h b/hw/apic-msidef.h > new file mode 100644 > index 0000000..3182f0b > --- /dev/null > +++ b/hw/apic-msidef.h > @@ -0,0 +1,28 @@ > +#ifndef HW_APIC_MSIDEF_H > +#define HW_APIC_MSIDEF_H > + > +/* > + * Intel APIC constants: from include/asm/msidef.h > + */ > + > +/* > + * Shifts for MSI data > + */ > + > +#define MSI_DATA_VECTOR_SHIFT 0 > +#define MSI_DATA_VECTOR_MASK 0x000000ff > + > +#define MSI_DATA_DELIVERY_MODE_SHIFT 8 > +#define MSI_DATA_LEVEL_SHIFT 14 > +#define MSI_DATA_TRIGGER_SHIFT 15 > + > +/* > + * Shift/mask fields for msi address > + */ > + > +#define MSI_ADDR_DEST_MODE_SHIFT 2 > + > +#define MSI_ADDR_DEST_ID_SHIFT 12 > +#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 > + > +#endif /* HW_APIC_MSIDEF_H */ > diff --git a/hw/apic.c b/hw/apic.c > index 8289eef..18c4a87 100644 > --- a/hw/apic.c > +++ b/hw/apic.c > @@ -24,6 +24,7 @@ > #include "sysbus.h" > #include "trace.h" > #include "pc.h" > +#include "apic-msidef.h" > > /* APIC Local Vector Table */ > #define APIC_LVT_TIMER 0 > @@ -65,16 +66,6 @@ > #define MAX_APICS 255 > #define MAX_APIC_WORDS 8 > > -/* Intel APIC constants: from include/asm/msidef.h */ > -#define MSI_DATA_VECTOR_SHIFT 0 > -#define MSI_DATA_VECTOR_MASK 0x000000ff > -#define MSI_DATA_DELIVERY_MODE_SHIFT 8 > -#define MSI_DATA_TRIGGER_SHIFT 15 > -#define MSI_DATA_LEVEL_SHIFT 14 > -#define MSI_ADDR_DEST_MODE_SHIFT 2 > -#define MSI_ADDR_DEST_ID_SHIFT 12 > -#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 > - > #define MSI_ADDR_SIZE 0x100000 > > typedef struct APICState APICState; > -- > Anthony PERARD >
diff --git a/hw/apic-msidef.h b/hw/apic-msidef.h new file mode 100644 index 0000000..3182f0b --- /dev/null +++ b/hw/apic-msidef.h @@ -0,0 +1,28 @@ +#ifndef HW_APIC_MSIDEF_H +#define HW_APIC_MSIDEF_H + +/* + * Intel APIC constants: from include/asm/msidef.h + */ + +/* + * Shifts for MSI data + */ + +#define MSI_DATA_VECTOR_SHIFT 0 +#define MSI_DATA_VECTOR_MASK 0x000000ff + +#define MSI_DATA_DELIVERY_MODE_SHIFT 8 +#define MSI_DATA_LEVEL_SHIFT 14 +#define MSI_DATA_TRIGGER_SHIFT 15 + +/* + * Shift/mask fields for msi address + */ + +#define MSI_ADDR_DEST_MODE_SHIFT 2 + +#define MSI_ADDR_DEST_ID_SHIFT 12 +#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 + +#endif /* HW_APIC_MSIDEF_H */ diff --git a/hw/apic.c b/hw/apic.c index 8289eef..18c4a87 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -24,6 +24,7 @@ #include "sysbus.h" #include "trace.h" #include "pc.h" +#include "apic-msidef.h" /* APIC Local Vector Table */ #define APIC_LVT_TIMER 0 @@ -65,16 +66,6 @@ #define MAX_APICS 255 #define MAX_APIC_WORDS 8 -/* Intel APIC constants: from include/asm/msidef.h */ -#define MSI_DATA_VECTOR_SHIFT 0 -#define MSI_DATA_VECTOR_MASK 0x000000ff -#define MSI_DATA_DELIVERY_MODE_SHIFT 8 -#define MSI_DATA_TRIGGER_SHIFT 15 -#define MSI_DATA_LEVEL_SHIFT 14 -#define MSI_ADDR_DEST_MODE_SHIFT 2 -#define MSI_ADDR_DEST_ID_SHIFT 12 -#define MSI_ADDR_DEST_ID_MASK 0x00ffff0 - #define MSI_ADDR_SIZE 0x100000 typedef struct APICState APICState;
This patch move the msi definition from apic.c to apic-msidef.h. So it can be used also by other .c files. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- hw/apic-msidef.h | 28 ++++++++++++++++++++++++++++ hw/apic.c | 11 +---------- 2 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 hw/apic-msidef.h