linux-generic: implementation name is odp-linux

Refer consistently to odp-linux as the implementation name.
Linux-generic is implementation internal directory name.

Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

16 files changed, 22 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index b5e1562a6..39627de70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,14 +112,18 @@ AC_SUBST([platform_with_platform_test], ["platform/${with_platform}/test"])
 ##########################################################################
 # Run platform specific checks and settings
 ##########################################################################
+IMPLEMENTATION_NAME=""
 if test "${with_platform}" == "linux-generic";
 then
     m4_include([./platform/linux-generic/m4/configure.m4])
+    IMPLEMENTATION_NAME="odp-linux"
 else
     echo "UNSUPPORTED PLATFORM: ${with_platform}"
     exit 1
 fi
 
+ODP_CFLAGS="$ODP_CFLAGS -DIMPLEMENTATION_NAME=$IMPLEMENTATION_NAME"
+
 ##########################################################################
 # Include m4 files
 ##########################################################################
@@ -268,6 +272,7 @@ AC_MSG_RESULT([
 
 	Library version:	${ODP_LIBSO_VERSION}
 
+	implementation_name:	${IMPLEMENTATION_NAME}
 	ARCH_DIR		${ARCH_DIR}
 	with_platform:		${with_platform}
 	prefix:			${prefix}
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index ccae907c8..8393244e4 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -1159,7 +1159,7 @@ static void usage(char *progname)
 	       " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
-	       " can be used to advanced pkt I/O selection for linux-generic\n"
+	       " can be used to advanced pkt I/O selection for odp-linux\n"
 	       "  -p, --packetsize payload length of the packets\n"
 	       "  -t, --timeout only for ping mode, wait ICMP reply timeout seconds\n"
 	       "  -i, --interval wait interval ms between sending each packet\n"
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index fb4385f6f..451bb2d5a 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -1589,7 +1589,7 @@ static void usage(char *progname)
 	       " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
-	       " can be used to advanced pkt I/O selection for linux-generic\n"
+	       " can be used to advanced pkt I/O selection for odp-linux\n"
 	       "                        ODP_IPSEC_USE_POLL_QUEUES\n"
 	       " to enable use of poll queues instead of scheduled (default)\n"
 	       "                        ODP_IPSEC_STREAM_VERIFY_MDEQ\n"
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index 9028ab2aa..564c63ac6 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -734,7 +734,7 @@ static void usage(char *progname)
 	       " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
-	       " can be used to advanced pkt I/O selection for linux-generic\n"
+	       " can be used to advanced pkt I/O selection for odp-linux\n"
 	       "\n", NO_PATH(progname), NO_PATH(progname)
 	    );
 }
diff --git a/example/switch/odp_switch.c b/example/switch/odp_switch.c
index 0c9b2575e..09835c09f 100644
--- a/example/switch/odp_switch.c
+++ b/example/switch/odp_switch.c
@@ -729,7 +729,7 @@ static void usage(char *progname)
 	       "                        ODP_PKTIO_DISABLE_NETMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
-	       " can be used to advanced pkt I/O selection for linux-generic\n"
+	       " can be used to advanced pkt I/O selection for odp-linux\n"
 	       "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS
 	    );
 }
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 85bc2e81e..053bd1213 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -12,7 +12,6 @@ AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
 
 GIT_DESC = `$(top_srcdir)/scripts/get_impl_str.sh $(top_srcdir)`
 AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)"
-AM_CFLAGS += -DPLATFORM=${with_platform}
 AM_CFLAGS += $(VISIBILITY_CFLAGS)
 
 #The implementation will need to retain the deprecated implementation
diff --git a/platform/linux-generic/include/odp/api/plat/queue_types.h b/platform/linux-generic/include/odp/api/plat/queue_types.h
index fcd8f1df7..1569f5d6b 100644
--- a/platform/linux-generic/include/odp/api/plat/queue_types.h
+++ b/platform/linux-generic/include/odp/api/plat/queue_types.h
@@ -36,7 +36,7 @@ typedef ODP_HANDLE_T(odp_queue_group_t);
 /**
  * @def ODP_QUEUE_TYPE_TM
  * Traffic manager queue
- * @note Internal to linux-generic implementation--not part of queue type API
+ * @note Internal to the implementation -- not part of queue type API
  */
 #define ODP_QUEUE_TYPE_TM     4
 
diff --git a/platform/linux-generic/include/odp/api/plat/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h
index 1b9409b2a..4847f3b1f 100644
--- a/platform/linux-generic/include/odp/api/plat/time_types.h
+++ b/platform/linux-generic/include/odp/api/plat/time_types.h
@@ -22,7 +22,7 @@ extern "C" {
  **/
 
 /**
- * @internal Time structure used to isolate linux-generic implementation from
+ * @internal Time structure used to isolate odp-linux implementation from
  * the linux timespec structure, which is dependent on POSIX extension level.
  */
 typedef struct odp_time_t {
diff --git a/platform/linux-generic/include/odp_config_internal.h b/platform/linux-generic/include/odp_config_internal.h
index 96c63af14..b108c0789 100644
--- a/platform/linux-generic/include/odp_config_internal.h
+++ b/platform/linux-generic/include/odp_config_internal.h
@@ -50,7 +50,7 @@ extern "C" {
  * allocated packets. Implementations may reserve a larger than minimum headroom
  * size e.g. due to HW or a protocol specific alignment requirement.
  *
- * @internal In linux-generic implementation:
+ * @internal In odp-linux implementation:
  * The default value (66) allows a 1500-byte packet to be received into a single
  * segment with Ethernet offset alignment and room for some header expansion.
  */
@@ -98,7 +98,7 @@ extern "C" {
  * (including default head- and tailrooms) or extend packets to sizes larger
  * than this limit will fail.
  *
- * @internal In linux-generic implementation:
+ * @internal In odp-linux implementation:
  * - The value MUST be an integral number of segments
  * - The value SHOULD be large enough to accommodate jumbo packets (9K)
  */
diff --git a/platform/linux-generic/include/odp_packet_io_ipc_internal.h b/platform/linux-generic/include/odp_packet_io_ipc_internal.h
index a224218e1..851114d91 100644
--- a/platform/linux-generic/include/odp_packet_io_ipc_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_ipc_internal.h
@@ -33,14 +33,14 @@ struct pktio_info {
 		/* size of packet/segment in remote pool */
 		uint32_t shm_pkt_size;
 		/* offset from shared memory block start
-		 * to pool_mdata_addr (linux-generic pool specific) */
+		 * to pool_mdata_addr (odp-linux pool specific) */
 		size_t mdata_offset;
 		char pool_name[ODP_POOL_NAME_LEN];
 	} master;
 	struct {
 		/* offset from shared memory block start
 		 * to pool_mdata_addr in remote process.
-		 * (linux-generic pool specific) */
+		 * (odp-linux pool specific) */
 		size_t mdata_offset;
 		char pool_name[ODP_POOL_NAME_LEN];
 	} slave;
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
index f8d1dfe5c..3fc2d6ab3 100644
--- a/platform/linux-generic/odp_impl.c
+++ b/platform/linux-generic/odp_impl.c
@@ -22,7 +22,7 @@ extern "C" {
 
 #define ODP_VERSION_IMPL 0
 #define ODP_VERSION_IMPL_STR \
-	ODP_VERSION_TO_STR(PLATFORM) " " \
+	ODP_VERSION_TO_STR(IMPLEMENTATION_NAME) " " \
 	ODP_VERSION_TO_STR(ODP_VERSION_API_GENERATION) "." \
 	ODP_VERSION_TO_STR(ODP_VERSION_API_MAJOR) "." \
 	ODP_VERSION_TO_STR(ODP_VERSION_API_MINOR) "-" \
@@ -33,7 +33,7 @@ extern "C" {
 	ODP_VERSION_TO_STR(GIT_HASH)
 
 #define ODP_VERSION_IMPL_NAME \
-	ODP_VERSION_TO_STR(PLATFORM)
+	ODP_VERSION_TO_STR(IMPLEMENTATION_NAME)
 
 const char *odp_version_impl_str(void)
 {
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index 8dde40460..d590901c3 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -376,7 +376,7 @@ void *odp_packet_offset(odp_packet_t pkt, uint32_t offset, uint32_t *len,
 	return addr;
 }
 
-/* This function is a no-op in linux-generic */
+/* This function is a no-op */
 void odp_packet_prefetch(odp_packet_t pkt ODP_UNUSED,
 			 uint32_t offset ODP_UNUSED,
 			 uint32_t len ODP_UNUSED)
diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
index 3ac32ef8f..7c2a077ba 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -930,7 +930,7 @@ static int schedule_thr_rem(odp_schedule_group_t group, int thr)
 	return 0;
 }
 
-/* This function is a no-op in linux-generic */
+/* This function is a no-op */
 void odp_schedule_prefetch(int num ODP_UNUSED)
 {
 }
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index b8a075cd1..8508824e7 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -371,7 +371,7 @@ static int _ipc_slave_start(pktio_entry_t *pktio_entry)
 					     pinfo->master.mdata_offset;
 	pktio_entry->s.ipc.pkt_size = pinfo->master.shm_pkt_size;
 
-	/* @todo: to simplify in linux-generic implementation we create pool for
+	/* @todo: to simplify in odp-linux implementation we create pool for
 	 * packets from IPC queue. On receive implementation copies packets to
 	 * that pool. Later we can try to reuse original pool without packets
 	 * copying. (pkt refcounts needs to be implemented).
diff --git a/platform/linux-generic/test/pktio_ipc/ipc_common.c b/platform/linux-generic/test/pktio_ipc/ipc_common.c
index 34d26324b..2ee326e28 100644
--- a/platform/linux-generic/test/pktio_ipc/ipc_common.c
+++ b/platform/linux-generic/test/pktio_ipc/ipc_common.c
@@ -150,7 +150,7 @@ void usage(char *progname)
 	       "Usage: %s OPTIONS\n"
 	       "  E.g. -n ipc_name_space %s -t seconds\n"
 	       "\n"
-	       "OpenDataPlane linux-generic ipc test application.\n"
+	       "OpenDataPlane odp-linux ipc test application.\n"
 	       "\n"
 		"Mandatory OPTIONS:\n"
 	       "  -n, --ns           IPC name space ID /dev/shm/odp-<ns>-objname.\n"
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index e38e6f8b3..2ceee74ff 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -1031,7 +1031,7 @@ static void usage(char *progname)
 	       " environment variables: ODP_PKTIO_DISABLE_NETMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMAP\n"
 	       "                        ODP_PKTIO_DISABLE_SOCKET_MMSG\n"
-	       " can be used to advanced pkt I/O selection for linux-generic\n"
+	       " can be used to advanced pkt I/O selection for odp-linux\n"
 	       "\n", NO_PATH(progname), NO_PATH(progname), MAX_PKTIOS
 	    );
 }