From 61911a44e2e52e5e1ec7227b9594207965d09253 Mon Sep 17 00:00:00 2001 From: skarg Date: Sat, 2 Apr 2005 11:12:00 +0000 Subject: [PATCH] corrected compile errors. --- bacnet-stack/abort.h | 1 + bacnet-stack/rp.h | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/abort.h b/bacnet-stack/abort.h index eb6ff7e5..eca30632 100644 --- a/bacnet-stack/abort.h +++ b/bacnet-stack/abort.h @@ -55,6 +55,7 @@ int abort_decode_apdu( uint8_t *abort_reason); #ifdef TEST +#include "ctest.h" void testAbort(Test * pTest); #endif diff --git a/bacnet-stack/rp.h b/bacnet-stack/rp.h index a22359d6..42679bca 100644 --- a/bacnet-stack/rp.h +++ b/bacnet-stack/rp.h @@ -50,8 +50,9 @@ typedef struct BACnet_Read_Property_Data // encode service - use -1 for limit if you want unlimited int rp_encode_apdu( uint8_t *apdu, + uint8_t invoke_id, BACNET_OBJECT_TYPE object_type, - uint32_t object_instance + uint32_t object_instance, BACNET_PROPERTY_ID object_property, int32_t array_index); @@ -60,19 +61,39 @@ int rp_decode_service_request( uint8_t *apdu, unsigned apdu_len, BACNET_OBJECT_TYPE *object_type, - uint32_t *object_instance + uint32_t *object_instance, BACNET_PROPERTY_ID *object_property, int32_t *array_index); int rp_decode_apdu( uint8_t *apdu, unsigned apdu_len, + uint8_t *invoke_id, BACNET_OBJECT_TYPE *object_type, - uint32_t *object_instance + uint32_t *object_instance, BACNET_PROPERTY_ID *object_property, int32_t *array_index); + +int rp_ack_encode_apdu( + uint8_t *apdu, + uint8_t invoke_id, + BACNET_READ_PROPERTY_DATA *data); + +int rp_ack_decode_service_request( + uint8_t *apdu, + int apdu_len, // total length of the apdu + BACNET_READ_PROPERTY_DATA *data); + +int rp_ack_decode_apdu( + uint8_t *apdu, + int apdu_len, // total length of the apdu + uint8_t *invoke_id, + BACNET_READ_PROPERTY_DATA *data); + #ifdef TEST +#include "ctest.h" + void test_ReadProperty(Test * pTest); void test_ReadPropertyAck(Test * pTest); #endif