diff options
| author | Alan Cox <alan@linux.intel.com> | 2010-01-18 15:34:35 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 16:42:51 -0800 |
| commit | 1cb180dc9dadf7739fe5bf9a8f159097abb67590 (patch) | |
| tree | 0f88f535ac9b5553778ae8856597a43bb15994ce /drivers/staging/et131x | |
| parent | 6720949d55623cb8c4cb6b06f218d8be68780a6f (diff) | |
| download | talos-op-linux-1cb180dc9dadf7739fe5bf9a8f159097abb67590.tar.gz talos-op-linux-1cb180dc9dadf7739fe5bf9a8f159097abb67590.zip | |
Staging: et131x: kill txmac err count typedef
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/et1310_address_map.h | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index 5fcb48334590..c8b22ba120fc 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h @@ -563,23 +563,12 @@ struct rxdma_regs { /* Location: */ /* * structure for error count reg in txmac address map * located at address 0x3008 + * + * 31-12: unused + * 11-8: reserved + * 7-4: txq_underrun + * 3-0: fifo_underrun */ -typedef union _TXMAC_ERR_CNT_t { - u32 value; - struct { -#ifdef _BIT_FIELDS_HTOL - u32 unused:20; /* bits 12-31 */ - u32 reserved:4; /* bits 8-11 */ - u32 txq_underrun:4; /* bits 4-7 */ - u32 fifo_underrun:4; /* bits 0-3 */ -#else - u32 fifo_underrun:4; /* bits 0-3 */ - u32 txq_underrun:4; /* bits 4-7 */ - u32 reserved:4; /* bits 8-11 */ - u32 unused:20; /* bits 12-31 */ -#endif - } bits; -} TXMAC_ERR_CNT_t, *PTXMAC_ERR_CNT_t; /* * structure for max fill reg in txmac address map @@ -682,7 +671,7 @@ typedef union _TXMAC_ERR_INT_t { typedef struct _TXMAC_t { /* Location: */ u32 ctl; /* 0x3000 */ u32 shadow_ptr; /* 0x3004 */ - TXMAC_ERR_CNT_t err_cnt; /* 0x3008 */ + u32 err_cnt; /* 0x3008 */ u32 max_fill; /* 0x300C */ u32 cf_param; /* 0x3010 */ u32 tx_test; /* 0x3014 */ |
