diff --git a/bacnet-stack/cov.c b/bacnet-stack/cov.c index cfe0f3d4..4ccbe59d 100644 --- a/bacnet-stack/cov.c +++ b/bacnet-stack/cov.c @@ -716,17 +716,24 @@ void npdu_encode_npdu_data(BACNET_NPDU_DATA * npdu, } /* dummy function stubs */ -int datalink_send_pdu(BACNET_ADDRESS * dest, /* destination address */ - BACNET_NPDU_DATA * npdu_data, /* network information */ - uint8_t * pdu, /* any data to be sent - may be null */ +int datalink_send_pdu( + BACNET_ADDRESS * dest, + BACNET_NPDU_DATA * npdu_data, + uint8_t * pdu, unsigned pdu_len) -{ /* number of bytes of data */ +{ + (void) dest; + (void) npdu_data; + (void) pdu; + (void) pdu_len; + return 0; } /* dummy function stubs */ void datalink_get_broadcast_address(BACNET_ADDRESS * dest) { + (void)dest; } /* dummy function stubs */ diff --git a/bacnet-stack/cov.mak b/bacnet-stack/cov.mak index adab2c62..2d5b9069 100644 --- a/bacnet-stack/cov.mak +++ b/bacnet-stack/cov.mak @@ -4,7 +4,7 @@ BASEDIR = . #CFLAGS = -Wall -I. # -g for debugging with gdb #CFLAGS = -Wall -I. -g -CFLAGS = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -g +CFLAGS = -Wall -I. -Itest -Idemo/object -DTEST -DTEST_COV -DBACDL_TEST=1 -DBIG_ENDIAN=0 -g SRCS = bacdcode.c \ bacstr.c \ diff --git a/bacnet-stack/datalink.h b/bacnet-stack/datalink.h index 11a682ac..7515a19c 100644 --- a/bacnet-stack/datalink.h +++ b/bacnet-stack/datalink.h @@ -70,6 +70,23 @@ #define datalink_get_broadcast_address bip_get_broadcast_address #define datalink_get_my_address bip_get_my_address +#elif defined(BACDL_TEST) +#include "npdu.h" + + extern int datalink_send_pdu( + BACNET_ADDRESS * dest, + BACNET_NPDU_DATA * npdu_data, + uint8_t * pdu, + unsigned pdu_len); + extern uint16_t datalink_receive( + BACNET_ADDRESS * src, + uint8_t * pdu, + uint16_t max_pdu, + unsigned timeout); + extern void datalink_cleanup(void); + extern void datalink_get_broadcast_address(BACNET_ADDRESS * dest); + extern void bip_get_my_address(BACNET_ADDRESS * my_address); + #endif #endif diff --git a/bacnet-stack/iam.c b/bacnet-stack/iam.c index 9caec26b..f9ed4923 100755 --- a/bacnet-stack/iam.c +++ b/bacnet-stack/iam.c @@ -217,23 +217,26 @@ void testIAm(Test * pTest) } #ifdef TEST_IAM -/* Dummy stubs to eliminate depencies */ +/* dummy function stubs */ +int datalink_send_pdu( + BACNET_ADDRESS * dest, + BACNET_NPDU_DATA * npdu_data, + uint8_t * pdu, + unsigned pdu_len) +{ + (void) dest; + (void) npdu_data; + (void) pdu; + (void) pdu_len; + + return 0; +} + void datalink_get_broadcast_address(BACNET_ADDRESS * dest) { /* destination address */ (void) dest; } -int datalink_send_pdu(BACNET_ADDRESS * dest, /* destination address */ - BACNET_NPDU_DATA * npdu_data, /* network information */ - uint8_t * pdu, /* any data to be sent - may be null */ - unsigned pdu_len) -{ /* number of bytes of data */ - (void) dest; - (void) pdu; - - return pdu_len; -} - uint16_t Device_Vendor_Identifier(void) { return 0; diff --git a/bacnet-stack/iam.mak b/bacnet-stack/iam.mak index 4afea483..55a783f6 100755 --- a/bacnet-stack/iam.mak +++ b/bacnet-stack/iam.mak @@ -2,7 +2,7 @@ CC = gcc BASEDIR = . # -g for debugging with gdb -DEFINES = -DBACFILE=1 -DTEST -DTEST_IAM +DEFINES = -DBACFILE=1 -DTEST -DTEST_IAM -DBACDL_TEST -DBIG_ENDIAN=0 INCLUDES = -I. -Idemo/object -Itest CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g diff --git a/bacnet-stack/tsm.c b/bacnet-stack/tsm.c index 4a80862a..103dded5 100644 --- a/bacnet-stack/tsm.c +++ b/bacnet-stack/tsm.c @@ -297,6 +297,27 @@ bool tsm_invoke_id_failed(uint8_t invokeID) /* flag to send an I-Am */ bool I_Am_Request = true; +/* dummy function stubs */ +int datalink_send_pdu( + BACNET_ADDRESS * dest, + BACNET_NPDU_DATA * npdu_data, + uint8_t * pdu, + unsigned pdu_len) +{ + (void) dest; + (void) npdu_data; + (void) pdu; + (void) pdu_len; + + return 0; +} + +/* dummy function stubs */ +void datalink_get_broadcast_address(BACNET_ADDRESS * dest) +{ + (void)dest; +} + void testTSM(Test * pTest) { /* FIXME: add some unit testing... */ diff --git a/bacnet-stack/tsm.mak b/bacnet-stack/tsm.mak index 754f52ec..398fb1f4 100644 --- a/bacnet-stack/tsm.mak +++ b/bacnet-stack/tsm.mak @@ -1,7 +1,7 @@ #Makefile to build test case CC = gcc # -g for debugging with gdb -DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM +DEFINES = -DTSM_ENABLED=1 -DTEST -DTEST_TSM -DBIG_ENDIAN=0 -DBACDL_TEST=1 INCLUDES = -I. -Idemo/object -Idemo/handler -Itest -Iports/linux CFLAGS = -Wall $(INCLUDES) $(DEFINES) -g @@ -21,11 +21,11 @@ SRCS = address.c \ demo/object/bv.c \ demo/object/lsp.c \ demo/object/mso.c \ + demo/object/lc.c \ iam.c \ dcc.c \ npdu.c \ apdu.c \ - datalink.c \ tsm.c \ test/ctest.c