diff options
| author | Alan Cox <alan@linux.intel.com> | 2009-08-27 11:02:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 12:02:29 -0700 |
| commit | e266b2022209a2bc389c1cd6b809395c67671a92 (patch) | |
| tree | e12551b52605310a9f8dbd4fa8a620452ebd324f /drivers/staging/et131x/et1310_address_map.h | |
| parent | b8c4cc46541d864b37497d0047b81b62a5d4e073 (diff) | |
| download | op-kernel-dev-e266b2022209a2bc389c1cd6b809395c67671a92.zip op-kernel-dev-e266b2022209a2bc389c1cd6b809395c67671a92.tar.gz | |
Staging: et131x: kill MSI type
Kill off the MSI structure
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_address_map.h')
| -rw-r--r-- | drivers/staging/et131x/et1310_address_map.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index 6dea0d9..1a2c73a 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h @@ -132,25 +132,11 @@ */ /* - * structure for MSI Configuration reg in global address map - * located at address 0x0030 + * MSI Configuration reg at address 0x0030 */ -typedef union _MSI_CONFIG_t { - u32 value; - struct { -#ifdef _BIT_FIELDS_HTOL - u32 unused1:13; /* bits 19-31 */ - u32 msi_tc:3; /* bits 16-18 */ - u32 unused2:11; /* bits 5-15 */ - u32 msi_vector:5; /* bits 0-4 */ -#else - u32 msi_vector:5; /* bits 0-4 */ - u32 unused2:11; /* bits 5-15 */ - u32 msi_tc:3; /* bits 16-18 */ - u32 unused1:13; /* bits 19-31 */ -#endif - } bits; -} MSI_CONFIG_t, *PMSI_CONFIG_t; + +#define ET_MSI_VECTOR 0x0000001F +#define ET_MSI_TC 0x00070000 /* * structure for Loopback reg in global address map @@ -188,7 +174,7 @@ typedef struct _GLOBAL_t { /* Location: */ u32 int_status_alias; /* 0x0024 */ u32 sw_reset; /* 0x0028 */ u32 slv_timer; /* 0x002C */ - MSI_CONFIG_t msi_config; /* 0x0030 */ + u32 msi_config; /* 0x0030 */ LOOPBACK_t loopback; /* 0x0034 */ u32 watchdog_timer; /* 0x0038 */ } GLOBAL_t, *PGLOBAL_t; |
