From cefe8c610311f8626c59e1fd01cf7e70e0b34a4e Mon Sep 17 00:00:00 2001 From: andysun2015 Date: Wed, 8 Sep 2021 10:45:51 +0800 Subject: [PATCH] [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 * Update test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATStrtoi/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_CommonCleanup/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/_Cellular_GetSocketData/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATStrDup/Makefile Co-authored-by: Paul Bartell * Update test/cbmc/proofs/Cellular_ATStrStartWith/Makefile Co-authored-by: Paul Bartell * [Cellular Library] Add .gitattribute to prevent CRLF from committing. Co-authored-by: Paul Bartell --- .gitattributes | 10 ++++ .github/memory_statistics_config.json | 21 +++---- .github/workflows/ci.yml | 1 - CONTRIBUTING.md | 59 ------------------- docs/doxygen/config.doxyfile | 8 ++- {common/src => source}/cellular_3gpp_api.c | 0 .../cellular_3gpp_urc_handler.c | 0 {common/src => source}/cellular_at_core.c | 0 {common/src => source}/cellular_common.c | 0 {common/src => source}/cellular_common_api.c | 0 {common/src => source}/cellular_pkthandler.c | 0 {common/src => source}/cellular_pktio.c | 2 +- {include => source/include}/cellular_api.h | 0 .../include}/cellular_config_defaults.h | 0 {include => source/include}/cellular_types.h | 0 .../include/common}/cellular_at_core.h | 0 .../include/common}/cellular_common.h | 0 .../include/common}/cellular_common_api.h | 0 .../common}/cellular_common_portable.h | 0 .../private/cellular_common_internal.h | 0 .../include/private/cellular_internal.h | 0 .../private/cellular_pkthandler_internal.h | 0 .../include/private/cellular_pktio_internal.h | 0 .../interface}/cellular_comm_interface.h | 0 test/CMakeLists.txt | 11 ++-- .../proofs/Cellular_ATGetNextTok/Makefile | 4 +- .../Cellular_ATGetSpecificNextTok/Makefile | 4 +- .../proofs/Cellular_ATHexStrToHex/Makefile | 4 +- .../Cellular_ATIsPrefixPresent/Makefile | 4 +- .../proofs/Cellular_ATIsStrDigit/Makefile | 4 +- .../Cellular_ATRemoveAllDoubleQuote/Makefile | 4 +- .../Cellular_ATRemoveAllWhiteSpaces/Makefile | 4 +- .../Makefile | 4 +- .../Makefile | 4 +- .../proofs/Cellular_ATRemovePrefix/Makefile | 4 +- .../Makefile | 4 +- test/cbmc/proofs/Cellular_ATStrDup/Makefile | 4 +- .../proofs/Cellular_ATStrStartWith/Makefile | 4 +- test/cbmc/proofs/Cellular_ATStrtoi/Makefile | 4 +- .../proofs/Cellular_ATcheckErrorCode/Makefile | 4 +- .../Cellular_CommonATCommandRaw/Makefile | 6 +- .../proofs/Cellular_CommonCleanup/Makefile | 6 +- .../Cellular_CommonCreateSocket/Makefile | 4 +- .../Cellular_CommonGetEidrxSettings/Makefile | 6 +- .../Cellular_CommonGetIPAddress/Makefile | 6 +- .../Cellular_CommonGetModemInfo/Makefile | 6 +- .../Cellular_CommonGetNetworkTime/Makefile | 6 +- .../Cellular_CommonGetPsmSettings/Makefile | 6 +- .../Makefile | 6 +- .../Cellular_CommonGetServiceStatus/Makefile | 6 +- .../Cellular_CommonGetSimCardInfo/Makefile | 6 +- .../Makefile | 6 +- test/cbmc/proofs/Cellular_CommonInit/Makefile | 4 +- .../Makefile | 6 +- .../Makefile | 6 +- .../Makefile | 6 +- .../Makefile | 6 +- .../Makefile | 6 +- .../cbmc/proofs/Cellular_CommonRfOff/Makefile | 6 +- test/cbmc/proofs/Cellular_CommonRfOn/Makefile | 6 +- .../Cellular_CommonSetEidrxSettings/Makefile | 6 +- .../Cellular_CommonSetPdnConfig/Makefile | 6 +- .../Cellular_CommonSetPsmSettings/Makefile | 6 +- .../Makefile | 6 +- .../Makefile | 6 +- .../Makefile | 6 +- .../Cellular_CommonSocketSetSockOpt/Makefile | 4 +- .../Cellular_CommonUrcProcessCereg/Makefile | 6 +- .../Cellular_CommonUrcProcessCgreg/Makefile | 6 +- .../Cellular_CommonUrcProcessCreg/Makefile | 6 +- test/cbmc/proofs/Makefile-project-defines | 7 ++- .../_Cellular_ComputeSignalBars/Makefile | 4 +- .../_Cellular_ConvertCsqSignalBer/Makefile | 4 +- .../_Cellular_ConvertCsqSignalRssi/Makefile | 4 +- .../proofs/_Cellular_GenericCallback/Makefile | 6 +- .../proofs/_Cellular_GetCurrentRat/Makefile | 4 +- .../_Cellular_GetModuleContext/Makefile | 4 +- .../proofs/_Cellular_GetSocketData/Makefile | 8 +-- .../proofs/_Cellular_IsValidSocket/Makefile | 4 +- .../cbmc/proofs/_Cellular_LibCleanup/Makefile | 6 +- .../_Cellular_ModemEventCallback/Makefile | 6 +- .../Makefile | 6 +- .../_Cellular_PdnEventCallback/Makefile | 6 +- .../_Cellular_RemoveSocketData/Makefile | 4 +- .../Makefile | 6 +- .../Makefile | 10 ++-- .../Makefile | 8 +-- .../Makefile | 6 +- .../_Cellular_TranslateAtCoreStatus/Makefile | 6 +- test/unit-test/CMakeLists.txt | 3 + test/unit-test/cellular_pktio_utest.c | 7 +++ test/unit-test/cellular_platform.h | 7 --- 92 files changed, 215 insertions(+), 257 deletions(-) create mode 100644 .gitattributes delete mode 100644 CONTRIBUTING.md rename {common/src => source}/cellular_3gpp_api.c (100%) rename {common/src => source}/cellular_3gpp_urc_handler.c (100%) rename {common/src => source}/cellular_at_core.c (100%) rename {common/src => source}/cellular_common.c (100%) rename {common/src => source}/cellular_common_api.c (100%) rename {common/src => source}/cellular_pkthandler.c (100%) rename {common/src => source}/cellular_pktio.c (99%) rename {include => source/include}/cellular_api.h (100%) rename {include => source/include}/cellular_config_defaults.h (100%) rename {include => source/include}/cellular_types.h (100%) rename {common/include => source/include/common}/cellular_at_core.h (100%) rename {common/include => source/include/common}/cellular_common.h (100%) rename {common/include => source/include/common}/cellular_common_api.h (100%) rename {common/include => source/include/common}/cellular_common_portable.h (100%) rename {common => source}/include/private/cellular_common_internal.h (100%) rename {common => source}/include/private/cellular_internal.h (100%) rename {common => source}/include/private/cellular_pkthandler_internal.h (100%) rename {common => source}/include/private/cellular_pktio_internal.h (100%) rename {include => source/interface}/cellular_comm_interface.h (100%) diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..0c6a360c --- /dev/null +++ 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 index 4930daf1..f7a7288f 100644 --- 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 index 35278a73..c79c7574 100644 --- 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 deleted file mode 100644 index c4b6a1c5..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,59 +0,0 @@ -# Contributing Guidelines - -Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional -documentation, we greatly value feedback and contributions from our community. - -Please read through this document before submitting any issues or pull requests to ensure we have all the necessary -information to effectively respond to your bug report or contribution. - - -## Reporting Bugs/Feature Requests - -We welcome you to use the GitHub issue tracker to report bugs or suggest features. - -When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already -reported the issue. Please try to include as much information as you can. Details like these are incredibly useful: - -* A reproducible test case or series of steps -* The version of our code being used -* Any modifications you've made relevant to the bug -* Anything unusual about your environment or deployment - - -## Contributing via Pull Requests -Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: - -1. You are working against the latest source on the *main* branch. -2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. -3. You open an issue to discuss any significant work - we would hate for your time to be wasted. - -To send us a pull request, please: - -1. Fork the repository. -2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change. -3. Ensure local tests pass. -4. Commit to your fork using clear commit messages. -5. Send us a pull request, answering any default questions in the pull request interface. -6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation. - -GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and -[creating a pull request](https://help.github.com/articles/creating-a-pull-request/). - - -## Finding contributions to work on -Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start. - - -## Code of Conduct -This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). -For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact -opensource-codeofconduct@amazon.com with any additional questions or comments. - - -## Security issue notifications -If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue. - - -## Licensing - -See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution. diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile index da8a77d6..53df889a 100644 --- 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 b/source/cellular_3gpp_api.c similarity index 100% rename from common/src/cellular_3gpp_api.c rename to source/cellular_3gpp_api.c diff --git a/common/src/cellular_3gpp_urc_handler.c b/source/cellular_3gpp_urc_handler.c similarity index 100% rename from common/src/cellular_3gpp_urc_handler.c rename to source/cellular_3gpp_urc_handler.c diff --git a/common/src/cellular_at_core.c b/source/cellular_at_core.c similarity index 100% rename from common/src/cellular_at_core.c rename to source/cellular_at_core.c diff --git a/common/src/cellular_common.c b/source/cellular_common.c similarity index 100% rename from common/src/cellular_common.c rename to source/cellular_common.c diff --git a/common/src/cellular_common_api.c b/source/cellular_common_api.c similarity index 100% rename from common/src/cellular_common_api.c rename to source/cellular_common_api.c diff --git a/common/src/cellular_pkthandler.c b/source/cellular_pkthandler.c similarity index 100% rename from common/src/cellular_pkthandler.c rename to source/cellular_pkthandler.c diff --git a/common/src/cellular_pktio.c b/source/cellular_pktio.c similarity index 99% rename from common/src/cellular_pktio.c rename to source/cellular_pktio.c index 11271972..ac01019c 100644 --- a/common/src/cellular_pktio.c +++ b/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 b/source/include/cellular_api.h similarity index 100% rename from include/cellular_api.h rename to source/include/cellular_api.h diff --git a/include/cellular_config_defaults.h b/source/include/cellular_config_defaults.h similarity index 100% rename from include/cellular_config_defaults.h rename to source/include/cellular_config_defaults.h diff --git a/include/cellular_types.h b/source/include/cellular_types.h similarity index 100% rename from include/cellular_types.h rename to source/include/cellular_types.h diff --git a/common/include/cellular_at_core.h b/source/include/common/cellular_at_core.h similarity index 100% rename from common/include/cellular_at_core.h rename to source/include/common/cellular_at_core.h diff --git a/common/include/cellular_common.h b/source/include/common/cellular_common.h similarity index 100% rename from common/include/cellular_common.h rename to source/include/common/cellular_common.h diff --git a/common/include/cellular_common_api.h b/source/include/common/cellular_common_api.h similarity index 100% rename from common/include/cellular_common_api.h rename to source/include/common/cellular_common_api.h diff --git a/common/include/cellular_common_portable.h b/source/include/common/cellular_common_portable.h similarity index 100% rename from common/include/cellular_common_portable.h rename to source/include/common/cellular_common_portable.h diff --git a/common/include/private/cellular_common_internal.h b/source/include/private/cellular_common_internal.h similarity index 100% rename from common/include/private/cellular_common_internal.h rename to source/include/private/cellular_common_internal.h diff --git a/common/include/private/cellular_internal.h b/source/include/private/cellular_internal.h similarity index 100% rename from common/include/private/cellular_internal.h rename to source/include/private/cellular_internal.h diff --git a/common/include/private/cellular_pkthandler_internal.h b/source/include/private/cellular_pkthandler_internal.h similarity index 100% rename from common/include/private/cellular_pkthandler_internal.h rename to source/include/private/cellular_pkthandler_internal.h diff --git a/common/include/private/cellular_pktio_internal.h b/source/include/private/cellular_pktio_internal.h similarity index 100% rename from common/include/private/cellular_pktio_internal.h rename to source/include/private/cellular_pktio_internal.h diff --git a/include/cellular_comm_interface.h b/source/interface/cellular_comm_interface.h similarity index 100% rename from include/cellular_comm_interface.h rename to source/interface/cellular_comm_interface.h diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 49fbe54d..3cef72f1 100644 --- 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 index 6c47baf1..3830547a 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile b/test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile index 451448a4..93959ec1 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile b/test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile index 07d517c9..6d823f7a 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile b/test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile index a0303579..a9282ce5 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile b/test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile index 4f7e7770..69f5f741 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile b/test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile index 05a16040..d5dbc6cc 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile index 8799fa2b..2b966431 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile index 4d4fc7a9..ae467499 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile b/test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile index 7ec2fa64..c328ff3a 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile b/test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile index 40c20842..6d9aa7ea 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile b/test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile index 705637d6..c7f586a5 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATStrDup/Makefile b/test/cbmc/proofs/Cellular_ATStrDup/Makefile index e1eb404c..91398d3e 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATStrStartWith/Makefile b/test/cbmc/proofs/Cellular_ATStrStartWith/Makefile index 64bc9684..708d6539 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATStrtoi/Makefile b/test/cbmc/proofs/Cellular_ATStrtoi/Makefile index 1ba0ae2a..9bbf9a2f 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile b/test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile index a5d82a8b..70f7bf11 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile b/test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile index 84b74fb8..9bf6c0f5 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonCleanup/Makefile b/test/cbmc/proofs/Cellular_CommonCleanup/Makefile index 3b4c67ab..d0408b20 100755 --- 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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonCreateSocket/Makefile b/test/cbmc/proofs/Cellular_CommonCreateSocket/Makefile index c1c326bd..d2b47bb6 100755 --- 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 index dee9d3c1..2e492525 100755 --- 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 index 79ab1bf4..64e1567f 100755 --- 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 index 4cc94cd4..f46b10c2 100755 --- 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 index 98cc3103..6aeeaf33 100755 --- 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 diff --git a/test/cbmc/proofs/Cellular_CommonGetPsmSettings/Makefile b/test/cbmc/proofs/Cellular_CommonGetPsmSettings/Makefile index 0f72ead1..1e44b0d8 100755 --- a/test/cbmc/proofs/Cellular_CommonGetPsmSettings/Makefile +++ b/test/cbmc/proofs/Cellular_CommonGetPsmSettings/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonGetRegisteredNetwork/Makefile b/test/cbmc/proofs/Cellular_CommonGetRegisteredNetwork/Makefile index 5351aa44..45fb8c17 100755 --- a/test/cbmc/proofs/Cellular_CommonGetRegisteredNetwork/Makefile +++ b/test/cbmc/proofs/Cellular_CommonGetRegisteredNetwork/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_CommonGetServiceStatus/Makefile b/test/cbmc/proofs/Cellular_CommonGetServiceStatus/Makefile index 6465650e..93ef185a 100755 --- a/test/cbmc/proofs/Cellular_CommonGetServiceStatus/Makefile +++ b/test/cbmc/proofs/Cellular_CommonGetServiceStatus/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonGetSimCardInfo/Makefile b/test/cbmc/proofs/Cellular_CommonGetSimCardInfo/Makefile index fc00ae86..abb47096 100755 --- a/test/cbmc/proofs/Cellular_CommonGetSimCardInfo/Makefile +++ b/test/cbmc/proofs/Cellular_CommonGetSimCardInfo/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonGetSimCardLockStatus/Makefile b/test/cbmc/proofs/Cellular_CommonGetSimCardLockStatus/Makefile index b4d35df5..aeb1d61e 100755 --- a/test/cbmc/proofs/Cellular_CommonGetSimCardLockStatus/Makefile +++ b/test/cbmc/proofs/Cellular_CommonGetSimCardLockStatus/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonInit/Makefile b/test/cbmc/proofs/Cellular_CommonInit/Makefile index 066884f1..e6271632 100755 --- a/test/cbmc/proofs/Cellular_CommonInit/Makefile +++ b/test/cbmc/proofs/Cellular_CommonInit/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 diff --git a/test/cbmc/proofs/Cellular_CommonRegisterModemEventCallback/Makefile b/test/cbmc/proofs/Cellular_CommonRegisterModemEventCallback/Makefile index b588d510..c4f68f14 100755 --- a/test/cbmc/proofs/Cellular_CommonRegisterModemEventCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRegisterModemEventCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonRegisterUrcGenericCallback/Makefile b/test/cbmc/proofs/Cellular_CommonRegisterUrcGenericCallback/Makefile index 1e3667dc..0f981a0e 100755 --- a/test/cbmc/proofs/Cellular_CommonRegisterUrcGenericCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRegisterUrcGenericCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonRegisterUrcNetworkRegistrationEventCallback/Makefile b/test/cbmc/proofs/Cellular_CommonRegisterUrcNetworkRegistrationEventCallback/Makefile index eea44754..d889c675 100755 --- a/test/cbmc/proofs/Cellular_CommonRegisterUrcNetworkRegistrationEventCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRegisterUrcNetworkRegistrationEventCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonRegisterUrcPdnEventCallback/Makefile b/test/cbmc/proofs/Cellular_CommonRegisterUrcPdnEventCallback/Makefile index 996b7d2f..a91087d0 100755 --- a/test/cbmc/proofs/Cellular_CommonRegisterUrcPdnEventCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRegisterUrcPdnEventCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonRegisterUrcSignalStrengthChangedCallback/Makefile b/test/cbmc/proofs/Cellular_CommonRegisterUrcSignalStrengthChangedCallback/Makefile index bfd0866a..d0ec43a5 100755 --- a/test/cbmc/proofs/Cellular_CommonRegisterUrcSignalStrengthChangedCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRegisterUrcSignalStrengthChangedCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonRfOff/Makefile b/test/cbmc/proofs/Cellular_CommonRfOff/Makefile index 2280aff2..a8a8b3e8 100755 --- a/test/cbmc/proofs/Cellular_CommonRfOff/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRfOff/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_CommonRfOn/Makefile b/test/cbmc/proofs/Cellular_CommonRfOn/Makefile index 26871b9b..17c1038b 100755 --- a/test/cbmc/proofs/Cellular_CommonRfOn/Makefile +++ b/test/cbmc/proofs/Cellular_CommonRfOn/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_CommonSetEidrxSettings/Makefile b/test/cbmc/proofs/Cellular_CommonSetEidrxSettings/Makefile index 2950b030..613b5b1d 100755 --- a/test/cbmc/proofs/Cellular_CommonSetEidrxSettings/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSetEidrxSettings/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_CommonSetPdnConfig/Makefile b/test/cbmc/proofs/Cellular_CommonSetPdnConfig/Makefile index b462ebe5..b2e25749 100755 --- a/test/cbmc/proofs/Cellular_CommonSetPdnConfig/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSetPdnConfig/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonSetPsmSettings/Makefile b/test/cbmc/proofs/Cellular_CommonSetPsmSettings/Makefile index a5e5ddc2..dc2a955c 100755 --- a/test/cbmc/proofs/Cellular_CommonSetPsmSettings/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSetPsmSettings/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_CommonSocketRegisterClosedCallback/Makefile b/test/cbmc/proofs/Cellular_CommonSocketRegisterClosedCallback/Makefile index eaa44aa2..a6967772 100755 --- a/test/cbmc/proofs/Cellular_CommonSocketRegisterClosedCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSocketRegisterClosedCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonSocketRegisterDataReadyCallback/Makefile b/test/cbmc/proofs/Cellular_CommonSocketRegisterDataReadyCallback/Makefile index 1dd601b1..310cc86b 100755 --- a/test/cbmc/proofs/Cellular_CommonSocketRegisterDataReadyCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSocketRegisterDataReadyCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonSocketRegisterSocketOpenCallback/Makefile b/test/cbmc/proofs/Cellular_CommonSocketRegisterSocketOpenCallback/Makefile index 313aa1a0..9af13958 100755 --- a/test/cbmc/proofs/Cellular_CommonSocketRegisterSocketOpenCallback/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSocketRegisterSocketOpenCallback/Makefile @@ -31,9 +31,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonSocketSetSockOpt/Makefile b/test/cbmc/proofs/Cellular_CommonSocketSetSockOpt/Makefile index b11ae535..331c9dd1 100755 --- a/test/cbmc/proofs/Cellular_CommonSocketSetSockOpt/Makefile +++ b/test/cbmc/proofs/Cellular_CommonSocketSetSockOpt/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_CommonUrcProcessCereg/Makefile b/test/cbmc/proofs/Cellular_CommonUrcProcessCereg/Makefile index 73a2c080..e615b096 100755 --- a/test/cbmc/proofs/Cellular_CommonUrcProcessCereg/Makefile +++ b/test/cbmc/proofs/Cellular_CommonUrcProcessCereg/Makefile @@ -48,9 +48,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonUrcProcessCgreg/Makefile b/test/cbmc/proofs/Cellular_CommonUrcProcessCgreg/Makefile index 1460641f..c5750747 100755 --- a/test/cbmc/proofs/Cellular_CommonUrcProcessCgreg/Makefile +++ b/test/cbmc/proofs/Cellular_CommonUrcProcessCgreg/Makefile @@ -48,9 +48,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Cellular_CommonUrcProcessCreg/Makefile b/test/cbmc/proofs/Cellular_CommonUrcProcessCreg/Makefile index 3a96cc1c..c3035a17 100755 --- a/test/cbmc/proofs/Cellular_CommonUrcProcessCreg/Makefile +++ b/test/cbmc/proofs/Cellular_CommonUrcProcessCreg/Makefile @@ -40,9 +40,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/Makefile-project-defines b/test/cbmc/proofs/Makefile-project-defines index 6a2b2308..348b8d8a 100644 --- a/test/cbmc/proofs/Makefile-project-defines +++ b/test/cbmc/proofs/Makefile-project-defines @@ -22,9 +22,10 @@ PROJECT_NAME = "FreeRTOS cellular" # Preprocessor include paths -I... INCLUDES += -I$(SRCDIR)/test/cbmc/include -INCLUDES += -I$(SRCDIR)/common/include -INCLUDES += -I$(SRCDIR)/common/include/private -INCLUDES += -I$(SRCDIR)/include +INCLUDES += -I$(SRCDIR)/source/include +INCLUDES += -I$(SRCDIR)/source/include/common +INCLUDES += -I$(SRCDIR)/source/include/private +INCLUDES += -I$(SRCDIR)/source/interface INCLUDES += -I$(SRCDIR)/source # Preprocessor definitions -D... diff --git a/test/cbmc/proofs/_Cellular_ComputeSignalBars/Makefile b/test/cbmc/proofs/_Cellular_ComputeSignalBars/Makefile index d05f1754..2e05c741 100755 --- a/test/cbmc/proofs/_Cellular_ComputeSignalBars/Makefile +++ b/test/cbmc/proofs/_Cellular_ComputeSignalBars/Makefile @@ -39,7 +39,7 @@ UNWINDSET += __CPROVER_file_local_cellular_common_c__getSignalBars.0:$(CBMC_MAX_ 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_ConvertCsqSignalBer/Makefile b/test/cbmc/proofs/_Cellular_ConvertCsqSignalBer/Makefile index 2cfe2614..6f3360d6 100755 --- a/test/cbmc/proofs/_Cellular_ConvertCsqSignalBer/Makefile +++ b/test/cbmc/proofs/_Cellular_ConvertCsqSignalBer/Makefile @@ -33,7 +33,7 @@ REMOVE_FUNCTION_BODY += _Cellular_CheckLibraryStatus 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_ConvertCsqSignalRssi/Makefile b/test/cbmc/proofs/_Cellular_ConvertCsqSignalRssi/Makefile index 1470fe3a..ad338ad2 100755 --- a/test/cbmc/proofs/_Cellular_ConvertCsqSignalRssi/Makefile +++ b/test/cbmc/proofs/_Cellular_ConvertCsqSignalRssi/Makefile @@ -33,7 +33,7 @@ REMOVE_FUNCTION_BODY += _Cellular_CheckLibraryStatus 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_GenericCallback/Makefile b/test/cbmc/proofs/_Cellular_GenericCallback/Makefile index 87e5fe83..f55898fc 100755 --- a/test/cbmc/proofs/_Cellular_GenericCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_GenericCallback/Makefile @@ -31,8 +31,8 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_GetCurrentRat/Makefile b/test/cbmc/proofs/_Cellular_GetCurrentRat/Makefile index 7da5dc79..b8f3897a 100755 --- a/test/cbmc/proofs/_Cellular_GetCurrentRat/Makefile +++ b/test/cbmc/proofs/_Cellular_GetCurrentRat/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 diff --git a/test/cbmc/proofs/_Cellular_GetModuleContext/Makefile b/test/cbmc/proofs/_Cellular_GetModuleContext/Makefile index 9318a1e9..05e29115 100755 --- a/test/cbmc/proofs/_Cellular_GetModuleContext/Makefile +++ b/test/cbmc/proofs/_Cellular_GetModuleContext/Makefile @@ -40,7 +40,7 @@ UNWINDSET += _Cellular_CreateSocketData.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_GetSocketData/Makefile b/test/cbmc/proofs/_Cellular_GetSocketData/Makefile index 82fbdd40..33dc0c49 100755 --- a/test/cbmc/proofs/_Cellular_GetSocketData/Makefile +++ b/test/cbmc/proofs/_Cellular_GetSocketData/Makefile @@ -38,8 +38,8 @@ UNWINDSET += allocateSocket.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)/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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_IsValidSocket/Makefile b/test/cbmc/proofs/_Cellular_IsValidSocket/Makefile index 280c6c0e..a58e83f9 100755 --- a/test/cbmc/proofs/_Cellular_IsValidSocket/Makefile +++ b/test/cbmc/proofs/_Cellular_IsValidSocket/Makefile @@ -40,7 +40,7 @@ UNWINDSET += _Cellular_CreateSocketData.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_LibCleanup/Makefile b/test/cbmc/proofs/_Cellular_LibCleanup/Makefile index c841a6d3..eabbcbad 100755 --- a/test/cbmc/proofs/_Cellular_LibCleanup/Makefile +++ b/test/cbmc/proofs/_Cellular_LibCleanup/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_ModemEventCallback/Makefile b/test/cbmc/proofs/_Cellular_ModemEventCallback/Makefile index 05a07a13..30e9fe7b 100755 --- a/test/cbmc/proofs/_Cellular_ModemEventCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_ModemEventCallback/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_NetworkRegistrationCallback/Makefile b/test/cbmc/proofs/_Cellular_NetworkRegistrationCallback/Makefile index bdb49e2f..3ace40cf 100755 --- a/test/cbmc/proofs/_Cellular_NetworkRegistrationCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_NetworkRegistrationCallback/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_PdnEventCallback/Makefile b/test/cbmc/proofs/_Cellular_PdnEventCallback/Makefile index b5f194d4..05fe6342 100755 --- a/test/cbmc/proofs/_Cellular_PdnEventCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_PdnEventCallback/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_RemoveSocketData/Makefile b/test/cbmc/proofs/_Cellular_RemoveSocketData/Makefile index 5ceec73b..ba46854c 100755 --- a/test/cbmc/proofs/_Cellular_RemoveSocketData/Makefile +++ b/test/cbmc/proofs/_Cellular_RemoveSocketData/Makefile @@ -42,7 +42,7 @@ UNWINDSET += _Cellular_RemoveSocketData.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_SignalStrengthChangedCallback/Makefile b/test/cbmc/proofs/_Cellular_SignalStrengthChangedCallback/Makefile index e68bd5c7..37ab6d5d 100755 --- a/test/cbmc/proofs/_Cellular_SignalStrengthChangedCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_SignalStrengthChangedCallback/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataRecvRequestWithCallback/Makefile b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataRecvRequestWithCallback/Makefile index a547b40c..2833c687 100755 --- a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataRecvRequestWithCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataRecvRequestWithCallback/Makefile @@ -41,9 +41,9 @@ UNWINDSET += __builtin___strncpy_chk.0:$(CBMC_MAX_BUFSIZE) PROJECT_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)/common/src/cellular_pkthandler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_pkthandler.c -include ../Makefile.common \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendRequestWithCallback/Makefile b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendRequestWithCallback/Makefile index fe2cf1ae..9d0b7079 100755 --- a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendRequestWithCallback/Makefile +++ b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendRequestWithCallback/Makefile @@ -42,8 +42,8 @@ UNWINDSET += __builtin___strncpy_chk.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)/common/src/cellular_pkthandler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_pkthandler.c -include ../Makefile.common \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendSuccessToken/Makefile b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendSuccessToken/Makefile index d36f51ec..a627efae 100755 --- a/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendSuccessToken/Makefile +++ b/test/cbmc/proofs/_Cellular_TimeoutAtcmdDataSendSuccessToken/Makefile @@ -35,7 +35,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 \ No newline at end of file +include ../Makefile.common diff --git a/test/cbmc/proofs/_Cellular_TranslateAtCoreStatus/Makefile b/test/cbmc/proofs/_Cellular_TranslateAtCoreStatus/Makefile index b931349e..1aa8275e 100755 --- a/test/cbmc/proofs/_Cellular_TranslateAtCoreStatus/Makefile +++ b/test/cbmc/proofs/_Cellular_TranslateAtCoreStatus/Makefile @@ -39,9 +39,9 @@ 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/strncpy.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_urc_handler.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c +PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_urc_handler.c include ../Makefile.common diff --git a/test/unit-test/CMakeLists.txt b/test/unit-test/CMakeLists.txt index 684c4c37..7c86f76d 100644 --- a/test/unit-test/CMakeLists.txt +++ b/test/unit-test/CMakeLists.txt @@ -17,6 +17,7 @@ list(APPEND mock_include_list ${CMAKE_CURRENT_LIST_DIR}/logging ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS} + ${CELLULAR_INTERFACE_INCLUDE_DIRS} ${CELLULAR_INCLUDE_DIRS} ) #list the definitions of your mocks to control what to be included @@ -40,6 +41,7 @@ list(APPEND real_include_directories . ${CMAKE_CURRENT_LIST_DIR}/logging ${CELLULAR_INCLUDE_DIRS} + ${CELLULAR_INTERFACE_INCLUDE_DIRS} ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS} ) @@ -51,6 +53,7 @@ list(APPEND test_include_directories . ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS} + ${CELLULAR_INTERFACE_INCLUDE_DIRS} ) # ============================= (end edit) =================================== diff --git a/test/unit-test/cellular_pktio_utest.c b/test/unit-test/cellular_pktio_utest.c index f6800356..4a006c48 100644 --- a/test/unit-test/cellular_pktio_utest.c +++ b/test/unit-test/cellular_pktio_utest.c @@ -71,6 +71,13 @@ #define MAX_QIRD_STRING_PREFIX_STRING ( 14U ) /* The max data prefix string is "+QIRD: 1460\r\n" */ +struct _cellularCommContext +{ + int test1; + int test2; + int test3; +}; + static uint16_t pktioEvtMask = 0x0000U; static uint16_t evtGroupCreate = 0x0001U; diff --git a/test/unit-test/cellular_platform.h b/test/unit-test/cellular_platform.h index 1ba227fd..f6822670 100644 --- a/test/unit-test/cellular_platform.h +++ b/test/unit-test/cellular_platform.h @@ -170,13 +170,6 @@ typedef struct PlatformMutex */ typedef TickType_t EventBits_t; -struct _cellularCommContext -{ - int test1; - int test2; - int test3; -}; - /*-----------------------------------------------------------*/ /**