diff options
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/et131x/et1310_address_map.h | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h index f751022b36d3..95fb22e42ed5 100644 --- a/drivers/staging/et131x/et1310_address_map.h +++ b/drivers/staging/et131x/et1310_address_map.h | |||
@@ -675,23 +675,11 @@ typedef union _TXMAC_CTL_t { | |||
675 | /* | 675 | /* |
676 | * structure for shadow pointer reg in txmac address map | 676 | * structure for shadow pointer reg in txmac address map |
677 | * located at address 0x3004 | 677 | * located at address 0x3004 |
678 | * 31-27: reserved | ||
679 | * 26-16: txq rd ptr | ||
680 | * 15-11: reserved | ||
681 | * 10-0: txq wr ptr | ||
678 | */ | 682 | */ |
679 | typedef union _TXMAC_SHADOW_PTR_t { | ||
680 | u32 value; | ||
681 | struct { | ||
682 | #ifdef _BIT_FIELDS_HTOL | ||
683 | u32 reserved2:5; /* bits 27-31 */ | ||
684 | u32 txq_rd_ptr:11; /* bits 16-26 */ | ||
685 | u32 reserved:5; /* bits 11-15 */ | ||
686 | u32 txq_wr_ptr:11; /* bits 0-10 */ | ||
687 | #else | ||
688 | u32 txq_wr_ptr:11; /* bits 0-10 */ | ||
689 | u32 reserved:5; /* bits 11-15 */ | ||
690 | u32 txq_rd_ptr:11; /* bits 16-26 */ | ||
691 | u32 reserved2:5; /* bits 27-31 */ | ||
692 | #endif | ||
693 | } bits; | ||
694 | } TXMAC_SHADOW_PTR_t, *PTXMAC_SHADOW_PTR_t; | ||
695 | 683 | ||
696 | /* | 684 | /* |
697 | * structure for error count reg in txmac address map | 685 | * structure for error count reg in txmac address map |
@@ -814,7 +802,7 @@ typedef union _TXMAC_ERR_INT_t { | |||
814 | */ | 802 | */ |
815 | typedef struct _TXMAC_t { /* Location: */ | 803 | typedef struct _TXMAC_t { /* Location: */ |
816 | TXMAC_CTL_t ctl; /* 0x3000 */ | 804 | TXMAC_CTL_t ctl; /* 0x3000 */ |
817 | TXMAC_SHADOW_PTR_t shadow_ptr; /* 0x3004 */ | 805 | u32 shadow_ptr; /* 0x3004 */ |
818 | TXMAC_ERR_CNT_t err_cnt; /* 0x3008 */ | 806 | TXMAC_ERR_CNT_t err_cnt; /* 0x3008 */ |
819 | u32 max_fill; /* 0x300C */ | 807 | u32 max_fill; /* 0x300C */ |
820 | u32 cf_param; /* 0x3010 */ | 808 | u32 cf_param; /* 0x3010 */ |