Since config.h is updated, the demo makefiles needed to be updated with the latest DEFINES. Also changed some of the demo projects built with CodeBlocks.

This commit is contained in:
skarg
2007-08-21 23:00:56 +00:00
parent f74d39558f
commit 6dc7399605
28 changed files with 177 additions and 321 deletions
+1
View File
@@ -37,6 +37,7 @@
#define MAX_APDU 480 #define MAX_APDU 480
/* #define MAX_APDU 1476 */ /* #define MAX_APDU 1476 */
#endif #endif
/* for confirmed messages, this is the number of transactions */ /* for confirmed messages, this is the number of transactions */
/* that we hold in a queue waiting for timeout. */ /* that we hold in a queue waiting for timeout. */
/* Configure to zero if you don't want any confirmed messages */ /* Configure to zero if you don't want any confirmed messages */
+2 -2
View File
@@ -7,10 +7,10 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DBACFILE -DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacdcc
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES= -DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacepics
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1;BIP_DEBUG=0 DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1;BIP_DEBUG=0
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -337,7 +337,7 @@ uint32_t bacfile_instance(char *filename)
return instance; return instance;
} }
#if TSM_ENABLED #if MAX_TSM_TRANSACTIONS
/* this is one way to match up the invoke ID with */ /* this is one way to match up the invoke ID with */
/* the file ID from the AtomicReadFile request. */ /* the file ID from the AtomicReadFile request. */
/* Another way would be to store the */ /* Another way would be to store the */
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacarf
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
+135 -283
View File
@@ -1,369 +1,221 @@
<?xml version="1.0"?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<!DOCTYPE CodeBlocks_project_file>
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="1"/> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="BACnet Read Property Demo"/> <Option title="BACnet Read Property Demo" />
<Option makefile="Makefile"/> <Option pch_mode="0" />
<Option makefile_is_custom="0"/> <Option compiler="gcc" />
<Option compiler="2"/>
<Build> <Build>
<Target title="default"> <Target title="default">
<Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe"/> <Option output="C:\code\bacnet-stack\demo\readprop\bacrp.exe" prefix_auto="0" extension_auto="0" />
<Option working_dir="."/> <Option type="1" />
<Option object_output=".objs"/> <Option compiler="gcc" />
<Option deps_output=".deps"/> <Option projectResourceIncludeDirsRelation="1" />
<Option type="1"/>
<Option compiler="2"/>
<Option projectResourceIncludeDirsRelation="1"/>
<Compiler> <Compiler>
<Add option="-DBACDL_BIP=1;TSM_ENABLED=1"/> <Add option="-DBACDL_BIP=1;TSM_ENABLED=1" />
<Add directory="..\handler"/> <Add directory="..\handler" />
<Add directory="..\object"/> <Add directory="..\object" />
<Add directory="..\..\..\bacnet-stack"/> <Add directory="..\..\..\bacnet-stack" />
<Add directory="..\..\ports\win32"/> <Add directory="..\..\ports\win32" />
</Compiler> </Compiler>
<Linker>
<Add library="..\..\..\..\BCC55\Lib\import32.lib"/>
<Add library="..\..\..\..\BCC55\Lib\cw32mt.lib"/>
</Linker>
</Target> </Target>
</Build> </Build>
<VirtualTargets>
<Add alias="All" targets="default;" />
</VirtualTargets>
<Compiler>
<Add option="-Wall" />
</Compiler>
<Linker>
<Add library="ws2_32" />
</Linker>
<Unit filename="..\..\abort.c"> <Unit filename="..\..\abort.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\abort.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\abort.h" />
<Unit filename="..\..\address.c"> <Unit filename="..\..\address.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\address.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\address.h" />
<Unit filename="..\..\apdu.c"> <Unit filename="..\..\apdu.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\apdu.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\apdu.h" />
<Unit filename="..\..\arf.c"> <Unit filename="..\..\arf.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\arf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\arf.h" />
<Unit filename="..\..\awf.c"> <Unit filename="..\..\awf.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\awf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\awf.h" />
<Unit filename="..\..\bacapp.c"> <Unit filename="..\..\bacapp.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacapp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bacapp.h" />
<Unit filename="..\..\bacdcode.c"> <Unit filename="..\..\bacdcode.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacdcode.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacdef.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacenum.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bacdcode.h" />
<Unit filename="..\..\bacdef.h" />
<Unit filename="..\..\bacenum.h" />
<Unit filename="..\..\bacerror.c"> <Unit filename="..\..\bacerror.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bacerror.h"> <Unit filename="..\..\bacerror.h" />
<Option compilerVar=""/> <Unit filename="..\..\bacint.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bacint.h" />
<Unit filename="..\..\bacstr.c"> <Unit filename="..\..\bacstr.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\bacstr.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bacstr.h" />
<Unit filename="..\..\bactext.c"> <Unit filename="..\..\bactext.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\bactext.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bactext.h" />
<Unit filename="..\..\bigend.c"> <Unit filename="..\..\bigend.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\bigend.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bigend.h" />
<Unit filename="..\..\bip.c"> <Unit filename="..\..\bip.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\bip.h"> <Unit filename="..\..\bip.h" />
<Option compilerVar=""/> <Unit filename="..\..\config.h" />
<Option compile="0"/> <Unit filename="..\..\datalink.h" />
<Option link="0"/> <Unit filename="..\..\datetime.c">
<Option target="default"/> <Option compilerVar="CC" />
</Unit> </Unit>
<Unit filename="..\..\config.h"> <Unit filename="..\..\datetime.h" />
<Option compilerVar=""/> <Unit filename="..\..\dcc.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\datalink.c">
<Option compilerVar="CC"/>
<Option target="default"/>
</Unit>
<Unit filename="..\..\datalink.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit>
<Unit filename="..\handler\client.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\dcc.h" />
<Unit filename="..\handler\client.h" />
<Unit filename="..\handler\h_iam.c"> <Unit filename="..\handler\h_iam.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\h_rp.c"> <Unit filename="..\handler\h_rp.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\h_rp_a.c"> <Unit filename="..\handler\h_rp_a.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\h_whois.c"> <Unit filename="..\handler\h_whois.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\handler\handlers.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\handlers.h" />
<Unit filename="..\handler\noserv.c"> <Unit filename="..\handler\noserv.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\s_rp.c"> <Unit filename="..\handler\s_rp.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\s_whois.c"> <Unit filename="..\handler\s_whois.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\txbuf.c"> <Unit filename="..\handler\txbuf.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\handler\txbuf.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\handler\txbuf.h" />
<Unit filename="..\object\ai.c"> <Unit filename="..\object\ai.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\object\ai.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\ai.h" />
<Unit filename="..\object\ao.c"> <Unit filename="..\object\ao.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\ao.h"> <Unit filename="..\object\ao.h" />
<Option compilerVar=""/> <Unit filename="..\object\av.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\av.h" />
<Unit filename="..\object\bacfile.c"> <Unit filename="..\object\bacfile.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\bacfile.h"> <Unit filename="..\object\bacfile.h" />
<Option compilerVar=""/> <Unit filename="..\object\bi.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\bi.h" />
<Unit filename="..\object\bo.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bo.h" />
<Unit filename="..\object\bv.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\bv.h" />
<Unit filename="..\object\device.c"> <Unit filename="..\object\device.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\object\device.h"> <Unit filename="..\object\device.h" />
<Option compilerVar=""/> <Unit filename="..\object\lc.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="readprop.c"> <Unit filename="..\object\lc.h" />
<Option compilerVar="CC"/> <Unit filename="..\object\lsp.c">
<Option target="default"/> <Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\lsp.h" />
<Unit filename="..\object\mso.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="..\object\mso.h" />
<Unit filename="main.c">
<Option compilerVar="CC" />
</Unit> </Unit>
<Unit filename="..\..\filename.c"> <Unit filename="..\..\filename.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\filename.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\filename.h" />
<Unit filename="..\..\iam.c"> <Unit filename="..\..\iam.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\iam.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\iam.h" />
<Unit filename="..\..\indtext.c"> <Unit filename="..\..\indtext.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\indtext.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\indtext.h" />
<Unit filename="..\..\npdu.c"> <Unit filename="..\..\npdu.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\npdu.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\npdu.h" />
<Unit filename="..\..\ports\win32\bip-init.c"> <Unit filename="..\..\ports\win32\bip-init.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\ports\win32\net.h" />
<Unit filename="..\..\ports\win32\stdbool.h" />
<Unit filename="..\..\ports\win32\stdint.h" />
<Unit filename="..\..\reject.c"> <Unit filename="..\..\reject.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\reject.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\reject.h" />
<Unit filename="..\..\rp.c"> <Unit filename="..\..\rp.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\rp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\rp.h" />
<Unit filename="..\..\tsm.c"> <Unit filename="..\..\tsm.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\tsm.h"> <Unit filename="..\..\tsm.h" />
<Option compilerVar=""/> <Unit filename="..\..\version.c">
<Option compile="0"/> <Option compilerVar="CC" />
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\whois.c"> <Unit filename="..\..\whois.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\whois.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\whois.h" />
<Unit filename="..\..\wp.c"> <Unit filename="..\..\wp.c">
<Option compilerVar="CC"/> <Option compilerVar="CC" />
<Option target="default"/>
</Unit>
<Unit filename="..\..\wp.h">
<Option compilerVar=""/>
<Option compile="0"/>
<Option link="0"/>
<Option target="default"/>
</Unit> </Unit>
<Unit filename="..\..\wp.h" />
<Extensions>
<code_completion />
<envvars />
<debugger />
</Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
+11 -7
View File
@@ -28,15 +28,19 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <time.h> /* for time */
#include <errno.h> #include <errno.h>
#include <time.h> /* for time */
#define PRINT_ENABLED 1
#include "bacdef.h"
#include "config.h"
#include "bactext.h" #include "bactext.h"
#include "bacerror.h"
#include "iam.h" #include "iam.h"
#include "arf.h" #include "arf.h"
#include "tsm.h" #include "tsm.h"
#include "address.h" #include "address.h"
#include "config.h"
#include "bacdef.h"
#include "npdu.h" #include "npdu.h"
#include "apdu.h" #include "apdu.h"
#include "device.h" #include "device.h"
@@ -70,8 +74,8 @@ static void MyErrorHandler(BACNET_ADDRESS * src,
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Error: %s: %s\r\n", printf("BACnet Error: %s: %s\r\n",
bactext_error_class_name(error_class), bactext_error_class_name((int)error_class),
bactext_error_code_name(error_code)); bactext_error_code_name((int)error_code));
Error_Detected = true; Error_Detected = true;
} }
@@ -83,7 +87,7 @@ void MyAbortHandler(BACNET_ADDRESS * src,
(void) invoke_id; (void) invoke_id;
(void) server; (void) server;
printf("BACnet Abort: %s\r\n", printf("BACnet Abort: %s\r\n",
bactext_abort_reason_name(abort_reason)); bactext_abort_reason_name((int)abort_reason));
Error_Detected = true; Error_Detected = true;
} }
@@ -94,7 +98,7 @@ void MyRejectHandler(BACNET_ADDRESS * src,
(void) src; (void) src;
(void) invoke_id; (void) invoke_id;
printf("BACnet Reject: %s\r\n", printf("BACnet Reject: %s\r\n",
bactext_reject_reason_name(reject_reason)); bactext_reject_reason_name((int)reject_reason));
Error_Detected = true; Error_Detected = true;
} }
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacrp
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacrd
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;USE_INADDR=1;BIP_DEBUG;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;USE_INADDR=1;BIP_DEBUG;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\rd.c \ ..\..\rd.c \
+5 -3
View File
@@ -2,12 +2,12 @@
<CodeBlocks_project_file> <CodeBlocks_project_file>
<FileVersion major="1" minor="6" /> <FileVersion major="1" minor="6" />
<Project> <Project>
<Option title="bacserv" /> <Option title="BACnet Server Demo" />
<Option pch_mode="2" /> <Option pch_mode="2" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="bin\Debug\bacserv.exe" prefix_auto="1" extension_auto="1" /> <Option output="bin\Debug\bacserv" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Debug\" /> <Option object_output="obj\Debug\" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@@ -22,7 +22,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin\Release\bacserv.exe" prefix_auto="1" extension_auto="1" /> <Option output="bin\Release\bacserv" prefix_auto="1" extension_auto="1" />
<Option object_output="obj\Release\" /> <Option object_output="obj\Release\" />
<Option type="1" /> <Option type="1" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@@ -49,6 +49,7 @@
<Add option="-DUSE_INADDR=1" /> <Add option="-DUSE_INADDR=1" />
<Add option="-DPRINT_ENABLED=1" /> <Add option="-DPRINT_ENABLED=1" />
<Add option="-DBIG_ENDIAN=0" /> <Add option="-DBIG_ENDIAN=0" />
<Add option="-DMAX_TSM_TRANSACTIONS=0" />
<Add directory="." /> <Add directory="." />
<Add directory="..\handler" /> <Add directory="..\handler" />
<Add directory="..\object" /> <Add directory="..\object" />
@@ -274,6 +275,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<envvars /> <envvars />
<debugger />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>
+1 -1
View File
@@ -11,7 +11,7 @@ BASEDIR = .
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DPRINT_ENABLED=1
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacts
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=0;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=0;PRINT_ENABLED=1
# Directories # Directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_OBJECT = ..\object BACNET_OBJECT = ..\object
+1 -1
View File
@@ -11,7 +11,7 @@ BASEDIR = .
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacucov
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -7,7 +7,7 @@ BASEDIR = .
# Note: you can strip out symbols using the strip command # Note: you can strip out symbols using the strip command
# to get an idea of how big the compile really is. # to get an idea of how big the compile really is.
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacwh
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\rd.c \ ..\..\rd.c \
+1 -1
View File
@@ -11,7 +11,7 @@ BASEDIR = .
#BACDL_DEFINE = -DBACDL_ETHERNET=1 #BACDL_DEFINE = -DBACDL_ETHERNET=1
#BACDL_DEFINE = -DBACDL_ARCNET=1 #BACDL_DEFINE = -DBACDL_ARCNET=1
BACDL_DEFINE = -DBACDL_BIP=1 -DUSE_INADDR=1 BACDL_DEFINE = -DBACDL_BIP=1 -DUSE_INADDR=1
BACNET_DEFINES = -DBACFILE=1 -DTSM_ENABLED=0 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES = -DMAX_TSM_TRANSACTIONS=0 -DPRINT_ENABLED=1
DEFINES=$(BACDL_DEFINE) $(BACNET_DEFINES) DEFINES=$(BACDL_DEFINE) $(BACNET_DEFINES)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacwi
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=0;USE_INADDR=1;BIG_ENDIAN=0;PRINT_ENABLED=1;BIP_DEBUG=1 DEFINES = -DBACDL_BIP=1;MAX_TSM_TRANSACTIONS=0;USE_INADDR=1;PRINT_ENABLED=1;BIP_DEBUG=1
# Directories # Directories
BACNET_PORT = ..\..\ports\win32 BACNET_PORT = ..\..\ports\win32
BACNET_OBJECT = ..\object BACNET_OBJECT = ..\object
+1 -1
View File
@@ -11,7 +11,7 @@ BASEDIR = .
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DTSM_ENABLED=1 -DPRINT_ENABLED=1
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacawf
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -1
View File
@@ -11,7 +11,7 @@ BASEDIR = .
#BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ETHERNET=1
#BACDL_DEFINE=-DBACDL_ARCNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1
BACDL_DEFINE=-DBACDL_BIP=1 BACDL_DEFINE=-DBACDL_BIP=1
BACNET_DEFINES=-DBACFILE=1 -DTSM_ENABLED=1 -DBIG_ENDIAN=0 -DPRINT_ENABLED=1 BACNET_DEFINES=-DPRINT_ENABLED=1
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE)
BACNET_PORT = ../../ports/linux BACNET_PORT = ../../ports/linux
+1 -1
View File
@@ -15,7 +15,7 @@ PRODUCT = bacwp
PRODUCT_EXE = $(PRODUCT).exe PRODUCT_EXE = $(PRODUCT).exe
# Choose the Data Link Layer to Enable # Choose the Data Link Layer to Enable
DEFINES = -DBACDL_BIP=1;TSM_ENABLED=1;BIG_ENDIAN=0;PRINT_ENABLED=1 DEFINES = -DBACDL_BIP=1;PRINT_ENABLED=1
SRCS = main.c \ SRCS = main.c \
..\..\ports\win32\bip-init.c \ ..\..\ports\win32\bip-init.c \
+1 -4
View File
@@ -42,10 +42,7 @@
/* note: TSM functionality is optional - only needed if we are /* note: TSM functionality is optional - only needed if we are
doing client requests */ doing client requests */
#ifndef TSM_ENABLED #if (!MAX_TSM_TRANSACTIONS)
#define TSM_ENABLED 0
#endif
#if (!TSM_ENABLED)
#define tsm_free_invoke_id(x) (void)x; #define tsm_free_invoke_id(x) (void)x;
#else #else
typedef enum { typedef enum {