[Cellular Library] Align folder structure with other library. (#38)

* [Cellular Library] Fix build warning message in unit test * [Cellular Library] Correct memory estimation. * [Cellular Library] The changes for reorg folder structure. * [Cellular Library] Changes for memory estimation and docs * [Cellular Library] Move structure _cellularCommContext from cellular_platform.h to cellular_pktio_utest.c * [Cellular Library] Prevent wrong return status due to null paramter. * Update test/cbmc/proofs/Cellular_ATGetNextTok/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATStrtoi/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_CommonCleanup/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/_Cellular_GetSocketData/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATStrDup/Makefile Co-authored-by: Paul Bartell <[email protected]> * Update test/cbmc/proofs/Cellular_ATStrStartWith/Makefile Co-authored-by: Paul Bartell <[email protected]> * [Cellular Library] Add .gitattribute to prevent CRLF from committing. Co-authored-by: Paul Bartell <[email protected]>
FreeRTOS · Sep 8, 2021 · cefe8c6 · cefe8c6
1 parent 2ca3253
commit cefe8c6
Show file tree

Hide file tree

Showing 92 changed files with 215 additions and 257 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,10 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.c text
+*.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.sln text eol=lf
diff --git a/.github/memory_statistics_config.json b/.github/memory_statistics_config.json
@@ -1,18 +1,19 @@
 {
     "lib_name" : "cellularLibrary",
     "src": [
-        "common/src/cellular_3gpp_api.c",
-        "common/src/cellular_3gpp_urc_handler.c",
-        "common/src/cellular_at_core.c",
-        "common/src/cellular_common_api.c",
-        "common/src/cellular_common.c",
-        "common/src/cellular_pkthandler.c",
-        "common/src/cellular_pktio.c"
+        "source/cellular_3gpp_api.c",
+        "source/cellular_3gpp_urc_handler.c",
+        "source/cellular_at_core.c",
+        "source/cellular_common_api.c",
+        "source/cellular_common.c",
+        "source/cellular_pkthandler.c",
+        "source/cellular_pktio.c"
     ],
     "include": [
-        "include",
-        "common/include",
-        "common/include/private",
+        "source/include",
+        "source/include/common",
+        "source/include/private",
+        "source/interface",
         "test/unit-test"
     ],
     "compiler_flags": [

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -43,7 +43,6 @@ jobs:
         uses: FreeRTOS/CI-CD-Github-Actions/complexity@main
         with:
           path: ./
-          source_path: common
   doxygen:
     runs-on: ubuntu-latest
     steps:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
@@ -892,8 +892,9 @@ WARN_LOGFILE           =
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = ./docs/doxygen \
-                         ./include \
-                         ./common/include
+                         ./source/include \
+                         ./source/include/common \
+                         ./source/interface
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -973,7 +974,8 @@ EXCLUDE_SYMBOLS        =
 # command).
 
 EXAMPLE_PATH           = docs/doxygen/include \
-                         common/include
+                         ./source/include \
+                         ./source/include/common \
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and

diff --git a/common/src/cellular_3gpp_api.c → source/cellular_3gpp_api.c b/common/src/cellular_3gpp_api.c → source/cellular_3gpp_api.c
diff --git a/common/src/cellular_3gpp_urc_handler.c → source/cellular_3gpp_urc_handler.c b/common/src/cellular_3gpp_urc_handler.c → source/cellular_3gpp_urc_handler.c
diff --git a/common/src/cellular_at_core.c → source/cellular_at_core.c b/common/src/cellular_at_core.c → source/cellular_at_core.c
diff --git a/common/src/cellular_common.c → source/cellular_common.c b/common/src/cellular_common.c → source/cellular_common.c
diff --git a/common/src/cellular_common_api.c → source/cellular_common_api.c b/common/src/cellular_common_api.c → source/cellular_common_api.c
diff --git a/common/src/cellular_pkthandler.c → source/cellular_pkthandler.c b/common/src/cellular_pkthandler.c → source/cellular_pkthandler.c
diff --git a/common/src/cellular_pktio.c → source/cellular_pktio.c b/common/src/cellular_pktio.c → source/cellular_pktio.c
@@ -419,7 +419,7 @@ static _atRespType_t _getMsgType( const CellularContext_t * pContext,
         /* Check if prefix exist in pLine. */
         ( void ) Cellular_ATIsPrefixPresent( pLine, &inputWithPrefix );
 
-        if( inputWithPrefix == true )
+        if( ( inputWithPrefix == true ) && ( pRespPrefix != NULL ) )
         {
             /* Check if SRC prefix exist in pLine. */
             atStatus = Cellular_ATStrStartWith( pLine, pRespPrefix, &inputWithSrcPrefix );

diff --git a/include/cellular_api.h → source/include/cellular_api.h b/include/cellular_api.h → source/include/cellular_api.h
diff --git a/include/cellular_config_defaults.h → source/include/cellular_config_defaults.h b/include/cellular_config_defaults.h → source/include/cellular_config_defaults.h
diff --git a/include/cellular_types.h → source/include/cellular_types.h b/include/cellular_types.h → source/include/cellular_types.h
diff --git a/common/include/cellular_at_core.h → source/include/common/cellular_at_core.h b/common/include/cellular_at_core.h → source/include/common/cellular_at_core.h
diff --git a/common/include/cellular_common.h → source/include/common/cellular_common.h b/common/include/cellular_common.h → source/include/common/cellular_common.h
diff --git a/common/include/cellular_common_api.h → source/include/common/cellular_common_api.h b/common/include/cellular_common_api.h → source/include/common/cellular_common_api.h
diff --git a/common/include/cellular_common_portable.h → ...include/common/cellular_common_portable.h b/common/include/cellular_common_portable.h → ...include/common/cellular_common_portable.h
diff --git a/...nclude/private/cellular_common_internal.h → ...nclude/private/cellular_common_internal.h b/...nclude/private/cellular_common_internal.h → ...nclude/private/cellular_common_internal.h
diff --git a/common/include/private/cellular_internal.h → source/include/private/cellular_internal.h b/common/include/private/cellular_internal.h → source/include/private/cellular_internal.h
diff --git a/...de/private/cellular_pkthandler_internal.h → ...de/private/cellular_pkthandler_internal.h b/...de/private/cellular_pkthandler_internal.h → ...de/private/cellular_pkthandler_internal.h
diff --git a/...include/private/cellular_pktio_internal.h → ...include/private/cellular_pktio_internal.h b/...include/private/cellular_pktio_internal.h → ...include/private/cellular_pktio_internal.h
diff --git a/include/cellular_comm_interface.h → source/interface/cellular_comm_interface.h b/include/cellular_comm_interface.h → source/interface/cellular_comm_interface.h
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -32,10 +32,11 @@ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
 # ===================================== Coverity Analysis Configuration =================================================
 
 # Set the source path and include path
-set( CELLULAR_COMMON_SOURCE ${MODULE_ROOT_DIR}/common/src )
-set( CELLULAR_INCLUDE_DIRS ${MODULE_ROOT_DIR}/include )
-set( CELLULAR_COMMON_INCLUDE_DIRS ${MODULE_ROOT_DIR}/common/include )
-set( CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS ${MODULE_ROOT_DIR}/common/include/private )
+set( CELLULAR_COMMON_SOURCE ${MODULE_ROOT_DIR}/source )
+set( CELLULAR_INCLUDE_DIRS ${CELLULAR_COMMON_SOURCE}/include )
+set( CELLULAR_COMMON_INCLUDE_DIRS ${CELLULAR_INCLUDE_DIRS}/common )
+set( CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS ${CELLULAR_INCLUDE_DIRS}/private )
+set( CELLULAR_INTERFACE_INCLUDE_DIRS ${CELLULAR_COMMON_SOURCE}/interface )
 set( CELLULAR_TEST_DIRS ${MODULE_ROOT_DIR}/test/unit-test )
 
 # Target for Coverity analysis that builds the library.
@@ -52,7 +53,7 @@ add_library( coverity_analysis
 target_compile_definitions( coverity_analysis PUBLIC CELLULAR_DO_NOT_USE_CUSTOM_CONFIG=1 )
 
 # Cellular include path.
-target_include_directories( coverity_analysis PUBLIC ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_INCLUDE_DIRS} ${CELLULAR_TEST_DIRS})
+target_include_directories( coverity_analysis PUBLIC ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_INCLUDE_DIRS} ${CELLULAR_INTERFACE_INCLUDE_DIRS} ${CELLULAR_TEST_DIRS})
 
 # Cellular private include path.
 target_include_directories( coverity_analysis PRIVATE ${CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS} )

diff --git a/test/cbmc/proofs/Cellular_ATGetNextTok/Makefile b/test/cbmc/proofs/Cellular_ATGetNextTok/Makefile
@@ -34,6 +34,6 @@ REMOVE_FUNCTION_BODY += Cellular_ATGetSpecificNextTok
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile b/test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile
@@ -39,7 +39,7 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtok.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile b/test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile b/test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile
@@ -41,6 +41,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile b/test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile b/test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile
@@ -38,6 +38,6 @@ UNWINDSET += Cellular_ATRemoveLeadingWhiteSpaces.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile b/test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile b/test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile
@@ -37,6 +37,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATStrDup/Makefile b/test/cbmc/proofs/Cellular_ATStrDup/Makefile
@@ -39,7 +39,7 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtok.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATStrStartWith/Makefile b/test/cbmc/proofs/Cellular_ATStrStartWith/Makefile
@@ -39,6 +39,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATStrtoi/Makefile b/test/cbmc/proofs/Cellular_ATStrtoi/Makefile
@@ -37,7 +37,7 @@ UNWINDSET += strtol.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 PROJECT_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtol.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile b/test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile
@@ -43,6 +43,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile b/test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile
@@ -30,7 +30,7 @@ INCLUDES +=
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonCleanup/Makefile b/test/cbmc/proofs/Cellular_CommonCleanup/Makefile
@@ -38,7 +38,7 @@ UNWINDSET += __CPROVER_file_local_cellular_common_c__Cellular_FreeContext.0:$(CB
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
 
-include ../Makefile.common
+include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonCreateSocket/Makefile b/test/cbmc/proofs/Cellular_CommonCreateSocket/Makefile
@@ -41,7 +41,7 @@ UNWINDSET += harness.0:$(CBMC_MAX_BUFSIZE)
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
 
 include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonGetEidrxSettings/Makefile b/test/cbmc/proofs/Cellular_CommonGetEidrxSettings/Makefile
@@ -30,8 +30,8 @@ INCLUDES +=
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
 
 include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonGetIPAddress/Makefile b/test/cbmc/proofs/Cellular_CommonGetIPAddress/Makefile
@@ -30,8 +30,8 @@ INCLUDES +=
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
 
 include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonGetModemInfo/Makefile b/test/cbmc/proofs/Cellular_CommonGetModemInfo/Makefile
@@ -30,8 +30,8 @@ INCLUDES +=
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
 
 include ../Makefile.common
diff --git a/test/cbmc/proofs/Cellular_CommonGetNetworkTime/Makefile b/test/cbmc/proofs/Cellular_CommonGetNetworkTime/Makefile
@@ -30,8 +30,8 @@ INCLUDES +=
 PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
 PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
-PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
+PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
 
 include ../Makefile.common