From 27706c21b25e86e12ad72d7f5212112475b99caa Mon Sep 17 00:00:00 2001
From: Marcus Winter <marcus.winter.ext@siemens.com>
Date: Fri, 4 Mar 2016 09:56:29 +0100
Subject: [PATCH] base_c: created defines for version mtapi_c: added organization ids, used version defines from base_c to fill info structure

---
 base_c/include/embb/base/c/internal/cmake_config.h.in |  6 ++++++
 mtapi_c/include/embb/mtapi/c/mtapi.h                  | 11 +++++++++++
 mtapi_c/src/embb_mtapi_node_t.c                       |  7 +++++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/base_c/include/embb/base/c/internal/cmake_config.h.in b/base_c/include/embb/base/c/internal/cmake_config.h.in
index 21b3048..f86d3e6 100644
--- a/base_c/include/embb/base/c/internal/cmake_config.h.in
+++ b/base_c/include/embb/base/c/internal/cmake_config.h.in
@@ -53,4 +53,10 @@
  */
 #cmakedefine EMBB_PLATFORM_HAS_GLIB_CPU
 
+
+#define EMBB_BASE_VERSION_MAJOR ${EMBB_BASE_VERSION_MAJOR}
+#define EMBB_BASE_VERSION_MINOR ${EMBB_BASE_VERSION_MINOR}
+#define EMBB_BASE_VERSION_PATCH ${EMBB_BASE_VERSION_PATCH}
+
+
 #endif /* EMBB_BASE_INTERNAL_CMAKE_CONFIG_H_ */
diff --git a/mtapi_c/include/embb/mtapi/c/mtapi.h b/mtapi_c/include/embb/mtapi/c/mtapi.h
index a146def..0de84bb 100644
--- a/mtapi_c/include/embb/mtapi/c/mtapi.h
+++ b/mtapi_c/include/embb/mtapi/c/mtapi.h
@@ -250,6 +250,17 @@ extern "C" {
 #endif
 
 
+/* ---- MCA ORGANIZATION IDS ----------------------------------------------- */
+
+#define MCA_ORG_ID_PSI 0 /* PolyCore Software, Inc. */
+#define MCA_ORG_ID_FSL 1 /* Freescale, Inc. */
+#define MCA_ORG_ID_MGC 2 /* Mentor Graphics, Corp. */
+#define MCA_ORG_ID_ADI 3 /* Analog Devices */
+#define MCA_ORG_ID_SIE 4 /* Siemens */
+#define MCA_ORG_ID_EMB 5 /* EMB2 project */
+#define MCA_ORG_ID_TBD 6 /* TBD */
+
+
 /* ---- BASIC DEFINITIONS -------------------------------------------------- */
 
 /** marks input parameters */
diff --git a/mtapi_c/src/embb_mtapi_node_t.c b/mtapi_c/src/embb_mtapi_node_t.c
index 75acf4a..c0bf58c 100644
--- a/mtapi_c/src/embb_mtapi_node_t.c
+++ b/mtapi_c/src/embb_mtapi_node_t.c
@@ -39,6 +39,8 @@
 #include <embb_mtapi_scheduler_t.h>
 #include <embb_mtapi_attr.h>
 
+#include <embb/base/c/internal/cmake_config.h>
+
 
 static embb_mtapi_node_t* embb_mtapi_node_instance = NULL;
 
@@ -121,8 +123,9 @@ void mtapi_initialize(
         if (MTAPI_NULL != node->scheduler) {
           /* fill information structure */
           node->info.mtapi_version = 0x1000; // mtapi version 1.0
-          node->info.organization_id = 'LYH '; // siemens fcc prefix
-          node->info.implementation_version = 0x0003; // implementation version 0.3
+          node->info.organization_id = MCA_ORG_ID_EMB;
+          node->info.implementation_version =
+            EMBB_BASE_VERSION_MAJOR * 0x1000 + EMBB_BASE_VERSION_MINOR;
           node->info.number_of_domains = 1;
           node->info.number_of_nodes = 1;
           node->info.hardware_concurrency = embb_core_count_available();
--
libgit2 0.26.0