diff options
| author | Petri Savolainen <petri.savolainen@nokia.com> | 2019-08-16 17:43:48 +0300 |
|---|---|---|
| committer | Petri Savolainen <petri.savolainen@nokia.com> | 2019-08-20 14:33:59 +0300 |
| commit | 0b9207d87fba558d0dd1dfcf192f4310d6bc9f93 (patch) | |
| tree | 972a088dd90a27ef5220067081da92f391285311 /helper | |
| parent | ca17284c6b3990d30c78900c9968d88feabe02fa (diff) | |
helper: debug: move odph_debug.h into helper API
Moved the debug header to be part of the helper API.
Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'helper')
| -rw-r--r-- | helper/Makefile.am | 2 | ||||
| -rw-r--r-- | helper/cuckootable.c | 4 | ||||
| -rw-r--r-- | helper/hashtable.c | 4 | ||||
| -rw-r--r-- | helper/include/odp/helper/odph_api.h | 1 | ||||
| -rw-r--r-- | helper/include/odp/helper/odph_debug.h (renamed from helper/include/odph_debug.h) | 0 | ||||
| -rw-r--r-- | helper/iplookuptable.c | 2 | ||||
| -rw-r--r-- | helper/lineartable.c | 4 | ||||
| -rw-r--r-- | helper/linux/thread.c | 2 | ||||
| -rw-r--r-- | helper/test/chksum.c | 1 | ||||
| -rw-r--r-- | helper/test/cuckootable.c | 1 | ||||
| -rw-r--r-- | helper/test/iplookuptable.c | 2 | ||||
| -rw-r--r-- | helper/test/linux/process.c | 2 | ||||
| -rw-r--r-- | helper/test/linux/pthread.c | 2 | ||||
| -rw-r--r-- | helper/test/odpthreads.c | 1 | ||||
| -rw-r--r-- | helper/test/parse.c | 2 | ||||
| -rw-r--r-- | helper/test/table.c | 3 | ||||
| -rw-r--r-- | helper/test/version.c | 2 | ||||
| -rw-r--r-- | helper/threads.c | 2 |
18 files changed, 14 insertions, 23 deletions
diff --git a/helper/Makefile.am b/helper/Makefile.am index a7d5132df..cfeeeeb40 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -13,6 +13,7 @@ AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ include/odp/helper/chksum.h\ + include/odp/helper/odph_debug.h \ include/odp/helper/eth.h\ include/odp/helper/icmp.h\ include/odp/helper/ip.h\ @@ -41,7 +42,6 @@ helperlinuxinclude_HEADERS = \ endif noinst_HEADERS = \ - include/odph_debug.h \ include/odph_list_internal.h __LIB__libodphelper_la_SOURCES = \ diff --git a/helper/cuckootable.c b/helper/cuckootable.c index febfa28ed..5609e6906 100644 --- a/helper/cuckootable.c +++ b/helper/cuckootable.c @@ -44,8 +44,8 @@ #include <errno.h> #include <stdio.h> -#include "odp/helper/odph_cuckootable.h" -#include "odph_debug.h" +#include <odp/helper/odph_cuckootable.h> +#include <odp/helper/odph_debug.h> #include <odp_api.h> /* More efficient access to a map of single ullong */ diff --git a/helper/hashtable.c b/helper/hashtable.c index 16f6c14cc..496bca5e6 100644 --- a/helper/hashtable.c +++ b/helper/hashtable.c @@ -10,9 +10,9 @@ #include <string.h> #include <malloc.h> -#include "odp/helper/odph_hashtable.h" +#include <odp/helper/odph_hashtable.h> +#include <odp/helper/odph_debug.h> #include "odph_list_internal.h" -#include "odph_debug.h" #include <odp_api.h> #define ODPH_SUCCESS 0 diff --git a/helper/include/odp/helper/odph_api.h b/helper/include/odp/helper/odph_api.h index 4bd10bf46..921914aa2 100644 --- a/helper/include/odp/helper/odph_api.h +++ b/helper/include/odp/helper/odph_api.h @@ -18,6 +18,7 @@ extern "C" { #endif +#include <odp/helper/odph_debug.h> #include <odp/helper/chksum.h> #include <odp/helper/odph_cuckootable.h> #include <odp/helper/eth.h> diff --git a/helper/include/odph_debug.h b/helper/include/odp/helper/odph_debug.h index c99936f4b..c99936f4b 100644 --- a/helper/include/odph_debug.h +++ b/helper/include/odp/helper/odph_debug.h diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c index 84b4e2cbb..1b5538ab8 100644 --- a/helper/iplookuptable.c +++ b/helper/iplookuptable.c @@ -12,8 +12,8 @@ #include <stdio.h> #include <odp/helper/odph_iplookuptable.h> +#include <odp/helper/odph_debug.h> #include "odph_list_internal.h" -#include "odph_debug.h" #include <odp_api.h> /** @magic word, write to the first byte of the memory block diff --git a/helper/lineartable.c b/helper/lineartable.c index b27246cbd..8479d2f1a 100644 --- a/helper/lineartable.c +++ b/helper/lineartable.c @@ -10,8 +10,8 @@ #include <string.h> #include <malloc.h> -#include "odp/helper/odph_lineartable.h" -#include "odph_debug.h" +#include <odp/helper/odph_lineartable.h> +#include <odp/helper/odph_debug.h> #include <odp_api.h> #define ODPH_SUCCESS 0 diff --git a/helper/linux/thread.c b/helper/linux/thread.c index 6ed1bc8f6..eecd6fed1 100644 --- a/helper/linux/thread.c +++ b/helper/linux/thread.c @@ -24,7 +24,7 @@ #include <odp_api.h> #include <odp/helper/linux/pthread.h> #include <odp/helper/linux/process.h> -#include "odph_debug.h" +#include <odp/helper/odph_debug.h> static void *_odph_run_start_routine(void *arg) { diff --git a/helper/test/chksum.c b/helper/test/chksum.c index 5c7c650e0..9fa4ec18a 100644 --- a/helper/test/chksum.c +++ b/helper/test/chksum.c @@ -6,7 +6,6 @@ #include "config.h" -#include "odph_debug.h" #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c index 3afa490a6..ee5f1d832 100644 --- a/helper/test/cuckootable.c +++ b/helper/test/cuckootable.c @@ -50,7 +50,6 @@ #include <time.h> #include <odp_api.h> -#include <odph_debug.h> #include <odp/helper/odph_api.h> /******************************************************************************* diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c index 5e16e7110..6637242d8 100644 --- a/helper/test/iplookuptable.c +++ b/helper/test/iplookuptable.c @@ -13,9 +13,7 @@ #include <errno.h> #include <odp_api.h> -#include <odph_debug.h> #include <odp/helper/odph_api.h> -#include <odp/helper/ip.h> static void print_prefix_info( const char *msg, uint32_t ip, uint8_t cidr) diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c index 92d779d9a..26c9649d6 100644 --- a/helper/test/linux/process.c +++ b/helper/test/linux/process.c @@ -6,8 +6,8 @@ #include "config.h" -#include <odph_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp/helper/linux/pthread.h> #include <odp/helper/linux/process.h> diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c index 8441805d3..b0a578151 100644 --- a/helper/test/linux/pthread.c +++ b/helper/test/linux/pthread.c @@ -6,8 +6,8 @@ #include "config.h" -#include <odph_debug.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> #include <odp/helper/linux/pthread.h> #include <string.h> diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c index 55db37e0d..dbff4294e 100644 --- a/helper/test/odpthreads.c +++ b/helper/test/odpthreads.c @@ -15,7 +15,6 @@ #include <unistd.h> #include <stdlib.h> -#include <odph_debug.h> #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/parse.c b/helper/test/parse.c index f2f12cc05..5f8c5846a 100644 --- a/helper/test/parse.c +++ b/helper/test/parse.c @@ -6,8 +6,6 @@ #include "config.h" -#include <odph_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/test/table.c b/helper/test/table.c index 29d87cb24..2887bd599 100644 --- a/helper/test/table.c +++ b/helper/test/table.c @@ -6,9 +6,8 @@ #include "config.h" -#include <odph_debug.h> -#include <odp/helper/odph_api.h> #include <odp_api.h> +#include <odp/helper/odph_api.h> /** * Address Resolution Protocol (ARP) diff --git a/helper/test/version.c b/helper/test/version.c index bd817bb47..22ee2955d 100644 --- a/helper/test/version.c +++ b/helper/test/version.c @@ -6,8 +6,6 @@ #include "config.h" -#include <odph_debug.h> - #include <odp_api.h> #include <odp/helper/odph_api.h> diff --git a/helper/threads.c b/helper/threads.c index e30c9f29d..37a0c25db 100644 --- a/helper/threads.c +++ b/helper/threads.c @@ -20,7 +20,7 @@ #include <odp_api.h> #include <odp/helper/threads.h> -#include "odph_debug.h" +#include <odp/helper/odph_debug.h> #define FAILED_CPU -1 |