fix nasa#503 - strawman for CCB consideration, moved CFE_TBL_LoadFrom…

…File code into CFE_TBL_Load

fsw/cfe-core/src/inc/cfe_error.h

@@ -1287,6 +1287,15 @@
 #define CFE_TBL_MESSAGE_ERROR           ((int32)0xcc00002a)
 
 
+/** TODO: document */
+#define CFE_TBL_ERR_SHORT_FILE          ((int32)0xcc00002b)
+
+/** TODO: document */
+#define CFE_TBL_ERR_OPEN                ((int32)0xcc00002c)
+
+/** TODO: document */
+#define CFE_TBL_ERR_ACCESS              ((int32)0xcc00002d)
+
 /**
 **  Current version of cFE does not have the function or the feature
 **  of the function implemented.  This could be due to either an early

fsw/cfe-core/src/inc/cfe_tbl_events.h

@@ -46,7 +46,7 @@
 ** and when you're done adding, set this to the highest EID you used. It may
 ** be worthwhile to, on occasion, re-number the EID's to put them back in order.
 */
-#define CFE_TBL_MAX_EID                         98
+#define CFE_TBL_MAX_EID                         105
 
 /******************* Macro Definitions ***********************/
 /*
@@ -940,19 +940,8 @@
 **/
 #define CFE_TBL_UNREGISTER_ERR_EID             92  
 
-/** \brief <tt> '\%s Failed to Load '\%s' from \%s, Status=0x\%08X"  </tt>
-**  \event <tt> '\%s Failed to Load '\%s' from \%s, Status=0x\%08X"  </tt>
-**
-**  \par Type: ERROR
-**
-**  \par Cause:
-**
-**  This event message is generated when an Application calls #CFE_TBL_Load unsuccessfully.
-**
-**  The \c Status field of the Event Message can be used to identify the reason for the failure
-**  by looking it up in the cfe_error.h file
-**/
-#define CFE_TBL_LOAD_ERR_EID                   93  
+/** TODO: document */
+#define CFE_TBL_LOAD_VAL_ERR_EID                93
 
 /** \brief <tt> '\%s Failed to Load '\%s' (Invalid Source Type)"  </tt>
 **  \event <tt> '\%s Failed to Load '\%s' (Invalid Source Type)"  </tt>
@@ -1052,6 +1041,44 @@
 **/
 #define CFE_TBL_PROCESSOR_ID_ERR_EID           98  
 
+/** \brief <tt> Attempted to load Dump Only Tbl '%s' </tt>
+**  \event <tt> Attempted to load Dump Only Tbl '%s' </tt>
+**
+**  \par Type: ERROR
+**
+**  \par Cause:
+**
+**  This event message is generated when an application attempts to load a dump-only table.
+**/
+#define CFE_TBL_LOAD_DUMPONLY_ERR_EID          99
+
+/** \brief <tt> Load already in progress for '%s' </tt>
+**  \event <tt> Load already in progress for '%s' </tt>
+**
+**  \par Type: ERROR
+**
+**  \par Cause:
+**
+**  This event message is generated when an application attempts to load a table already
+**  in progress. Likely due to a race condition.
+**/
+#define CFE_TBL_LOAD_IN_PROGRESS_ERR_EID       100
+
+/** TODO: document */
+#define CFE_TBL_LOAD_SRC_TYPE_ERR_EID          101
+
+/** TODO: document */
+#define CFE_TBL_LOAD_FILENAME_LONG_ERR_EID     102
+
+/** TODO: document */
+#define CFE_TBL_LOAD_SHORT_FILE_ERR_EID        103
+
+/** TODO: document */
+#define CFE_TBL_LOAD_TBLNAME_MISMATCH_ERR_EID  104
+
+/** TODO: document */
+#define CFE_TBL_HANDLE_ACCESS_ERR_EID          105
+
 /** \} */