git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/ice/base: print link configure error
[dpdk.git]
/
drivers
/
net
/
ice
/
base
/
ice_osdep.h
diff --git
a/drivers/net/ice/base/ice_osdep.h
b/drivers/net/ice/base/ice_osdep.h
index
9a170b5
..
f4cc762
100644
(file)
--- a/
drivers/net/ice/base/ice_osdep.h
+++ b/
drivers/net/ice/base/ice_osdep.h
@@
-1,5
+1,5
@@
/* SPDX-License-Identifier: BSD-3-Clause
/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2018-202
0
Intel Corporation
+ * Copyright(c) 2018-202
1
Intel Corporation
*/
#ifndef _ICE_OSDEP_H_
*/
#ifndef _ICE_OSDEP_H_
@@
-62,9
+62,24
@@
typedef uint64_t s64;
#define __be64 uint64_t
#endif
#define __be64 uint64_t
#endif
+/* Avoid macro redefinition warning on Windows */
+#ifdef RTE_EXEC_ENV_WINDOWS
+#ifdef min
+#undef min
+#endif
+#ifdef max
+#undef max
+#endif
+#endif
#define min(a, b) RTE_MIN(a, b)
#define max(a, b) RTE_MAX(a, b)
#define min(a, b) RTE_MIN(a, b)
#define max(a, b) RTE_MAX(a, b)
+#ifdef RTE_EXEC_ENV_WINDOWS
+#define ice_access _access
+#else
+#define ice_access access
+#endif
+
#define FIELD_SIZEOF(t, f) RTE_SIZEOF_FIELD(t, f)
#define ARRAY_SIZE(arr) RTE_DIM(arr)
#define FIELD_SIZEOF(t, f) RTE_SIZEOF_FIELD(t, f)
#define ARRAY_SIZE(arr) RTE_DIM(arr)
@@
-165,6
+180,7
@@
do { \
#endif
#define ICE_PCI_REG_WRITE(reg, value) writel(value, reg)
#endif
#define ICE_PCI_REG_WRITE(reg, value) writel(value, reg)
+#define ICE_PCI_REG_WC_WRITE(reg, value) rte_write32_wc(value, reg)
#define ICE_READ_REG(hw, reg) rd32(hw, reg)
#define ICE_WRITE_REG(hw, reg, value) wr32(hw, reg, value)
#define ICE_READ_REG(hw, reg) rd32(hw, reg)
#define ICE_WRITE_REG(hw, reg, value) wr32(hw, reg, value)