Got rid of the handler-set functions for RP,RPM,WP,RD. Just referencing the device object functions directly.

bacnet-stack/include/device.h

@@ -39,7 +39,9 @@
 #include "bacdef.h"
 #include "bacenum.h"
 #include "wp.h"
+#include "rd.h"
 #include "rp.h"
+#include "rpm.h"
 #include "readrange.h"
 
 typedef void (
@@ -67,11 +69,17 @@ extern "C" {
 
     void Device_Init(
         void);
+    
+    bool Device_Reinitialize(
+        BACNET_REINITIALIZE_DEVICE_DATA *rd_data);
 
     void Device_Property_Lists(
         const int **pRequired,
         const int **pOptional,
         const int **pProprietary);
+    void Device_Objects_Property_List(
+        BACNET_OBJECT_TYPE object_type,
+        struct special_property_list_t *pPropertyList);
 
     uint32_t Device_Object_Instance_Number(
         void);
@@ -160,9 +168,6 @@ extern "C" {
         int object_type,
         uint32_t object_instance);
 
-    int Device_Objects_Read_Property(
-        BACNET_READ_PROPERTY_DATA *rpdata);
-
     int Device_Read_Property(
         BACNET_READ_PROPERTY_DATA *rpdata);
     bool Device_Write_Property(

bacnet-stack/include/handlers.h

@@ -79,8 +79,6 @@ extern "C" {
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
-    void handler_read_property_function_set(
-        read_property_function pFunction);
         
     void handler_rr_object_set(
         get_rr_info_fn pFunction1);
@@ -96,8 +94,6 @@ extern "C" {
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
-    void handler_write_property_function_set(
-        write_property_function pFunction);
 
     bool WPValidateString(
         BACNET_APPLICATION_DATA_VALUE *pValue,
@@ -135,16 +131,12 @@ extern "C" {
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
-    void handler_reinitialize_device_function_set(
-        reinitialize_device_function pFunction);
 
     void handler_device_communication_control(
         uint8_t * service_request,
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
-    void handler_dcc_password_set(
-        char *new_password);
 
     void handler_i_have(
         uint8_t * service_request,
@@ -166,10 +158,6 @@ extern "C" {
         uint16_t service_len,
         BACNET_ADDRESS * src,
         BACNET_CONFIRMED_SERVICE_DATA * service_data);
-    void handler_rpm_function_set(
-        read_property_function pFunction);
-    void handler_rpm_list_set(
-        rpm_object_property_lists_function pFunction);
 
     void handler_read_property_multiple_ack(
         uint8_t * service_request,