diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b971b7c..749e7322 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -116,6 +116,8 @@ The git repositories are hosted at the following sites: ### Changed +* Changed BACFILE define dependencies to reflect bacfile-posix.c dependence + since bacfile.c is now independent of any back end file system. (#1227) * Changed the default BACnet protocol revision to 28 to enable usage of special lighting output values. (#1211) * Changed bacnet_strtof and bacnet_strtold functions to use strtod to diff --git a/src/bacnet/basic/sys/bramfs.c b/src/bacnet/basic/sys/bramfs.c index 538bc75c..81efb1ea 100644 --- a/src/bacnet/basic/sys/bramfs.c +++ b/src/bacnet/basic/sys/bramfs.c @@ -446,13 +446,11 @@ void bacfile_ramfs_deinit(void) */ void bacfile_ramfs_init(void) { -#if defined(BACFILE) bacfile_write_stream_data_callback_set(bacfile_ramfs_write_stream_data); bacfile_read_stream_data_callback_set(bacfile_ramfs_read_stream_data); bacfile_write_record_data_callback_set(bacfile_ramfs_write_record_data); bacfile_read_record_data_callback_set(bacfile_ramfs_read_record_data); bacfile_file_size_callback_set(bacfile_ramfs_file_size); bacfile_file_size_set_callback_set(bacfile_ramfs_file_size_set); -#endif File_List = Keylist_Create(); } diff --git a/src/bacnet/basic/sys/bsramfs.c b/src/bacnet/basic/sys/bsramfs.c index 4ca18865..5750c4ce 100644 --- a/src/bacnet/basic/sys/bsramfs.c +++ b/src/bacnet/basic/sys/bsramfs.c @@ -203,9 +203,7 @@ bool bacfile_sramfs_read_record_data( */ void bacfile_sramfs_init(void) { -#if defined(BACFILE) bacfile_read_stream_data_callback_set(bacfile_sramfs_read_stream_data); bacfile_read_record_data_callback_set(bacfile_sramfs_read_record_data); bacfile_file_size_callback_set(bacfile_sramfs_file_size); -#endif } diff --git a/test/bacnet/basic/object/test/bacfile_mock.c b/test/bacnet/basic/object/test/bacfile_mock.c new file mode 100644 index 00000000..e65015ef --- /dev/null +++ b/test/bacnet/basic/object/test/bacfile_mock.c @@ -0,0 +1,69 @@ +/** + * @file + * @brief mock file object functions + * @author Steve Karg + * @date February 2026 + * + * @copyright SPDX-License-Identifier: MIT + */ +#include +#include +#include + +/** + * @brief Sets the callback function for writing stream data + * @param callback - function pointer to the callback + */ +void bacfile_write_stream_data_callback_set( + size_t (*callback)(const char *, int32_t, const uint8_t *, size_t)) +{ + (void)callback; +} + +/** + * @brief Sets the callback function for writing record data + * @param callback - function pointer to the callback + */ +void bacfile_write_record_data_callback_set( + bool (*callback)(const char *, int32_t, size_t, const uint8_t *, size_t)) +{ + (void)callback; +} + +/** + * @brief Sets the callback function for reading record data + * @param callback - function pointer to the callback + */ +void bacfile_read_record_data_callback_set( + bool (*callback)(const char *, int32_t, size_t, uint8_t *, size_t)) +{ + (void)callback; +} + +/** + * @brief Sets the callback function for reading stream data + * @param callback - function pointer to the callback + */ +void bacfile_read_stream_data_callback_set( + size_t (*callback)(const char *, int32_t, uint8_t *, size_t)) +{ + (void)callback; +} + +/** + * @brief Sets the callback function for getting file size + * @param callback - function pointer to the callback + */ +void bacfile_file_size_callback_set(size_t (*callback)(const char *)) +{ + (void)callback; +} + +/** + * @brief Sets the callback function for setting file size + * @param callback - function pointer to the callback + */ +void bacfile_file_size_set_callback_set(bool (*callback)(const char *, size_t)) +{ + (void)callback; +} diff --git a/test/bacnet/basic/sys/bramfs/CMakeLists.txt b/test/bacnet/basic/sys/bramfs/CMakeLists.txt index 1d5fce5e..c01fac5a 100644 --- a/test/bacnet/basic/sys/bramfs/CMakeLists.txt +++ b/test/bacnet/basic/sys/bramfs/CMakeLists.txt @@ -28,6 +28,7 @@ add_compile_definitions( include_directories( ${SRC_DIR} ${TST_DIR}/ztest/include + ${TST_DIR}/bacnet/basic/object/test ) add_executable(${PROJECT_NAME} @@ -40,6 +41,7 @@ add_executable(${PROJECT_NAME} # Support files and stubs (pathname alphabetical) # Test and test library files ./src/main.c + ${TST_DIR}/bacnet/basic/object/test/bacfile_mock.c ${ZTST_DIR}/ztest_mock.c ${ZTST_DIR}/ztest.c ) diff --git a/test/bacnet/basic/sys/bsramfs/CMakeLists.txt b/test/bacnet/basic/sys/bsramfs/CMakeLists.txt index f108e327..6188a0f7 100644 --- a/test/bacnet/basic/sys/bsramfs/CMakeLists.txt +++ b/test/bacnet/basic/sys/bsramfs/CMakeLists.txt @@ -28,6 +28,7 @@ add_compile_definitions( include_directories( ${SRC_DIR} ${TST_DIR}/ztest/include + ${TST_DIR}/bacnet/basic/object/test ) add_executable(${PROJECT_NAME} @@ -40,6 +41,7 @@ add_executable(${PROJECT_NAME} # Support files and stubs (pathname alphabetical) # Test and test library files ./src/main.c + ${TST_DIR}/bacnet/basic/object/test/bacfile_mock.c ${ZTST_DIR}/ztest_mock.c ${ZTST_DIR}/ztest.c )