X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Ftxgbe%2Fbase%2Ftxgbe_osdep.h;h=11fcf7e8fefe18217f252674bc60e7b5310f7ee6;hb=1c9e61b3a45321b3cae742e8769b10c06c0324f0;hp=f3d443ad372847e83e0e24869754f98b1e502b98;hpb=e1698e383c2a678bb80fcd9215d374eb50207876;p=dpdk.git

diff --git a/drivers/net/txgbe/base/txgbe_osdep.h b/drivers/net/txgbe/base/txgbe_osdep.h
index f3d443ad37..11fcf7e8fe 100644
--- a/drivers/net/txgbe/base/txgbe_osdep.h
+++ b/drivers/net/txgbe/base/txgbe_osdep.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_OS_H_
@@ -27,13 +28,16 @@
 
 #define ASSERT(x) do {			\
 	if (!(x))			\
-		rte_panic("TXGBE: x");	\
+		PMD_DRV_LOG(ERR, "TXGBE: %d", x);	\
 } while (0)
 
+#define txgbe_unused __rte_unused
+
 #define usec_delay(x) rte_delay_us(x)
 #define msec_delay(x) rte_delay_ms(x)
 #define usleep(x)     rte_delay_us(x)
 #define msleep(x)     rte_delay_ms(x)
+#define usec_stamp()    (rte_get_timer_cycles() * 1000000 / rte_get_timer_hz())
 
 #define FALSE               0
 #define TRUE                1
@@ -148,10 +152,6 @@ static inline u64 REVERT_BIT_MASK64(u64 mask)
 	       ((mask & 0xFFFFFFFF00000000) >> 32);
 }
 
-#ifndef __rte_weak
-#define __rte_weak __attribute__((__weak__))
-#endif
-
 #define IOMEM
 
 #define prefetch(x) rte_prefetch0(x)