From 413e8baa0d4fe582afb6ed56ef788ae349876857 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 26 Aug 2014 16:11:02 +0200 Subject: [PATCH] eal: remove unused macros Clean both linux and bsd implementations from unused macros. Signed-off-by: David Marchand Acked-by: Thomas Monjalon --- lib/librte_eal/bsdapp/eal/eal.c | 18 ------------------ lib/librte_eal/bsdapp/eal/eal_pci.c | 7 ------- lib/librte_eal/bsdapp/eal/eal_timer.c | 2 -- lib/librte_eal/linuxapp/eal/eal.c | 2 -- lib/librte_eal/linuxapp/eal/eal_ivshmem.c | 1 - lib/librte_eal/linuxapp/eal/eal_timer.c | 2 -- 6 files changed, 32 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index 38c6cfc436..71f93e010d 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -95,28 +95,10 @@ #define OPT_VDEV "vdev" #define OPT_SYSLOG "syslog" -#define RTE_EAL_BLACKLIST_SIZE 0x100 - #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL) -#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10) - -#define HIGHEST_RPL 3 - #define BITS_PER_HEX 4 -#define GET_BLACKLIST_FIELD(in, fd, lim, dlm) \ -{ \ - unsigned long val; \ - char *end; \ - errno = 0; \ - val = strtoul((in), &end, 16); \ - if (errno != 0 || end[0] != (dlm) || val > (lim)) \ - return (-EINVAL); \ - (fd) = (typeof (fd))val; \ - (in) = end + 1; \ -} - /* Allow the application to print its usage message too if set */ static rte_usage_hook_t rte_application_usage_hook = NULL; /* early configuration structure, when memory config is not mmapped */ diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index 2bbbeb03fd..54fcaf0c46 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -156,10 +156,6 @@ fail: return NULL; } -#ifndef OFF_MAX -#define OFF_MAX ((uint64_t)(off_t)-1) -#endif - static int pci_uio_map_secondary(struct rte_pci_device *dev) { @@ -274,9 +270,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) return (0); } -/* parse the "resource" sysfs file */ -#define IORESOURCE_MEM 0x00000200 - /* Compare two PCI device addresses. */ static int pci_addr_comparison(struct rte_pci_addr *addr, struct rte_pci_addr *addr2) diff --git a/lib/librte_eal/bsdapp/eal/eal_timer.c b/lib/librte_eal/bsdapp/eal/eal_timer.c index 9ac3f2e783..fd800b9e55 100644 --- a/lib/librte_eal/bsdapp/eal/eal_timer.c +++ b/lib/librte_eal/bsdapp/eal/eal_timer.c @@ -70,8 +70,6 @@ static uint64_t eal_tsc_resolution_hz = 0; /* General capabilities register */ #define CLK_PERIOD_SHIFT 32 /* Clock period shift. */ #define CLK_PERIOD_MASK 0xffffffff00000000ULL /* Clock period mask. */ -#define COUNT_SIZE_CAP_SHIFT 13 /* Count size capa. shift. */ -#define COUNT_SIZE_CAP_MASK 0x0000000000002000ULL /* Count size capa. mask. */ /** * HPET timer registers. From the Intel IA-PC HPET (High Precision Event diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index ad4391404d..4869e7c294 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -102,8 +102,6 @@ #define OPT_CREATE_UIO_DEV "create-uio-dev" #define OPT_VFIO_INTR "vfio-intr" -#define RTE_EAL_BLACKLIST_SIZE 0x100 - #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL) #define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10) diff --git a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c index 16d407e917..413a9bae34 100644 --- a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c +++ b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c @@ -62,7 +62,6 @@ #define PCI_DEVICE_ID_IVSHMEM 0x1110 #define IVSHMEM_MAGIC 0x0BADC0DE -#define IVSHMEM_METADATA_SIZE 0x1000 #define IVSHMEM_RESOURCE_PATH "/sys/bus/pci/devices/%04x:%02x:%02x.%x/resource2" #define IVSHMEM_CONFIG_PATH "/var/run/.%s_ivshmem_config" diff --git a/lib/librte_eal/linuxapp/eal/eal_timer.c b/lib/librte_eal/linuxapp/eal/eal_timer.c index 7f7589fffa..ca57916c16 100644 --- a/lib/librte_eal/linuxapp/eal/eal_timer.c +++ b/lib/librte_eal/linuxapp/eal/eal_timer.c @@ -71,8 +71,6 @@ static uint64_t eal_tsc_resolution_hz = 0; /* General capabilities register */ #define CLK_PERIOD_SHIFT 32 /* Clock period shift. */ #define CLK_PERIOD_MASK 0xffffffff00000000ULL /* Clock period mask. */ -#define COUNT_SIZE_CAP_SHIFT 13 /* Count size capa. shift. */ -#define COUNT_SIZE_CAP_MASK 0x0000000000002000ULL /* Count size capa. mask. */ /** * HPET timer registers. From the Intel IA-PC HPET (High Precision Event -- 2.20.1