spidernet: Replace literal with const
Replace literal with const; add bit definitions. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Родитель
57a9f236eb
Коммит
e65bbf13dd
|
@ -1235,7 +1235,7 @@ spider_net_decode_one_descr(struct spider_net_card *card)
|
||||||
goto bad_desc;
|
goto bad_desc;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hwdescr->dmac_cmd_status & 0xfcf4) {
|
if (hwdescr->dmac_cmd_status & SPIDER_NET_DESCR_BAD_STATUS) {
|
||||||
dev_err(&card->netdev->dev, "bad status, cmd_status=x%08x\n",
|
dev_err(&card->netdev->dev, "bad status, cmd_status=x%08x\n",
|
||||||
hwdescr->dmac_cmd_status);
|
hwdescr->dmac_cmd_status);
|
||||||
pr_err("buf_addr=x%08x\n", hw_buf_addr);
|
pr_err("buf_addr=x%08x\n", hw_buf_addr);
|
||||||
|
|
|
@ -354,6 +354,18 @@ enum spider_net_int2_status {
|
||||||
#define SPIDER_NET_DMAC_UDP 0x00030000
|
#define SPIDER_NET_DMAC_UDP 0x00030000
|
||||||
#define SPIDER_NET_TXDCEST 0x08000000
|
#define SPIDER_NET_TXDCEST 0x08000000
|
||||||
|
|
||||||
|
#define SPIDER_NET_DESCR_RXFDIS 0x00000001
|
||||||
|
#define SPIDER_NET_DESCR_RXDCEIS 0x00000002
|
||||||
|
#define SPIDER_NET_DESCR_RXDEN0IS 0x00000004
|
||||||
|
#define SPIDER_NET_DESCR_RXINVDIS 0x00000008
|
||||||
|
#define SPIDER_NET_DESCR_RXRERRIS 0x00000010
|
||||||
|
#define SPIDER_NET_DESCR_RXFDCIMS 0x00000100
|
||||||
|
#define SPIDER_NET_DESCR_RXDCEIMS 0x00000200
|
||||||
|
#define SPIDER_NET_DESCR_RXDEN0IMS 0x00000400
|
||||||
|
#define SPIDER_NET_DESCR_RXINVDIMS 0x00000800
|
||||||
|
#define SPIDER_NET_DESCR_RXRERRMIS 0x00001000
|
||||||
|
#define SPIDER_NET_DESCR_UNUSED 0x077fe0e0
|
||||||
|
|
||||||
#define SPIDER_NET_DESCR_IND_PROC_MASK 0xF0000000
|
#define SPIDER_NET_DESCR_IND_PROC_MASK 0xF0000000
|
||||||
#define SPIDER_NET_DESCR_COMPLETE 0x00000000 /* used in rx and tx */
|
#define SPIDER_NET_DESCR_COMPLETE 0x00000000 /* used in rx and tx */
|
||||||
#define SPIDER_NET_DESCR_RESPONSE_ERROR 0x10000000 /* used in rx and tx */
|
#define SPIDER_NET_DESCR_RESPONSE_ERROR 0x10000000 /* used in rx and tx */
|
||||||
|
@ -364,6 +376,13 @@ enum spider_net_int2_status {
|
||||||
#define SPIDER_NET_DESCR_NOT_IN_USE 0xF0000000
|
#define SPIDER_NET_DESCR_NOT_IN_USE 0xF0000000
|
||||||
#define SPIDER_NET_DESCR_TXDESFLG 0x00800000
|
#define SPIDER_NET_DESCR_TXDESFLG 0x00800000
|
||||||
|
|
||||||
|
#define SPIDER_NET_DESCR_BAD_STATUS (SPIDER_NET_DESCR_RXDEN0IS | \
|
||||||
|
SPIDER_NET_DESCR_RXRERRIS | \
|
||||||
|
SPIDER_NET_DESCR_RXDEN0IMS | \
|
||||||
|
SPIDER_NET_DESCR_RXINVDIMS | \
|
||||||
|
SPIDER_NET_DESCR_RXRERRMIS | \
|
||||||
|
SPIDER_NET_DESCR_UNUSED)
|
||||||
|
|
||||||
/* Descriptor, as defined by the hardware */
|
/* Descriptor, as defined by the hardware */
|
||||||
struct spider_net_hw_descr {
|
struct spider_net_hw_descr {
|
||||||
u32 buf_addr;
|
u32 buf_addr;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче