#define _ENIC_COMPAT_H_
#include <stdio.h>
+#include <unistd.h>
#include <rte_atomic.h>
#include <rte_malloc.h>
+#include <rte_log.h>
-#define ENIC_PAGE_ALIGN 4096ULL
+#define ENIC_PAGE_ALIGN 4096UL
#define ENIC_ALIGN ENIC_PAGE_ALIGN
#define NAME_MAX 255
#define ETH_ALEN 6
#define pr_warn(y, args...) dev_warning(0, y, ##args)
#define BUG() pr_err("BUG at %s:%d", __func__, __LINE__)
-#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
+#define VNIC_ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1)
#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask))
#define udelay usleep
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define kzalloc(size, flags) calloc(1, size)
#define kfree(x) free(x)
-#define dev_err(x, args...) printf("rte_enic_pmd : Error - " args)
-#define dev_info(x, args...) printf("rte_enic_pmd: Info - " args)
-#define dev_warning(x, args...) printf("rte_enic_pmd: Warning - " args)
-#define dev_trace(x, args...) printf("rte_enic_pmd: Trace - " args)
+#define dev_printk(level, fmt, args...) \
+ RTE_LOG(level, PMD, "rte_enic_pmd: " fmt, ## args)
+
+#define dev_err(x, args...) dev_printk(ERR, args)
+#define dev_info(x, args...) dev_printk(INFO, args)
+#define dev_warning(x, args...) dev_printk(WARNING, args)
+#define dev_debug(x, args...) dev_printk(DEBUG, args)
#define __le16 u16
#define __le32 u32
typedef unsigned long long u64;
typedef unsigned long long dma_addr_t;
-static inline u_int32_t ioread32(volatile void *addr)
+static inline uint32_t ioread32(volatile void *addr)
{
- return *(volatile u_int32_t *)addr;
+ return *(volatile uint32_t *)addr;
}
-static inline u16 ioread16(volatile void *addr)
+static inline uint16_t ioread16(volatile void *addr)
{
- return *(volatile u16 *)addr;
+ return *(volatile uint16_t *)addr;
}
-static inline u_int8_t ioread8(volatile void *addr)
+static inline uint8_t ioread8(volatile void *addr)
{
- return *(volatile u_int8_t *)addr;
+ return *(volatile uint8_t *)addr;
}
-static inline void iowrite32(u_int32_t val, volatile void *addr)
+static inline void iowrite32(uint32_t val, volatile void *addr)
{
- *(volatile u_int32_t *)addr = val;
+ *(volatile uint32_t *)addr = val;
}
-static inline void iowrite16(u16 val, volatile void *addr)
+static inline void iowrite16(uint16_t val, volatile void *addr)
{
- *(volatile u16 *)addr = val;
+ *(volatile uint16_t *)addr = val;
}
-static inline void iowrite8(u_int8_t val, volatile void *addr)
+static inline void iowrite8(uint8_t val, volatile void *addr)
{
- *(volatile u_int8_t *)addr = val;
+ *(volatile uint8_t *)addr = val;
}
static inline unsigned int readl(volatile void __iomem *addr)