net/txgbe: add build and doc infrastructure

[dpdk.git] / drivers / net / axgbe / axgbe_common.h

diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h
index f481171..fb97f0b 100644 (file)
--- a/drivers/net/axgbe/axgbe_common.h
+++ b/drivers/net/axgbe/axgbe_common.h
@@ -21,6 +21,7 @@
 #include <inttypes.h>
 #include <pthread.h>
 
+#include <rte_bitops.h>
 #include <rte_byteorder.h>
 #include <rte_memory.h>
 #include <rte_malloc.h>
@@ -45,6 +46,7 @@
 #endif
 
 #define AXGBE_HZ                               250
+#define NSEC_PER_SEC    1000000000L
 
 /* DMA register offsets */
 #define DMA_MR                         0x3000
@@ -491,6 +493,8 @@
 #define MAC_TSCR_TSEVNTENA_WIDTH       1
 #define MAC_TSCR_TSINIT_INDEX          2
 #define MAC_TSCR_TSINIT_WIDTH          1
+#define MAC_TSCR_TSUPDT_INDEX          3
+#define MAC_TSCR_TSUPDT_WIDTH          1
 #define MAC_TSCR_TSIPENA_INDEX         11
 #define MAC_TSCR_TSIPENA_WIDTH         1
 #define MAC_TSCR_TSIPV4ENA_INDEX       13
@@ -505,6 +509,8 @@
 #define MAC_TSCR_TXTSSTSM_WIDTH                1
 #define MAC_TSSR_TXTSC_INDEX           15
 #define MAC_TSSR_TXTSC_WIDTH           1
+#define MAC_STNUR_ADDSUB_INDEX          31
+#define MAC_STNUR_ADDSUB_WIDTH          1
 #define MAC_TXSNR_TXTSSTSMIS_INDEX     31
 #define MAC_TXSNR_TXTSSTSMIS_WIDTH     1
 #define MAC_VLANHTR_VLHT_INDEX         0
@@ -538,6 +544,7 @@
 #define MAC_VR_USERVER_INDEX           16
 #define MAC_VR_USERVER_WIDTH           8
 
+
 /* MMC register offsets */
 #define MMC_CR                         0x0800
 #define MMC_RISR                       0x0804
@@ -1170,6 +1177,8 @@
 #define RX_CONTEXT_DESC3_TSA_WIDTH             1
 #define RX_CONTEXT_DESC3_TSD_INDEX             6
 #define RX_CONTEXT_DESC3_TSD_WIDTH             1
+#define RX_CONTEXT_DESC3_PMT_INDEX             0
+#define RX_CONTEXT_DESC3_PMT_WIDTH             4
 
 #define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_INDEX 0
 #define TX_PACKET_ATTRIBUTES_CSUM_ENABLE_WIDTH 1
@@ -1700,34 +1709,6 @@ do {                                                                     \
 #define time_after_eq(a, b)     ((long)((a) - (b)) >= 0)
 #define time_before_eq(a, b)   time_after_eq(b, a)
 
-/*---bitmap support apis---*/
-static inline int axgbe_test_bit(int nr, volatile unsigned long *addr)
-{
-       int res;
-
-       rte_mb();
-       res = ((*addr) & (1UL << nr)) != 0;
-       rte_mb();
-       return res;
-}
-
-static inline void axgbe_set_bit(unsigned int nr, volatile unsigned long *addr)
-{
-       __sync_fetch_and_or(addr, (1UL << nr));
-}
-
-static inline void axgbe_clear_bit(int nr, volatile unsigned long *addr)
-{
-       __sync_fetch_and_and(addr, ~(1UL << nr));
-}
-
-static inline int axgbe_test_and_clear_bit(int nr, volatile unsigned long *addr)
-{
-       unsigned long mask = (1UL << nr);
-
-       return __sync_fetch_and_and(addr, ~mask) & mask;
-}
-
 static inline unsigned long msecs_to_timer_cycles(unsigned int m)
 {
        return rte_get_timer_hz() * (m / 1000);