Skip to content

Commit cefe8c6

Browse files
andysun2015paulbartell
andysun2015
and
paulbartell
authored
[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]>
1 parent 2ca3253 commit cefe8c6

File tree

92 files changed

+215
-257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+215
-257
lines changed

‎.gitattributes

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# Set the default behavior, in case people don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files you want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.c text
7+
*.h text
8+
9+
# Declare files that will always have CRLF line endings on checkout.
10+
*.sln text eol=lf

‎.github/memory_statistics_config.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"lib_name" : "cellularLibrary",
33
"src": [
4-
"common/src/cellular_3gpp_api.c",
5-
"common/src/cellular_3gpp_urc_handler.c",
6-
"common/src/cellular_at_core.c",
7-
"common/src/cellular_common_api.c",
8-
"common/src/cellular_common.c",
9-
"common/src/cellular_pkthandler.c",
10-
"common/src/cellular_pktio.c"
4+
"source/cellular_3gpp_api.c",
5+
"source/cellular_3gpp_urc_handler.c",
6+
"source/cellular_at_core.c",
7+
"source/cellular_common_api.c",
8+
"source/cellular_common.c",
9+
"source/cellular_pkthandler.c",
10+
"source/cellular_pktio.c"
1111
],
1212
"include": [
13-
"include",
14-
"common/include",
15-
"common/include/private",
13+
"source/include",
14+
"source/include/common",
15+
"source/include/private",
16+
"source/interface",
1617
"test/unit-test"
1718
],
1819
"compiler_flags": [

‎.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
uses: FreeRTOS/CI-CD-Github-Actions/complexity@main
4444
with:
4545
path: ./
46-
source_path: common
4746
doxygen:
4847
runs-on: ubuntu-latest
4948
steps:

‎CONTRIBUTING.md

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎docs/doxygen/config.doxyfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -892,8 +892,9 @@ WARN_LOGFILE =
892892
# Note: If this tag is empty the current directory is searched.
893893

894894
INPUT = ./docs/doxygen \
895-
./include \
896-
./common/include
895+
./source/include \
896+
./source/include/common \
897+
./source/interface
897898

898899
# This tag can be used to specify the character encoding of the source files
899900
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -973,7 +974,8 @@ EXCLUDE_SYMBOLS =
973974
# command).
974975

975976
EXAMPLE_PATH = docs/doxygen/include \
976-
common/include
977+
./source/include \
978+
./source/include/common \
977979

978980
# If the value of the EXAMPLE_PATH tag contains directories, you can use the
979981
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and

‎common/src/cellular_3gpp_api.c renamed to ‎source/cellular_3gpp_api.c

File renamed without changes.

‎common/src/cellular_3gpp_urc_handler.c renamed to ‎source/cellular_3gpp_urc_handler.c

File renamed without changes.

‎common/src/cellular_at_core.c renamed to ‎source/cellular_at_core.c

File renamed without changes.

‎common/src/cellular_common.c renamed to ‎source/cellular_common.c

File renamed without changes.

‎common/src/cellular_common_api.c renamed to ‎source/cellular_common_api.c

File renamed without changes.

‎common/src/cellular_pkthandler.c renamed to ‎source/cellular_pkthandler.c

File renamed without changes.

‎common/src/cellular_pktio.c renamed to ‎source/cellular_pktio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ static _atRespType_t _getMsgType( const CellularContext_t * pContext,
419419
/* Check if prefix exist in pLine. */
420420
( void ) Cellular_ATIsPrefixPresent( pLine, &inputWithPrefix );
421421

422-
if( inputWithPrefix == true )
422+
if( ( inputWithPrefix == true ) && ( pRespPrefix != NULL ) )
423423
{
424424
/* Check if SRC prefix exist in pLine. */
425425
atStatus = Cellular_ATStrStartWith( pLine, pRespPrefix, &inputWithSrcPrefix );

‎include/cellular_api.h renamed to ‎source/include/cellular_api.h

File renamed without changes.

‎include/cellular_config_defaults.h renamed to ‎source/include/cellular_config_defaults.h

File renamed without changes.

‎include/cellular_types.h renamed to ‎source/include/cellular_types.h

File renamed without changes.

‎common/include/cellular_at_core.h renamed to ‎source/include/common/cellular_at_core.h

File renamed without changes.

‎common/include/cellular_common.h renamed to ‎source/include/common/cellular_common.h

File renamed without changes.

‎common/include/cellular_common_api.h renamed to ‎source/include/common/cellular_common_api.h

File renamed without changes.

‎common/include/cellular_common_portable.h renamed to ‎source/include/common/cellular_common_portable.h

File renamed without changes.

‎common/include/private/cellular_common_internal.h renamed to ‎source/include/private/cellular_common_internal.h

File renamed without changes.

‎common/include/private/cellular_internal.h renamed to ‎source/include/private/cellular_internal.h

File renamed without changes.

‎common/include/private/cellular_pkthandler_internal.h renamed to ‎source/include/private/cellular_pkthandler_internal.h

File renamed without changes.

‎common/include/private/cellular_pktio_internal.h renamed to ‎source/include/private/cellular_pktio_internal.h

File renamed without changes.

‎include/cellular_comm_interface.h renamed to ‎source/interface/cellular_comm_interface.h

File renamed without changes.

‎test/CMakeLists.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib )
3232
# ===================================== Coverity Analysis Configuration =================================================
3333

3434
# Set the source path and include path
35-
set( CELLULAR_COMMON_SOURCE ${MODULE_ROOT_DIR}/common/src )
36-
set( CELLULAR_INCLUDE_DIRS ${MODULE_ROOT_DIR}/include )
37-
set( CELLULAR_COMMON_INCLUDE_DIRS ${MODULE_ROOT_DIR}/common/include )
38-
set( CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS ${MODULE_ROOT_DIR}/common/include/private )
35+
set( CELLULAR_COMMON_SOURCE ${MODULE_ROOT_DIR}/source )
36+
set( CELLULAR_INCLUDE_DIRS ${CELLULAR_COMMON_SOURCE}/include )
37+
set( CELLULAR_COMMON_INCLUDE_DIRS ${CELLULAR_INCLUDE_DIRS}/common )
38+
set( CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS ${CELLULAR_INCLUDE_DIRS}/private )
39+
set( CELLULAR_INTERFACE_INCLUDE_DIRS ${CELLULAR_COMMON_SOURCE}/interface )
3940
set( CELLULAR_TEST_DIRS ${MODULE_ROOT_DIR}/test/unit-test )
4041

4142
# Target for Coverity analysis that builds the library.
@@ -52,7 +53,7 @@ add_library( coverity_analysis
5253
target_compile_definitions( coverity_analysis PUBLIC CELLULAR_DO_NOT_USE_CUSTOM_CONFIG=1 )
5354

5455
# Cellular include path.
55-
target_include_directories( coverity_analysis PUBLIC ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_INCLUDE_DIRS} ${CELLULAR_TEST_DIRS})
56+
target_include_directories( coverity_analysis PUBLIC ${CELLULAR_COMMON_INCLUDE_DIRS} ${CELLULAR_INCLUDE_DIRS} ${CELLULAR_INTERFACE_INCLUDE_DIRS} ${CELLULAR_TEST_DIRS})
5657

5758
# Cellular private include path.
5859
target_include_directories( coverity_analysis PRIVATE ${CELLULAR_COMMON_INCLUDE_PRIVATE_DIRS} )

‎test/cbmc/proofs/Cellular_ATGetNextTok/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ REMOVE_FUNCTION_BODY += Cellular_ATGetSpecificNextTok
3434
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3535
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3636
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
37-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
37+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
3838

39-
include ../Makefile.common
39+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATGetSpecificNextTok/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtok.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

4444

45-
include ../Makefile.common
45+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATHexStrToHex/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATIsPrefixPresent/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4242
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
4343
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
44-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
44+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4545

46-
include ../Makefile.common
46+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATIsStrDigit/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemoveAllDoubleQuote/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemoveAllWhiteSpaces/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemoveLeadingWhiteSpaces/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@ UNWINDSET += Cellular_ATRemoveLeadingWhiteSpaces.0:$(CBMC_MAX_BUFSIZE)
3838
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
41-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
41+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4242

43-
include ../Makefile.common
43+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemoveOutermostDoubleQuote/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemovePrefix/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3737
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3838
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
40-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
40+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4141

42-
include ../Makefile.common
42+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATRemoveTrailingWhiteSpaces/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ UNWINDSET += strlen.0:$(CBMC_MAX_BUFSIZE)
3939
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATStrDup/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtok.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

4444

45-
include ../Makefile.common
45+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATStrStartWith/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
4141
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATStrtoi/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ UNWINDSET += strtol.0:$(CBMC_MAX_BUFSIZE)
3737
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3838
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
40-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
40+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4141
PROJECT_SOURCES += $(SRCDIR)/test/cbmc/stubs/strtol.c
4242

43-
include ../Makefile.common
43+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_ATcheckErrorCode/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4343
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4444
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
4545
PROOF_SOURCES += $(SRCDIR)/test/cbmc/stubs/strchr.c
46-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_at_core.c
46+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_at_core.c
4747

48-
include ../Makefile.common
48+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonATCommandRaw/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ INCLUDES +=
3030
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3131
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3232
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
33-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
34-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
34+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
3535

36-
include ../Makefile.common
36+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonCleanup/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ UNWINDSET += __CPROVER_file_local_cellular_common_c__Cellular_FreeContext.0:$(CB
3838
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3939
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4040
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
41-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
42-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
41+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
42+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
4343

44-
include ../Makefile.common
44+
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonCreateSocket/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ UNWINDSET += harness.0:$(CBMC_MAX_BUFSIZE)
4141
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
4242
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
4343
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
44-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
45-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
44+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
45+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
4646

4747
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonGetEidrxSettings/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ INCLUDES +=
3030
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3131
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3232
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
33-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
34-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
35-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
34+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
35+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
3636

3737
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonGetIPAddress/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ INCLUDES +=
3030
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3131
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3232
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
33-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
34-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
35-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
34+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
35+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
3636

3737
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonGetModemInfo/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ INCLUDES +=
3030
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3131
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3232
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
33-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
34-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
35-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
34+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
35+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
3636

3737
include ../Makefile.common

‎test/cbmc/proofs/Cellular_CommonGetNetworkTime/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ INCLUDES +=
3030
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
3131
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/cellular_cbmc_state.c
3232
PROOF_SOURCES += $(SRCDIR)/test/cbmc/sources/global_state_cellular.c
33-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common_api.c
34-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_common.c
35-
PROJECT_SOURCES += $(SRCDIR)/common/src/cellular_3gpp_api.c
33+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common_api.c
34+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_common.c
35+
PROJECT_SOURCES += $(SRCDIR)/source/cellular_3gpp_api.c
3636

3737
include ../Makefile.common

0 commit comments

Comments
 (0)