Merge pull request #425 from jphickey/fix-424-add-eds

Fix #424, Add EDS

CMakeLists.txt

@@ -14,11 +14,16 @@ set(APP_SRC_FILES
   fsw/src/cf_codec.c
   fsw/src/cf_cmd.c
   fsw/src/cf_crc.c
-  fsw/src/cf_dispatch.c
   fsw/src/cf_timer.c
   fsw/src/cf_utils.c
 )
 
+if (CFE_EDS_ENABLED_BUILD)
+  list(APPEND APP_SRC_FILES fsw/src/cf_eds_dispatch.c)
+else()
+  list(APPEND APP_SRC_FILES fsw/src/cf_dispatch.c)
+endif()
+
 # Create the app module
 add_cfe_app(cf ${APP_SRC_FILES})
 

config/default_cf_extern_typedefs.h

@@ -29,6 +29,28 @@
 /* constants such as CF_FILENAME_MAX_LEN are in mission_cfg.h */
 #include "cf_mission_cfg.h"
 
+#ifdef CFE_EDS_ENABLED_BUILD
+
+#include "cf_eds_typedefs.h"
+
+typedef CF_QueueIdx_Enum_t CF_QueueIdx_t;
+#define CF_QueueIdx_NUM       (1 + CF_QueueIdx_Enum_t_MAX)
+#define CF_GetSet_ValueID_MAX (1 + CF_GetSet_ValueID_Enum_t_MAX)
+
+typedef CF_EntityId_Atom_t       CF_EntityId_t;
+typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;
+
+typedef CF_CFDP_Enum_t           CF_CFDP_Class_t;
+typedef CF_GetSet_ValueID_Enum_t CF_GetSet_ValueID_t;
+
+typedef BASE_TYPES_PathName_String_t CF_PathName_t;
+typedef BASE_TYPES_FileName_String_t CF_FileName_t;
+
+#define CF_FILENAME_MAX_NAME ((int)sizeof(CF_FileName_t))
+#define CF_FILENAME_MAX_LEN  ((int)sizeof(CF_PathName_t))
+
+#else
+
 /**
  * @brief Values for CFDP file transfer class
  *
@@ -113,4 +135,6 @@ typedef uint32 CF_EntityId_t;
  */
 typedef uint32 CF_TransactionSeq_t;
 
+#endif
+
 #endif /* CF_EXTERN_TYPEDEFS_H */