From 6da080105d740c84422166d916ecd9541c8829b0 Mon Sep 17 00:00:00 2001 From: skarg Date: Sun, 19 Apr 2009 20:05:06 +0000 Subject: [PATCH] Cleaned up Borland compiler warnings. --- bacnet-stack/demo/handler/h_ucov.c | 2 ++ bacnet-stack/demo/handler/s_router.c | 8 ++++++-- bacnet-stack/demo/object/bi.c | 3 +-- bacnet-stack/demo/object/bo.c | 1 - bacnet-stack/demo/object/bv.c | 1 - bacnet-stack/demo/object/lsp.c | 3 +-- bacnet-stack/include/mstp.h | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bacnet-stack/demo/handler/h_ucov.c b/bacnet-stack/demo/handler/h_ucov.c index 2e81dbf3..a2cc2682 100644 --- a/bacnet-stack/demo/handler/h_ucov.c +++ b/bacnet-stack/demo/handler/h_ucov.c @@ -49,6 +49,8 @@ void handler_ucov_notification( BACNET_PROPERTY_VALUE property_value; int len = 0; + /* src not needed for this application */ + src = src; /* create linked list to store data if more than one property value is expected */ property_value.next = NULL; diff --git a/bacnet-stack/demo/handler/s_router.c b/bacnet-stack/demo/handler/s_router.c index f8a321d1..ae2b00e5 100644 --- a/bacnet-stack/demo/handler/s_router.c +++ b/bacnet-stack/demo/handler/s_router.c @@ -153,7 +153,7 @@ void Send_Initialize_Routing_Table( BACNET_NPDU_DATA npdu_data; uint8_t number_of_ports = 0; BACNET_ROUTER_PORT *router_port; - unsigned i = 0; /* counter */ + uint8_t i = 0; /* counter */ npdu_encode_npdu_network(&npdu_data, NETWORK_MESSAGE_INIT_RT_TABLE, true, MESSAGE_PRIORITY_NORMAL); @@ -203,7 +203,11 @@ void Send_Initialize_Routing_Table_Ack( BACNET_ADDRESS dest; int bytes_sent = 0; BACNET_NPDU_DATA npdu_data; - + + + /* FIXME: is this parameter needed? */ + router_port_list = router_port_list; + /* setup packet for sending */ npdu_encode_npdu_network(&npdu_data, NETWORK_MESSAGE_INIT_RT_TABLE_ACK, false, MESSAGE_PRIORITY_NORMAL); pdu_len = diff --git a/bacnet-stack/demo/object/bi.c b/bacnet-stack/demo/object/bi.c index 11c16837..4d90bd9e 100644 --- a/bacnet-stack/demo/object/bi.c +++ b/bacnet-stack/demo/object/bi.c @@ -396,8 +396,7 @@ bool Binary_Input_Write_Property( switch (wp_data->object_property) { case PROP_PRESENT_VALUE: if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) { - if ((value.type.Enumerated >= MIN_BINARY_PV) && - (value.type.Enumerated <= MAX_BINARY_PV)) { + if (value.type.Enumerated <= MAX_BINARY_PV) { Binary_Input_Present_Value_Set(wp_data->object_instance, (BACNET_BINARY_PV) value.type.Enumerated); status = true; diff --git a/bacnet-stack/demo/object/bo.c b/bacnet-stack/demo/object/bo.c index 3e6ebdd5..de4f6c35 100644 --- a/bacnet-stack/demo/object/bo.c +++ b/bacnet-stack/demo/object/bo.c @@ -361,7 +361,6 @@ bool Binary_Output_Write_Property( object. */ if (priority && (priority <= BACNET_MAX_PRIORITY) && (priority != 6 /* reserved */ ) && - (value.type.Enumerated >= MIN_BINARY_PV) && (value.type.Enumerated <= MAX_BINARY_PV)) { level = (BACNET_BINARY_PV) value.type.Enumerated; object_index = diff --git a/bacnet-stack/demo/object/bv.c b/bacnet-stack/demo/object/bv.c index d5c86236..4f5770b2 100644 --- a/bacnet-stack/demo/object/bv.c +++ b/bacnet-stack/demo/object/bv.c @@ -342,7 +342,6 @@ bool Binary_Value_Write_Property( object. */ if (priority && (priority <= BACNET_MAX_PRIORITY) && (priority != 6 /* reserved */ ) && - (value.type.Enumerated >= MIN_BINARY_PV) && (value.type.Enumerated <= MAX_BINARY_PV)) { level = (BACNET_BINARY_PV) value.type.Enumerated; object_index = diff --git a/bacnet-stack/demo/object/lsp.c b/bacnet-stack/demo/object/lsp.c index 1e288fca..4c5bd24b 100644 --- a/bacnet-stack/demo/object/lsp.c +++ b/bacnet-stack/demo/object/lsp.c @@ -315,8 +315,7 @@ bool Life_Safety_Point_Write_Property( switch (wp_data->object_property) { case PROP_MODE: if (value.tag == BACNET_APPLICATION_TAG_ENUMERATED) { - if ((value.type.Enumerated >= MIN_LIFE_SAFETY_MODE) && - (value.type.Enumerated <= MIN_LIFE_SAFETY_MODE)) { + if (value.type.Enumerated <= MAX_LIFE_SAFETY_MODE) { object_index = Life_Safety_Point_Instance_To_Index(wp_data-> object_instance); diff --git a/bacnet-stack/include/mstp.h b/bacnet-stack/include/mstp.h index 0030d282..be3e1583 100644 --- a/bacnet-stack/include/mstp.h +++ b/bacnet-stack/include/mstp.h @@ -146,7 +146,7 @@ struct mstp_port_struct_t { uint8_t DataCRCActualMSB; uint8_t DataCRCActualLSB; /* Used to store the data length of a received frame. */ - unsigned DataLength; + uint16_t DataLength; /* Used to store the destination address of a received frame. */ uint8_t DestinationAddress; /* Used to count the number of received octets or errors. */