CF -> CFDP file rename complete

Author: Brian-Campuzano

Svc/Ccsds/CfdpManager/CMakeLists.txt

@@ -17,14 +17,14 @@ register_fprime_library(
         "${CMAKE_CURRENT_LIST_DIR}/CfdpCfg.fpp"
         SOURCES
         "${CMAKE_CURRENT_LIST_DIR}/CfdpManager.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_codec.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_cfdp.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_cfdp_r.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_cfdp_s.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_chunk.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_clist.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_utils.cpp"
-        "${CMAKE_CURRENT_LIST_DIR}/cf_cfdp_dispatch.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpEngine.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpCodec.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpRx.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpTx.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpChunk.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpClist.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpUtils.cpp"
+        "${CMAKE_CURRENT_LIST_DIR}/CfdpDispatch.cpp"
         "${CMAKE_CURRENT_LIST_DIR}/CfeStubs.hpp"
         "${CMAKE_CURRENT_LIST_DIR}/CfdpTimer.cpp"
         # TODO This should be moved to the F' config directory

Svc/Ccsds/CfdpManager/CfdpChunk.cpp

@@ -1,41 +1,44 @@
-/************************************************************************
- * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
- * Application version 3.0.0”
- *
- * Copyright (c) 2019 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
- *
- *  The CF Application chunks (sparse gap tracking) logic file
- *
- *  This class handles the complexity of sparse gap tracking so that
- *  the CFDP engine doesn't need to worry about it. Information is given
- *  to the class and when needed calculations are made internally to
- *  help the engine build NAK packets. Received NAK segment requests
- *  are stored in this class as well and used for re-transmit processing.
- *
- *  This is intended to be mostly a generic purpose class used by CF.
- */
+// ======================================================================
+// \title  CfdpChunk.cpp
+// \brief  CFDP chunks (sparse gap tracking) logic file
+//
+// This file is a port of the cf_chunks.cpp file from the 
+// NASA Core Flight System (cFS) CFDP (CF) Application,
+// version 3.0.0, adapted for use within the F-Prime (F') framework.
+//
+// This class handles the complexity of sparse gap tracking so that
+// the CFDP engine doesn't need to worry about it. Information is given
+// to the class and when needed calculations are made internally to
+// help the engine build NAK packets. Received NAK segment requests
+// are stored in this class as well and used for re-transmit processing.
+// 
+// ======================================================================
+//
+// NASA Docket No. GSC-18,447-1
+//
+// Copyright (c) 2019 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.
+//
+// ======================================================================
 
 #include <string.h>
 
 #include <Fw/Types/Assert.hpp>
 
-#include "cf_chunk.hpp"
+#include "CfdpChunk.hpp"
 
 namespace Svc {
 namespace Ccsds {

Svc/Ccsds/CfdpManager/CfdpChunk.hpp

@@ -1,30 +1,35 @@
-/************************************************************************
- * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
- * Application version 3.0.0”
- *
- * Copyright (c) 2019 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.
- ************************************************************************/
+// ======================================================================
+// \title  CfdpChunks.hpp
+// \brief  CFDP chunks (spare gap tracking) header file
+//
+// This file is a port of the cf_chunks.hpp file from the 
+// NASA Core Flight System (cFS) CFDP (CF) Application,
+// version 3.0.0, adapted for use within the F-Prime (F') framework.
+//
+// ======================================================================
+//
+// NASA Docket No. GSC-18,447-1
+//
+// Copyright (c) 2019 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
- *
- *  The CF Application chunks (spare gap tracking) header file
- */
-
-#ifndef CF_CHUNK_HPP
-#define CF_CHUNK_HPP
+#ifndef CFDP_CHUNK_HPP
+#define CFDP_CHUNK_HPP
 
 #include <Fw/FPrimeBasicTypes.hpp>
 #include <Svc/Ccsds/CfdpManager/CfdpStatusEnumAc.hpp>
@@ -317,4 +322,4 @@ void CF_Chunks_Insert(CF_ChunkList_t *chunks, CF_ChunkIdx_t i, const CF_Chunk_t
 }  // namespace Ccsds
 }  // namespace Svc
 
-#endif /* !CF_CHUNK_HPP */
+#endif /* !CFDP_CHUNK_HPP */

Svc/Ccsds/CfdpManager/CfdpClist.cpp

@@ -1,34 +1,37 @@
-/************************************************************************
- * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
- * Application version 3.0.0”
- *
- * Copyright (c) 2019 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
- *
- *  The CF Application circular list definition source file
- *
- *  This is a circular doubly-linked list implementation. It is used for
- *  all data structures in CF.
- *
- *  This file is intended to be a generic class that can be used in other apps.
- */
-
-#include "cf_clist.hpp"
+// ======================================================================
+// \title  CfdpClist.cpp
+// \brief  CFDP circular list definition source file
+//
+// This file is a port of the cf_clist.cpp file from the 
+// NASA Core Flight System (cFS) CFDP (CF) Application,
+// version 3.0.0, adapted for use within the F-Prime (F') framework.
+//
+// This is a circular doubly-linked list implementation. It is used for
+// multiple data structures in CFDP.
+// 
+// ======================================================================
+//
+// NASA Docket No. GSC-18,447-1
+//
+// Copyright (c) 2019 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.
+//
+// ======================================================================
+
+#include "CfdpClist.hpp"
 
 #include <Fw/Types/Assert.hpp>
 

Svc/Ccsds/CfdpManager/CfdpClist.hpp

@@ -1,36 +1,40 @@
-/************************************************************************
- * NASA Docket No. GSC-18,447-1, and identified as “CFS CFDP (CF)
- * Application version 3.0.0”
- *
- * Copyright (c) 2019 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
- *
- * The CF Application circular list header file
- */
-
-#ifndef CF_CLIST_HPP
-#define CF_CLIST_HPP
+// ======================================================================
+// \title  CfdpClist.hpp
+// \brief  CFDP circular list header file
+//
+// This file is a port of the cf_clist.hpp file from the 
+// NASA Core Flight System (cFS) CFDP (CF) Application,
+// version 3.0.0, adapted for use within the F-Prime (F') framework.
+//
+// ======================================================================
+//
+// NASA Docket No. GSC-18,447-1
+//
+// Copyright (c) 2019 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.
+//
+// ======================================================================
+
+#ifndef CFDP_CLIST_HPP
+#define CFDP_CLIST_HPP
 
 #include <cstddef>
 #include <stddef.h>
 #include <stdbool.h>
 
-
 namespace Svc {
 namespace Ccsds {
 
@@ -194,4 +198,4 @@ void CF_CList_Traverse_R(CF_CListNode_t *end, CF_CListFn_t fn, void *context);
 }  // namespace Ccsds
 }  // namespace Svc
 
-#endif /* !CF_CLIST_HPP */
+#endif /* !CFDP_CLIST_HPP */