Cleaned up gcc build on linux for whohas and i-have changes.

This commit is contained in:
skarg
2006-02-16 21:53:23 +00:00
parent 5fcf45a781
commit 44587d5b81
7 changed files with 19 additions and 15 deletions
-1
View File
@@ -87,7 +87,6 @@ int Analog_Input_Encode_Property_APDU(
int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string;
char text_string[32] = {""};
float value = 3.14;
(void)array_index;
-1
View File
@@ -168,7 +168,6 @@ int Analog_Output_Encode_Property_APDU(
int apdu_len = 0; // return value
BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string;
char text_string[32] = {""};
float real_value = 1.414;
unsigned object_index = 0;
unsigned i = 0;
+7 -6
View File
@@ -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=0 -DBACDL_BIP=1
BACNET_PORT = ../../ports/linux
BACNET_OBJECT = ../object
BACNET_HANDLER = ../handler
@@ -18,7 +18,7 @@ INCLUDES = -I$(BACNET_ROOT) -I$(BACNET_PORT) -I$(BACNET_OBJECT) -I$(BACNET_HANDL
CFLAGS = -Wall -g $(INCLUDES) $(DEFINES)
TARGET = bacrd
TARGET = bacwh
SRCS = main.c \
$(BACNET_ROOT)/rd.c \
@@ -27,10 +27,10 @@ SRCS = main.c \
$(BACNET_HANDLER)/txbuf.c \
$(BACNET_HANDLER)/noserv.c \
$(BACNET_HANDLER)/h_whois.c \
$(BACNET_HANDLER)/h_ihave.c \
$(BACNET_HANDLER)/h_rp.c \
$(BACNET_HANDLER)/h_iam.c \
$(BACNET_HANDLER)/s_whois.c \
$(BACNET_HANDLER)/s_rd.c \
$(BACNET_HANDLER)/s_whohas.c \
$(BACNET_HANDLER)/s_ihave.c \
$(BACNET_OBJECT)/device.c \
$(BACNET_OBJECT)/ai.c \
$(BACNET_OBJECT)/ao.c \
@@ -47,7 +47,8 @@ SRCS = main.c \
$(BACNET_ROOT)/bigend.c \
$(BACNET_ROOT)/whois.c \
$(BACNET_ROOT)/iam.c \
$(BACNET_ROOT)/tsm.c \
$(BACNET_ROOT)/whohas.c \
$(BACNET_ROOT)/ihave.c \
$(BACNET_ROOT)/datalink.c \
$(BACNET_ROOT)/address.c \
$(BACNET_ROOT)/arf.c \
-3
View File
@@ -135,13 +135,10 @@ int main(int argc, char *argv[])
BACNET_ADDRESS src = {0}; // address where message came from
uint16_t pdu_len = 0;
unsigned timeout = 100; // milliseconds
unsigned max_apdu = 0;
time_t elapsed_seconds = 0;
time_t last_seconds = 0;
time_t current_seconds = 0;
time_t timeout_seconds = 0;
uint8_t invoke_id = 0;
bool found = false;
#ifdef BIP_DEBUG
BACNET_ADDRESS my_address, broadcast_address;
#endif