dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed RR handler to call Device_Objects_RR_Info directly.

Browse Source 
Removed handler_rr_object_set and associated info. 
Simplified parameter passing to rr info functions by passing ptr to BACnet_Read_Range_Data.
This commit is contained in:
petermcs
2010-02-18 11:12:38 +00:00
parent d7d22234d4
commit 9c9e4b9603
7 changed files with 29 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/device.h
+5 -5
View File
@@ -73,6 +73,9 @@ extern "C" {
bool Device_Reinitialize(
BACNET_REINITIALIZE_DEVICE_DATA *rd_data);
rr_info_function Device_Objects_RR_Info(
BACNET_OBJECT_TYPE object_type);
void Device_Property_Lists(
const int **pRequired,
const int **pOptional,
@@ -174,11 +177,8 @@ extern "C" {
BACNET_WRITE_PROPERTY_DATA * wp_data);
bool DeviceGetRRInfo(
uint32_t Object, /* Which particular object - obviously not important for device object */
BACNET_PROPERTY_ID Property, /* Which property */
RR_PROP_INFO *pInfo, /* Where to put the information */
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code);
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */
RR_PROP_INFO *pInfo); /* Where to put the information */
#ifdef __cplusplus
bacnet-stack/include/handlers.h
-3
View File
@@ -80,9 +80,6 @@ extern "C" {
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_rr_object_set(
get_rr_info_fn pFunction1);
void handler_read_property_ack(
uint8_t * service_request,
uint16_t service_len,
bacnet-stack/include/readrange.h
+2 -8
View File
@@ -127,14 +127,8 @@ typedef struct rrpropertyinfo {
/* Function pointer for ReadRange information retrieval function */
typedef bool (*rr_info_function) (
uint32_t Object, /* Which particular object instance (we know the type implicetly) */
BACNET_PROPERTY_ID Property, /* Which property */
RR_PROP_INFO *pInfo, /* Where to write the response to */
BACNET_ERROR_CLASS *error_class, /* Somewhere to write error responses to */
BACNET_ERROR_CODE *error_code);
typedef rr_info_function (*get_rr_info_fn) (
BACNET_OBJECT_TYPE object_type);
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */
RR_PROP_INFO *pInfo); /* Where to write the response to */
int rr_encode_apdu(
uint8_t * apdu,
bacnet-stack/include/trendlog.h
+2 -5
View File
@@ -97,11 +97,8 @@ extern "C" {
BACNET_READ_RANGE_DATA *pRequest);
bool TrendLogGetRRInfo(
uint32_t Object, /* Which particular object */
BACNET_PROPERTY_ID Property, /* Which property */
RR_PROP_INFO *pInfo, /* Where to put the information */
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code);
BACNET_READ_RANGE_DATA *pRequest, /* Info on the request */
RR_PROP_INFO *pInfo); /* Where to put the information */
int rr_trend_log_encode(
uint8_t *apdu,