Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci if_skreg.h: remove duplicate or triplicate ident...



details:   https://anonhg.NetBSD.org/src/rev/11b6f0611c18
branches:  trunk
changeset: 971917:11b6f0611c18
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri May 08 16:43:17 2020 +0000

description:
if_skreg.h: remove duplicate or triplicate identical #defines

diffstat:

 sys/dev/pci/if_skreg.h |  51 +-------------------------------------------------
 1 files changed, 1 insertions(+), 50 deletions(-)

diffs (79 lines):

diff -r bcd4303bf89f -r 11b6f0611c18 sys/dev/pci/if_skreg.h
--- a/sys/dev/pci/if_skreg.h    Fri May 08 16:05:36 2020 +0000
+++ b/sys/dev/pci/if_skreg.h    Fri May 08 16:43:17 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_skreg.h,v 1.28 2020/04/26 15:39:04 jakllsch Exp $ */
+/* $NetBSD: if_skreg.h,v 1.29 2020/05/08 16:43:17 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -1624,11 +1624,6 @@
 
 #define SK_RING_ALIGN  64
 
-#define SK_ADDR_LO(x)  ((u_int64_t) (x) & 0xffffffff)
-#define SK_ADDR_HI(x)  ((u_int64_t) (x) >> 32)
-
-#define SK_RING_ALIGN  64
-
 /* RX queue descriptor data structure */
 struct sk_rx_desc {
        u_int32_t               sk_ctl;
@@ -1739,14 +1734,6 @@
 #define SK_Y2_ST_TXA2_MSKH     0x000f
 #define SK_Y2_ST_TXA2_SHIFTH   8
 
-#define SK_Y2_ST_TXA1_MSKL     0x00000fff
-#define SK_Y2_ST_TXA1_SHIFT    0
-
-#define SK_Y2_ST_TXA2_MSKL     0xff000000
-#define SK_Y2_ST_TXA2_SHIFTL   24
-#define SK_Y2_ST_TXA2_MSKH     0x000f
-#define SK_Y2_ST_TXA2_SHIFTH   8
-
 #define MSK_TX_RING_CNT                512
 #define MSK_RX_RING_CNT                512
 #define MSK_STATUS_RING_CNT    2048
@@ -1953,42 +1940,6 @@
 
 #define YU_RXSTAT_BYTES(x)      ((x) >> YU_RXSTAT_LENSHIFT)
 
-/* Receive status */
-#define YU_RXSTAT_FOFL         0x00000001      /* Rx FIFO overflow */
-#define YU_RXSTAT_CRCERR       0x00000002      /* CRC error */
-#define YU_RXSTAT_FRAGMENT     0x00000008      /* fragment */
-#define YU_RXSTAT_LONGERR      0x00000010      /* too long packet */
-#define YU_RXSTAT_MIIERR       0x00000020      /* MII error */
-#define YU_RXSTAT_BADFC                0x00000040      /* bad flow-control packet */
-#define YU_RXSTAT_GOODFC       0x00000080      /* good flow-control packet */
-#define YU_RXSTAT_RXOK         0x00000100      /* receice OK (Good packet) */
-#define YU_RXSTAT_BROADCAST    0x00000200      /* broadcast packet */
-#define YU_RXSTAT_MULTICAST    0x00000400      /* multicast packet */
-#define YU_RXSTAT_RUNT         0x00000800      /* undersize packet */
-#define YU_RXSTAT_JABBER       0x00001000      /* jabber packet */
-#define YU_RXSTAT_VLAN         0x00002000      /* VLAN packet */
-#define YU_RXSTAT_LENSHIFT     16
-
-#define        YU_RXSTAT_BYTES(x)      ((x) >> YU_RXSTAT_LENSHIFT)
-
-/* Receive status */
-#define YU_RXSTAT_FOFL         0x00000001      /* Rx FIFO overflow */
-#define YU_RXSTAT_CRCERR       0x00000002      /* CRC error */
-#define YU_RXSTAT_FRAGMENT     0x00000008      /* fragment */
-#define YU_RXSTAT_LONGERR      0x00000010      /* too long packet */
-#define YU_RXSTAT_MIIERR       0x00000020      /* MII error */
-#define YU_RXSTAT_BADFC                0x00000040      /* bad flow-control packet */
-#define YU_RXSTAT_GOODFC       0x00000080      /* good flow-control packet */
-#define YU_RXSTAT_RXOK         0x00000100      /* receice OK (Good packet) */
-#define YU_RXSTAT_BROADCAST    0x00000200      /* broadcast packet */
-#define YU_RXSTAT_MULTICAST    0x00000400      /* multicast packet */
-#define YU_RXSTAT_RUNT         0x00000800      /* undersize packet */
-#define YU_RXSTAT_JABBER       0x00001000      /* jabber packet */
-#define YU_RXSTAT_VLAN         0x00002000      /* VLAN packet */
-#define YU_RXSTAT_LENSHIFT     16
-
-#define        YU_RXSTAT_BYTES(x)      ((x) >> YU_RXSTAT_LENSHIFT)
-
 /*
  * Registers and data structures for the XaQti Corporation XMAC II
  * Gigabit Ethernet MAC. Datasheet is available from http://www.xaqti.com.



Home | Main Index | Thread Index | Old Index