Merge pull request #480 from jphickey/fix-435-add-hold

Fix #435, simplify state machines and add holdover

Author: dzbaker

config/default_cf_extern_typedefs.h

@@ -78,7 +78,7 @@ typedef enum
     CF_QueueIdx_HIST      = 4,
     CF_QueueIdx_HIST_FREE = 5,
     CF_QueueIdx_FREE      = 6,
-    CF_QueueIdx_NUM       = 7,
+    CF_QueueIdx_NUM       = 7
 } CF_QueueIdx_t;
 
 /**

config/default_cf_internal_cfg.h

@@ -16,24 +16,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ************************************************************************/
-/************************************************************************
- * NASA Docket No. GSC-18,920-1, and identified as “Core Flight
- * System (cFS) Health & Safety (CF) Application version 2.4.1”
- *
- * Copyright (c) 2021 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may
- * not use this file except in compliance with the License. You may obtain
- * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- ************************************************************************/
 
 /**
  * @file

config/default_cf_tbldefs.h

@@ -78,7 +78,6 @@ typedef struct CF_ChannelConfig
     char  move_dir[OS_MAX_PATH_LEN]; /**< \brief Move directory if not empty */
 } CF_ChannelConfig_t;
 
-
 /*
  * Previously, the entire definition of the CF table was in this file, now it is split.
  * For backward compatibility with existing CF table definitions, include the other part here.

config/default_cf_tblstruct.h

@@ -48,9 +48,9 @@ typedef struct CF_ConfigTable
 
     CF_ChannelConfig_t chan[CF_NUM_CHANNELS]; /**< \brief Channel configuration */
 
-    uint16 outgoing_file_chunk_size;    /**< \brief maximum size of outgoing file data chunk in a PDU.
-                                         *   Limited by CF_MAX_PDU_SIZE minus the PDU header(s) */
-    char tmp_dir[CF_FILENAME_MAX_PATH]; /**< \brief directory to put temp files */
+    uint16 outgoing_file_chunk_size;     /**< \brief maximum size of outgoing file data chunk in a PDU.
+                                          *   Limited by CF_MAX_PDU_SIZE minus the PDU header(s) */
+    char tmp_dir[CF_FILENAME_MAX_PATH];  /**< \brief directory to put temp files */
     char fail_dir[CF_FILENAME_MAX_PATH]; /**< \brief fail directory */
 } CF_ConfigTable_t;
 

fsw/inc/cf_events.h

@@ -490,6 +490,19 @@
  */
 #define CF_CFDP_CLOSE_ERR_EID (68)
 
+/**
+ * \brief CF No chunklist available
+ *
+ *  \par Type: ERROR
+ *
+ *  \par Cause:
+ *
+ *  Engine has aborted a transaction due to lack of an
+ *  available resource to track the chunks associated
+ *  with the file.
+ */
+#define CF_CFDP_NO_CHUNKLIST_AVAIL_EID 88
+
 /**************************************************************************
  * CF_CFDP_R event IDs - Engine receive
  */
@@ -710,6 +723,19 @@
  */
 #define CF_CFDP_R_INACT_TIMER_ERR_EID (88)
 
+/**
+ * \brief CF No chunklist available
+ *
+ *  \par Type: ERROR
+ *
+ *  \par Cause:
+ *
+ *  Engine has aborted a transaction due to lack of an
+ *  available resource to track the chunks associated
+ *  with the file.
+ */
+#define CF_CFDP_NO_CHUNKLIST_AVAIL_EID 88
+
 /**************************************************************************
  * CF_CFDP_S event IDs - Engine send
  */