From c36d28aa09a74574a6b27f0f4254cbb937298d35 Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 10 Aug 2006 21:11:04 +0000 Subject: [PATCH] --- bacnet-stack/config.h | 8 ++++---- bacnet-stack/demo/dcc/Makefile | 2 +- bacnet-stack/demo/dcc/main.c | 18 ++++++++++++++---- bacnet-stack/demo/dcc/makefile.b32 | 2 +- bacnet-stack/demo/readfile/Makefile | 2 +- bacnet-stack/demo/readfile/makefile.b32 | 2 +- bacnet-stack/demo/readprop/Makefile | 2 +- bacnet-stack/demo/readprop/makefile.b32 | 2 +- bacnet-stack/demo/reinit/Makefile | 2 +- bacnet-stack/demo/reinit/makefile.b32 | 2 +- bacnet-stack/demo/server/Makefile | 2 +- bacnet-stack/demo/server/makefile.b32 | 2 +- bacnet-stack/demo/timesync/Makefile | 2 +- bacnet-stack/demo/timesync/makefile.b32 | 2 +- bacnet-stack/demo/ucov/Makefile | 2 +- bacnet-stack/demo/ucov/makefile.b32 | 2 +- bacnet-stack/demo/whohas/Makefile | 2 +- bacnet-stack/demo/whohas/makefile.b32 | 2 +- bacnet-stack/demo/whois/Makefile | 2 +- bacnet-stack/demo/whois/makefile.b32 | 2 +- bacnet-stack/demo/writefile/Makefile | 2 +- bacnet-stack/demo/writefile/makefile.b32 | 2 +- bacnet-stack/demo/writeprop/Makefile | 2 +- bacnet-stack/demo/writeprop/makefile.b32 | 2 +- 24 files changed, 40 insertions(+), 30 deletions(-) diff --git a/bacnet-stack/config.h b/bacnet-stack/config.h index ae1d3c23..0782e172 100644 --- a/bacnet-stack/config.h +++ b/bacnet-stack/config.h @@ -11,8 +11,8 @@ /* This is used in constructing messages and to tell others our limits */ /* 50 is the minimum; adjust to your memory and physical layer constraints */ /* Lon=206, MS/TP=480, ARCNET=480, Ethernet=1476 */ -/* #define MAX_APDU 50 */ -#define MAX_APDU 480 +#define MAX_APDU 50 +/* #define MAX_APDU 480 */ /* #define MAX_APDU 1476 */ /* for confirmed messages, this is the number of transactions */ @@ -20,13 +20,13 @@ /* Configure to zero if you don't want any confirmed messages */ /* Configure from 1..255 for number of outstanding confirmed */ /* requests available. */ -#define MAX_TSM_TRANSACTIONS 16 +#define MAX_TSM_TRANSACTIONS 1 /* The address cache is used for binding to BACnet devices */ /* The number of entries corresponds to the number of */ /* devices that might respond to an I-Am on the network. */ /* If your device is a simple server and does not need to bind, */ /* then you don't need to use this. */ -#define MAX_ADDRESS_CACHE 255 +#define MAX_ADDRESS_CACHE 2 #endif diff --git a/bacnet-stack/demo/dcc/Makefile b/bacnet-stack/demo/dcc/Makefile index 23212dde..4f5617c1 100644 --- a/bacnet-stack/demo/dcc/Makefile +++ b/bacnet-stack/demo/dcc/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/dcc/main.c b/bacnet-stack/demo/dcc/main.c index 6bbaef3a..397bb8d5 100644 --- a/bacnet-stack/demo/dcc/main.c +++ b/bacnet-stack/demo/dcc/main.c @@ -201,16 +201,26 @@ int main(int argc, char *argv[]) Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE); address_init(); Init_Service_Handlers(); - /* configure standard BACnet/IP port */ - bip_set_interface("eth0"); /* for linux */ - bip_set_port(0xBAC0); +#ifdef BACDL_ETHERNET + /* init the physical layer */ + if (!ethernet_init("eth0")) + return 1; +#endif +#ifdef BACDL_BIP + bip_set_interface("eth0"); if (!bip_init()) return 1; + printf("bip: using port %hu\r\n", bip_get_port()); #ifdef BIP_DEBUG datalink_get_broadcast_address(&broadcast_address); print_address("Broadcast", &broadcast_address); datalink_get_my_address(&my_address); print_address("Address", &my_address); +#endif +#endif +#ifdef BACDL_ARCNET + if (!arcnet_init("arc0")) + return 1; #endif /* configure the timeout values */ last_seconds = time(NULL); @@ -225,7 +235,7 @@ int main(int argc, char *argv[]) current_seconds = time(NULL); /* returns 0 bytes on timeout */ - pdu_len = bip_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout); + pdu_len = datalink_receive(&src, &Rx_Buf[0], MAX_MPDU, timeout); /* process */ if (pdu_len) { diff --git a/bacnet-stack/demo/dcc/makefile.b32 b/bacnet-stack/demo/dcc/makefile.b32 index f344e905..99b644e7 100644 --- a/bacnet-stack/demo/dcc/makefile.b32 +++ b/bacnet-stack/demo/dcc/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacdcc PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = main.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/readfile/Makefile b/bacnet-stack/demo/readfile/Makefile index b6e1610c..f8bc28d6 100644 --- a/bacnet-stack/demo/readfile/Makefile +++ b/bacnet-stack/demo/readfile/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/readfile/makefile.b32 b/bacnet-stack/demo/readfile/makefile.b32 index 04a03346..b70238a2 100644 --- a/bacnet-stack/demo/readfile/makefile.b32 +++ b/bacnet-stack/demo/readfile/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacarf PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = readfile.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile index 107207e3..be25c704 100644 --- a/bacnet-stack/demo/readprop/Makefile +++ b/bacnet-stack/demo/readprop/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/readprop/makefile.b32 b/bacnet-stack/demo/readprop/makefile.b32 index 44f88cf0..61ebb08f 100644 --- a/bacnet-stack/demo/readprop/makefile.b32 +++ b/bacnet-stack/demo/readprop/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacrp PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = readprop.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/reinit/Makefile b/bacnet-stack/demo/reinit/Makefile index adb7c41e..70094675 100644 --- a/bacnet-stack/demo/reinit/Makefile +++ b/bacnet-stack/demo/reinit/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/reinit/makefile.b32 b/bacnet-stack/demo/reinit/makefile.b32 index c32d9d48..675874dd 100644 --- a/bacnet-stack/demo/reinit/makefile.b32 +++ b/bacnet-stack/demo/reinit/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacrd PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = main.c \ ..\..\rd.c \ diff --git a/bacnet-stack/demo/server/Makefile b/bacnet-stack/demo/server/Makefile index 67a2e10a..7d8f8581 100644 --- a/bacnet-stack/demo/server/Makefile +++ b/bacnet-stack/demo/server/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DBACDL_BIP=1 -DPRINT_ENABLED=1 -DBIG_ENDIAN=0 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/server/makefile.b32 b/bacnet-stack/demo/server/makefile.b32 index beaca43e..4185de39 100644 --- a/bacnet-stack/demo/server/makefile.b32 +++ b/bacnet-stack/demo/server/makefile.b32 @@ -17,7 +17,7 @@ PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable # Note: unless some other drivers are installed, BIP is the only # datalink layer that Win32 supports -DEFINES = -DBACDL_BIP=1;USE_INADDR=1 +DEFINES = -DBACDL_BIP=1;USE_INADDR=1;PRINT_ENABLED=1;BIG_ENDIAN=0 SRCS = server.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/timesync/Makefile b/bacnet-stack/demo/timesync/Makefile index 1ab630eb..37b7b747 100644 --- a/bacnet-stack/demo/timesync/Makefile +++ b/bacnet-stack/demo/timesync/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DUSE_INADDR=0 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DUSE_INADDR=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/timesync/makefile.b32 b/bacnet-stack/demo/timesync/makefile.b32 index 0c5f7409..e40a54c2 100644 --- a/bacnet-stack/demo/timesync/makefile.b32 +++ b/bacnet-stack/demo/timesync/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacts PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=0 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=0;BIG_ENDIAN=0;PRINT_ENABLED=1 # Directories BACNET_PORT = ..\..\ports\win32 BACNET_OBJECT = ..\object diff --git a/bacnet-stack/demo/ucov/Makefile b/bacnet-stack/demo/ucov/Makefile index cca9efc0..a6ce0f3e 100644 --- a/bacnet-stack/demo/ucov/Makefile +++ b/bacnet-stack/demo/ucov/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/ucov/makefile.b32 b/bacnet-stack/demo/ucov/makefile.b32 index 815614ad..e81acd88 100644 --- a/bacnet-stack/demo/ucov/makefile.b32 +++ b/bacnet-stack/demo/ucov/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacucov PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = main.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/whohas/Makefile b/bacnet-stack/demo/whohas/Makefile index 34b34b2f..90fcbb2d 100644 --- a/bacnet-stack/demo/whohas/Makefile +++ b/bacnet-stack/demo/whohas/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/whohas/makefile.b32 b/bacnet-stack/demo/whohas/makefile.b32 index f437a038..c40cd92b 100644 --- a/bacnet-stack/demo/whohas/makefile.b32 +++ b/bacnet-stack/demo/whohas/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacwh PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = main.c \ ..\..\rd.c \ diff --git a/bacnet-stack/demo/whois/Makefile b/bacnet-stack/demo/whois/Makefile index 4ccdf54f..e625a223 100644 --- a/bacnet-stack/demo/whois/Makefile +++ b/bacnet-stack/demo/whois/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DUSE_INADDR=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBACDL_BIP=1 -DUSE_INADDR=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/whois/makefile.b32 b/bacnet-stack/demo/whois/makefile.b32 index 1a370ea0..f4d8e944 100644 --- a/bacnet-stack/demo/whois/makefile.b32 +++ b/bacnet-stack/demo/whois/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacwi PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1 # Directories BACNET_PORT = ..\..\ports\win32 BACNET_OBJECT = ..\object diff --git a/bacnet-stack/demo/writefile/Makefile b/bacnet-stack/demo/writefile/Makefile index 04fa37e5..a45bc433 100644 --- a/bacnet-stack/demo/writefile/Makefile +++ b/bacnet-stack/demo/writefile/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/writefile/makefile.b32 b/bacnet-stack/demo/writefile/makefile.b32 index bda9260f..d6138411 100644 --- a/bacnet-stack/demo/writefile/makefile.b32 +++ b/bacnet-stack/demo/writefile/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacawf PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = writefile.c \ ..\..\ports\win32\bip-init.c \ diff --git a/bacnet-stack/demo/writeprop/Makefile b/bacnet-stack/demo/writeprop/Makefile index 5cb8e901..8850175a 100644 --- a/bacnet-stack/demo/writeprop/Makefile +++ b/bacnet-stack/demo/writeprop/Makefile @@ -9,7 +9,7 @@ BASEDIR = . #DEFINES = -DBACFILE=1 -DBACDL_ETHERNET=1 #DEFINES = -DBACFILE=1 -DBACDL_ARCNET=1 #DEFINES = -DBACFILE=1 -DBACDL_MSTP=1 -DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 +DEFINES = -DBACFILE=1 -DTSM_ENABLED=1 -DBACDL_BIP=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_PORT = ../../ports/linux BACNET_OBJECT = ../object BACNET_HANDLER = ../handler diff --git a/bacnet-stack/demo/writeprop/makefile.b32 b/bacnet-stack/demo/writeprop/makefile.b32 index bbc0f99d..556b5044 100644 --- a/bacnet-stack/demo/writeprop/makefile.b32 +++ b/bacnet-stack/demo/writeprop/makefile.b32 @@ -15,7 +15,7 @@ PRODUCT = bacwp PRODUCT_EXE = $(PRODUCT).exe # Choose the Data Link Layer to Enable -DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1 +DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 SRCS = writeprop.c \ ..\..\ports\win32\bip-init.c \