Merge pull request #275 from Michail-Antropov/OSCBS-23-Scalable-BACnet-object-arrays-2
Oscbs 23 scalable ba cnet object arrays - variant 2
This commit is contained in:
@@ -95,5 +95,11 @@
|
||||
extern int bip_get_local_netmask(
|
||||
struct in_addr *netmask);
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
static_assert(false, "Unsupported BACNET_OBJECT_TABLE for this platform")
|
||||
|
||||
#endif
|
||||
|
||||
@@ -101,6 +101,13 @@
|
||||
#include <netdb.h>
|
||||
#include "bacnet/bacnet_stack_exports.h"
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
static_assert(false, "Unsupported BACNET_OBJECT_TABLE for this platform")
|
||||
|
||||
/** @file linux/bacport.h Includes Linux network headers. */
|
||||
|
||||
/* Local helper functions for this port */
|
||||
|
||||
@@ -36,4 +36,11 @@
|
||||
#include "lwip/dhcp.h"
|
||||
#include "lwip/inet.h"
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
static_assert(false, "Unsupported BACNET_OBJECT_TABLE for this platform")
|
||||
|
||||
#endif
|
||||
|
||||
@@ -81,4 +81,11 @@ and globals in favor of more secure versions. */
|
||||
#define snprintf _snprintf
|
||||
#endif
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
static_assert(false, "Unsupported BACNET_OBJECT_TABLE for this platform")
|
||||
|
||||
#endif
|
||||
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
#include <net/net_ip.h>
|
||||
#include <net/socket.h>
|
||||
#include <zephyr.h>
|
||||
#include <bacnet/basic/object/device.h>
|
||||
|
||||
static inline char *inet_ntoa(struct in_addr in) {
|
||||
return "(inet_ntoa() to be implemented)";
|
||||
@@ -37,5 +39,40 @@ static inline char *inet_ntoa(struct in_addr in) {
|
||||
extern int bip_get_local_netmask(
|
||||
struct in_addr *netmask);
|
||||
|
||||
#ifdef CONFIG_BACNET_USE_SECTION_ITERABLE_OBJECT_TABLE
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
STRUCT_SECTION_ITERABLE(object_functions, table_name) = { \
|
||||
.Object_Type = _type, \
|
||||
.Object_Init = _init, \
|
||||
.Object_Count = _count, \
|
||||
.Object_Index_To_Instance = _index_to_instance, \
|
||||
.Object_Valid_Instance = _valid_instance, \
|
||||
.Object_Name = _object_name, \
|
||||
.Object_Read_Property = _read_property, \
|
||||
.Object_Write_Property = _write_property, \
|
||||
.Object_RPM_List = _RPM_list, \
|
||||
.Object_RR_Info = _RR_info, \
|
||||
.Object_Iterator = _iterator, \
|
||||
.Object_Value_List = _value_list, \
|
||||
.Object_COV = _COV, \
|
||||
.Object_COV_Clear = _COV_clear, \
|
||||
.Object_Intrinsic_Reporting = _intrinsic_reporting \
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \
|
||||
_index_to_instance, _valid_instance, _object_name, \
|
||||
_read_property, _write_property, _RPM_list, \
|
||||
_RR_info, _iterator, _value_list, _COV, \
|
||||
_COV_clear, _intrinsic_reporting) \
|
||||
while{}(0)
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user