diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cfe3657..7cf5cab8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -411,8 +411,8 @@ add_library(${PROJECT_NAME} src/bacnet/basic/sys/sbuf.h src/bacnet/basic/tsm/tsm.c src/bacnet/basic/tsm/tsm.h - src/bacnet/bits.h - src/bacnet/bytes.h + src/bacnet/basic/sys/bits.h + src/bacnet/basic/sys/bytes.h src/bacnet/config.h src/bacnet/calendar_entry.c src/bacnet/calendar_entry.h diff --git a/apps/abort/main.c b/apps/abort/main.c index dc47b3e1..8694b05d 100644 --- a/apps/abort/main.c +++ b/apps/abort/main.c @@ -30,10 +30,11 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/version.h" diff --git a/apps/ack-alarm/main.c b/apps/ack-alarm/main.c index 6640737e..10898d0f 100644 --- a/apps/ack-alarm/main.c +++ b/apps/ack-alarm/main.c @@ -30,15 +30,16 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/cov.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" +#include "bacnet/basic/tsm/tsm.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacport.h" #include "bacnet/datalink/datalink.h" diff --git a/apps/add-list-element/main.c b/apps/add-list-element/main.c index a8501e9a..23c8ee3e 100644 --- a/apps/add-list-element/main.c +++ b/apps/add-list-element/main.c @@ -12,36 +12,33 @@ #include #include #include - #define PRINT_ENABLED 1 - -#if BACNET_SVC_SERVER -#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" -#endif - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacdest.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/list_element.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacnet/basic/object/device.h" + +#if BACNET_SVC_SERVER +#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" +#endif /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/apdu/main.c b/apps/apdu/main.c index e439f962..1dc8b6e0 100644 --- a/apps/apdu/main.c +++ b/apps/apdu/main.c @@ -12,25 +12,26 @@ #include #include #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/abort.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/bactext.h" #include "bacnet/reject.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #include "bacport.h" diff --git a/apps/blinkt/device.c b/apps/blinkt/device.c index 0a1873f9..61ac0cb8 100644 --- a/apps/blinkt/device.c +++ b/apps/blinkt/device.c @@ -28,19 +28,19 @@ #include #include -#include /* for memmove */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/datetime.h" #include "bacnet/apdu.h" -#include "bacnet/wp.h" /* WriteProperty handling */ -#include "bacnet/rp.h" /* ReadProperty handling */ -#include "bacnet/dcc.h" /* DeviceCommunicationControl handling */ +#include "bacnet/wp.h" +#include "bacnet/rp.h" +#include "bacnet/dcc.h" #include "bacnet/version.h" -#include "bacnet/basic/object/device.h" /* me */ +/* demo services */ #include "bacnet/basic/services.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/binding/address.h" diff --git a/apps/blinkt/main.c b/apps/blinkt/main.c index d3f967f9..68e69e0f 100644 --- a/apps/blinkt/main.c +++ b/apps/blinkt/main.c @@ -27,24 +27,23 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" -#include "bacnet/datalink/dlenv.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/iam.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/basic/object/bacfile.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/dcc.h" #include "bacnet/getevent.h" #include "bacnet/lighting.h" -#include "bacport.h" +/* demo services */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/services.h" +#include "bacnet/datalink/dlenv.h" +#include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/sys/color_rgb.h" #include "bacnet/basic/sys/filename.h" @@ -53,10 +52,13 @@ #include "bacnet/version.h" /* include the device object */ #include "bacnet/basic/object/device.h" +#include "bacnet/basic/object/bacfile.h" #include "bacnet/basic/object/lo.h" #include "bacnet/basic/object/channel.h" #include "bacnet/basic/object/color_object.h" #include "bacnet/basic/object/color_temperature.h" +/* local includes */ +#include "bacport.h" #include "blinkt.h" /** @file blinkt/main.c Example application using the BACnet Stack. */ diff --git a/apps/create-object/main.c b/apps/create-object/main.c index f84c2def..357c240e 100644 --- a/apps/create-object/main.c +++ b/apps/create-object/main.c @@ -12,38 +12,36 @@ #include #include #include - #define PRINT_ENABLED 1 - -#if BACNET_SVC_SERVER -#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" -#endif - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacdest.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" -#include "bacnet/create_object.h" #include "bacnet/abort.h" +#include "bacnet/create_object.h" #include "bacnet/reject.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#if BACNET_SVC_SERVER +#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" +#endif + /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; /* target device data for the request */ diff --git a/apps/dcc/main.c b/apps/dcc/main.c index 3685b46f..4592efa2 100644 --- a/apps/dcc/main.c +++ b/apps/dcc/main.c @@ -30,27 +30,26 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" #include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/dcc.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/object/device.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" +#include "bacnet/datalink/datalink.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/delete-object/main.c b/apps/delete-object/main.c index f0fb909d..a1883d22 100644 --- a/apps/delete-object/main.c +++ b/apps/delete-object/main.c @@ -12,38 +12,36 @@ #include #include #include - #define PRINT_ENABLED 1 - -#if BACNET_SVC_SERVER -#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" -#endif - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacdest.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/create_object.h" #include "bacnet/whois.h" #include "bacnet/abort.h" #include "bacnet/reject.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#if BACNET_SVC_SERVER +#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" +#endif + /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; /* target device data for the request */ diff --git a/apps/epics/main.c b/apps/epics/main.c index 2c68663d..88629c23 100644 --- a/apps/epics/main.c +++ b/apps/epics/main.c @@ -36,12 +36,12 @@ #endif #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacport.h" @@ -54,7 +54,6 @@ #include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/keylist.h" #include "bacnet/basic/tsm/tsm.h" diff --git a/apps/error/main.c b/apps/error/main.c index d5ad0b6f..537b9942 100644 --- a/apps/error/main.c +++ b/apps/error/main.c @@ -30,10 +30,11 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/version.h" @@ -41,7 +42,6 @@ #include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/datalink.h" diff --git a/apps/event/main.c b/apps/event/main.c index 57a482e1..911fba28 100644 --- a/apps/event/main.c +++ b/apps/event/main.c @@ -30,25 +30,25 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/cov.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" #include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/event.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" /* buffer used for receive */ diff --git a/apps/fuzz-afl/main.c b/apps/fuzz-afl/main.c index 7ecc4873..2adddbce 100644 --- a/apps/fuzz-afl/main.c +++ b/apps/fuzz-afl/main.c @@ -35,9 +35,9 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/fuzz-libfuzzer/main.c b/apps/fuzz-libfuzzer/main.c index 4ea4aea2..c2530ec5 100644 --- a/apps/fuzz-libfuzzer/main.c +++ b/apps/fuzz-libfuzzer/main.c @@ -35,10 +35,9 @@ #include #include #include - - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/gateway/main.c b/apps/gateway/main.c index ff8c8145..b81b5613 100644 --- a/apps/gateway/main.c +++ b/apps/gateway/main.c @@ -34,30 +34,31 @@ #include #include #include -#include "bacnet/config.h" -#include "gateway.h" -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" -#include "bacnet/datalink/dlenv.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/iam.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/object/bacfile.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/dcc.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/object/lc.h" -#include "bacnet/basic/sys/debug.h" #include "bacnet/version.h" +/* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/tsm/tsm.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/sys/debug.h" +#include "bacnet/datalink/datalink.h" +#include "bacnet/datalink/dlenv.h" /* include the device object */ #include "bacnet/basic/object/device.h" +#include "bacnet/basic/object/bacfile.h" +#include "bacnet/basic/object/lc.h" #ifdef BACNET_TEST_VMAC #include "bacnet/basic/bbmd6/vmac.h" #endif +/* me! */ +#include "gateway.h" /** @file gateway/main.c Example virtual gateway application using the BACnet * Stack. */ diff --git a/apps/getevent/main.c b/apps/getevent/main.c index 4e95d38c..b033d89b 100644 --- a/apps/getevent/main.c +++ b/apps/getevent/main.c @@ -29,9 +29,9 @@ #include #include #include -/* core stuff needed */ +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/iam/main.c b/apps/iam/main.c index 4b32406f..a0006ef5 100644 --- a/apps/iam/main.c +++ b/apps/iam/main.c @@ -30,21 +30,21 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" /* buffer used for receive */ diff --git a/apps/iamrouter/main.c b/apps/iamrouter/main.c index 3fbde452..553081cf 100644 --- a/apps/iamrouter/main.c +++ b/apps/iamrouter/main.c @@ -30,21 +30,21 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" /* global variables used in this file */ diff --git a/apps/initrouter/main.c b/apps/initrouter/main.c index 948693bf..aa73f1b4 100644 --- a/apps/initrouter/main.c +++ b/apps/initrouter/main.c @@ -30,24 +30,21 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/version.h" /* some demo stuff needed */ -#ifndef DEBUG_ENABLED -#define DEBUG_ENABLED 0 -#endif #include "bacnet/basic/sys/debug.h" +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" diff --git a/apps/mstpcap/main.c b/apps/mstpcap/main.c index cce73f7c..4c6fc43e 100644 --- a/apps/mstpcap/main.c +++ b/apps/mstpcap/main.c @@ -39,7 +39,9 @@ #include #include #include -#include "bacnet/bytes.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/iam.h" #include "bacnet/version.h" #include "bacnet/datetime.h" diff --git a/apps/mstpcrc/main.c b/apps/mstpcrc/main.c index 418daf28..092676b8 100644 --- a/apps/mstpcrc/main.c +++ b/apps/mstpcrc/main.c @@ -41,13 +41,14 @@ #include #include #include -/* OS specific include*/ -#include "bacport.h" -/* local includes */ -#include "bacnet/bytes.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/mstimer.h" #include "bacnet/datalink/crc.h" #include "bacnet/version.h" +/* OS specific include*/ +#include "bacport.h" #ifndef max #define max(a, b) (((a)(b)) ? (a) : (b)) diff --git a/apps/netnumis/main.c b/apps/netnumis/main.c index d7337f4b..ff6d834e 100644 --- a/apps/netnumis/main.c +++ b/apps/netnumis/main.c @@ -12,10 +12,11 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" /* some demo stuff needed */ diff --git a/apps/perl/perl_bindings.c b/apps/perl/perl_bindings.c index 169860f2..be6310b3 100644 --- a/apps/perl/perl_bindings.c +++ b/apps/perl/perl_bindings.c @@ -1,9 +1,11 @@ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/services.h" #include "bacnet/bacenum.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/object/device.h" -#include #include "bacnet/arf.h" /* Free is redefined as a macro, but Perl does not like that. */ diff --git a/apps/piface/device.c b/apps/piface/device.c index 1452be59..5841326d 100644 --- a/apps/piface/device.c +++ b/apps/piface/device.c @@ -28,23 +28,22 @@ #include #include -#include /* for memmove */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/datetime.h" #include "bacnet/apdu.h" -#include "bacnet/wp.h" /* WriteProperty handling */ -#include "bacnet/rp.h" /* ReadProperty handling */ -#include "bacnet/dcc.h" /* DeviceCommunicationControl handling */ +#include "bacnet/wp.h" +#include "bacnet/rp.h" +#include "bacnet/dcc.h" #include "bacnet/version.h" -#include "bacnet/basic/object/device.h" /* me */ -#include "bacnet/basic/services.h" +/* some demo stuff needed */ #include "bacnet/datalink/datalink.h" +#include "bacnet/basic/services.h" #include "bacnet/basic/binding/address.h" -/* include the OS specific */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/object/bi.h" #include "bacnet/basic/object/blo.h" diff --git a/apps/piface/main.c b/apps/piface/main.c index 66894b93..1aec4ad0 100644 --- a/apps/piface/main.c +++ b/apps/piface/main.c @@ -12,17 +12,17 @@ #include #include #include - -#include "bacnet/config.h" -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" -#include "bacnet/datalink/dlenv.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/iam.h" +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/services.h" +#include "bacnet/datalink/dlenv.h" #include "bacnet/basic/object/device.h" #include "bacnet/basic/object/bacfile.h" #include "bacnet/datalink/datalink.h" diff --git a/apps/ptransfer/h_pt.c b/apps/ptransfer/h_pt.c index 8b65a507..495208d5 100644 --- a/apps/ptransfer/h_pt.c +++ b/apps/ptransfer/h_pt.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/apps/ptransfer/h_pt.h b/apps/ptransfer/h_pt.h index b4896544..f7aa9e4f 100644 --- a/apps/ptransfer/h_pt.h +++ b/apps/ptransfer/h_pt.h @@ -32,8 +32,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/bacenum.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/apps/ptransfer/h_pt_a.c b/apps/ptransfer/h_pt_a.c index 353e206e..5b8565b4 100644 --- a/apps/ptransfer/h_pt_a.c +++ b/apps/ptransfer/h_pt_a.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/apps/ptransfer/h_pt_a.h b/apps/ptransfer/h_pt_a.h index aa65f0dd..34960d65 100644 --- a/apps/ptransfer/h_pt_a.h +++ b/apps/ptransfer/h_pt_a.h @@ -32,7 +32,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/apps/ptransfer/main.c b/apps/ptransfer/main.c index 817151d8..7e5fe64e 100644 --- a/apps/ptransfer/main.c +++ b/apps/ptransfer/main.c @@ -34,9 +34,9 @@ #include #endif #define PRINT_ENABLED 1 - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/ptransfer/s_ptransfer.c b/apps/ptransfer/s_ptransfer.c index aecb2ed1..a4017730 100644 --- a/apps/ptransfer/s_ptransfer.c +++ b/apps/ptransfer/s_ptransfer.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/apps/ptransfer/s_ptransfer.h b/apps/ptransfer/s_ptransfer.h index 28980704..4f71ac24 100644 --- a/apps/ptransfer/s_ptransfer.h +++ b/apps/ptransfer/s_ptransfer.h @@ -32,9 +32,10 @@ #include #include #include -#include "bacnet/bacapp.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/bacenum.h" +/* BACnet Stack API */ +#include "bacnet/bacapp.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/apps/readbdt/main.c b/apps/readbdt/main.c index a3a0bb8e..186eba76 100644 --- a/apps/readbdt/main.c +++ b/apps/readbdt/main.c @@ -31,24 +31,21 @@ #include /* for time */ #include #include /* for toupper */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacnet/datalink/datalink.h" #include "bacnet/datalink/bvlc.h" /* some demo stuff needed */ -#ifndef DEBUG_ENABLED -#define DEBUG_ENABLED 0 -#endif #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" diff --git a/apps/readfdt/main.c b/apps/readfdt/main.c index 94a44a22..840558ee 100644 --- a/apps/readfdt/main.c +++ b/apps/readfdt/main.c @@ -31,24 +31,21 @@ #include /* for time */ #include #include /* for toupper */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacnet/datalink/datalink.h" #include "bacnet/datalink/bvlc.h" /* some demo stuff needed */ -#ifndef DEBUG_ENABLED -#define DEBUG_ENABLED 0 -#endif #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" diff --git a/apps/readfile/main.c b/apps/readfile/main.c index 35fb8b65..61b9644c 100644 --- a/apps/readfile/main.c +++ b/apps/readfile/main.c @@ -30,25 +30,24 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" #include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #if BACNET_SVC_SERVER diff --git a/apps/readprop/main.c b/apps/readprop/main.c index 79915852..d45916a5 100644 --- a/apps/readprop/main.c +++ b/apps/readprop/main.c @@ -32,34 +32,32 @@ #if (__STDC_VERSION__ >= 199901L) && defined (__STDC_ISO_10646__) #include #endif - #define PRINT_ENABLED 1 - -#if BACNET_SVC_SERVER -#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" -#endif - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" #include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#if BACNET_SVC_SERVER +#error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" +#endif + /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/readpropm/main.c b/apps/readpropm/main.c index 7af90cf0..c08c080d 100644 --- a/apps/readpropm/main.c +++ b/apps/readpropm/main.c @@ -32,35 +32,33 @@ #if (__STDC_VERSION__ >= 199901L) && defined (__STDC_ISO_10646__) #include #endif - #define PRINT_ENABLED 1 +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bactext.h" +#include "bacnet/bacerror.h" +#include "bacnet/iam.h" +#include "bacnet/arf.h" +#include "bacnet/npdu.h" +#include "bacnet/apdu.h" +#include "bacnet/rpm.h" +#include "bacnet/whois.h" +#include "bacnet/version.h" +/* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/basic/sys/filename.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" +#include "bacnet/datalink/dlenv.h" +#include "bacport.h" #if BACNET_SVC_SERVER #error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" #endif -#include "bacnet/bacdef.h" -#include "bacnet/config.h" -#include "bacnet/bactext.h" -#include "bacnet/bacerror.h" -#include "bacnet/iam.h" -#include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/npdu.h" -#include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" -#include "bacnet/whois.h" -#include "bacnet/version.h" -/* some demo stuff needed */ -#include "bacnet/rpm.h" -#include "bacnet/basic/sys/filename.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/datalink/dlenv.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/readrange/main.c b/apps/readrange/main.c index 5f003889..8ea0dde1 100644 --- a/apps/readrange/main.c +++ b/apps/readrange/main.c @@ -34,27 +34,26 @@ #if (__STDC_VERSION__ >= 199901L) && defined (__STDC_ISO_10646__) #include #endif +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #include "bacnet/readrange.h" +#include "bacport.h" #if BACNET_SVC_SERVER #error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" diff --git a/apps/reinit/main.c b/apps/reinit/main.c index 6c72de50..7d4b4aa3 100644 --- a/apps/reinit/main.c +++ b/apps/reinit/main.c @@ -30,26 +30,25 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/rd.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/remove-list-element/main.c b/apps/remove-list-element/main.c index e73e391e..dc5d2de8 100644 --- a/apps/remove-list-element/main.c +++ b/apps/remove-list-element/main.c @@ -12,31 +12,28 @@ #include #include #include - #define PRINT_ENABLED 1 - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacdest.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/list_element.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #if BACNET_SVC_SERVER diff --git a/apps/router-ipv6/main.c b/apps/router-ipv6/main.c index b85bc2af..d33a541f 100644 --- a/apps/router-ipv6/main.c +++ b/apps/router-ipv6/main.c @@ -35,9 +35,9 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/router-mstp/main.c b/apps/router-mstp/main.c index ebbc393e..63eb1202 100644 --- a/apps/router-mstp/main.c +++ b/apps/router-mstp/main.c @@ -36,9 +36,9 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" diff --git a/apps/router/msgqueue.h b/apps/router/msgqueue.h index 4a84fb8e..61075b9c 100644 --- a/apps/router/msgqueue.h +++ b/apps/router/msgqueue.h @@ -34,7 +34,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" extern pthread_mutex_t msg_lock; diff --git a/apps/router/network_layer.h b/apps/router/network_layer.h index 6a976bb6..ec229932 100644 --- a/apps/router/network_layer.h +++ b/apps/router/network_layer.h @@ -34,9 +34,11 @@ #include #include #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" +/* router utils */ #include "bacport.h" #include "portthread.h" diff --git a/apps/router/portthread.h b/apps/router/portthread.h index 771cea58..6f8ff3e0 100644 --- a/apps/router/portthread.h +++ b/apps/router/portthread.h @@ -32,9 +32,12 @@ #include #include #include -#include "msgqueue.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" +/* router utils */ +#include "msgqueue.h" #define ERROR 1 #define INFO 2 diff --git a/apps/scov/main.c b/apps/scov/main.c index 1f184570..07c62b30 100644 --- a/apps/scov/main.c +++ b/apps/scov/main.c @@ -30,29 +30,26 @@ #include #include /* for time */ #include /* for toupper */ - #define PRINT_ENABLED 1 - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" #if BACNET_SVC_SERVER #error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" diff --git a/apps/server-client/main.c b/apps/server-client/main.c index 3d55d192..1ba57cf1 100644 --- a/apps/server-client/main.c +++ b/apps/server-client/main.c @@ -12,11 +12,12 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/bacenum.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/version.h" +/* some demo stuff needed */ #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/sys/mstimer.h" diff --git a/apps/server-discover/main.c b/apps/server-discover/main.c index bb5a3735..435a9eae 100644 --- a/apps/server-discover/main.c +++ b/apps/server-discover/main.c @@ -13,11 +13,10 @@ #include #include #include - -/* core library */ -#include "bacnet/config.h" -#include "bacnet/apdu.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/apdu.h" #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/bacstr.h" diff --git a/apps/server/main.c b/apps/server/main.c index c17ae6bd..df5c7ce2 100644 --- a/apps/server/main.c +++ b/apps/server/main.c @@ -28,8 +28,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/dcc.h" @@ -37,14 +38,14 @@ #include "bacnet/npdu.h" #include "bacnet/getevent.h" #include "bacnet/version.h" +/* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/services.h" -#include "bacnet/datalink/dlenv.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/datalink.h" -#include "bacnet/basic/binding/address.h" +#include "bacnet/datalink/dlenv.h" /* include the device object */ #include "bacnet/basic/object/device.h" /* objects that have tasks inside them */ diff --git a/apps/timesync/main.c b/apps/timesync/main.c index e75bad3c..6ab4b1f4 100644 --- a/apps/timesync/main.c +++ b/apps/timesync/main.c @@ -30,26 +30,26 @@ #include #include #include -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/datetime.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/timesync.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/ucov/main.c b/apps/ucov/main.c index 0e2955ad..220d3016 100644 --- a/apps/ucov/main.c +++ b/apps/ucov/main.c @@ -30,25 +30,24 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/cov.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" static void Init_Service_Handlers(void) { diff --git a/apps/uevent/main.c b/apps/uevent/main.c index 8587f5de..841191b4 100644 --- a/apps/uevent/main.c +++ b/apps/uevent/main.c @@ -30,27 +30,26 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/cov.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/event.h" #include "bacnet/whois.h" -/* some demo stuff needed */ #include "bacnet/version.h" +/* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" static void Init_Service_Handlers(void) { diff --git a/apps/uptransfer/main.c b/apps/uptransfer/main.c index 8c6d270d..95764a81 100644 --- a/apps/uptransfer/main.c +++ b/apps/uptransfer/main.c @@ -30,30 +30,27 @@ #include #include /* for time */ #include /* for toupper */ - #define PRINT_ENABLED 1 - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/config.h" +/* BACnet Stack API */ +#include "bacnet/bacapp.h" #include "bacnet/bactext.h" #include "bacnet/bacerror.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" -#include "bacnet/bacapp.h" +#include "bacport.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/whatisnetnum/main.c b/apps/whatisnetnum/main.c index 3f0d17bb..fd512ebc 100644 --- a/apps/whatisnetnum/main.c +++ b/apps/whatisnetnum/main.c @@ -12,10 +12,11 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" /* some demo stuff needed */ diff --git a/apps/whohas/main.c b/apps/whohas/main.c index 2e970401..eef912e7 100644 --- a/apps/whohas/main.c +++ b/apps/whohas/main.c @@ -30,25 +30,24 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whohas.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/whois/main.c b/apps/whois/main.c index a21fcc87..59ba6e09 100644 --- a/apps/whois/main.c +++ b/apps/whois/main.c @@ -30,25 +30,23 @@ #include #include #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/bactext.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" -#if defined(BACDL_MSTP) -#include "rs485.h" -#endif +#include "bacnet/basic/object/device.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" #include "bacport.h" diff --git a/apps/whoisrouter/main.c b/apps/whoisrouter/main.c index 6db782bf..6f5f11a7 100644 --- a/apps/whoisrouter/main.c +++ b/apps/whoisrouter/main.c @@ -30,10 +30,11 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" /* some demo stuff needed */ diff --git a/apps/writebdt/main.c b/apps/writebdt/main.c index 8d62276f..781aeb90 100644 --- a/apps/writebdt/main.c +++ b/apps/writebdt/main.c @@ -31,25 +31,23 @@ #include /* for time */ #include #include /* for toupper */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/datalink/datalink.h" -#include "bacnet/datalink/bvlc.h" /* some demo stuff needed */ -#ifndef DEBUG_ENABLED -#define DEBUG_ENABLED 0 -#endif +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/bvlc.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" /* buffer used for receive */ diff --git a/apps/writefile/main.c b/apps/writefile/main.c index bff55ab7..eff18cf1 100644 --- a/apps/writefile/main.c +++ b/apps/writefile/main.c @@ -30,25 +30,24 @@ #include #include /* for time */ #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/awf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/apps/writeprop/main.c b/apps/writeprop/main.c index 72ef972f..01a85428 100644 --- a/apps/writeprop/main.c +++ b/apps/writeprop/main.c @@ -32,25 +32,25 @@ #include #include #include /* toupper */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/iam.h" #include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/config.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/whois.h" #include "bacnet/version.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/datalink/datalink.h" #include "bacnet/basic/sys/filename.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/dlenv.h" +#include "bacport.h" #ifndef MAX_PROPERTY_VALUES #define MAX_PROPERTY_VALUES 64 diff --git a/apps/writepropm/main.c b/apps/writepropm/main.c index 84928e03..7b2cf977 100644 --- a/apps/writepropm/main.c +++ b/apps/writepropm/main.c @@ -30,36 +30,33 @@ #include #include #include /* for time */ - #define PRINT_ENABLED 1 +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bactext.h" +#include "bacnet/bacerror.h" +#include "bacnet/iam.h" +#include "bacnet/apdu.h" +#include "bacnet/arf.h" +#include "bacnet/npdu.h" +#include "bacnet/rpm.h" +#include "bacnet/whois.h" +#include "bacnet/version.h" +/* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/basic/sys/filename.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" +#include "bacnet/datalink/dlenv.h" +#include "bacport.h" #if BACNET_SVC_SERVER #error "App requires server-only features disabled! Set BACNET_SVC_SERVER=0" #endif -#include "bacnet/bacdef.h" -#include "bacnet/config.h" -#include "bacnet/bactext.h" -#include "bacnet/bacerror.h" -#include "bacnet/iam.h" -#include "bacnet/arf.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/basic/binding/address.h" -#include "bacnet/npdu.h" -#include "bacnet/apdu.h" -#include "bacnet/basic/object/device.h" -#include "bacport.h" -#include "bacnet/datalink/datalink.h" -#include "bacnet/whois.h" -#include "bacnet/version.h" -/* some demo stuff needed */ -#include "bacnet/rpm.h" -#include "bacnet/basic/sys/filename.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/services.h" -#include "bacnet/basic/tsm/tsm.h" -#include "bacnet/datalink/dlenv.h" - /* buffer used for receive */ static uint8_t Rx_Buf[MAX_MPDU] = { 0 }; diff --git a/ports/arduino_uno/apdu.c b/ports/arduino_uno/apdu.c index 97feded1..2dfffd76 100644 --- a/ports/arduino_uno/apdu.c +++ b/ports/arduino_uno/apdu.c @@ -34,11 +34,11 @@ #include #include #include -#include "bacnet/bits.h" -#include "bacnet/apdu.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/apdu.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/basic/services.h" bool apdu_service_supported(BACNET_SERVICES_SUPPORTED service_supported) diff --git a/ports/at91sam7s/dlmstp.c b/ports/at91sam7s/dlmstp.c index c2bbde89..c0bcb102 100644 --- a/ports/at91sam7s/dlmstp.c +++ b/ports/at91sam7s/dlmstp.c @@ -36,15 +36,16 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstpdef.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" -#include "bacnet/bytes.h" #include "bacnet/bacaddr.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/datalink/crc.h" +/* port specific */ #include "rs485.h" #include "timer.h" #include "board.h" diff --git a/ports/atmega168/apdu.c b/ports/atmega168/apdu.c index a6ee5a28..81da4e6f 100644 --- a/ports/atmega168/apdu.c +++ b/ports/atmega168/apdu.c @@ -34,11 +34,11 @@ #include #include #include -#include "bacnet/bits.h" -#include "bacnet/apdu.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/apdu.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/basic/services.h" bool apdu_service_supported(BACNET_SERVICES_SUPPORTED service_supported) diff --git a/ports/atmega168/dlmstp.c b/ports/atmega168/dlmstp.c index 2cc60186..f96e5126 100644 --- a/ports/atmega168/dlmstp.c +++ b/ports/atmega168/dlmstp.c @@ -36,18 +36,19 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/mstpdef.h" #include "bacnet/datalink/dlmstp.h" -#include "rs485.h" #include "bacnet/datalink/crc.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" -#include "bacnet/bytes.h" #include "bacnet/bacaddr.h" /* special optimization - I-Am response in this module */ #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" +/* port specific */ +#include "rs485.h" /* This file has been customized for use with small microprocessors */ /* Assumptions: diff --git a/ports/atmega168/hardware.h b/ports/atmega168/hardware.h index c41a7e56..59dfb35a 100644 --- a/ports/atmega168/hardware.h +++ b/ports/atmega168/hardware.h @@ -38,6 +38,6 @@ #endif #endif #include "iar2gcc.h" -#include "bacnet/bits.h" +#include "bacnet/basic/sys/bits.h" #endif diff --git a/ports/bdk-atxx4-mstp/dlmstp.c b/ports/bdk-atxx4-mstp/dlmstp.c index 8d0a11f7..d31569b1 100644 --- a/ports/bdk-atxx4-mstp/dlmstp.c +++ b/ports/bdk-atxx4-mstp/dlmstp.c @@ -36,17 +36,18 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstpdef.h" #include "bacnet/datalink/crc.h" -#include "rs485.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" -#include "bacnet/bytes.h" #include "bacnet/bacaddr.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/basic/sys/mstimer.h" +/* port specific */ +#include "rs485.h" /* This file has been customized for use with small microprocessors */ /* Assumptions: diff --git a/ports/bdk-atxx4-mstp/hardware.h b/ports/bdk-atxx4-mstp/hardware.h index ba1cebaa..485ab311 100644 --- a/ports/bdk-atxx4-mstp/hardware.h +++ b/ports/bdk-atxx4-mstp/hardware.h @@ -62,7 +62,7 @@ #endif #include "iar2gcc.h" -#include "bacnet/bits.h" +#include "bacnet/basic/sys/bits.h" /* SEEPROM is 24LC128 */ /*#define SEEPROM_PAGE_SIZE 64 */ diff --git a/ports/bsd/bacport.h b/ports/bsd/bacport.h index 142dd3df..c6e2ee06 100644 --- a/ports/bsd/bacport.h +++ b/ports/bsd/bacport.h @@ -23,8 +23,8 @@ * *********************************************************************/ -#ifndef NET_H -#define NET_H +#ifndef BACPORT_H +#define BACPORT_H /* common unix sockets headers needed */ #include /* basic system data types */ @@ -88,7 +88,7 @@ #include #include #include -#include "bacnet/bacnet_stack_exports.h" +#include "bacnet/basic/sys/bacnet_stack_exports.h" /** @file bsd/net.h Includes BSD network headers. */ diff --git a/ports/linux/bacport.h b/ports/linux/bacport.h index dcf67ad3..f9b1be13 100644 --- a/ports/linux/bacport.h +++ b/ports/linux/bacport.h @@ -23,8 +23,8 @@ * *********************************************************************/ -#ifndef NET_H -#define NET_H +#ifndef BACPORT_H +#define BACPORT_H /* common unix sockets headers needed */ #include /* basic system data types */ @@ -99,7 +99,7 @@ #include #include #include -#include "bacnet/bacnet_stack_exports.h" +#include "bacnet/basic/sys/bacnet_stack_exports.h" #define BACNET_OBJECT_TABLE(table_name, _type, _init, _count, \ _index_to_instance, _valid_instance, _object_name, \ diff --git a/ports/linux/dlmstp.c b/ports/linux/dlmstp.c index 0fc0f26b..ebabbf86 100644 --- a/ports/linux/dlmstp.c +++ b/ports/linux/dlmstp.c @@ -30,17 +30,19 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" +#include "bacnet/npdu.h" #include "bacnet/datalink/mstp.h" #include "bacnet/datalink/dlmstp.h" -#include "rs485.h" -#include "bacnet/npdu.h" -#include "bacnet/bits.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/basic/sys/debug.h" /* OS Specific include */ #include "bacport.h" +/* port specific */ +#include "rs485.h" /** @file linux/dlmstp.c Provides Linux-specific DataLink functions for MS/TP. */ diff --git a/ports/linux/dlmstp_linux.c b/ports/linux/dlmstp_linux.c index 1d509b0a..e6310d12 100644 --- a/ports/linux/dlmstp_linux.c +++ b/ports/linux/dlmstp_linux.c @@ -29,17 +29,19 @@ #include #include #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdef.h" #include "bacnet/bacaddr.h" +#include "bacnet/npdu.h" #include "bacnet/datalink/mstp.h" -/*#include "bacnet/datalink/dlmstp.h" */ +#include "bacnet/basic/sys/ringbuf.h" +/* port specific */ #include "dlmstp_linux.h" #include "rs485.h" -#include "bacnet/npdu.h" -#include "bacnet/bits.h" /* OS Specific include */ #include "bacport.h" -#include "bacnet/basic/sys/ringbuf.h" /** @file linux/dlmstp.c Provides Linux-specific DataLink functions for MS/TP. */ diff --git a/ports/linux/dlmstp_linux.h b/ports/linux/dlmstp_linux.h index de3538d9..bf8ee5c1 100644 --- a/ports/linux/dlmstp_linux.h +++ b/ports/linux/dlmstp_linux.h @@ -32,10 +32,11 @@ #include #include #include -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacdef.h" -#include "bacnet/npdu.h" #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/npdu.h" #include "bacnet/basic/sys/fifo.h" #include "bacnet/basic/sys/ringbuf.h" /* defines specific to MS/TP */ diff --git a/ports/linux/mstpsnap.c b/ports/linux/mstpsnap.c index 4fda8d4c..10384e87 100644 --- a/ports/linux/mstpsnap.c +++ b/ports/linux/mstpsnap.c @@ -38,17 +38,20 @@ #include #include #include -/* OS specific include*/ -#include "bacport.h" +#/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/mstimer.h" -/* local includes */ -#include "bacnet/bytes.h" -#include "rs485.h" +#include "bacnet/basic/sys/bytes.h" #include "bacnet/datalink/crc.h" #include "bacnet/datalink/mstp.h" #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstptext.h" #include "bacnet/bacint.h" +/* OS specific include*/ +#include "bacport.h" +/* local includes */ +#include "rs485.h" /** @file linux/mstpsnap.c Example application testing BACnet MS/TP on Linux. */ diff --git a/ports/linux/rs485.h b/ports/linux/rs485.h index b33f10df..daffc90c 100644 --- a/ports/linux/rs485.h +++ b/ports/linux/rs485.h @@ -37,7 +37,6 @@ #define RS485_H #include -#include "bacnet/bacnet_stack_exports.h" #include "bacnet/datalink/mstp.h" #ifdef __cplusplus diff --git a/ports/pic18f6720/apdu.c b/ports/pic18f6720/apdu.c index 9393dfd0..98e85054 100644 --- a/ports/pic18f6720/apdu.c +++ b/ports/pic18f6720/apdu.c @@ -34,10 +34,10 @@ #include #include #include -#include "bacnet/bits.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/dcc.h" #include "bacnet/basic/services.h" /* me */ diff --git a/ports/pic18f6720/mstp.c b/ports/pic18f6720/mstp.c index adc9fa0d..4e6de89e 100644 --- a/ports/pic18f6720/mstp.c +++ b/ports/pic18f6720/mstp.c @@ -49,15 +49,17 @@ #if PRINT_ENABLED #include #endif +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/mstp.h" -#include "bacnet/bytes.h" -#include "bacnet/bits.h" -#include "crc.h" #include "bacnet/bacaddr.h" -#include "rs485.h" #if PRINT_ENABLED #include "bacnet/datalink/mstptext.h" #endif +/* port specific */ +#include "crc.h" +#include "rs485.h" /* debug print statements */ #if PRINT_ENABLED diff --git a/ports/pic18f97j60/apdu.c b/ports/pic18f97j60/apdu.c index 9393dfd0..fa2f5a32 100644 --- a/ports/pic18f97j60/apdu.c +++ b/ports/pic18f97j60/apdu.c @@ -34,10 +34,11 @@ #include #include #include -#include "bacnet/bits.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/dcc.h" #include "bacnet/basic/services.h" /* me */ diff --git a/ports/pic18f97j60/mstp.c b/ports/pic18f97j60/mstp.c index f61daad3..0d0e5fbe 100644 --- a/ports/pic18f97j60/mstp.c +++ b/ports/pic18f97j60/mstp.c @@ -49,15 +49,17 @@ #if PRINT_ENABLED #include #endif +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/mstp.h" -#include "bacnet/bytes.h" -#include "bacnet/bits.h" -#include "crc.h" #include "bacnet/bacaddr.h" -#include "rs485.h" #if PRINT_ENABLED #include "bacnet/datalink/mstptext.h" #endif +/* port specific */ +#include "crc.h" +#include "rs485.h" /* debug print statements */ #if PRINT_ENABLED diff --git a/ports/stm32f10x/dlmstp.c b/ports/stm32f10x/dlmstp.c index 53a1b1e5..cf546855 100644 --- a/ports/stm32f10x/dlmstp.c +++ b/ports/stm32f10x/dlmstp.c @@ -36,11 +36,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/dlmstp.h" -#include "rs485.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" #include "bacnet/bacaddr.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/basic/sys/ringbuf.h" @@ -48,6 +48,8 @@ #include "bacnet/datalink/mstpdef.h" #include "bacnet/datalink/automac.h" #include "bacnet/basic/object/device.h" +/* port specific */ +#include "rs485.h" /* This file has been customized for use with small microprocessors */ /* Assumptions: diff --git a/ports/stm32f10x/rs485.c b/ports/stm32f10x/rs485.c index 2c6f1f2e..b5872151 100644 --- a/ports/stm32f10x/rs485.c +++ b/ports/stm32f10x/rs485.c @@ -27,11 +27,14 @@ #include #include #include -#include "hardware.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/mstimer.h" -#include "bacnet/bits.h" #include "bacnet/datalink/dlmstp.h" #include "bacnet/basic/sys/fifo.h" +/* port specific */ +#include "hardware.h" #include "led.h" #include "rs485.h" diff --git a/ports/stm32f4xx/rs485.c b/ports/stm32f4xx/rs485.c index d1fb192b..14d194ba 100644 --- a/ports/stm32f4xx/rs485.c +++ b/ports/stm32f4xx/rs485.c @@ -29,12 +29,15 @@ #include #include #include -#include "stm32f4xx.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/mstimer.h" -#include "bacnet/bits.h" #include "bacnet/basic/sys/fifo.h" #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstpdef.h" +/* port specific */ +#include "stm32f4xx.h" #include "rs485.h" #ifndef RS485_LINKSPRITE_ENABLED diff --git a/ports/win32/bacport.h b/ports/win32/bacport.h index 73b31207..4b01b9a6 100644 --- a/ports/win32/bacport.h +++ b/ports/win32/bacport.h @@ -26,7 +26,7 @@ #ifndef BACPORT_H #define BACPORT_H -#include "bacnet/bacnet_stack_exports.h" +#include "bacnet/basic/sys/bacnet_stack_exports.h" #define WIN32_LEAN_AND_MEAN #define STRICT 1 diff --git a/ports/win32/dlmstp-mm.c b/ports/win32/dlmstp-mm.c index f5910181..625a5706 100644 --- a/ports/win32/dlmstp-mm.c +++ b/ports/win32/dlmstp-mm.c @@ -29,13 +29,15 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" #include "bacnet/datalink/mstp.h" #include "bacnet/datalink/dlmstp.h" -#include "rs485.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" +/* port specific */ +#include "rs485.h" #define WIN32_LEAN_AND_MEAN #define STRICT 1 diff --git a/ports/win32/dlmstp.c b/ports/win32/dlmstp.c index 45c8bb24..f6293ed3 100644 --- a/ports/win32/dlmstp.c +++ b/ports/win32/dlmstp.c @@ -30,15 +30,18 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" -#include "bacnet/bits.h" #include "bacnet/npdu.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/datalink/mstp.h" #include "bacnet/datalink/dlmstp.h" +/* OS common includes */ #include "bacport.h" +/* port specific */ #include "rs485.h" /* Number of MS/TP Packets Rx/Tx */ diff --git a/ports/win32/rs485.h b/ports/win32/rs485.h index 7a89569c..3cf53a90 100644 --- a/ports/win32/rs485.h +++ b/ports/win32/rs485.h @@ -37,7 +37,6 @@ #define RS485_H #include -#include "bacnet/bacnet_stack_exports.h" #include "bacnet/datalink/mstp.h" #include "bacport.h" diff --git a/ports/xplained/dlmstp.c b/ports/xplained/dlmstp.c index 0f387b79..84e551d5 100644 --- a/ports/xplained/dlmstp.c +++ b/ports/xplained/dlmstp.c @@ -36,17 +36,18 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstpdef.h" -#include "rs485.h" #include "bacnet/datalink/crc.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" -#include "bacnet/bytes.h" #include "bacnet/bacaddr.h" #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/basic/sys/mstimer.h" +/* port specific */ +#include "rs485.h" /* This file has been customized for use with small microprocessors */ /* Assumptions: diff --git a/ports/zephyr/bacnet/datalink/ethernet.h b/ports/zephyr/bacnet/datalink/ethernet.h index 8944f51e..c2ed94e4 100644 --- a/ports/zephyr/bacnet/datalink/ethernet.h +++ b/ports/zephyr/bacnet/datalink/ethernet.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /* specific defines for Ethernet */ diff --git a/src/bacnet/abort.c b/src/bacnet/abort.c index 83db9696..d393f4ac 100644 --- a/src/bacnet/abort.c +++ b/src/bacnet/abort.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/abort.h" /** @file abort.c Abort Encoding/Decoding */ diff --git a/src/bacnet/abort.h b/src/bacnet/abort.h index 2cc2e3b1..5af317e8 100644 --- a/src/bacnet/abort.h +++ b/src/bacnet/abort.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/access_rule.h b/src/bacnet/access_rule.h index 068a3abf..9fc3030c 100644 --- a/src/bacnet/access_rule.h +++ b/src/bacnet/access_rule.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/alarm_ack.h b/src/bacnet/alarm_ack.h index 1c60f96b..3ef50e7b 100644 --- a/src/bacnet/alarm_ack.h +++ b/src/bacnet/alarm_ack.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/apdu.h b/src/bacnet/apdu.h index a4b383a5..db3b0ed3 100644 --- a/src/bacnet/apdu.h +++ b/src/bacnet/apdu.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct _confirmed_service_data { bool segmented_message; diff --git a/src/bacnet/arf.c b/src/bacnet/arf.c index 31d37f5e..5134bc7c 100644 --- a/src/bacnet/arf.c +++ b/src/bacnet/arf.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/arf.h" /** @file arf.c Atomic Read File */ diff --git a/src/bacnet/arf.h b/src/bacnet/arf.h index 49eb2a33..73c9ffb7 100644 --- a/src/bacnet/arf.h +++ b/src/bacnet/arf.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/assigned_access_rights.h b/src/bacnet/assigned_access_rights.h index 3dbd1d79..8e00ca4b 100644 --- a/src/bacnet/assigned_access_rights.h +++ b/src/bacnet/assigned_access_rights.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/authentication_factor.h b/src/bacnet/authentication_factor.h index 39eaa0b6..aac73195 100644 --- a/src/bacnet/authentication_factor.h +++ b/src/bacnet/authentication_factor.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" typedef struct { diff --git a/src/bacnet/authentication_factor_format.h b/src/bacnet/authentication_factor_format.h index ce023a05..88cee5ad 100644 --- a/src/bacnet/authentication_factor_format.h +++ b/src/bacnet/authentication_factor_format.h @@ -28,8 +28,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct { BACNET_AUTHENTICATION_FACTOR_TYPE format_type; diff --git a/src/bacnet/awf.c b/src/bacnet/awf.c index a7fd9fcc..08578dc9 100644 --- a/src/bacnet/awf.c +++ b/src/bacnet/awf.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/awf.h" /** @file awf.c Atomic Write File */ diff --git a/src/bacnet/awf.h b/src/bacnet/awf.h index cbe0befe..04339b93 100644 --- a/src/bacnet/awf.h +++ b/src/bacnet/awf.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #ifndef BACNET_WRITE_FILE_RECORD_COUNT diff --git a/src/bacnet/bacaddr.c b/src/bacnet/bacaddr.c index 6a44ddaf..112a926b 100644 --- a/src/bacnet/bacaddr.c +++ b/src/bacnet/bacaddr.c @@ -36,9 +36,10 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/bacint.h" #include "bacnet/bacstr.h" #include "bacnet/bacaddr.h" diff --git a/src/bacnet/bacaddr.h b/src/bacnet/bacaddr.h index de24b714..a988a422 100644 --- a/src/bacnet/bacaddr.h +++ b/src/bacnet/bacaddr.h @@ -27,9 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/bacapp.h b/src/bacnet/bacapp.h index b332daf8..b5d77fb7 100644 --- a/src/bacnet/bacapp.h +++ b/src/bacnet/bacapp.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdest.h" #include "bacnet/bacint.h" #include "bacnet/bacstr.h" diff --git a/src/bacnet/bacdcode.c b/src/bacnet/bacdcode.c index 274659ff..3974696c 100644 --- a/src/bacnet/bacdcode.c +++ b/src/bacnet/bacdcode.c @@ -33,11 +33,10 @@ ####COPYRIGHTEND####*/ #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" -#include "bacnet/bits.h" #include "bacnet/bacstr.h" #include "bacnet/bacint.h" #include "bacnet/bacreal.h" diff --git a/src/bacnet/bacdcode.h b/src/bacnet/bacdcode.h index 746b9353..07562445 100644 --- a/src/bacnet/bacdcode.h +++ b/src/bacnet/bacdcode.h @@ -27,14 +27,13 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datetime.h" #include "bacnet/bacstr.h" #include "bacnet/bacint.h" #include "bacnet/bacreal.h" -#include "bacnet/bits.h" /** * @brief Encode a BACnetARRAY property element; a function template diff --git a/src/bacnet/bacdef.h b/src/bacnet/bacdef.h index c69329eb..f859b300 100644 --- a/src/bacnet/bacdef.h +++ b/src/bacnet/bacdef.h @@ -1,39 +1,27 @@ -/************************************************************************** -* -* Copyright (C) 2012 Steve Karg -* -* Permission is hereby granted, free of charge, to any person obtaining -* a copy of this software and associated documentation files (the -* "Software"), to deal in the Software without restriction, including -* without limitation the rights to use, copy, modify, merge, publish, -* distribute, sublicense, and/or sell copies of the Software, and to -* permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ +/** + * @file + * @brief Core BACnet defines and enumerations and structures + * @author Steve Karg + * @date 2004 + * @copyright 2004 Steve Karg + * + * SPDX-License-Identifier: MIT + */ #ifndef BACDEF_H #define BACDEF_H #include #include +/* config is always first to allow developers to override */ #include "bacnet/config.h" +/* BACnet Stack core enumerations */ #include "bacnet/bacenum.h" - -#if defined(_MSC_VER) -/* Silence the warnings about unsafe versions of library functions */ -/* as we need to keep the code portable */ -#pragma warning( disable : 4996) -#endif +/* BACnet Stack libc and compiler abstraction */ +#include "bacnet/basic/sys/platform.h" +#include "bacnet/basic/sys/bacnet_stack_exports.h" +/* BACnet Stack common helper macros */ +#include "bacnet/basic/sys/bits.h" +#include "bacnet/basic/sys/bytes.h" /* This stack implements this version of BACnet */ #define BACNET_PROTOCOL_VERSION 1 @@ -51,14 +39,14 @@ #define MAX_ASHRAE_OBJECT_TYPE 21 #define MAX_BACNET_SERVICES_SUPPORTED 37 #elif (BACNET_PROTOCOL_REVISION == 2) - /* from 135-2001 version of the BACnet Standard */ +/* from 135-2001 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 23 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 3) #define MAX_ASHRAE_OBJECT_TYPE 23 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 4) - /* from 135-2004 version of the BACnet Standard */ +/* from 135-2004 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 25 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 5) @@ -74,7 +62,7 @@ #define MAX_ASHRAE_OBJECT_TYPE 31 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 9) - /* from 135-2008 version of the BACnet Standard */ +/* from 135-2008 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 38 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 10) @@ -84,42 +72,42 @@ #define MAX_ASHRAE_OBJECT_TYPE 51 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 12) - /* from 135-2010 version of the BACnet Standard */ +/* from 135-2010 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 51 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 13) #define MAX_ASHRAE_OBJECT_TYPE 53 #define MAX_BACNET_SERVICES_SUPPORTED 40 #elif (BACNET_PROTOCOL_REVISION == 14) || (BACNET_PROTOCOL_REVISION == 15) - /* from 135-2012 version of the BACnet Standard */ +/* from 135-2012 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 55 #define MAX_BACNET_SERVICES_SUPPORTED 41 #elif (BACNET_PROTOCOL_REVISION == 16) - /* Addendum 135-2012an, 135-2012at, 135-2012au, - 135-2012av, 135-2012aw, 135-2012ax, 135-2012az */ +/* Addendum 135-2012an, 135-2012at, 135-2012au, + 135-2012av, 135-2012aw, 135-2012ax, 135-2012az */ #define MAX_ASHRAE_OBJECT_TYPE 56 #define MAX_BACNET_SERVICES_SUPPORTED 41 #elif (BACNET_PROTOCOL_REVISION == 17) - /* Addendum 135-2012ai */ +/* Addendum 135-2012ai */ #define MAX_ASHRAE_OBJECT_TYPE 57 #define MAX_BACNET_SERVICES_SUPPORTED 41 #elif (BACNET_PROTOCOL_REVISION == 18) || (BACNET_PROTOCOL_REVISION == 19) - /* from 135-2016 version of the BACnet Standard */ +/* from 135-2016 version of the BACnet Standard */ #define MAX_ASHRAE_OBJECT_TYPE 60 #define MAX_BACNET_SERVICES_SUPPORTED 44 #elif (BACNET_PROTOCOL_REVISION == 20) || (BACNET_PROTOCOL_REVISION == 21) - /* Addendum 135-2016bd, 135-2016be, 135-2016bi */ +/* Addendum 135-2016bd, 135-2016be, 135-2016bi */ #define MAX_ASHRAE_OBJECT_TYPE 63 #define MAX_BACNET_SERVICES_SUPPORTED 47 #elif (BACNET_PROTOCOL_REVISION == 22) #define MAX_ASHRAE_OBJECT_TYPE 63 #define MAX_BACNET_SERVICES_SUPPORTED 47 #elif (BACNET_PROTOCOL_REVISION == 23) - /* Addendum 135-2020cd */ +/* Addendum 135-2020cd */ #define MAX_ASHRAE_OBJECT_TYPE 63 #define MAX_BACNET_SERVICES_SUPPORTED 47 #elif (BACNET_PROTOCOL_REVISION == 24) - /* Addendum 135-2020ca, 135-2020cc, 135-2020bv */ +/* Addendum 135-2020ca, 135-2020cc, 135-2020bv */ #define MAX_ASHRAE_OBJECT_TYPE 65 #define MAX_BACNET_SERVICES_SUPPORTED 47 #else @@ -145,7 +133,7 @@ typedef uint32_t BACNET_UNSIGNED_INTEGER; #define BACNET_ARRAY_ALL UINT32_MAX typedef uint32_t BACNET_ARRAY_INDEX; /* For device object property references with no device id defined */ -#define BACNET_NO_DEV_ID 0xFFFFFFFFu +#define BACNET_NO_DEV_ID 0xFFFFFFFFu #define BACNET_NO_DEV_TYPE OBJECT_NONE /* Priority Array for commandable objects */ #define BACNET_NO_PRIORITY 0 @@ -173,16 +161,16 @@ struct BACnet_Device_Address { /* DNET,DLEN,DADR or SNET,SLEN,SADR */ /* the following are used if the device is behind a router */ /* net = 0 indicates local */ - uint16_t net; /* BACnet network number */ + uint16_t net; /* BACnet network number */ /* LEN = 0 denotes broadcast MAC ADR and ADR field is absent */ /* LEN > 0 specifies length of ADR field */ - uint8_t len; /* length of MAC address */ - uint8_t adr[MAX_MAC_LEN]; /* hwaddr (MAC) address */ + uint8_t len; /* length of MAC address */ + uint8_t adr[MAX_MAC_LEN]; /* hwaddr (MAC) address */ }; typedef struct BACnet_Device_Address BACNET_ADDRESS; /* define a MAC address for manipulation */ struct BACnet_MAC_Address { - uint8_t len; /* length of MAC address */ + uint8_t len; /* length of MAC address */ uint8_t adr[MAX_MAC_LEN]; }; typedef struct BACnet_MAC_Address BACNET_MAC_ADDRESS; @@ -195,12 +183,16 @@ typedef struct BACnet_Object_Id { uint32_t instance; } BACNET_OBJECT_ID; -#define MAX_NPDU (1+1+2+1+MAX_MAC_LEN+2+1+MAX_MAC_LEN+1+1+2) +#define MAX_NPDU (1 + 1 + 2 + 1 + MAX_MAC_LEN + 2 + 1 + MAX_MAC_LEN + 1 + 1 + 2) #define MAX_PDU (MAX_APDU + MAX_NPDU) -#define BACNET_ID_VALUE(bacnet_object_instance, bacnet_object_type) ((((bacnet_object_type) & BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | ((bacnet_object_instance) & BACNET_MAX_INSTANCE)) -#define BACNET_INSTANCE(bacnet_object_id_num) ((bacnet_object_id_num)&BACNET_MAX_INSTANCE) -#define BACNET_TYPE(bacnet_object_id_num) (((bacnet_object_id_num) >> BACNET_INSTANCE_BITS ) & BACNET_MAX_OBJECT) +#define BACNET_ID_VALUE(bacnet_object_instance, bacnet_object_type) \ + ((((bacnet_object_type)&BACNET_MAX_OBJECT) << BACNET_INSTANCE_BITS) | \ + ((bacnet_object_instance)&BACNET_MAX_INSTANCE)) +#define BACNET_INSTANCE(bacnet_object_id_num) \ + ((bacnet_object_id_num)&BACNET_MAX_INSTANCE) +#define BACNET_TYPE(bacnet_object_id_num) \ + (((bacnet_object_id_num) >> BACNET_INSTANCE_BITS) & BACNET_MAX_OBJECT) #define BACNET_STATUS_OK (0) #define BACNET_STATUS_ERROR (-1) diff --git a/src/bacnet/bacdest.c b/src/bacnet/bacdest.c index 8b85d53d..7b771a92 100644 --- a/src/bacnet/bacdest.c +++ b/src/bacnet/bacdest.c @@ -16,13 +16,14 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" #include "bacnet/bacapp.h" #include "bacnet/bacdcode.h" #include "bacnet/bacdest.h" #include "bacnet/basic/binding/address.h" -#include "bacdest.h" /** * @brief Initialize the BACnetDestination data structure with defaults diff --git a/src/bacnet/bacdest.h b/src/bacnet/bacdest.h index b5ae3fe6..34ff9d82 100644 --- a/src/bacnet/bacdest.h +++ b/src/bacnet/bacdest.h @@ -14,9 +14,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/bacdevobjpropref.h b/src/bacnet/bacdevobjpropref.h index 7880cd51..6926afb1 100644 --- a/src/bacnet/bacdevobjpropref.h +++ b/src/bacnet/bacdevobjpropref.h @@ -28,11 +28,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacint.h" -#include "bacnet/bacenum.h" -#include "bacnet/basic/sys/platform.h" typedef struct BACnetDeviceObjectPropertyReference { /* number type first to avoid enum cast warning on = { 0 } */ diff --git a/src/bacnet/bacerror.c b/src/bacnet/bacerror.c index dd3bae38..ddcc6add 100644 --- a/src/bacnet/bacerror.c +++ b/src/bacnet/bacerror.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" /** @file bacerror.c Encode/Decode BACnet Errors */ diff --git a/src/bacnet/bacerror.h b/src/bacnet/bacerror.h index 99ae6e45..054d8163 100644 --- a/src/bacnet/bacerror.h +++ b/src/bacnet/bacerror.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/bacint.c b/src/bacnet/bacint.c index df5d7a2c..7c35d36d 100644 --- a/src/bacnet/bacint.c +++ b/src/bacnet/bacint.c @@ -36,7 +36,9 @@ #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacint.h" /** @file bacint.c Encode/Decode Integer Types */ diff --git a/src/bacnet/bacint.h b/src/bacnet/bacint.h index 2eca26b1..9a6f7fd1 100644 --- a/src/bacnet/bacint.h +++ b/src/bacnet/bacint.h @@ -27,8 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/bacprop.h b/src/bacnet/bacprop.h index 5167da3c..674f7913 100644 --- a/src/bacnet/bacprop.h +++ b/src/bacnet/bacprop.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct { signed prop_id; /* index number that matches the text */ diff --git a/src/bacnet/bacpropstates.h b/src/bacnet/bacpropstates.h index 79486d6f..05abe568 100644 --- a/src/bacnet/bacpropstates.h +++ b/src/bacnet/bacpropstates.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/bacreal.c b/src/bacnet/bacreal.c index 748b89a8..a4eae025 100644 --- a/src/bacnet/bacreal.c +++ b/src/bacnet/bacreal.c @@ -33,11 +33,10 @@ ####COPYRIGHTEND####*/ #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" -#include "bacnet/bits.h" #include "bacnet/bacstr.h" #include "bacnet/bacint.h" #include "bacnet/bacreal.h" diff --git a/src/bacnet/bacreal.h b/src/bacnet/bacreal.h index 52a14170..2068afb3 100644 --- a/src/bacnet/bacreal.h +++ b/src/bacnet/bacreal.h @@ -27,8 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/bacstr.c b/src/bacnet/bacstr.c index e665a4ce..753344ca 100644 --- a/src/bacnet/bacstr.c +++ b/src/bacnet/bacstr.c @@ -38,19 +38,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" -#include "bacnet/bits.h" - -/* TODO: For some reason my Zephyr build for non-native targets does not - * see a definition for strnlen(), but it is visible in when - * compiling for native_posix. This results in the compiler - * emitting a warning, forcing Zephyr's sanitycheck() script to stop. - * Until this is chased down, the definition is being provided here. - */ -#if __ZEPHYR__ && !CONFIG_NATIVE_APPLICATION -size_t strnlen(const char *, size_t); -#endif /** @file bacstr.c Manipulate Bit/Char/Octet Strings */ #ifndef BACNET_STRING_UTF8_VALIDATION diff --git a/src/bacnet/bacstr.h b/src/bacnet/bacstr.h index ce046713..8ea4e742 100644 --- a/src/bacnet/bacstr.h +++ b/src/bacnet/bacstr.h @@ -27,9 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* bit strings They could be as large as 256/8=32 octets */ diff --git a/src/bacnet/bactext.h b/src/bacnet/bactext.h index f76e1daf..6cb8bd8d 100644 --- a/src/bacnet/bactext.h +++ b/src/bacnet/bactext.h @@ -31,8 +31,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/indtext.h" #ifdef __cplusplus diff --git a/src/bacnet/bactimevalue.h b/src/bacnet/bactimevalue.h index 30d1f604..15c3fce3 100644 --- a/src/bacnet/bactimevalue.h +++ b/src/bacnet/bactimevalue.h @@ -28,10 +28,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacint.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/basic/bbmd/h_bbmd.h b/src/bacnet/basic/bbmd/h_bbmd.h index f6d1a0ff..4d12809b 100644 --- a/src/bacnet/basic/bbmd/h_bbmd.h +++ b/src/bacnet/basic/bbmd/h_bbmd.h @@ -32,8 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/bvlc.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/bbmd6/h_bbmd6.h b/src/bacnet/basic/bbmd6/h_bbmd6.h index d36806c5..991fdf38 100644 --- a/src/bacnet/basic/bbmd6/h_bbmd6.h +++ b/src/bacnet/basic/bbmd6/h_bbmd6.h @@ -32,8 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/bvlc6.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/bbmd6/vmac.c b/src/bacnet/basic/bbmd6/vmac.c index b8e8be64..b409304c 100644 --- a/src/bacnet/basic/bbmd6/vmac.c +++ b/src/bacnet/basic/bbmd6/vmac.c @@ -36,7 +36,6 @@ #include #include #include -#include "bacnet/config.h" #include "bacnet/bacdef.h" #include "bacnet/basic/sys/keylist.h" /* me! */ diff --git a/src/bacnet/basic/bbmd6/vmac.h b/src/bacnet/basic/bbmd6/vmac.h index f07f1ebb..c37aafe7 100644 --- a/src/bacnet/basic/bbmd6/vmac.h +++ b/src/bacnet/basic/bbmd6/vmac.h @@ -8,8 +8,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* define the max MAC as big as IPv6 + port number */ #define VMAC_MAC_MAX 18 diff --git a/src/bacnet/basic/binding/address.c b/src/bacnet/basic/binding/address.c index 2e26469e..4cfe0524 100644 --- a/src/bacnet/basic/binding/address.c +++ b/src/bacnet/basic/binding/address.c @@ -36,14 +36,13 @@ #include #include #include -#include "bacnet/bits.h" -#include "bacnet/config.h" -#include "bacnet/bacaddr.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacaddr.h" #include "bacnet/bacdcode.h" #include "bacnet/readrange.h" #include "bacnet/basic/binding/address.h" -#include "bacnet/basic/binding/address.h" /* we are likely compiling the demo command line tools if print enabled */ #if !defined(BACNET_ADDRESS_CACHE_FILE) diff --git a/src/bacnet/basic/binding/address.h b/src/bacnet/basic/binding/address.h index 58a897ce..f91d3d8c 100644 --- a/src/bacnet/basic/binding/address.h +++ b/src/bacnet/basic/binding/address.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/client/bac-data.c b/src/bacnet/basic/client/bac-data.c index 65a9636a..f596162a 100644 --- a/src/bacnet/basic/client/bac-data.c +++ b/src/bacnet/basic/client/bac-data.c @@ -9,8 +9,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/bacenum.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/mstimer.h" /* us */ #include "bacnet/basic/client/bac-rw.h" diff --git a/src/bacnet/basic/client/bac-data.h b/src/bacnet/basic/client/bac-data.h index 1c0b35fb..0d8985e7 100644 --- a/src/bacnet/basic/client/bac-data.h +++ b/src/bacnet/basic/client/bac-data.h @@ -9,11 +9,11 @@ #define BAC_DATA_H #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/rp.h" -#include "bacnet/bacnet_stack_exports.h" struct bacnet_status_flags_t { bool in_alarm : 1; diff --git a/src/bacnet/basic/client/bac-discover.c b/src/bacnet/basic/client/bac-discover.c index c85191bd..e873b82c 100644 --- a/src/bacnet/basic/client/bac-discover.c +++ b/src/bacnet/basic/client/bac-discover.c @@ -12,8 +12,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" -#include "bacnet/bacenum.h" +/* BACnet Stack API */ #include "bacnet/bactext.h" #include "bacnet/bacapp.h" #include "bacnet/basic/sys/mstimer.h" diff --git a/src/bacnet/basic/client/bac-discover.h b/src/bacnet/basic/client/bac-discover.h index 2288fdde..25c62791 100644 --- a/src/bacnet/basic/client/bac-discover.h +++ b/src/bacnet/basic/client/bac-discover.h @@ -10,11 +10,11 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/rp.h" -#include "bacnet/bacnet_stack_exports.h" /** * @brief Callback function for iterating the results of the device discovery. diff --git a/src/bacnet/basic/client/bac-rw.h b/src/bacnet/basic/client/bac-rw.h index 5ba1badd..db6b7f2f 100644 --- a/src/bacnet/basic/client/bac-rw.h +++ b/src/bacnet/basic/client/bac-rw.h @@ -9,11 +9,11 @@ #define BAC_RW_H #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/rp.h" -#include "bacnet/bacnet_stack_exports.h" /** * Save the requested ReadProperty data to a data store diff --git a/src/bacnet/basic/client/bac-task.c b/src/bacnet/basic/client/bac-task.c index f10f1423..0551c109 100644 --- a/src/bacnet/basic/client/bac-task.c +++ b/src/bacnet/basic/client/bac-task.c @@ -13,11 +13,12 @@ #include #include /* core library */ -#include "bacnet/apdu.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/apdu.h" #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" -#include "bacnet/config.h" #include "bacnet/dcc.h" #include "bacnet/iam.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/client/bac-task.h b/src/bacnet/basic/client/bac-task.h index 2fc0ad2e..de1809af 100644 --- a/src/bacnet/basic/client/bac-task.h +++ b/src/bacnet/basic/client/bac-task.h @@ -10,8 +10,8 @@ #define BACNET_TASK_H #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/npdu/h_npdu.c b/src/bacnet/basic/npdu/h_npdu.c index 1013facf..dbb91f65 100644 --- a/src/bacnet/basic/npdu/h_npdu.c +++ b/src/bacnet/basic/npdu/h_npdu.c @@ -24,12 +24,12 @@ *********************************************************************/ #include #include -#include "bacnet/bacaddr.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacaddr.h" #include "bacnet/bacdcode.h" #include "bacnet/bacint.h" -#include "bacnet/bacenum.h" -#include "bacnet/bits.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/npdu/h_npdu.h b/src/bacnet/basic/npdu/h_npdu.h index c8d848ee..be14c94d 100644 --- a/src/bacnet/basic/npdu/h_npdu.h +++ b/src/bacnet/basic/npdu/h_npdu.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/npdu/h_routed_npdu.c b/src/bacnet/basic/npdu/h_routed_npdu.c index ba754b4b..885320c0 100644 --- a/src/bacnet/basic/npdu/h_routed_npdu.c +++ b/src/bacnet/basic/npdu/h_routed_npdu.c @@ -27,11 +27,11 @@ #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacint.h" -#include "bacnet/bacenum.h" -#include "bacnet/bits.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/npdu/h_routed_npdu.h b/src/bacnet/basic/npdu/h_routed_npdu.h index 3ad62954..8ee8893e 100644 --- a/src/bacnet/basic/npdu/h_routed_npdu.h +++ b/src/bacnet/basic/npdu/h_routed_npdu.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/npdu/s_router.c b/src/bacnet/basic/npdu/s_router.c index f7d5a5e8..f717f533 100644 --- a/src/bacnet/basic/npdu/s_router.c +++ b/src/bacnet/basic/npdu/s_router.c @@ -26,7 +26,6 @@ #include #include #include -#include "bacnet/config.h" #include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" #include "bacnet/bacaddr.h" diff --git a/src/bacnet/basic/npdu/s_router.h b/src/bacnet/basic/npdu/s_router.h index 4e3c9759..ef116b6d 100644 --- a/src/bacnet/basic/npdu/s_router.h +++ b/src/bacnet/basic/npdu/s_router.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/object/acc.c b/src/bacnet/basic/object/acc.c index bd1cdcbb..fe38d0be 100644 --- a/src/bacnet/basic/object/acc.c +++ b/src/bacnet/basic/object/acc.c @@ -1,35 +1,19 @@ -/************************************************************************** +/** + * @file + * @brief BACnet accumulator Objects used to represent meter registers + * @author Steve Karg + * @date 2017 + * @copyright 2017 Steve Karg * - * Copyright (C) 2017 Steve Karg - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - *********************************************************************/ -/* BACnet accumulator Objects used to represent meter registers */ - + * SPDX-License-Identifier: MIT + */ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/config.h" #include "bacnet/basic/object/acc.h" #ifndef MAX_ACCUMULATORS diff --git a/src/bacnet/basic/object/acc.h b/src/bacnet/basic/object/acc.h index 633e72f0..763ad97c 100644 --- a/src/bacnet/basic/object/acc.h +++ b/src/bacnet/basic/object/acc.h @@ -1,10 +1,20 @@ -#ifndef ACC_H -#define ACC_H +/** + * @file + * @brief Accumulator object header file + * @author Steve Karg + * @date 2017 + * @copyright 2017 Steve Karg + * + * SPDX-License-Identifier: MIT + */ +#ifndef BACNET_BASIC_OBJECT_ACCUMULATOR_H +#define BACNET_BASIC_OBJECT_ACCUMULATOR_H #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacint.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/access_credential.c b/src/bacnet/basic/object/access_credential.c index a1b9faef..f74b8a17 100644 --- a/src/bacnet/basic/object/access_credential.c +++ b/src/bacnet/basic/object/access_credential.c @@ -29,11 +29,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "bacnet/basic/object/access_credential.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/access_credential.h b/src/bacnet/basic/object/access_credential.h index 328a27aa..0ac93b37 100644 --- a/src/bacnet/basic/object/access_credential.h +++ b/src/bacnet/basic/object/access_credential.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/datetime.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/basic/object/access_door.c b/src/bacnet/basic/object/access_door.c index 8a325d5e..f71023d2 100644 --- a/src/bacnet/basic/object/access_door.c +++ b/src/bacnet/basic/object/access_door.c @@ -28,11 +28,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "access_door.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/access_door.h b/src/bacnet/basic/object/access_door.h index 57d5a231..1d083b16 100644 --- a/src/bacnet/basic/object/access_door.h +++ b/src/bacnet/basic/object/access_door.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/access_point.c b/src/bacnet/basic/object/access_point.c index 3cd205b9..bd2e7d56 100644 --- a/src/bacnet/basic/object/access_point.c +++ b/src/bacnet/basic/object/access_point.c @@ -28,11 +28,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "access_point.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/access_point.h b/src/bacnet/basic/object/access_point.h index 58f36a91..d6ff4c8d 100644 --- a/src/bacnet/basic/object/access_point.h +++ b/src/bacnet/basic/object/access_point.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/timestamp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/basic/object/access_rights.c b/src/bacnet/basic/object/access_rights.c index e55e5414..0b25ae27 100644 --- a/src/bacnet/basic/object/access_rights.c +++ b/src/bacnet/basic/object/access_rights.c @@ -28,14 +28,15 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" -#include "access_rights.h" #include "bacnet/basic/services.h" +/* me! */ +#include "access_rights.h" static bool Access_Rights_Initialized = false; diff --git a/src/bacnet/basic/object/access_rights.h b/src/bacnet/basic/object/access_rights.h index 1ba9412f..576df564 100644 --- a/src/bacnet/basic/object/access_rights.h +++ b/src/bacnet/basic/object/access_rights.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/access_rule.h" diff --git a/src/bacnet/basic/object/access_user.c b/src/bacnet/basic/object/access_user.c index 97da2f74..d4ceb9d5 100644 --- a/src/bacnet/basic/object/access_user.c +++ b/src/bacnet/basic/object/access_user.c @@ -28,11 +28,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "access_user.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/access_user.h b/src/bacnet/basic/object/access_user.h index 3e218007..e174a496 100644 --- a/src/bacnet/basic/object/access_user.h +++ b/src/bacnet/basic/object/access_user.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/access_zone.c b/src/bacnet/basic/object/access_zone.c index 1e12f614..b3841e20 100644 --- a/src/bacnet/basic/object/access_zone.c +++ b/src/bacnet/basic/object/access_zone.c @@ -28,14 +28,15 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" -#include "access_zone.h" #include "bacnet/basic/services.h" +/* me! */ +#include "access_zone.h" static bool Access_Zone_Initialized = false; diff --git a/src/bacnet/basic/object/access_zone.h b/src/bacnet/basic/object/access_zone.h index 1cf4327f..a4bb39e2 100644 --- a/src/bacnet/basic/object/access_zone.h +++ b/src/bacnet/basic/object/access_zone.h @@ -27,14 +27,14 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" #include "bacnet/rp.h" #include "bacnet/wp.h" - #ifndef MAX_ACCESS_ZONES #define MAX_ACCESS_ZONES 4 #endif diff --git a/src/bacnet/basic/object/ai.c b/src/bacnet/basic/object/ai.c index eb416deb..864130f6 100644 --- a/src/bacnet/basic/object/ai.c +++ b/src/bacnet/basic/object/ai.c @@ -29,12 +29,11 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/basic/object/ai.h b/src/bacnet/basic/object/ai.h index f45bfd0f..247e74c5 100644 --- a/src/bacnet/basic/object/ai.h +++ b/src/bacnet/basic/object/ai.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/rp.h" #include "bacnet/wp.h" #if defined(INTRINSIC_REPORTING) diff --git a/src/bacnet/basic/object/ao.c b/src/bacnet/basic/object/ao.c index f66863ba..9ed92767 100644 --- a/src/bacnet/basic/object/ao.c +++ b/src/bacnet/basic/object/ao.c @@ -36,10 +36,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/ao.h b/src/bacnet/basic/object/ao.h index 344c750d..4e247279 100644 --- a/src/bacnet/basic/object/ao.h +++ b/src/bacnet/basic/object/ao.h @@ -37,9 +37,6 @@ #include #include #include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/config.h" -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/av.c b/src/bacnet/basic/object/av.c index 327db5e4..9cd6887e 100644 --- a/src/bacnet/basic/object/av.c +++ b/src/bacnet/basic/object/av.c @@ -30,13 +30,12 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" #include "bacnet/basic/object/av.h" diff --git a/src/bacnet/basic/object/av.h b/src/bacnet/basic/object/av.h index 33ae9a06..13d563d7 100644 --- a/src/bacnet/basic/object/av.h +++ b/src/bacnet/basic/object/av.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/bacfile.c b/src/bacnet/basic/object/bacfile.c index d6215f19..752af213 100644 --- a/src/bacnet/basic/object/bacfile.c +++ b/src/bacnet/basic/object/bacfile.c @@ -27,23 +27,24 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/bacdcode.h" #include "bacnet/datetime.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/basic/tsm/tsm.h" #include "bacnet/arf.h" #include "bacnet/awf.h" #include "bacnet/rp.h" #include "bacnet/wp.h" -#include "bacnet/basic/services.h" +#include "bacnet/datalink/datalink.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/bacfile.h" +#include "bacnet/basic/services.h" #include "bacnet/basic/sys/keylist.h" +#include "bacnet/basic/tsm/tsm.h" #ifndef FILE_RECORD_SIZE #define FILE_RECORD_SIZE MAX_OCTET_STRING_BYTES diff --git a/src/bacnet/basic/object/bacfile.h b/src/bacnet/basic/object/bacfile.h index 8f14c9d5..807888f4 100644 --- a/src/bacnet/basic/object/bacfile.h +++ b/src/bacnet/basic/object/bacfile.h @@ -36,9 +36,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacint.h" #include "bacnet/datetime.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/object/bi.c b/src/bacnet/basic/object/bi.c index d33f2f7a..d0c73e4f 100644 --- a/src/bacnet/basic/object/bi.c +++ b/src/bacnet/basic/object/bi.c @@ -28,14 +28,14 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/cov.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/bi.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/bi.h b/src/bacnet/basic/object/bi.h index 8ee86006..50e72bf2 100644 --- a/src/bacnet/basic/object/bi.h +++ b/src/bacnet/basic/object/bi.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/cov.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/blo.c b/src/bacnet/basic/object/blo.c index 8f53e7d4..6cafef62 100644 --- a/src/bacnet/basic/object/blo.c +++ b/src/bacnet/basic/object/blo.c @@ -11,11 +11,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/lighting.h" diff --git a/src/bacnet/basic/object/blo.h b/src/bacnet/basic/object/blo.h index ea04fb4f..5f74ed72 100644 --- a/src/bacnet/basic/object/blo.h +++ b/src/bacnet/basic/object/blo.h @@ -11,8 +11,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/bo.c b/src/bacnet/basic/object/bo.c index a170af37..86d26610 100644 --- a/src/bacnet/basic/object/bo.c +++ b/src/bacnet/basic/object/bo.c @@ -35,10 +35,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/bo.h b/src/bacnet/basic/object/bo.h index 689761a3..939df214 100644 --- a/src/bacnet/basic/object/bo.h +++ b/src/bacnet/basic/object/bo.h @@ -35,10 +35,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/config.h" -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/cov.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/bv.c b/src/bacnet/basic/object/bv.c index b1ee4c00..0d1445f7 100644 --- a/src/bacnet/basic/object/bv.c +++ b/src/bacnet/basic/object/bv.c @@ -30,9 +30,7 @@ #include #include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "bacnet/rp.h" #include "bacnet/basic/object/bv.h" diff --git a/src/bacnet/basic/object/bv.h b/src/bacnet/basic/object/bv.h index 317e1aba..98ad2020 100644 --- a/src/bacnet/basic/object/bv.h +++ b/src/bacnet/basic/object/bv.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/calendar.c b/src/bacnet/basic/object/calendar.c index e893c896..1270294a 100644 --- a/src/bacnet/basic/object/calendar.c +++ b/src/bacnet/basic/object/calendar.c @@ -20,12 +20,12 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/abort.h" #include "bacnet/apdu.h" -#include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/calendar.h b/src/bacnet/basic/object/calendar.h index 077a1814..090a3a16 100644 --- a/src/bacnet/basic/object/calendar.h +++ b/src/bacnet/basic/object/calendar.h @@ -12,11 +12,10 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/calendar_entry.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/channel.c b/src/bacnet/basic/object/channel.c index 1e74c8b3..167070f0 100644 --- a/src/bacnet/basic/object/channel.c +++ b/src/bacnet/basic/object/channel.c @@ -36,11 +36,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" #include "bacnet/basic/services.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/basic/object/channel.h b/src/bacnet/basic/object/channel.h index b5e772fa..d4bcb4d3 100644 --- a/src/bacnet/basic/object/channel.h +++ b/src/bacnet/basic/object/channel.h @@ -36,8 +36,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/lo.h" diff --git a/src/bacnet/basic/object/client/device-client.c b/src/bacnet/basic/object/client/device-client.c index e3497b8c..afe62829 100644 --- a/src/bacnet/basic/object/client/device-client.c +++ b/src/bacnet/basic/object/client/device-client.c @@ -30,26 +30,25 @@ #include #include -#include /* for memmove */ -/* OS specific include*/ -#include "bacnet/basic/sys/mstimer.h" -/* BACnet includes */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/datetime.h" #include "bacnet/apdu.h" +#include "bacnet/proplist.h" #include "bacnet/rp.h" /* ReadProperty handling */ #include "bacnet/version.h" #include "bacnet/basic/services.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/binding/address.h" -#include "bacnet/proplist.h" #if (BACNET_PROTOCOL_REVISION >= 17) #include "bacnet/basic/object/netport.h" #endif +/* OS specific include*/ +#include "bacnet/basic/sys/mstimer.h" /* include the device object */ #include "bacnet/basic/object/device.h" /* me */ diff --git a/src/bacnet/basic/object/color_object.c b/src/bacnet/basic/object/color_object.c index 76b31741..68b8be1a 100644 --- a/src/bacnet/basic/object/color_object.c +++ b/src/bacnet/basic/object/color_object.c @@ -21,10 +21,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/color_object.h b/src/bacnet/basic/object/color_object.h index b6bf1098..943f8477 100644 --- a/src/bacnet/basic/object/color_object.h +++ b/src/bacnet/basic/object/color_object.h @@ -20,10 +20,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/color_temperature.c b/src/bacnet/basic/object/color_temperature.c index fec53797..87d8a78d 100644 --- a/src/bacnet/basic/object/color_temperature.c +++ b/src/bacnet/basic/object/color_temperature.c @@ -21,10 +21,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/color_temperature.h b/src/bacnet/basic/object/color_temperature.h index df2c7f6f..8c7f8885 100644 --- a/src/bacnet/basic/object/color_temperature.h +++ b/src/bacnet/basic/object/color_temperature.h @@ -20,10 +20,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/command.c b/src/bacnet/basic/object/command.c index 7595f71d..1804f40f 100644 --- a/src/bacnet/basic/object/command.c +++ b/src/bacnet/basic/object/command.c @@ -43,16 +43,17 @@ #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ -#include "bacnet/basic/object/device.h" -#include "bacnet/basic/services.h" #include "bacnet/lighting.h" #include "bacnet/proplist.h" #include "bacnet/timestamp.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/basic/services.h" +/* me!*/ #include "bacnet/basic/object/command.h" /*BACnetActionCommand ::= SEQUENCE { diff --git a/src/bacnet/basic/object/command.h b/src/bacnet/basic/object/command.h index aa609b89..3268dcc1 100644 --- a/src/bacnet/basic/object/command.h +++ b/src/bacnet/basic/object/command.h @@ -44,8 +44,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/credential_data_input.c b/src/bacnet/basic/object/credential_data_input.c index 617f445b..1f2d3d17 100644 --- a/src/bacnet/basic/object/credential_data_input.c +++ b/src/bacnet/basic/object/credential_data_input.c @@ -29,14 +29,15 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/wp.h" -#include "bacnet/basic/object/credential_data_input.h" #include "bacnet/basic/services.h" +/* me! */ +#include "bacnet/basic/object/credential_data_input.h" static bool Credential_Data_Input_Initialized = false; diff --git a/src/bacnet/basic/object/credential_data_input.h b/src/bacnet/basic/object/credential_data_input.h index e6510161..345ec2b8 100644 --- a/src/bacnet/basic/object/credential_data_input.h +++ b/src/bacnet/basic/object/credential_data_input.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/timestamp.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/basic/object/csv.c b/src/bacnet/basic/object/csv.c index cb33fd00..9e56a2d9 100644 --- a/src/bacnet/basic/object/csv.c +++ b/src/bacnet/basic/object/csv.c @@ -29,11 +29,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/csv.h" diff --git a/src/bacnet/basic/object/csv.h b/src/bacnet/basic/object/csv.h index fb30b7e6..c9f0a1fb 100644 --- a/src/bacnet/basic/object/csv.h +++ b/src/bacnet/basic/object/csv.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/device.c b/src/bacnet/basic/object/device.c index 34c369f8..1779c543 100644 --- a/src/bacnet/basic/object/device.c +++ b/src/bacnet/basic/object/device.c @@ -28,12 +28,12 @@ #include #include -#include /* for memmove */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/datetime.h" #include "bacnet/apdu.h" #include "bacnet/wp.h" /* WriteProperty handling */ diff --git a/src/bacnet/basic/object/device.h b/src/bacnet/basic/object/device.h index 15565a82..e3607e90 100644 --- a/src/bacnet/basic/object/device.h +++ b/src/bacnet/basic/object/device.h @@ -31,9 +31,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/create_object.h" #include "bacnet/delete_object.h" #include "bacnet/list_element.h" diff --git a/src/bacnet/basic/object/gateway/gw_device.c b/src/bacnet/basic/object/gateway/gw_device.c index afa4e3cc..20f3bbfb 100644 --- a/src/bacnet/basic/object/gateway/gw_device.c +++ b/src/bacnet/basic/object/gateway/gw_device.c @@ -28,23 +28,23 @@ #include #include -#include /* for memmove */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/datetime.h" #include "bacnet/apdu.h" #include "bacnet/wp.h" /* write property handling */ #include "bacnet/rp.h" /* read property handling */ +#include "bacnet/reject.h" #include "bacnet/version.h" -#include "bacnet/basic/object/device.h" /* me */ #include "bacnet/basic/services.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/binding/address.h" -#include "bacnet/reject.h" /* include the objects */ +#include "bacnet/basic/object/device.h" /* me */ #include "bacnet/basic/object/ai.h" #include "bacnet/basic/object/ao.h" #include "bacnet/basic/object/av.h" diff --git a/src/bacnet/basic/object/iv.c b/src/bacnet/basic/object/iv.c index f36b8cf8..bba3d89c 100644 --- a/src/bacnet/basic/object/iv.c +++ b/src/bacnet/basic/object/iv.c @@ -36,12 +36,12 @@ #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" /* me! */ diff --git a/src/bacnet/basic/object/iv.h b/src/bacnet/basic/object/iv.h index b3e9dcde..11927435 100644 --- a/src/bacnet/basic/object/iv.h +++ b/src/bacnet/basic/object/iv.h @@ -35,8 +35,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/lc.c b/src/bacnet/basic/object/lc.c index 6c968c13..238620db 100644 --- a/src/bacnet/basic/object/lc.c +++ b/src/bacnet/basic/object/lc.c @@ -29,12 +29,12 @@ #include #include #include -#include /* for memcpy */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/datetime.h" -#include "bacnet/bacenum.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/lc.h" #include "bacnet/basic/object/ao.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lc.h b/src/bacnet/basic/object/lc.h index 5dd3b507..331d49c3 100644 --- a/src/bacnet/basic/object/lc.h +++ b/src/bacnet/basic/object/lc.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lo.c b/src/bacnet/basic/object/lo.c index 2e9b9f4a..918985c3 100644 --- a/src/bacnet/basic/object/lo.c +++ b/src/bacnet/basic/object/lo.c @@ -33,11 +33,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/lighting.h" diff --git a/src/bacnet/basic/object/lo.h b/src/bacnet/basic/object/lo.h index 0a5f7bbf..359f9fe0 100644 --- a/src/bacnet/basic/object/lo.h +++ b/src/bacnet/basic/object/lo.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lsp.c b/src/bacnet/basic/object/lsp.c index e14c60d4..046ffac8 100644 --- a/src/bacnet/basic/object/lsp.c +++ b/src/bacnet/basic/object/lsp.c @@ -29,11 +29,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/lsp.h" diff --git a/src/bacnet/basic/object/lsp.h b/src/bacnet/basic/object/lsp.h index f9c95d7d..71e8205a 100644 --- a/src/bacnet/basic/object/lsp.h +++ b/src/bacnet/basic/object/lsp.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/lsz.c b/src/bacnet/basic/object/lsz.c index 2ec7f6a9..e073ddd7 100644 --- a/src/bacnet/basic/object/lsz.c +++ b/src/bacnet/basic/object/lsz.c @@ -22,11 +22,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/object/lsz.h b/src/bacnet/basic/object/lsz.h index 58b16946..499c5c5e 100644 --- a/src/bacnet/basic/object/lsz.h +++ b/src/bacnet/basic/object/lsz.h @@ -22,8 +22,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/ms-input.c b/src/bacnet/basic/object/ms-input.c index 31ef614f..2328e253 100644 --- a/src/bacnet/basic/object/ms-input.c +++ b/src/bacnet/basic/object/ms-input.c @@ -28,11 +28,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/device.h" diff --git a/src/bacnet/basic/object/ms-input.h b/src/bacnet/basic/object/ms-input.h index 9e74ad97..2f0fdd8a 100644 --- a/src/bacnet/basic/object/ms-input.h +++ b/src/bacnet/basic/object/ms-input.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/mso.c b/src/bacnet/basic/object/mso.c index ac94de13..9afac9c5 100644 --- a/src/bacnet/basic/object/mso.c +++ b/src/bacnet/basic/object/mso.c @@ -35,10 +35,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/mso.h b/src/bacnet/basic/object/mso.h index 6e28ca7c..098f0540 100644 --- a/src/bacnet/basic/object/mso.h +++ b/src/bacnet/basic/object/mso.h @@ -35,10 +35,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/config.h" -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/cov.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/msv.c b/src/bacnet/basic/object/msv.c index 9d65f972..53a59bc5 100644 --- a/src/bacnet/basic/object/msv.c +++ b/src/bacnet/basic/object/msv.c @@ -28,11 +28,11 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/rp.h" #include "bacnet/wp.h" #include "bacnet/basic/object/msv.h" diff --git a/src/bacnet/basic/object/msv.h b/src/bacnet/basic/object/msv.h index d5689651..991d6e44 100644 --- a/src/bacnet/basic/object/msv.h +++ b/src/bacnet/basic/object/msv.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/nc.c b/src/bacnet/basic/object/nc.c index ba3719ad..d98edbc1 100644 --- a/src/bacnet/basic/object/nc.c +++ b/src/bacnet/basic/object/nc.c @@ -32,23 +32,21 @@ #include #include #include - -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/bacdest.h" -#include "bacnet/basic/services.h" -#include "bacnet/config.h" #include "bacnet/datetime.h" -#include "bacnet/basic/object/device.h" #include "bacnet/event.h" +#include "bacnet/wp.h" +#include "bacnet/basic/object/device.h" +#include "bacnet/basic/object/nc.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/services.h" #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/tsm/tsm.h" -#include "bacnet/wp.h" -#include "bacnet/basic/object/nc.h" #include "bacnet/datalink/datalink.h" #define PRINTF debug_perror diff --git a/src/bacnet/basic/object/nc.h b/src/bacnet/basic/object/nc.h index e21a74ef..f5cea4d8 100644 --- a/src/bacnet/basic/object/nc.h +++ b/src/bacnet/basic/object/nc.h @@ -24,9 +24,9 @@ *********************************************************************/ #ifndef NC_H #define NC_H - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdest.h" #include "bacnet/event.h" #include "bacnet/list_element.h" diff --git a/src/bacnet/basic/object/netport.c b/src/bacnet/basic/object/netport.c index 2d1b45cd..32df2ca9 100644 --- a/src/bacnet/basic/object/netport.c +++ b/src/bacnet/basic/object/netport.c @@ -36,15 +36,16 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/basic/binding/address.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/bacint.h" #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/datalink/datalink.h" +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" /* me */ #include "bacnet/basic/object/netport.h" diff --git a/src/bacnet/basic/object/netport.h b/src/bacnet/basic/object/netport.h index fbb116ec..dd5ffd41 100644 --- a/src/bacnet/basic/object/netport.h +++ b/src/bacnet/basic/object/netport.h @@ -36,9 +36,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/objects.h b/src/bacnet/basic/object/objects.h index d78371f0..32c3a335 100644 --- a/src/bacnet/basic/object/objects.h +++ b/src/bacnet/basic/object/objects.h @@ -27,10 +27,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" -#include "bacnet/bacenum.h" typedef struct object_device_t { BACNET_OBJECT_ID Object_Identifier; diff --git a/src/bacnet/basic/object/osv.c b/src/bacnet/basic/object/osv.c index 8c91ecf9..67aaa72d 100644 --- a/src/bacnet/basic/object/osv.c +++ b/src/bacnet/basic/object/osv.c @@ -29,13 +29,12 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" #include "bacnet/basic/object/osv.h" diff --git a/src/bacnet/basic/object/osv.h b/src/bacnet/basic/object/osv.h index 029819d9..4473f0cd 100644 --- a/src/bacnet/basic/object/osv.h +++ b/src/bacnet/basic/object/osv.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/piv.c b/src/bacnet/basic/object/piv.c index 88ebd10a..a9834ecc 100644 --- a/src/bacnet/basic/object/piv.c +++ b/src/bacnet/basic/object/piv.c @@ -29,13 +29,12 @@ #include #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" /* the custom stuff */ #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" #include "bacnet/basic/object/piv.h" diff --git a/src/bacnet/basic/object/piv.h b/src/bacnet/basic/object/piv.h index 82898bfe..a1090095 100644 --- a/src/bacnet/basic/object/piv.h +++ b/src/bacnet/basic/object/piv.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/object/schedule.c b/src/bacnet/basic/object/schedule.c index 90d0cf45..7f92c501 100644 --- a/src/bacnet/basic/object/schedule.c +++ b/src/bacnet/basic/object/schedule.c @@ -25,16 +25,15 @@ #include #include - +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bactext.h" -#include "bacnet/config.h" -#include "bacnet/basic/object/device.h" -#include "bacnet/basic/services.h" #include "bacnet/proplist.h" #include "bacnet/timestamp.h" +#include "bacnet/basic/services.h" +#include "bacnet/basic/object/device.h" #include "bacnet/basic/object/schedule.h" #ifndef MAX_SCHEDULES diff --git a/src/bacnet/basic/object/schedule.h b/src/bacnet/basic/object/schedule.h index 9cb0ba11..60abe3b3 100644 --- a/src/bacnet/basic/object/schedule.h +++ b/src/bacnet/basic/object/schedule.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/datetime.h" #include "bacnet/bacerror.h" diff --git a/src/bacnet/basic/object/time_value.c b/src/bacnet/basic/object/time_value.c index 05a0ed65..f7a3444b 100644 --- a/src/bacnet/basic/object/time_value.c +++ b/src/bacnet/basic/object/time_value.c @@ -19,10 +19,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/bacapp.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/object/time_value.h b/src/bacnet/basic/object/time_value.h index f28a8589..f3dad507 100644 --- a/src/bacnet/basic/object/time_value.h +++ b/src/bacnet/basic/object/time_value.h @@ -12,10 +12,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/rp.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/object/trendlog.c b/src/bacnet/basic/object/trendlog.c index b8da5b19..3b05d4ed 100644 --- a/src/bacnet/basic/object/trendlog.c +++ b/src/bacnet/basic/object/trendlog.c @@ -25,22 +25,22 @@ #include #include -#include /* for memmove */ +#include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacapp.h" -#include "bacnet/config.h" /* the custom stuff */ +#include "bacnet/bacdevobjpropref.h" #include "bacnet/apdu.h" +#include "bacnet/datetime.h" #include "bacnet/wp.h" /* write property handling */ #include "bacnet/version.h" #include "bacnet/basic/object/device.h" /* me */ #include "bacnet/basic/services.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/basic/binding/address.h" -#include "bacnet/bacdevobjpropref.h" #include "bacnet/basic/object/trendlog.h" -#include "bacnet/datetime.h" +#include "bacnet/datalink/datalink.h" #if defined(BACFILE) #include "bacnet/basic/object/bacfile.h" /* object list dependency */ #endif diff --git a/src/bacnet/basic/object/trendlog.h b/src/bacnet/basic/object/trendlog.h index e4f19eed..67adb66a 100644 --- a/src/bacnet/basic/object/trendlog.h +++ b/src/bacnet/basic/object/trendlog.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/cov.h" #include "bacnet/datetime.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/service/h_alarm_ack.c b/src/bacnet/basic/service/h_alarm_ack.c index 4f1858e6..c0ccf930 100644 --- a/src/bacnet/basic/service/h_alarm_ack.c +++ b/src/bacnet/basic/service/h_alarm_ack.c @@ -28,9 +28,9 @@ #include #include #include - -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/bactext.h" diff --git a/src/bacnet/basic/service/h_alarm_ack.h b/src/bacnet/basic/service/h_alarm_ack.h index a354e4c3..085b3daa 100644 --- a/src/bacnet/basic/service/h_alarm_ack.h +++ b/src/bacnet/basic/service/h_alarm_ack.h @@ -30,9 +30,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/alarm_ack.h" diff --git a/src/bacnet/basic/service/h_apdu.c b/src/bacnet/basic/service/h_apdu.c index 34429abb..3c50d24d 100644 --- a/src/bacnet/basic/service/h_apdu.c +++ b/src/bacnet/basic/service/h_apdu.c @@ -34,11 +34,11 @@ #include #include #include -#include "bacnet/bits.h" -#include "bacnet/apdu.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/apdu.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/dcc.h" #include "bacnet/iam.h" diff --git a/src/bacnet/basic/service/h_apdu.h b/src/bacnet/basic/service/h_apdu.h index ef46525b..b9731ef6 100644 --- a/src/bacnet/basic/service/h_apdu.h +++ b/src/bacnet/basic/service/h_apdu.h @@ -30,9 +30,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_arf.c b/src/bacnet/basic/service/h_arf.c index 64c9ea39..625e0e53 100644 --- a/src/bacnet/basic/service/h_arf.c +++ b/src/bacnet/basic/service/h_arf.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_arf.h b/src/bacnet/basic/service/h_arf.h index e163aa00..9c3eedc3 100644 --- a/src/bacnet/basic/service/h_arf.h +++ b/src/bacnet/basic/service/h_arf.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_arf_a.c b/src/bacnet/basic/service/h_arf_a.c index be87acd2..edb1984d 100644 --- a/src/bacnet/basic/service/h_arf_a.c +++ b/src/bacnet/basic/service/h_arf_a.c @@ -24,8 +24,9 @@ *********************************************************************/ #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_arf_a.h b/src/bacnet/basic/service/h_arf_a.h index c4b4b59d..6cc21a58 100644 --- a/src/bacnet/basic/service/h_arf_a.h +++ b/src/bacnet/basic/service/h_arf_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_awf.c b/src/bacnet/basic/service/h_awf.c index 94adf75c..da46cb22 100644 --- a/src/bacnet/basic/service/h_awf.c +++ b/src/bacnet/basic/service/h_awf.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" #include "bacnet/bacerror.h" #include "bacnet/bacdcode.h" diff --git a/src/bacnet/basic/service/h_awf.h b/src/bacnet/basic/service/h_awf.h index 6e7f6573..a1b88d0d 100644 --- a/src/bacnet/basic/service/h_awf.h +++ b/src/bacnet/basic/service/h_awf.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_ccov.c b/src/bacnet/basic/service/h_ccov.c index 99ee2968..4eac8e2a 100644 --- a/src/bacnet/basic/service/h_ccov.c +++ b/src/bacnet/basic/service/h_ccov.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_ccov.h b/src/bacnet/basic/service/h_ccov.h index 74ba9697..b667f3c5 100644 --- a/src/bacnet/basic/service/h_ccov.h +++ b/src/bacnet/basic/service/h_ccov.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/service/h_cov.c b/src/bacnet/basic/service/h_cov.c index f698dc8f..a77b01ff 100644 --- a/src/bacnet/basic/service/h_cov.c +++ b/src/bacnet/basic/service/h_cov.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdcode.h" #include "bacnet/bacaddr.h" diff --git a/src/bacnet/basic/service/h_cov.h b/src/bacnet/basic/service/h_cov.h index 3e2a1307..6dd6a66e 100644 --- a/src/bacnet/basic/service/h_cov.h +++ b/src/bacnet/basic/service/h_cov.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +#/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_create_object.c b/src/bacnet/basic/service/h_create_object.c index 8742b287..12bc3230 100644 --- a/src/bacnet/basic/service/h_create_object.c +++ b/src/bacnet/basic/service/h_create_object.c @@ -12,8 +12,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_create_object.h b/src/bacnet/basic/service/h_create_object.h index 90fee3df..7ebaf74c 100644 --- a/src/bacnet/basic/service/h_create_object.h +++ b/src/bacnet/basic/service/h_create_object.h @@ -12,9 +12,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_dcc.c b/src/bacnet/basic/service/h_dcc.c index 57cd508f..ffc54376 100644 --- a/src/bacnet/basic/service/h_dcc.c +++ b/src/bacnet/basic/service/h_dcc.c @@ -27,7 +27,6 @@ #include #include #include -#include "bacnet/config.h" #include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" diff --git a/src/bacnet/basic/service/h_dcc.h b/src/bacnet/basic/service/h_dcc.h index 65f7221c..a4b8dc1c 100644 --- a/src/bacnet/basic/service/h_dcc.h +++ b/src/bacnet/basic/service/h_dcc.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_delete_object.c b/src/bacnet/basic/service/h_delete_object.c index a561b8aa..c05102a4 100644 --- a/src/bacnet/basic/service/h_delete_object.c +++ b/src/bacnet/basic/service/h_delete_object.c @@ -12,8 +12,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_delete_object.h b/src/bacnet/basic/service/h_delete_object.h index e9058ed1..f3ec21ba 100644 --- a/src/bacnet/basic/service/h_delete_object.h +++ b/src/bacnet/basic/service/h_delete_object.h @@ -12,9 +12,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_gas_a.c b/src/bacnet/basic/service/h_gas_a.c index beffbe51..fb5141a5 100644 --- a/src/bacnet/basic/service/h_gas_a.c +++ b/src/bacnet/basic/service/h_gas_a.c @@ -35,8 +35,9 @@ * not equal to NORMAL and a Notify_Type property whose value is ALARM. */ #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_gas_a.h b/src/bacnet/basic/service/h_gas_a.h index 1c584567..54ca23f3 100644 --- a/src/bacnet/basic/service/h_gas_a.h +++ b/src/bacnet/basic/service/h_gas_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_get_alarm_sum.c b/src/bacnet/basic/service/h_get_alarm_sum.c index 78a33cde..6a8236a4 100644 --- a/src/bacnet/basic/service/h_get_alarm_sum.c +++ b/src/bacnet/basic/service/h_get_alarm_sum.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_get_alarm_sum.h b/src/bacnet/basic/service/h_get_alarm_sum.h index 07c231a2..035bfba8 100644 --- a/src/bacnet/basic/service/h_get_alarm_sum.h +++ b/src/bacnet/basic/service/h_get_alarm_sum.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/get_alarm_sum.h" diff --git a/src/bacnet/basic/service/h_getevent.c b/src/bacnet/basic/service/h_getevent.c index fa76bb92..675c9605 100644 --- a/src/bacnet/basic/service/h_getevent.c +++ b/src/bacnet/basic/service/h_getevent.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_getevent.h b/src/bacnet/basic/service/h_getevent.h index 4d7da228..b15bab26 100644 --- a/src/bacnet/basic/service/h_getevent.h +++ b/src/bacnet/basic/service/h_getevent.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/event.h" #include "bacnet/getevent.h" diff --git a/src/bacnet/basic/service/h_getevent_a.c b/src/bacnet/basic/service/h_getevent_a.c index 3f104914..bc0cbd45 100644 --- a/src/bacnet/basic/service/h_getevent_a.c +++ b/src/bacnet/basic/service/h_getevent_a.c @@ -37,8 +37,9 @@ * (TO-OFFNORMAL, TO-FAULT, TONORMAL) set to FALSE. */ #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_getevent_a.h b/src/bacnet/basic/service/h_getevent_a.h index c8b60078..8b4f0fef 100644 --- a/src/bacnet/basic/service/h_getevent_a.h +++ b/src/bacnet/basic/service/h_getevent_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_iam.c b/src/bacnet/basic/service/h_iam.c index 1fa228de..ae76d42b 100644 --- a/src/bacnet/basic/service/h_iam.c +++ b/src/bacnet/basic/service/h_iam.c @@ -25,8 +25,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/iam.h" #include "bacnet/basic/binding/address.h" diff --git a/src/bacnet/basic/service/h_iam.h b/src/bacnet/basic/service/h_iam.h index 300f8c60..05fde619 100644 --- a/src/bacnet/basic/service/h_iam.h +++ b/src/bacnet/basic/service/h_iam.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_ihave.c b/src/bacnet/basic/service/h_ihave.c index c5e4d02e..a7e169eb 100644 --- a/src/bacnet/basic/service/h_ihave.c +++ b/src/bacnet/basic/service/h_ihave.c @@ -25,8 +25,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bactext.h" #include "bacnet/ihave.h" diff --git a/src/bacnet/basic/service/h_ihave.h b/src/bacnet/basic/service/h_ihave.h index 20f4e0dd..8e0a9de6 100644 --- a/src/bacnet/basic/service/h_ihave.h +++ b/src/bacnet/basic/service/h_ihave.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_list_element.c b/src/bacnet/basic/service/h_list_element.c index 1ab6ca5f..1e642649 100644 --- a/src/bacnet/basic/service/h_list_element.c +++ b/src/bacnet/basic/service/h_list_element.c @@ -14,8 +14,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_list_element.h b/src/bacnet/basic/service/h_list_element.h index 449c0f07..ac229463 100644 --- a/src/bacnet/basic/service/h_list_element.h +++ b/src/bacnet/basic/service/h_list_element.h @@ -14,9 +14,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_lso.c b/src/bacnet/basic/service/h_lso.c index c68a7414..75c8a93f 100644 --- a/src/bacnet/basic/service/h_lso.c +++ b/src/bacnet/basic/service/h_lso.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_lso.h b/src/bacnet/basic/service/h_lso.h index d01aa931..05a95b8b 100644 --- a/src/bacnet/basic/service/h_lso.h +++ b/src/bacnet/basic/service/h_lso.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_noserv.c b/src/bacnet/basic/service/h_noserv.c index 40d0f488..050da4d6 100644 --- a/src/bacnet/basic/service/h_noserv.c +++ b/src/bacnet/basic/service/h_noserv.c @@ -27,7 +27,9 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_noserv.h b/src/bacnet/basic/service/h_noserv.h index f19a3971..3c8f1e42 100644 --- a/src/bacnet/basic/service/h_noserv.h +++ b/src/bacnet/basic/service/h_noserv.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_rd.c b/src/bacnet/basic/service/h_rd.c index 0e12f5ce..87f27162 100644 --- a/src/bacnet/basic/service/h_rd.c +++ b/src/bacnet/basic/service/h_rd.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rd.h b/src/bacnet/basic/service/h_rd.h index b9261768..8aec0db3 100644 --- a/src/bacnet/basic/service/h_rd.h +++ b/src/bacnet/basic/service/h_rd.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_rp.c b/src/bacnet/basic/service/h_rp.c index e5f2883a..c3d3851e 100644 --- a/src/bacnet/basic/service/h_rp.c +++ b/src/bacnet/basic/service/h_rp.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/bacdevobjpropref.h" diff --git a/src/bacnet/basic/service/h_rp.h b/src/bacnet/basic/service/h_rp.h index 3f56fa75..bb8c2272 100644 --- a/src/bacnet/basic/service/h_rp.h +++ b/src/bacnet/basic/service/h_rp.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_rp_a.c b/src/bacnet/basic/service/h_rp_a.c index 3e19d2ac..0eaf3444 100644 --- a/src/bacnet/basic/service/h_rp_a.c +++ b/src/bacnet/basic/service/h_rp_a.c @@ -25,12 +25,12 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/bactext.h" #include "bacnet/rp.h" /* some demo stuff needed */ @@ -39,6 +39,7 @@ #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/basic/sys/debug.h" +#include "bacnet/datalink/datalink.h" #define PRINTF debug_aprintf #define PRINTF_ERR debug_perror diff --git a/src/bacnet/basic/service/h_rp_a.h b/src/bacnet/basic/service/h_rp_a.h index fc2c5f2d..4606789e 100644 --- a/src/bacnet/basic/service/h_rp_a.h +++ b/src/bacnet/basic/service/h_rp_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/rp.h" diff --git a/src/bacnet/basic/service/h_rpm.c b/src/bacnet/basic/service/h_rpm.c index 21bdc7ad..f838c9c4 100644 --- a/src/bacnet/basic/service/h_rpm.c +++ b/src/bacnet/basic/service/h_rpm.c @@ -29,9 +29,10 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/memcopy.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/memcopy.h" #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_rpm.h b/src/bacnet/basic/service/h_rpm.h index e120c178..292557e6 100644 --- a/src/bacnet/basic/service/h_rpm.h +++ b/src/bacnet/basic/service/h_rpm.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_rpm_a.c b/src/bacnet/basic/service/h_rpm_a.c index 8e252ed6..e3d69fb9 100644 --- a/src/bacnet/basic/service/h_rpm_a.c +++ b/src/bacnet/basic/service/h_rpm_a.c @@ -25,13 +25,13 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" -#include "bacnet/datalink/datalink.h" #include "bacnet/bactext.h" #include "bacnet/rpm.h" /* some demo stuff needed */ @@ -39,6 +39,7 @@ #include "bacnet/basic/services.h" #include "bacnet/basic/sys/debug.h" #include "bacnet/basic/tsm/tsm.h" +#include "bacnet/datalink/datalink.h" #define PRINTF debug_aprintf #define PERROR debug_perror diff --git a/src/bacnet/basic/service/h_rpm_a.h b/src/bacnet/basic/service/h_rpm_a.h index 96122a0b..e1913563 100644 --- a/src/bacnet/basic/service/h_rpm_a.h +++ b/src/bacnet/basic/service/h_rpm_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/rpm.h" diff --git a/src/bacnet/basic/service/h_rr.c b/src/bacnet/basic/service/h_rr.c index d174315c..9b3cf414 100644 --- a/src/bacnet/basic/service/h_rr.c +++ b/src/bacnet/basic/service/h_rr.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_rr.h b/src/bacnet/basic/service/h_rr.h index ba218ead..81a07ac6 100644 --- a/src/bacnet/basic/service/h_rr.h +++ b/src/bacnet/basic/service/h_rr.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_rr_a.c b/src/bacnet/basic/service/h_rr_a.c index a6a2f485..ed7c0875 100644 --- a/src/bacnet/basic/service/h_rr_a.c +++ b/src/bacnet/basic/service/h_rr_a.c @@ -24,15 +24,14 @@ *********************************************************************/ #include #include -#include "bacnet/config.h" #include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" -#include "bacnet/basic/binding/address.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/bactext.h" #include "bacnet/readrange.h" /* some demo stuff needed */ +#include "bacnet/basic/binding/address.h" #include "bacnet/basic/object/device.h" #include "bacnet/basic/services.h" #include "bacnet/basic/tsm/tsm.h" diff --git a/src/bacnet/basic/service/h_rr_a.h b/src/bacnet/basic/service/h_rr_a.h index 34015ae0..f11c8371 100644 --- a/src/bacnet/basic/service/h_rr_a.h +++ b/src/bacnet/basic/service/h_rr_a.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_ts.c b/src/bacnet/basic/service/h_ts.c index 8230706f..b945daf0 100644 --- a/src/bacnet/basic/service/h_ts.c +++ b/src/bacnet/basic/service/h_ts.c @@ -25,9 +25,10 @@ #include #include #include -#include "bacnet/config.h" -#include "bacnet/datetime.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/datetime.h" #include "bacnet/bacdcode.h" #include "bacnet/timesync.h" #include "bacnet/bacaddr.h" diff --git a/src/bacnet/basic/service/h_ts.h b/src/bacnet/basic/service/h_ts.h index 6c1b80cf..f11b1dd3 100644 --- a/src/bacnet/basic/service/h_ts.h +++ b/src/bacnet/basic/service/h_ts.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/datetime.h" #include "bacnet/wp.h" diff --git a/src/bacnet/basic/service/h_ucov.c b/src/bacnet/basic/service/h_ucov.c index 8de4b74c..372093aa 100644 --- a/src/bacnet/basic/service/h_ucov.c +++ b/src/bacnet/basic/service/h_ucov.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_ucov.h b/src/bacnet/basic/service/h_ucov.h index 764f5056..1ee1cdd4 100644 --- a/src/bacnet/basic/service/h_ucov.h +++ b/src/bacnet/basic/service/h_ucov.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/cov.h" diff --git a/src/bacnet/basic/service/h_upt.c b/src/bacnet/basic/service/h_upt.c index 73c0e50a..d9581d5d 100644 --- a/src/bacnet/basic/service/h_upt.c +++ b/src/bacnet/basic/service/h_upt.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/h_upt.h b/src/bacnet/basic/service/h_upt.h index 96c82bbd..cf86674f 100644 --- a/src/bacnet/basic/service/h_upt.h +++ b/src/bacnet/basic/service/h_upt.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/ptransfer.h" diff --git a/src/bacnet/basic/service/h_whohas.c b/src/bacnet/basic/service/h_whohas.c index 99f100e9..ee38dc3f 100644 --- a/src/bacnet/basic/service/h_whohas.c +++ b/src/bacnet/basic/service/h_whohas.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/whohas.h" #include "bacnet/basic/object/device.h" diff --git a/src/bacnet/basic/service/h_whohas.h b/src/bacnet/basic/service/h_whohas.h index 730c5085..9261950d 100644 --- a/src/bacnet/basic/service/h_whohas.h +++ b/src/bacnet/basic/service/h_whohas.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_whois.c b/src/bacnet/basic/service/h_whois.c index dfb11f27..a5f73574 100644 --- a/src/bacnet/basic/service/h_whois.c +++ b/src/bacnet/basic/service/h_whois.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/whois.h" #include "bacnet/iam.h" diff --git a/src/bacnet/basic/service/h_whois.h b/src/bacnet/basic/service/h_whois.h index e619d28f..f70eb474 100644 --- a/src/bacnet/basic/service/h_whois.h +++ b/src/bacnet/basic/service/h_whois.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/h_wp.c b/src/bacnet/basic/service/h_wp.c index bf5e026e..b33ad73a 100644 --- a/src/bacnet/basic/service/h_wp.c +++ b/src/bacnet/basic/service/h_wp.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_wp.h b/src/bacnet/basic/service/h_wp.h index f9b98d9a..a60df7ab 100644 --- a/src/bacnet/basic/service/h_wp.h +++ b/src/bacnet/basic/service/h_wp.h @@ -32,9 +32,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacapp.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacenum.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_wpm.c b/src/bacnet/basic/service/h_wpm.c index 0653b260..a2176505 100644 --- a/src/bacnet/basic/service/h_wpm.c +++ b/src/bacnet/basic/service/h_wpm.c @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/h_wpm.h b/src/bacnet/basic/service/h_wpm.h index 67f1f3d1..1451d6b6 100644 --- a/src/bacnet/basic/service/h_wpm.h +++ b/src/bacnet/basic/service/h_wpm.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_abort.c b/src/bacnet/basic/service/s_abort.c index 23e48d22..f55ca2ac 100644 --- a/src/bacnet/basic/service/s_abort.c +++ b/src/bacnet/basic/service/s_abort.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/abort.h" #include "bacnet/dcc.h" diff --git a/src/bacnet/basic/service/s_abort.h b/src/bacnet/basic/service/s_abort.h index 3222bc69..86a4524b 100644 --- a/src/bacnet/basic/service/s_abort.h +++ b/src/bacnet/basic/service/s_abort.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_ack_alarm.c b/src/bacnet/basic/service/s_ack_alarm.c index 9bfb3ae7..afc7ddaf 100644 --- a/src/bacnet/basic/service/s_ack_alarm.c +++ b/src/bacnet/basic/service/s_ack_alarm.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_ack_alarm.h b/src/bacnet/basic/service/s_ack_alarm.h index cf95e3ca..0b8fe30b 100644 --- a/src/bacnet/basic/service/s_ack_alarm.h +++ b/src/bacnet/basic/service/s_ack_alarm.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/alarm_ack.h" diff --git a/src/bacnet/basic/service/s_arfs.c b/src/bacnet/basic/service/s_arfs.c index b6835ca8..eea3c772 100644 --- a/src/bacnet/basic/service/s_arfs.c +++ b/src/bacnet/basic/service/s_arfs.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/dcc.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_arfs.h b/src/bacnet/basic/service/s_arfs.h index 8ed305dc..74c54ee9 100644 --- a/src/bacnet/basic/service/s_arfs.h +++ b/src/bacnet/basic/service/s_arfs.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_awfs.c b/src/bacnet/basic/service/s_awfs.c index 9e362a6e..2a5d1d2c 100644 --- a/src/bacnet/basic/service/s_awfs.c +++ b/src/bacnet/basic/service/s_awfs.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/dcc.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_awfs.h b/src/bacnet/basic/service/s_awfs.h index 0965d433..9324701f 100644 --- a/src/bacnet/basic/service/s_awfs.h +++ b/src/bacnet/basic/service/s_awfs.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_cevent.h b/src/bacnet/basic/service/s_cevent.h index 6a473b27..e7125d33 100644 --- a/src/bacnet/basic/service/s_cevent.h +++ b/src/bacnet/basic/service/s_cevent.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/event.h" diff --git a/src/bacnet/basic/service/s_cov.c b/src/bacnet/basic/service/s_cov.c index 0bc3c89b..1f90fc8a 100644 --- a/src/bacnet/basic/service/s_cov.c +++ b/src/bacnet/basic/service/s_cov.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/dcc.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_cov.h b/src/bacnet/basic/service/s_cov.h index aaa1a1c0..e3fbec2c 100644 --- a/src/bacnet/basic/service/s_cov.h +++ b/src/bacnet/basic/service/s_cov.h @@ -33,10 +33,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/cov.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_create_object.c b/src/bacnet/basic/service/s_create_object.c index 36485e25..cfed578c 100644 --- a/src/bacnet/basic/service/s_create_object.c +++ b/src/bacnet/basic/service/s_create_object.c @@ -12,8 +12,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_create_object.h b/src/bacnet/basic/service/s_create_object.h index f070b3fd..88180a0b 100644 --- a/src/bacnet/basic/service/s_create_object.h +++ b/src/bacnet/basic/service/s_create_object.h @@ -14,10 +14,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_dcc.c b/src/bacnet/basic/service/s_dcc.c index 23bb0a13..250058c2 100644 --- a/src/bacnet/basic/service/s_dcc.c +++ b/src/bacnet/basic/service/s_dcc.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_dcc.h b/src/bacnet/basic/service/s_dcc.h index 0d4f08e6..14055a6a 100644 --- a/src/bacnet/basic/service/s_dcc.h +++ b/src/bacnet/basic/service/s_dcc.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_delete_object.c b/src/bacnet/basic/service/s_delete_object.c index aebe7c2d..306279d6 100644 --- a/src/bacnet/basic/service/s_delete_object.c +++ b/src/bacnet/basic/service/s_delete_object.c @@ -12,8 +12,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_delete_object.h b/src/bacnet/basic/service/s_delete_object.h index dff81598..8cc6dae0 100644 --- a/src/bacnet/basic/service/s_delete_object.h +++ b/src/bacnet/basic/service/s_delete_object.h @@ -14,10 +14,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_error.c b/src/bacnet/basic/service/s_error.c index 7a0edf56..17f34e65 100644 --- a/src/bacnet/basic/service/s_error.c +++ b/src/bacnet/basic/service/s_error.c @@ -26,10 +26,10 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/bacerror.h" #include "bacnet/dcc.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_error.h b/src/bacnet/basic/service/s_error.h index edb93b31..d8d462e2 100644 --- a/src/bacnet/basic/service/s_error.h +++ b/src/bacnet/basic/service/s_error.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_get_alarm_sum.c b/src/bacnet/basic/service/s_get_alarm_sum.c index 00de6e5f..98c94f63 100644 --- a/src/bacnet/basic/service/s_get_alarm_sum.c +++ b/src/bacnet/basic/service/s_get_alarm_sum.c @@ -38,8 +38,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_get_alarm_sum.h b/src/bacnet/basic/service/s_get_alarm_sum.h index 3009c636..d3e2d926 100644 --- a/src/bacnet/basic/service/s_get_alarm_sum.h +++ b/src/bacnet/basic/service/s_get_alarm_sum.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_get_event.c b/src/bacnet/basic/service/s_get_event.c index 0b38ebd1..371baf53 100644 --- a/src/bacnet/basic/service/s_get_event.c +++ b/src/bacnet/basic/service/s_get_event.c @@ -40,8 +40,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_get_event.h b/src/bacnet/basic/service/s_get_event.h index 00e291e1..60f6fe02 100644 --- a/src/bacnet/basic/service/s_get_event.h +++ b/src/bacnet/basic/service/s_get_event.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_getevent.c b/src/bacnet/basic/service/s_getevent.c index 1d7ec8d3..e44b7f63 100644 --- a/src/bacnet/basic/service/s_getevent.c +++ b/src/bacnet/basic/service/s_getevent.c @@ -26,14 +26,14 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" #include "bacnet/dcc.h" #include "bacnet/getevent.h" -#include "bacnet/bacenum.h" /* some demo stuff needed */ #include "bacnet/basic/binding/address.h" #include "bacnet/basic/tsm/tsm.h" diff --git a/src/bacnet/basic/service/s_getevent.h b/src/bacnet/basic/service/s_getevent.h index 2d4b07ff..d3d72c48 100644 --- a/src/bacnet/basic/service/s_getevent.h +++ b/src/bacnet/basic/service/s_getevent.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_iam.c b/src/bacnet/basic/service/s_iam.c index 1a069378..16f468c8 100644 --- a/src/bacnet/basic/service/s_iam.c +++ b/src/bacnet/basic/service/s_iam.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/dcc.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/basic/service/s_iam.h b/src/bacnet/basic/service/s_iam.h index 16140730..bf517d7d 100644 --- a/src/bacnet/basic/service/s_iam.h +++ b/src/bacnet/basic/service/s_iam.h @@ -32,11 +32,11 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/npdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_ihave.c b/src/bacnet/basic/service/s_ihave.c index 1b78eb82..10cd9a81 100644 --- a/src/bacnet/basic/service/s_ihave.c +++ b/src/bacnet/basic/service/s_ihave.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_ihave.h b/src/bacnet/basic/service/s_ihave.h index d283956d..e6e27122 100644 --- a/src/bacnet/basic/service/s_ihave.h +++ b/src/bacnet/basic/service/s_ihave.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_list_element.c b/src/bacnet/basic/service/s_list_element.c index 6b603eb1..10fb12b0 100644 --- a/src/bacnet/basic/service/s_list_element.c +++ b/src/bacnet/basic/service/s_list_element.c @@ -14,8 +14,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_list_element.h b/src/bacnet/basic/service/s_list_element.h index e14bf148..dcea95ae 100644 --- a/src/bacnet/basic/service/s_list_element.h +++ b/src/bacnet/basic/service/s_list_element.h @@ -16,10 +16,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_lso.c b/src/bacnet/basic/service/s_lso.c index d30f2a0b..a617e9d2 100644 --- a/src/bacnet/basic/service/s_lso.c +++ b/src/bacnet/basic/service/s_lso.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_lso.h b/src/bacnet/basic/service/s_lso.h index 64c6afc6..b3eec49a 100644 --- a/src/bacnet/basic/service/s_lso.h +++ b/src/bacnet/basic/service/s_lso.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/lso.h" diff --git a/src/bacnet/basic/service/s_rd.c b/src/bacnet/basic/service/s_rd.c index 3d9d8ebb..f104b301 100644 --- a/src/bacnet/basic/service/s_rd.c +++ b/src/bacnet/basic/service/s_rd.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_rd.h b/src/bacnet/basic/service/s_rd.h index fcf088b4..87521ed0 100644 --- a/src/bacnet/basic/service/s_rd.h +++ b/src/bacnet/basic/service/s_rd.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_readrange.c b/src/bacnet/basic/service/s_readrange.c index 958df3ee..60d9c9de 100644 --- a/src/bacnet/basic/service/s_readrange.c +++ b/src/bacnet/basic/service/s_readrange.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_readrange.h b/src/bacnet/basic/service/s_readrange.h index 7aea3cd0..f20c484c 100644 --- a/src/bacnet/basic/service/s_readrange.h +++ b/src/bacnet/basic/service/s_readrange.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/readrange.h" diff --git a/src/bacnet/basic/service/s_rp.c b/src/bacnet/basic/service/s_rp.c index d969e1c1..6596ea53 100644 --- a/src/bacnet/basic/service/s_rp.c +++ b/src/bacnet/basic/service/s_rp.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_rp.h b/src/bacnet/basic/service/s_rp.h index e0a6a6af..197c6b43 100644 --- a/src/bacnet/basic/service/s_rp.h +++ b/src/bacnet/basic/service/s_rp.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_rpm.c b/src/bacnet/basic/service/s_rpm.c index 7105084c..95c005a3 100644 --- a/src/bacnet/basic/service/s_rpm.c +++ b/src/bacnet/basic/service/s_rpm.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_rpm.h b/src/bacnet/basic/service/s_rpm.h index ae2129b7..73e5755d 100644 --- a/src/bacnet/basic/service/s_rpm.h +++ b/src/bacnet/basic/service/s_rpm.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/rpm.h" diff --git a/src/bacnet/basic/service/s_ts.c b/src/bacnet/basic/service/s_ts.c index 4fc255db..a02c4533 100644 --- a/src/bacnet/basic/service/s_ts.c +++ b/src/bacnet/basic/service/s_ts.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_ts.h b/src/bacnet/basic/service/s_ts.h index cc7a3873..d1fe1b81 100644 --- a/src/bacnet/basic/service/s_ts.h +++ b/src/bacnet/basic/service/s_ts.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_uevent.h b/src/bacnet/basic/service/s_uevent.h index f5618eed..1b089fad 100644 --- a/src/bacnet/basic/service/s_uevent.h +++ b/src/bacnet/basic/service/s_uevent.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_upt.c b/src/bacnet/basic/service/s_upt.c index 22524a45..4c4cf8ec 100644 --- a/src/bacnet/basic/service/s_upt.c +++ b/src/bacnet/basic/service/s_upt.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_upt.h b/src/bacnet/basic/service/s_upt.h index 5ed8e28e..c254d693 100644 --- a/src/bacnet/basic/service/s_upt.h +++ b/src/bacnet/basic/service/s_upt.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/ptransfer.h" diff --git a/src/bacnet/basic/service/s_whohas.c b/src/bacnet/basic/service/s_whohas.c index 04eb7df7..8ad04eaa 100644 --- a/src/bacnet/basic/service/s_whohas.c +++ b/src/bacnet/basic/service/s_whohas.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_whohas.h b/src/bacnet/basic/service/s_whohas.h index ea5a3ffe..77b9dc6e 100644 --- a/src/bacnet/basic/service/s_whohas.h +++ b/src/bacnet/basic/service/s_whohas.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_whois.c b/src/bacnet/basic/service/s_whois.c index 1d596f02..74b9010f 100644 --- a/src/bacnet/basic/service/s_whois.c +++ b/src/bacnet/basic/service/s_whois.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/basic/binding/address.h" #include "bacnet/basic/tsm/tsm.h" diff --git a/src/bacnet/basic/service/s_whois.h b/src/bacnet/basic/service/s_whois.h index afb4c4c4..4b8d4d75 100644 --- a/src/bacnet/basic/service/s_whois.h +++ b/src/bacnet/basic/service/s_whois.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_wp.c b/src/bacnet/basic/service/s_wp.c index aba04616..e4d9c280 100644 --- a/src/bacnet/basic/service/s_wp.c +++ b/src/bacnet/basic/service/s_wp.c @@ -26,8 +26,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_wp.h b/src/bacnet/basic/service/s_wp.h index cd2d120b..f4a1e7da 100644 --- a/src/bacnet/basic/service/s_wp.h +++ b/src/bacnet/basic/service/s_wp.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #ifdef __cplusplus diff --git a/src/bacnet/basic/service/s_wpm.c b/src/bacnet/basic/service/s_wpm.c index 12635bc0..e784c264 100644 --- a/src/bacnet/basic/service/s_wpm.c +++ b/src/bacnet/basic/service/s_wpm.c @@ -31,8 +31,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/basic/service/s_wpm.h b/src/bacnet/basic/service/s_wpm.h index a2605692..bbb819c4 100644 --- a/src/bacnet/basic/service/s_wpm.h +++ b/src/bacnet/basic/service/s_wpm.h @@ -32,10 +32,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" #include "bacnet/apdu.h" #include "bacnet/wpm.h" diff --git a/src/bacnet/basic/services.h b/src/bacnet/basic/services.h index 2af648b0..a55361a1 100644 --- a/src/bacnet/basic/services.h +++ b/src/bacnet/basic/services.h @@ -24,8 +24,8 @@ *********************************************************************/ #ifndef BASIC_SERVICES_H #define BASIC_SERVICES_H - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* NPDU layer handlers */ #include "bacnet/basic/npdu/h_npdu.h" diff --git a/src/bacnet/bacnet_stack_exports.h b/src/bacnet/basic/sys/bacnet_stack_exports.h similarity index 100% rename from src/bacnet/bacnet_stack_exports.h rename to src/bacnet/basic/sys/bacnet_stack_exports.h diff --git a/src/bacnet/basic/sys/bigend.h b/src/bacnet/basic/sys/bigend.h index f668388d..09647d55 100644 --- a/src/bacnet/basic/sys/bigend.h +++ b/src/bacnet/basic/sys/bigend.h @@ -24,8 +24,8 @@ #ifndef BIGEND_H #define BIGEND_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/sys/bits.h b/src/bacnet/basic/sys/bits.h new file mode 100644 index 00000000..57c762da --- /dev/null +++ b/src/bacnet/basic/sys/bits.h @@ -0,0 +1,51 @@ +/** + * @file + * @author Steve Karg + * @date 2022 + * @brief Bitwise helper macros + * @copyright 2012 Steve Karg + * + * SPDX-License-Identifier: MIT + */ +#ifndef BACNET_SYS_BITS_H +#define BACNET_SYS_BITS_H + +/******************************************************************** +* Bit Masks +*********************************************************************/ +#ifndef BIT +#define BIT(x) (1<<(x)) +#endif +#ifndef _BV +#define _BV(x) (1<<(x)) +#endif + +/* a=register, b=bit number to act upon 0-n */ +#ifndef BIT_SET +#define BIT_SET(a,b) ((a) |= (1<<(b))) +#endif +#ifndef BIT_CLEAR +#define BIT_CLEAR(a,b) ((a) &= ~(1<<(b))) +#endif +#ifndef BIT_FLIP +#define BIT_FLIP(a,b) ((a) ^= (1<<(b))) +#endif +#ifndef BIT_CHECK +#define BIT_CHECK(a,b) ((a) & (1<<(b))) +#endif + +/* x=target variable, y=mask */ +#ifndef BITMASK_SET +#define BITMASK_SET(x,y) ((x) |= (y)) +#endif +#ifndef BITMASK_CLEAR +#define BITMASK_CLEAR(x,y) ((x) &= (~(y))) +#endif +#ifndef BITMASK_FLIP +#define BITMASK_FLIP(x,y) ((x) ^= (y)) +#endif +#ifndef BITMASK_CHECK +#define BITMASK_CHECK(x,y) (((x) & (y)) == (y)) +#endif + +#endif diff --git a/src/bacnet/basic/sys/bytes.h b/src/bacnet/basic/sys/bytes.h new file mode 100644 index 00000000..41988f9b --- /dev/null +++ b/src/bacnet/basic/sys/bytes.h @@ -0,0 +1,48 @@ +/** + * @file + * @author Steve Karg + * @date 2022 + * @brief Defines the bit/byte/word/long conversions that are used in code + * @copyright 2012 Steve Karg + * + * SPDX-License-Identifier: MIT + */ +#ifndef BACNET_SYS_BYTES_H +#define BACNET_SYS_BYTES_H +#include + +#ifndef LO_NIB +#define LO_NIB(b) ((b)&0xF) +#endif + +#ifndef HI_NIB +#define HI_NIB(b) ((b) >> 4) +#endif + +#ifndef LO_BYTE +#define LO_BYTE(w) ((uint8_t)(w)) +#endif + +#ifndef HI_BYTE +#define HI_BYTE(w) ((uint8_t)((uint16_t)(w) >> 8)) +#endif + +#ifndef LO_WORD +#define LO_WORD(x) ((uint16_t)(x)) +#endif + +#ifndef HI_WORD +#define HI_WORD(x) ((uint16_t)((uint32_t)(x) >> 16)) +#endif + +#ifndef MAKE_WORD +#define MAKE_WORD(lo, hi) \ + ((uint16_t)(((uint8_t)(lo)) | (((uint16_t)((uint8_t)(hi))) << 8))) +#endif + +#ifndef MAKE_LONG +#define MAKE_LONG(lo, hi) \ + ((uint32_t)(((uint16_t)(lo)) | (((uint32_t)((uint16_t)(hi))) << 16))) +#endif + +#endif /* end of header file */ diff --git a/src/bacnet/basic/sys/color_rgb.h b/src/bacnet/basic/sys/color_rgb.h index 8677b9ee..2ae13f0f 100644 --- a/src/bacnet/basic/sys/color_rgb.h +++ b/src/bacnet/basic/sys/color_rgb.h @@ -8,8 +8,8 @@ #define COLOR_RGB_H #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/sys/days.h b/src/bacnet/basic/sys/days.h index ffc162e5..2b6c918d 100644 --- a/src/bacnet/basic/sys/days.h +++ b/src/bacnet/basic/sys/days.h @@ -8,8 +8,8 @@ #define DAYS_H #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/sys/debug.h b/src/bacnet/basic/sys/debug.h index 84956e31..3f7e7481 100644 --- a/src/bacnet/basic/sys/debug.h +++ b/src/bacnet/basic/sys/debug.h @@ -27,8 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifndef DEBUG_ENABLED #define DEBUG_ENABLED 0 diff --git a/src/bacnet/basic/sys/fifo.h b/src/bacnet/basic/sys/fifo.h index 2d23391d..b9691db1 100644 --- a/src/bacnet/basic/sys/fifo.h +++ b/src/bacnet/basic/sys/fifo.h @@ -8,8 +8,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /** * FIFO buffer power of two alignment macro diff --git a/src/bacnet/basic/sys/filename.h b/src/bacnet/basic/sys/filename.h index 0c7e2e3f..0b031f42 100644 --- a/src/bacnet/basic/sys/filename.h +++ b/src/bacnet/basic/sys/filename.h @@ -24,8 +24,8 @@ #ifndef FILENAME_H #define FILENAME_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/sys/key.h b/src/bacnet/basic/sys/key.h index b3e4e0cd..8d887bf4 100644 --- a/src/bacnet/basic/sys/key.h +++ b/src/bacnet/basic/sys/key.h @@ -25,7 +25,8 @@ #define KEY_H #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* This file has the macros that encode and decode the */ /* keys for the keylist when used with BACnet Object Id's */ diff --git a/src/bacnet/basic/sys/keylist.h b/src/bacnet/basic/sys/keylist.h index 3405834c..0214120e 100644 --- a/src/bacnet/basic/sys/keylist.h +++ b/src/bacnet/basic/sys/keylist.h @@ -24,9 +24,9 @@ #ifndef KEYLIST_H #define KEYLIST_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/key.h" /* This is a key sorted linked list data library that */ diff --git a/src/bacnet/basic/sys/linear.h b/src/bacnet/basic/sys/linear.h index 0baa165b..1546db7d 100644 --- a/src/bacnet/basic/sys/linear.h +++ b/src/bacnet/basic/sys/linear.h @@ -6,7 +6,8 @@ #ifndef LINEAR_H #define LINEAR_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/basic/sys/mstimer.h b/src/bacnet/basic/sys/mstimer.h index ff965ac2..9c1f763e 100644 --- a/src/bacnet/basic/sys/mstimer.h +++ b/src/bacnet/basic/sys/mstimer.h @@ -20,8 +20,8 @@ #ifndef MSTIMER_H_ #define MSTIMER_H_ -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /** * A timer. diff --git a/src/bacnet/basic/sys/platform.h b/src/bacnet/basic/sys/platform.h index 761819bc..a983fed3 100644 --- a/src/bacnet/basic/sys/platform.h +++ b/src/bacnet/basic/sys/platform.h @@ -3,24 +3,20 @@ * @author Steve Karg * @date 2022 * @brief Platform libc and compiler abstraction layer - * + * * @section DESCRIPTION * * This libc and compiler abstraction layer assists with differences - * between compiler and libc versions, capabilities, and standards. + * between compiler and libc versions, capabilities, and C standards. * - * @section LICENSE - * - * Copyright (C) 2022 Steve Karg + * @copyright 2022 Steve Karg * * SPDX-License-Identifier: MIT -*/ + */ #ifndef BACNET_SYS_PLATFORM_H #define BACNET_SYS_PLATFORM_H - #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ #ifndef islessgreater #define islessgreater(x, y) ((x) < (y) || (x) > (y)) @@ -32,14 +28,14 @@ /* marking some code as 'deprecated' */ #if defined(BACNET_STACK_DEPRECATED_DISABLE) -# define BACNET_STACK_DEPRECATED(message) +#define BACNET_STACK_DEPRECATED(message) #elif defined(_MSC_VER) -# define BACNET_STACK_DEPRECATED(message) __declspec(deprecated(message)) +#define BACNET_STACK_DEPRECATED(message) __declspec(deprecated(message)) #elif defined(__GNUC__) -# define BACNET_STACK_DEPRECATED(message) __attribute__((deprecated(message))) -# else -# define BACNET_STACK_DEPRECATED(message) -# endif +#define BACNET_STACK_DEPRECATED(message) __attribute__((deprecated(message))) +#else +#define BACNET_STACK_DEPRECATED(message) +#endif #if defined(_MSC_VER) #ifndef strcasecmp @@ -54,8 +50,8 @@ #define snprintf c99_snprintf #define vsnprintf c99_vsnprintf -__inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, - va_list ap) +__inline int c99_vsnprintf( + char *outBuf, size_t size, const char *format, va_list ap) { int count = -1; @@ -80,25 +76,40 @@ __inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...) } #endif #elif defined(__ZEPHYR__) -# include -# endif +#include +/* For some reason my Zephyr build for non-native targets does not + * see a definition for strnlen(), but it is visible in when + * compiling for native_posix. This results in the compiler + * emitting a warning, forcing Zephyr's sanitycheck() script to stop. + * Until this is chased down, the definition is being provided here. + */ +#if !CONFIG_NATIVE_APPLICATION +size_t strnlen(const char *, size_t); +#endif +#endif /* some common min/max as defined in windef.h */ #ifndef NOMINMAX #ifndef max -#define max(a,b) (((a) > (b)) ? (a) : (b)) +#define max(a, b) (((a) > (b)) ? (a) : (b)) #endif #ifndef min -#define min(a,b) (((a) < (b)) ? (a) : (b)) +#define min(a, b) (((a) < (b)) ? (a) : (b)) #endif -#endif /* NOMINMAX */ +#endif /* NOMINMAX */ #if defined(__MINGW32__) #define BACNET_STACK_FALLTHROUGH() /* fall through */ #elif defined(__GNUC__) -#define BACNET_STACK_FALLTHROUGH() __attribute__ ((fallthrough)) +#define BACNET_STACK_FALLTHROUGH() __attribute__((fallthrough)) #else #define BACNET_STACK_FALLTHROUGH() /* fall through */ #endif +#if defined(_MSC_VER) +/* Silence the warnings about unsafe versions of library functions */ +/* as we need to keep the code portable */ +#pragma warning(disable : 4996) +#endif + #endif diff --git a/src/bacnet/basic/sys/ringbuf.h b/src/bacnet/basic/sys/ringbuf.h index dabb9973..b6e354c2 100644 --- a/src/bacnet/basic/sys/ringbuf.h +++ b/src/bacnet/basic/sys/ringbuf.h @@ -11,8 +11,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /** * ring buffer power of two alignment macro diff --git a/src/bacnet/basic/sys/sbuf.h b/src/bacnet/basic/sys/sbuf.h index 9deff972..4a86bb77 100644 --- a/src/bacnet/basic/sys/sbuf.h +++ b/src/bacnet/basic/sys/sbuf.h @@ -29,8 +29,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" struct static_buffer_t { char *data; /* block of memory or array of data */ diff --git a/src/bacnet/basic/tsm/tsm.c b/src/bacnet/basic/tsm/tsm.c index 9c4ff532..1c8568ff 100644 --- a/src/bacnet/basic/tsm/tsm.c +++ b/src/bacnet/basic/tsm/tsm.c @@ -35,13 +35,12 @@ #include #include #include -#include "bacnet/bits.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/bacaddr.h" -#include "bacnet/bacdef.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" -#include "bacnet/config.h" #include "bacnet/basic/tsm/tsm.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/basic/tsm/tsm.h b/src/bacnet/basic/tsm/tsm.h index 9c1bca9a..e3156231 100644 --- a/src/bacnet/basic/tsm/tsm.h +++ b/src/bacnet/basic/tsm/tsm.h @@ -27,9 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /* note: TSM functionality is optional - only needed if we are diff --git a/src/bacnet/basic/ucix/ucix.h b/src/bacnet/basic/ucix/ucix.h index 136f2e1f..9779e6e3 100644 --- a/src/bacnet/basic/ucix/ucix.h +++ b/src/bacnet/basic/ucix/ucix.h @@ -19,8 +19,8 @@ #ifndef _UCI_H__ #define _UCI_H__ -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" BACNET_STACK_EXPORT struct uci_context *ucix_init( diff --git a/src/bacnet/bits.h b/src/bacnet/bits.h deleted file mode 100644 index e9e1c911..00000000 --- a/src/bacnet/bits.h +++ /dev/null @@ -1,67 +0,0 @@ -/************************************************************************** -* -* Copyright (C) 2012 Steve Karg -* -* Permission is hereby granted, free of charge, to any person obtaining -* a copy of this software and associated documentation files (the -* "Software"), to deal in the Software without restriction, including -* without limitation the rights to use, copy, modify, merge, publish, -* distribute, sublicense, and/or sell copies of the Software, and to -* permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ -#ifndef BITS_H -#define BITS_H - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ - -/******************************************************************** -* Bit Masks -*********************************************************************/ -#ifndef BIT -#define BIT(x) (1<<(x)) -#endif -#ifndef _BV -#define _BV(x) (1<<(x)) -#endif - -/* a=register, b=bit number to act upon 0-n */ -#ifndef BIT_SET -#define BIT_SET(a,b) ((a) |= (1<<(b))) -#endif -#ifndef BIT_CLEAR -#define BIT_CLEAR(a,b) ((a) &= ~(1<<(b))) -#endif -#ifndef BIT_FLIP -#define BIT_FLIP(a,b) ((a) ^= (1<<(b))) -#endif -#ifndef BIT_CHECK -#define BIT_CHECK(a,b) ((a) & (1<<(b))) -#endif - -/* x=target variable, y=mask */ -#ifndef BITMASK_SET -#define BITMASK_SET(x,y) ((x) |= (y)) -#endif -#ifndef BITMASK_CLEAR -#define BITMASK_CLEAR(x,y) ((x) &= (~(y))) -#endif -#ifndef BITMASK_FLIP -#define BITMASK_FLIP(x,y) ((x) ^= (y)) -#endif -#ifndef BITMASK_CHECK -#define BITMASK_CHECK(x,y) (((x) & (y)) == (y)) -#endif - -#endif diff --git a/src/bacnet/bytes.h b/src/bacnet/bytes.h deleted file mode 100644 index 52a68a3c..00000000 --- a/src/bacnet/bytes.h +++ /dev/null @@ -1,93 +0,0 @@ -/************************************************************************** -* -* Copyright (C) 2012 Steve Karg -* -* Permission is hereby granted, free of charge, to any person obtaining -* a copy of this software and associated documentation files (the -* "Software"), to deal in the Software without restriction, including -* without limitation the rights to use, copy, modify, merge, publish, -* distribute, sublicense, and/or sell copies of the Software, and to -* permit persons to whom the Software is furnished to do so, subject to -* the following conditions: -* -* The above copyright notice and this permission notice shall be included -* in all copies or substantial portions of the Software. -* -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*********************************************************************/ -#ifndef BYTES_H -#define BYTES_H - -/* Defines the bit/byte/word/long conversions that are used in code */ - -#include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ - -#ifndef LO_NIB -#define LO_NIB(b) ((b) & 0xF) -#endif - -#ifndef HI_NIB -#define HI_NIB(b) ((b) >> 4) - -#endif - - - -#ifndef LO_BYTE - -#define LO_BYTE(w) ((uint8_t)(w)) - -#endif - - - -#ifndef HI_BYTE - -#define HI_BYTE(w) ((uint8_t)((uint16_t)(w) >> 8)) - -#endif - - - -#ifndef LO_WORD - -#define LO_WORD(x) ((uint16_t)(x)) - -#endif - - - -#ifndef HI_WORD - -#define HI_WORD(x) ((uint16_t)((uint32_t)(x) >> 16)) - -#endif - - - -#ifndef MAKE_WORD - -#define MAKE_WORD(lo,hi) \ - ((uint16_t)(((uint8_t)(lo))|(((uint16_t)((uint8_t)(hi)))<<8))) - -#endif - - - -#ifndef MAKE_LONG - -#define MAKE_LONG(lo,hi) \ - ((uint32_t)(((uint16_t)(lo))|(((uint32_t)((uint16_t)(hi)))<<16))) - -#endif - - - -#endif /* end of header file */ diff --git a/src/bacnet/calendar_entry.h b/src/bacnet/calendar_entry.h index 6f009c0a..9bf96ac7 100644 --- a/src/bacnet/calendar_entry.h +++ b/src/bacnet/calendar_entry.h @@ -13,8 +13,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactimevalue.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/cov.c b/src/bacnet/cov.c index 72c2a1b8..72be827a 100644 --- a/src/bacnet/cov.c +++ b/src/bacnet/cov.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" /* me! */ #include "bacnet/cov.h" diff --git a/src/bacnet/cov.h b/src/bacnet/cov.h index e4b79e7e..517ccdc6 100644 --- a/src/bacnet/cov.h +++ b/src/bacnet/cov.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" typedef struct BACnet_COV_Data { diff --git a/src/bacnet/create_object.c b/src/bacnet/create_object.c index 60277d1a..e8f42d22 100644 --- a/src/bacnet/create_object.c +++ b/src/bacnet/create_object.c @@ -9,10 +9,11 @@ */ #include #include -#include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacapp.h" +#include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/create_object.h" diff --git a/src/bacnet/create_object.h b/src/bacnet/create_object.h index e1f9a4b1..ab9dfe2a 100644 --- a/src/bacnet/create_object.h +++ b/src/bacnet/create_object.h @@ -12,9 +12,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/credential_authentication_factor.h b/src/bacnet/credential_authentication_factor.h index bf95c037..4a7275c9 100644 --- a/src/bacnet/credential_authentication_factor.h +++ b/src/bacnet/credential_authentication_factor.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/authentication_factor.h" diff --git a/src/bacnet/dailyschedule.h b/src/bacnet/dailyschedule.h index 93abf5d4..34e6fdf8 100644 --- a/src/bacnet/dailyschedule.h +++ b/src/bacnet/dailyschedule.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactimevalue.h" /* arbitrary value, shall be unlimited for B-OWS but we don't care, 640k shall be enough */ diff --git a/src/bacnet/datalink/arcnet.h b/src/bacnet/datalink/arcnet.h index 01152d8c..7868e766 100644 --- a/src/bacnet/datalink/arcnet.h +++ b/src/bacnet/datalink/arcnet.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /* specific defines for ARCNET */ diff --git a/src/bacnet/datalink/automac.c b/src/bacnet/datalink/automac.c index 35e2ed13..d3ccb3ca 100644 --- a/src/bacnet/datalink/automac.c +++ b/src/bacnet/datalink/automac.c @@ -9,10 +9,10 @@ #include #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" -#include "bacnet/config.h" #include "bacnet/datalink/mstpdef.h" #include "bacnet/datalink/automac.h" diff --git a/src/bacnet/datalink/automac.h b/src/bacnet/datalink/automac.h index 23a853d7..27312229 100644 --- a/src/bacnet/datalink/automac.h +++ b/src/bacnet/datalink/automac.h @@ -29,7 +29,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* MS/TP Auto MAC address functionality */ /* starting number available for AutoMAC */ diff --git a/src/bacnet/datalink/bacsec.h b/src/bacnet/datalink/bacsec.h index fd100f73..dcceeaea 100644 --- a/src/bacnet/datalink/bacsec.h +++ b/src/bacnet/datalink/bacsec.h @@ -38,10 +38,8 @@ #include #include - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct BACnet_Security_Wrapper { bool payload_net_or_bvll_flag; /* true if NPDU or BVLL */ diff --git a/src/bacnet/datalink/bip.h b/src/bacnet/datalink/bip.h index 1fa34262..b77b4a71 100644 --- a/src/bacnet/datalink/bip.h +++ b/src/bacnet/datalink/bip.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" #include "bacnet/datalink/bvlc.h" diff --git a/src/bacnet/datalink/bip6.h b/src/bacnet/datalink/bip6.h index e854cb34..ae1aa746 100644 --- a/src/bacnet/datalink/bip6.h +++ b/src/bacnet/datalink/bip6.h @@ -16,8 +16,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" #include "bacnet/datalink/bvlc6.h" diff --git a/src/bacnet/datalink/bvlc.c b/src/bacnet/datalink/bvlc.c index ab4a17fe..e1cd1d20 100644 --- a/src/bacnet/datalink/bvlc.c +++ b/src/bacnet/datalink/bvlc.c @@ -35,10 +35,11 @@ #include #include #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacint.h" -#include "bacnet/bacdef.h" #include "bacnet/hostnport.h" #include "bacnet/datalink/bvlc.h" diff --git a/src/bacnet/datalink/bvlc.h b/src/bacnet/datalink/bvlc.h index eeefc3d5..cfd5f5d3 100644 --- a/src/bacnet/datalink/bvlc.h +++ b/src/bacnet/datalink/bvlc.h @@ -27,7 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /** diff --git a/src/bacnet/datalink/bvlc6.h b/src/bacnet/datalink/bvlc6.h index 8a09eaac..438067bf 100644 --- a/src/bacnet/datalink/bvlc6.h +++ b/src/bacnet/datalink/bvlc6.h @@ -12,8 +12,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /** diff --git a/src/bacnet/datalink/cobs.h b/src/bacnet/datalink/cobs.h index 850d937d..dda562f1 100644 --- a/src/bacnet/datalink/cobs.h +++ b/src/bacnet/datalink/cobs.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* number of bytes needed for COBS encoded CRC */ #define COBS_ENCODED_CRC_SIZE 5 diff --git a/src/bacnet/datalink/crc.h b/src/bacnet/datalink/crc.h index 208e5c06..96fdaecd 100644 --- a/src/bacnet/datalink/crc.h +++ b/src/bacnet/datalink/crc.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/datalink/datalink.h b/src/bacnet/datalink/datalink.h index 3d7343e4..2fbe53f3 100644 --- a/src/bacnet/datalink/datalink.h +++ b/src/bacnet/datalink/datalink.h @@ -24,9 +24,8 @@ #ifndef DATALINK_H #define DATALINK_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/config.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #if defined(BACDL_ETHERNET) #include "bacnet/datalink/ethernet.h" diff --git a/src/bacnet/datalink/dlenv.c b/src/bacnet/datalink/dlenv.c index 5410dce9..c095b1e3 100644 --- a/src/bacnet/datalink/dlenv.c +++ b/src/bacnet/datalink/dlenv.c @@ -28,8 +28,9 @@ #include #include #include -#include "bacnet/config.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/apdu.h" #include "bacnet/datalink/datalink.h" #include "bacnet/basic/services.h" diff --git a/src/bacnet/datalink/dlenv.h b/src/bacnet/datalink/dlenv.h index ce7b3934..be58d2c5 100644 --- a/src/bacnet/datalink/dlenv.h +++ b/src/bacnet/datalink/dlenv.h @@ -27,11 +27,11 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/bvlc.h" -#include "bacnet/bacnet_stack_exports.h" - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ diff --git a/src/bacnet/datalink/dlmstp.c b/src/bacnet/datalink/dlmstp.c index 5633b791..7a88465b 100644 --- a/src/bacnet/datalink/dlmstp.c +++ b/src/bacnet/datalink/dlmstp.c @@ -11,16 +11,16 @@ #include #include #include +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/basic/sys/mstimer.h" #include "bacnet/datalink/crc.h" #include "bacnet/datalink/mstp.h" #include "bacnet/datalink/dlmstp.h" #include "bacnet/datalink/mstpdef.h" -#include "bacnet/bacdef.h" #include "bacnet/npdu.h" -#include "bacnet/bits.h" -#include "bacnet/bytes.h" #include "bacnet/bacaddr.h" /* the current MSTP port that the datalink is using */ diff --git a/src/bacnet/datalink/dlmstp.h b/src/bacnet/datalink/dlmstp.h index d693add5..843d5570 100644 --- a/src/bacnet/datalink/dlmstp.h +++ b/src/bacnet/datalink/dlmstp.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/basic/sys/ringbuf.h" #include "bacnet/datalink/mstpdef.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/datalink/ethernet.h b/src/bacnet/datalink/ethernet.h index 411ff65d..a3015bef 100644 --- a/src/bacnet/datalink/ethernet.h +++ b/src/bacnet/datalink/ethernet.h @@ -27,8 +27,9 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" /* specific defines for Ethernet */ diff --git a/src/bacnet/datalink/mstp.c b/src/bacnet/datalink/mstp.c index e2aa7223..7e9352a0 100644 --- a/src/bacnet/datalink/mstp.c +++ b/src/bacnet/datalink/mstp.c @@ -59,10 +59,6 @@ #include "bacnet/datalink/crc.h" #include "bacnet/datalink/mstptext.h" #include "bacnet/npdu.h" - -#ifndef DEBUG_ENABLED -#define DEBUG_ENABLED 0 -#endif #include "bacnet/basic/sys/debug.h" #if PRINT_ENABLED diff --git a/src/bacnet/datalink/mstp.h b/src/bacnet/datalink/mstp.h index 090c6aa9..3ec5ae7a 100644 --- a/src/bacnet/datalink/mstp.h +++ b/src/bacnet/datalink/mstp.h @@ -28,10 +28,10 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/datalink/mstpdef.h" -#include "bacnet/config.h" /* Repeater turnoff delay. The duration of a continuous logical one state */ /* at the active input port of an MS/TP repeater after which the repeater */ diff --git a/src/bacnet/datalink/mstpdef.h b/src/bacnet/datalink/mstpdef.h index 0f091dc9..c7aac553 100644 --- a/src/bacnet/datalink/mstpdef.h +++ b/src/bacnet/datalink/mstpdef.h @@ -27,7 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* The value 255 is used to denote broadcast when used as a */ /* destination address but is not allowed as a value for a station. */ diff --git a/src/bacnet/datalink/mstptext.h b/src/bacnet/datalink/mstptext.h index 2846af02..39e2a5ff 100644 --- a/src/bacnet/datalink/mstptext.h +++ b/src/bacnet/datalink/mstptext.h @@ -24,8 +24,8 @@ #ifndef MSTPTEXT_H #define MSTPTEXT_H -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/datetime.h b/src/bacnet/datetime.h index c47eda14..18b635ec 100644 --- a/src/bacnet/datetime.h +++ b/src/bacnet/datetime.h @@ -15,9 +15,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* define our epic beginnings */ #define BACNET_DATE_YEAR_EPOCH 1900 diff --git a/src/bacnet/dcc.c b/src/bacnet/dcc.c index 3e1a0215..7f4c8d23 100644 --- a/src/bacnet/dcc.c +++ b/src/bacnet/dcc.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/dcc.h" /** @file dcc.c Enable/Disable Device Communication Control (DCC) */ diff --git a/src/bacnet/dcc.h b/src/bacnet/dcc.h index 0daaca78..1408f78a 100644 --- a/src/bacnet/dcc.h +++ b/src/bacnet/dcc.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" #ifdef __cplusplus diff --git a/src/bacnet/delete_object.c b/src/bacnet/delete_object.c index 36704e55..6d82da36 100644 --- a/src/bacnet/delete_object.c +++ b/src/bacnet/delete_object.c @@ -9,10 +9,11 @@ */ #include #include -#include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacapp.h" +#include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/delete_object.h" diff --git a/src/bacnet/delete_object.h b/src/bacnet/delete_object.h index 5880ac8b..083c684f 100644 --- a/src/bacnet/delete_object.h +++ b/src/bacnet/delete_object.h @@ -12,9 +12,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/event.h b/src/bacnet/event.h index 2c60746b..4bd755eb 100644 --- a/src/bacnet/event.h +++ b/src/bacnet/event.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/timestamp.h" #include "bacnet/bacpropstates.h" diff --git a/src/bacnet/get_alarm_sum.h b/src/bacnet/get_alarm_sum.h index 84de8706..00958ea3 100644 --- a/src/bacnet/get_alarm_sum.h +++ b/src/bacnet/get_alarm_sum.h @@ -28,8 +28,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/timestamp.h" diff --git a/src/bacnet/getevent.c b/src/bacnet/getevent.c index ea2e7a90..c1f3407a 100644 --- a/src/bacnet/getevent.c +++ b/src/bacnet/getevent.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/getevent.h" /** @file getevent.c Encode/Decode GetEvent services */ diff --git a/src/bacnet/getevent.h b/src/bacnet/getevent.h index 979c8932..56dd0ff4 100644 --- a/src/bacnet/getevent.h +++ b/src/bacnet/getevent.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/timestamp.h" #include "bacnet/event.h" diff --git a/src/bacnet/hostnport.h b/src/bacnet/hostnport.h index 599fa3ff..e4ab9617 100644 --- a/src/bacnet/hostnport.h +++ b/src/bacnet/hostnport.h @@ -14,9 +14,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" #include "bacnet/datalink/bvlc.h" diff --git a/src/bacnet/iam.c b/src/bacnet/iam.c index 79b36403..b75aebe6 100644 --- a/src/bacnet/iam.c +++ b/src/bacnet/iam.c @@ -32,8 +32,9 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/npdu.h" #include "bacnet/dcc.h" #include "bacnet/bacdcode.h" diff --git a/src/bacnet/iam.h b/src/bacnet/iam.h index 5dfb9225..9ecee2b0 100644 --- a/src/bacnet/iam.h +++ b/src/bacnet/iam.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacaddr.h" #include "bacnet/npdu.h" diff --git a/src/bacnet/ihave.c b/src/bacnet/ihave.c index 746fa299..a45d40d4 100644 --- a/src/bacnet/ihave.c +++ b/src/bacnet/ihave.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/ihave.h" /** @file ihave.c Encode/Decode I-Have service */ diff --git a/src/bacnet/ihave.h b/src/bacnet/ihave.h index 42ff7c22..d4d22489 100644 --- a/src/bacnet/ihave.h +++ b/src/bacnet/ihave.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" typedef struct BACnet_I_Have_Data { diff --git a/src/bacnet/indtext.h b/src/bacnet/indtext.h index 64735e2a..7143a8e2 100644 --- a/src/bacnet/indtext.h +++ b/src/bacnet/indtext.h @@ -27,8 +27,8 @@ #include #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* index and text pairs */ typedef const struct { diff --git a/src/bacnet/lighting.h b/src/bacnet/lighting.h index 6c992a97..81efe9b9 100644 --- a/src/bacnet/lighting.h +++ b/src/bacnet/lighting.h @@ -15,9 +15,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* BACnetLightingCommand ::= SEQUENCE { operation [0] BACnetLightingOperation, diff --git a/src/bacnet/list_element.c b/src/bacnet/list_element.c index 8b572b10..805ebce3 100644 --- a/src/bacnet/list_element.c +++ b/src/bacnet/list_element.c @@ -11,9 +11,10 @@ */ #include #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/list_element.h" diff --git a/src/bacnet/list_element.h b/src/bacnet/list_element.h index b15645f5..d4160c90 100644 --- a/src/bacnet/list_element.h +++ b/src/bacnet/list_element.h @@ -14,9 +14,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" /** diff --git a/src/bacnet/lso.h b/src/bacnet/lso.h index 56016473..537c1cd3 100644 --- a/src/bacnet/lso.h +++ b/src/bacnet/lso.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" typedef struct { diff --git a/src/bacnet/memcopy.h b/src/bacnet/memcopy.h index 6340737d..a12594b6 100644 --- a/src/bacnet/memcopy.h +++ b/src/bacnet/memcopy.h @@ -28,7 +28,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/npdu.c b/src/bacnet/npdu.c index 3d5b36b2..e7978a04 100644 --- a/src/bacnet/npdu.c +++ b/src/bacnet/npdu.c @@ -33,11 +33,11 @@ ####COPYRIGHTEND####*/ #include #include +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacint.h" -#include "bacnet/bacenum.h" -#include "bacnet/bits.h" #include "bacnet/npdu.h" #include "bacnet/apdu.h" diff --git a/src/bacnet/npdu.h b/src/bacnet/npdu.h index 4cc6ffb5..21bcc84d 100644 --- a/src/bacnet/npdu.h +++ b/src/bacnet/npdu.h @@ -26,10 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /** Hop count default is required by BTL to be maximum */ #ifndef HOP_COUNT_DEFAULT diff --git a/src/bacnet/property.c b/src/bacnet/property.c index d1778230..22929a56 100644 --- a/src/bacnet/property.c +++ b/src/bacnet/property.c @@ -32,10 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/rpm.h" #include "bacnet/rp.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/property.h b/src/bacnet/property.h index 49783538..17682568 100644 --- a/src/bacnet/property.h +++ b/src/bacnet/property.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/rp.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/proplist.c b/src/bacnet/proplist.c index 57907ade..67c1ec31 100644 --- a/src/bacnet/proplist.c +++ b/src/bacnet/proplist.c @@ -32,10 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" -#include "bacnet/bacenum.h" #include "bacnet/rpm.h" #include "bacnet/rp.h" #include "bacnet/proplist.h" diff --git a/src/bacnet/proplist.h b/src/bacnet/proplist.h index 2d6b036d..ea981f07 100644 --- a/src/bacnet/proplist.h +++ b/src/bacnet/proplist.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/rp.h" /** @file Property_List property encode decode helper */ diff --git a/src/bacnet/ptransfer.c b/src/bacnet/ptransfer.c index aefdaa20..841e0d9d 100644 --- a/src/bacnet/ptransfer.c +++ b/src/bacnet/ptransfer.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/ptransfer.h" /** @file ptransfer.c Encode/Decode Private Transfer data */ diff --git a/src/bacnet/ptransfer.h b/src/bacnet/ptransfer.h index fc7867b7..284f08fb 100644 --- a/src/bacnet/ptransfer.h +++ b/src/bacnet/ptransfer.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct BACnet_Private_Transfer_Data { uint16_t vendorID; diff --git a/src/bacnet/rd.c b/src/bacnet/rd.c index fa15eff7..f9bb9a43 100644 --- a/src/bacnet/rd.c +++ b/src/bacnet/rd.c @@ -32,10 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include - -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/rd.h" /** @file rd.c Encode/Decode Reinitialize Device APDUs */ diff --git a/src/bacnet/rd.h b/src/bacnet/rd.h index c5005575..b21140e8 100644 --- a/src/bacnet/rd.h +++ b/src/bacnet/rd.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct BACnet_Reinitialize_Device_Data { BACNET_REINITIALIZED_STATE state; diff --git a/src/bacnet/readrange.c b/src/bacnet/readrange.c index 67772cb4..bc33a773 100644 --- a/src/bacnet/readrange.c +++ b/src/bacnet/readrange.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/readrange.h" /** @file readrange.c Encode/Decode ReadRange requests */ diff --git a/src/bacnet/readrange.h b/src/bacnet/readrange.h index 00c3d1e4..2802a4b9 100644 --- a/src/bacnet/readrange.h +++ b/src/bacnet/readrange.h @@ -23,9 +23,9 @@ *********************************************************************/ #ifndef READRANGE_H #define READRANGE_H - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" #include "bacnet/datetime.h" diff --git a/src/bacnet/reject.c b/src/bacnet/reject.c index 79c53b09..08186f67 100644 --- a/src/bacnet/reject.c +++ b/src/bacnet/reject.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/reject.h" /** @file reject.c Encode/Decode Reject APDUs */ diff --git a/src/bacnet/reject.h b/src/bacnet/reject.h index 726c1384..233cbacf 100644 --- a/src/bacnet/reject.h +++ b/src/bacnet/reject.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/rp.c b/src/bacnet/rp.c index 87128338..91aabf2c 100644 --- a/src/bacnet/rp.c +++ b/src/bacnet/rp.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/rp.h" /** @file rp.c Encode/Decode Read Property and RP ACKs */ diff --git a/src/bacnet/rp.h b/src/bacnet/rp.h index 59001c30..9a066db2 100644 --- a/src/bacnet/rp.h +++ b/src/bacnet/rp.h @@ -26,9 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" typedef struct BACnet_Read_Property_Data { BACNET_OBJECT_TYPE object_type; diff --git a/src/bacnet/rpm.c b/src/bacnet/rpm.c index ea963803..30976454 100644 --- a/src/bacnet/rpm.c +++ b/src/bacnet/rpm.c @@ -32,10 +32,11 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacerror.h" #include "bacnet/bacdcode.h" -#include "bacnet/bacdef.h" #include "bacnet/bacapp.h" #include "bacnet/memcopy.h" #include "bacnet/rpm.h" diff --git a/src/bacnet/rpm.h b/src/bacnet/rpm.h index 0a896702..ff55a1a5 100644 --- a/src/bacnet/rpm.h +++ b/src/bacnet/rpm.h @@ -26,9 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacapp.h" #include "bacnet/proplist.h" #include "bacnet/rp.h" diff --git a/src/bacnet/special_event.h b/src/bacnet/special_event.h index c15b97a3..3d8587de 100644 --- a/src/bacnet/special_event.h +++ b/src/bacnet/special_event.h @@ -13,8 +13,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bactimevalue.h" #include "bacnet/calendar_entry.h" #include "bacnet/dailyschedule.h" diff --git a/src/bacnet/timestamp.h b/src/bacnet/timestamp.h index 9e0355fd..e828491f 100644 --- a/src/bacnet/timestamp.h +++ b/src/bacnet/timestamp.h @@ -24,10 +24,9 @@ #ifndef _TIMESTAMP_H_ #define _TIMESTAMP_H_ #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" -#include "bacnet/basic/sys/platform.h" -#include "bacnet/bacenum.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" typedef enum { diff --git a/src/bacnet/timesync.c b/src/bacnet/timesync.c index 13c9fc0b..47ed7e54 100644 --- a/src/bacnet/timesync.c +++ b/src/bacnet/timesync.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" #include "bacnet/timesync.h" diff --git a/src/bacnet/timesync.h b/src/bacnet/timesync.h index 2691bdb4..76d6cf15 100644 --- a/src/bacnet/timesync.h +++ b/src/bacnet/timesync.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" struct BACnet_Recipient_List; typedef struct BACnet_Recipient_List { diff --git a/src/bacnet/version.h b/src/bacnet/version.h index 808debf2..b5a08a2e 100644 --- a/src/bacnet/version.h +++ b/src/bacnet/version.h @@ -9,8 +9,8 @@ */ #ifndef _BACNET_VERSION_H_ #define _BACNET_VERSION_H_ - -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" /* This BACnet protocol stack version 0.0.0 - 255.255.255 */ #ifndef BACNET_VERSION diff --git a/src/bacnet/weeklyschedule.h b/src/bacnet/weeklyschedule.h index 503df5a5..75c5fa30 100644 --- a/src/bacnet/weeklyschedule.h +++ b/src/bacnet/weeklyschedule.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/dailyschedule.h" #include "bacnet/bactimevalue.h" diff --git a/src/bacnet/whohas.c b/src/bacnet/whohas.c index 709e7b37..ef85250d 100644 --- a/src/bacnet/whohas.c +++ b/src/bacnet/whohas.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/whohas.h" /** @file whohas.c Encode/Decode Who-Has requests */ diff --git a/src/bacnet/whohas.h b/src/bacnet/whohas.h index 847127c1..d5684640 100644 --- a/src/bacnet/whohas.h +++ b/src/bacnet/whohas.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacstr.h" typedef struct BACnet_Who_Has_Data { diff --git a/src/bacnet/whois.c b/src/bacnet/whois.c index afc97335..4c8c52a3 100644 --- a/src/bacnet/whois.c +++ b/src/bacnet/whois.c @@ -32,9 +32,10 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/whois.h" /** @file whois.c Encode/Decode Who-Is requests */ diff --git a/src/bacnet/whois.h b/src/bacnet/whois.h index 366ec368..b25f39e8 100644 --- a/src/bacnet/whois.h +++ b/src/bacnet/whois.h @@ -26,8 +26,8 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" #ifdef __cplusplus extern "C" { diff --git a/src/bacnet/wp.c b/src/bacnet/wp.c index 96e89207..771fc3aa 100644 --- a/src/bacnet/wp.c +++ b/src/bacnet/wp.c @@ -33,9 +33,10 @@ ####COPYRIGHTEND####*/ #include #include -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacdcode.h" #include "bacnet/wp.h" /** @file wp.c Encode/Decode BACnet Write Property APDUs */ diff --git a/src/bacnet/wp.h b/src/bacnet/wp.h index de67493d..29a5c914 100644 --- a/src/bacnet/wp.h +++ b/src/bacnet/wp.h @@ -26,8 +26,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" diff --git a/src/bacnet/wpm.c b/src/bacnet/wpm.c index 5dbf75c3..fa07d8da 100644 --- a/src/bacnet/wpm.c +++ b/src/bacnet/wpm.c @@ -25,10 +25,11 @@ *********************************************************************/ #include #include -#include "bacnet/bacapp.h" -#include "bacnet/bacenum.h" -#include "bacnet/bacdcode.h" +/* BACnet Stack defines - first */ #include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacapp.h" +#include "bacnet/bacdcode.h" #include "bacnet/bacerror.h" #include "bacnet/wp.h" #include "bacnet/wpm.h" diff --git a/src/bacnet/wpm.h b/src/bacnet/wpm.h index 505f83c7..3d6ff07a 100644 --- a/src/bacnet/wpm.h +++ b/src/bacnet/wpm.h @@ -27,8 +27,9 @@ #include #include -#include "bacnet/bacdef.h" /* Must be before all other bacnet *.h files */ -#include "bacnet/bacnet_stack_exports.h" +/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ #include "bacnet/bacdcode.h" #include "bacnet/bacapp.h" #include "bacnet/wp.h" diff --git a/test/bacnet/datalink/automac/src/main.c b/test/bacnet/datalink/automac/src/main.c index e9fd5937..5ffe89ec 100644 --- a/test/bacnet/datalink/automac/src/main.c +++ b/test/bacnet/datalink/automac/src/main.c @@ -8,7 +8,7 @@ */ #include #include -#include +#include /** * @addtogroup bacnet_tests diff --git a/test/bacnet/datalink/cobs/src/main.c b/test/bacnet/datalink/cobs/src/main.c index f1c7839f..b97a2a30 100644 --- a/test/bacnet/datalink/cobs/src/main.c +++ b/test/bacnet/datalink/cobs/src/main.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include /** * @addtogroup bacnet_tests diff --git a/test/bacnet/datalink/crc/src/main.c b/test/bacnet/datalink/crc/src/main.c index 457361e6..883d929d 100644 --- a/test/bacnet/datalink/crc/src/main.c +++ b/test/bacnet/datalink/crc/src/main.c @@ -10,7 +10,7 @@ #include #include -#include +#include /** * @addtogroup bacnet_tests diff --git a/test/bacnet/datalink/mstp/src/main.c b/test/bacnet/datalink/mstp/src/main.c index c88db4fb..3920527f 100644 --- a/test/bacnet/datalink/mstp/src/main.c +++ b/test/bacnet/datalink/mstp/src/main.c @@ -9,7 +9,10 @@ #include #include #include -#include +#/* BACnet Stack defines - first */ +#include "bacnet/bacdef.h" +/* BACnet Stack API */ +#include "bacnet/bacint.h" #include #include #include @@ -17,6 +20,7 @@ #include #include #include +#include #include /** diff --git a/test/unit/bacnet/bits/src/main.c b/test/unit/bacnet/bits/src/main.c index 3c1fdeae..ce4083a3 100644 --- a/test/unit/bacnet/bits/src/main.c +++ b/test/unit/bacnet/bits/src/main.c @@ -18,7 +18,7 @@ #undef BITMASK_FLIP #undef BITMASK_CHECK -#include "bacnet/bits.h" +#include "bacnet/basic/sys/bits.h" /* NOTE: These tests must be compatible with C90, so they do not diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 65984bcb..6e346abb 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -235,8 +235,8 @@ set(BACNETSTACK_SRCS ${BACNETSTACK_SRC}/bacnet/basic/sys/sbuf.h ${BACNETSTACK_SRC}/bacnet/basic/tsm/tsm.c ${BACNETSTACK_SRC}/bacnet/basic/tsm/tsm.h - ${BACNETSTACK_SRC}/bacnet/bits.h - ${BACNETSTACK_SRC}/bacnet/bytes.h + ${BACNETSTACK_SRC}/bacnet/basic/sys/bits.h + ${BACNETSTACK_SRC}/bacnet/basic/sys/bytes.h ${BACNETSTACK_SRC}/bacnet/config.h ${BACNETSTACK_SRC}/bacnet/cov.c ${BACNETSTACK_SRC}/bacnet/cov.h