From bc0de6b71f878be78fe9ded9e79acfec58ba2787 Mon Sep 17 00:00:00 2001 From: skarg Date: Tue, 17 Aug 2010 13:51:56 +0000 Subject: [PATCH] Cleaning up code by adding prototypes or include files where required. --- bacnet-stack/demo/object/bacfile.c | 3 ++- bacnet-stack/demo/object/ms-input.c | 4 ++-- bacnet-stack/demo/readprop/Makefile | 4 ++-- bacnet-stack/include/av.h | 2 ++ bacnet-stack/include/bacdcode.h | 8 ++++++++ bacnet-stack/include/bv.h | 2 ++ bacnet-stack/include/lc.h | 4 ++++ bacnet-stack/include/lsp.h | 2 ++ bacnet-stack/include/mso.h | 2 ++ bacnet-stack/lib/Makefile | 5 +++-- bacnet-stack/ports/bdk-atxx4-mstp/Makefile | 4 ++-- bacnet-stack/src/abort.c | 1 + bacnet-stack/src/bacaddr.c | 1 + bacnet-stack/src/bacerror.c | 1 + bacnet-stack/src/bacint.c | 1 + bacnet-stack/src/bactext.c | 1 + bacnet-stack/src/bvlc.c | 16 ++++++++-------- bacnet-stack/src/filename.c | 1 + bacnet-stack/src/memcopy.c | 1 + bacnet-stack/src/ptransfer.c | 2 +- 20 files changed, 47 insertions(+), 18 deletions(-) diff --git a/bacnet-stack/demo/object/bacfile.c b/bacnet-stack/demo/object/bacfile.c index 3574b115..723adb91 100644 --- a/bacnet-stack/demo/object/bacfile.c +++ b/bacnet-stack/demo/object/bacfile.c @@ -42,6 +42,7 @@ #include "rp.h" #include "wp.h" #include "handlers.h" +#include "bacfile.h" typedef struct { uint32_t instance; @@ -164,7 +165,7 @@ static long fsize( return (size); } -static unsigned bacfile_file_size( +unsigned bacfile_file_size( uint32_t object_instance) { char *pFilename = NULL; diff --git a/bacnet-stack/demo/object/ms-input.c b/bacnet-stack/demo/object/ms-input.c index 2620b55f..31921480 100644 --- a/bacnet-stack/demo/object/ms-input.c +++ b/bacnet-stack/demo/object/ms-input.c @@ -182,7 +182,7 @@ bool Multistate_Input_Present_Value_Set( return status; } -char *Multistate_Input_Description( +static char *Multistate_Input_Description( uint32_t object_instance) { unsigned index = 0; /* offset from instance lookup */ @@ -268,7 +268,7 @@ bool Multistate_Input_Name_Set( return status; } -char *Multistate_Input_State_Text( +static char *Multistate_Input_State_Text( uint32_t object_instance, uint32_t state_index) { diff --git a/bacnet-stack/demo/readprop/Makefile b/bacnet-stack/demo/readprop/Makefile index c2abdc03..97f05d07 100644 --- a/bacnet-stack/demo/readprop/Makefile +++ b/bacnet-stack/demo/readprop/Makefile @@ -45,7 +45,7 @@ DEBUGGING = -g endif # put all the flags together CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(INCLUDES) $(DEFINES) -LFLAGS = -Wl,-Map=$(TARGET).map,$(LIBRARIES) +LFLAGS = -Wl,$(LIBRARIES) SRCS = main.c @@ -70,6 +70,6 @@ depend: ${CC} -MM ${CFLAGS} *.c >> .depend clean: - rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET} $(TARGET).map + rm -f core ${TARGET_BIN} ${OBJS} ${BACNET_LIB_TARGET} include: .depend diff --git a/bacnet-stack/include/av.h b/bacnet-stack/include/av.h index 2486a551..79cd009e 100644 --- a/bacnet-stack/include/av.h +++ b/bacnet-stack/include/av.h @@ -45,6 +45,8 @@ extern "C" { void); uint32_t Analog_Value_Index_To_Instance( unsigned index); + unsigned Analog_Value_Instance_To_Index( + uint32_t object_instance); char *Analog_Value_Name( uint32_t object_instance); diff --git a/bacnet-stack/include/bacdcode.h b/bacnet-stack/include/bacdcode.h index d29a9344..eab9a8b8 100644 --- a/bacnet-stack/include/bacdcode.h +++ b/bacnet-stack/include/bacdcode.h @@ -67,6 +67,10 @@ extern "C" { int decode_tag_number( uint8_t * apdu, uint8_t * tag_number); + int decode_tag_number_safe( + uint8_t * apdu, + uint32_t apdu_len_remaining, + uint8_t * tag_number); int decode_tag_number_and_value( uint8_t * apdu, uint8_t * tag_number, @@ -88,6 +92,10 @@ extern "C" { bool decode_is_context_tag( uint8_t * apdu, uint8_t tag_number); + bool decode_is_context_tag_with_length( + uint8_t * apdu, + uint8_t tag_number, + int *tag_length); /* returns true if the tag is an opening tag */ bool decode_is_opening_tag( uint8_t * apdu); diff --git a/bacnet-stack/include/bv.h b/bacnet-stack/include/bv.h index c3ca354f..02abeed7 100644 --- a/bacnet-stack/include/bv.h +++ b/bacnet-stack/include/bv.h @@ -46,6 +46,8 @@ extern "C" { void); uint32_t Binary_Value_Index_To_Instance( unsigned index); + unsigned Binary_Value_Instance_To_Index( + uint32_t object_instance); char *Binary_Value_Name( uint32_t object_instance); diff --git a/bacnet-stack/include/lc.h b/bacnet-stack/include/lc.h index 0172b882..e562ec4d 100644 --- a/bacnet-stack/include/lc.h +++ b/bacnet-stack/include/lc.h @@ -49,11 +49,15 @@ extern "C" { void); uint32_t Load_Control_Index_To_Instance( unsigned index); + unsigned Load_Control_Instance_To_Index( + uint32_t object_instance); char *Load_Control_Name( uint32_t object_instance); void Load_Control_Init( void); + void Load_Control_State_Machine( + int object_index); int Load_Control_Read_Property( BACNET_READ_PROPERTY_DATA * rpdata); diff --git a/bacnet-stack/include/lsp.h b/bacnet-stack/include/lsp.h index f0144930..d231f92d 100644 --- a/bacnet-stack/include/lsp.h +++ b/bacnet-stack/include/lsp.h @@ -46,6 +46,8 @@ extern "C" { void); uint32_t Life_Safety_Point_Index_To_Instance( unsigned index); + unsigned Life_Safety_Point_Instance_To_Index( + uint32_t object_instance); char *Life_Safety_Point_Name( uint32_t object_instance); void Life_Safety_Point_Init( diff --git a/bacnet-stack/include/mso.h b/bacnet-stack/include/mso.h index 659724dc..48dd2fd7 100644 --- a/bacnet-stack/include/mso.h +++ b/bacnet-stack/include/mso.h @@ -46,6 +46,8 @@ extern "C" { void); uint32_t Multistate_Output_Index_To_Instance( unsigned index); + unsigned Multistate_Output_Instance_To_Index( + uint32_t object_instance); char *Multistate_Output_Name( uint32_t object_instance); diff --git a/bacnet-stack/lib/Makefile b/bacnet-stack/lib/Makefile index c2350c20..99fee337 100644 --- a/bacnet-stack/lib/Makefile +++ b/bacnet-stack/lib/Makefile @@ -1,6 +1,6 @@ #Makefile to build BACnet Library with GCC -# tools - only if you need them. +# tools - only if you need them. # Most platforms have this already defined # CC = gcc # AR = ar @@ -30,6 +30,7 @@ BACNET_INCLUDE = ../include INCLUDES = -I$(BACNET_INCLUDE) -I$(BACNET_PORT_DIR) -I$(BACNET_OBJECT) -I$(BACNET_HANDLER) OPTIMIZATION = -Os DEBUGGING = +WARNINGS = -Wall -Wmissing-prototypes ifeq (${BUILD},debug) OPTIMIZATION = -O0 DEBUGGING = -g @@ -37,7 +38,7 @@ ifeq (${BACDL_DEFINE},-DBACDL_BIP=1) DEFINES += -DBIP_DEBUG endif endif -CFLAGS = -Wall $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES) +CFLAGS = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DEFINES) CORE_SRC = \ $(BACNET_CORE)/apdu.c \ diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile index 126dd741..b3aebc39 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile +++ b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile @@ -31,9 +31,9 @@ SIZE_OPTIONS = -t # avr109 = bootloader #AVRDUDE_PROGRAMMERID = avr109 #AVRDUDE_PROGRAMMERID = jtag2fast -AVRDUDE_PROGRAMMERID = avrispmkII +#AVRDUDE_PROGRAMMERID = avrispmkII #AVRDUDE_PROGRAMMERID = dragon_isp -#AVRDUDE_PROGRAMMERID = dragon_jtag +AVRDUDE_PROGRAMMERID = dragon_jtag # # port--serial or parallel port to which your # hardware programmer is attached diff --git a/bacnet-stack/src/abort.c b/bacnet-stack/src/abort.c index 01121fb8..0b061c21 100644 --- a/bacnet-stack/src/abort.c +++ b/bacnet-stack/src/abort.c @@ -35,6 +35,7 @@ #include "bacenum.h" #include "bacdcode.h" #include "bacdef.h" +#include "abort.h" /** @file abort.c Abort Encoding/Decoding */ /* Helper function to avoid needing additional entries in service data structures diff --git a/bacnet-stack/src/bacaddr.c b/bacnet-stack/src/bacaddr.c index ba3a6e66..333f466f 100644 --- a/bacnet-stack/src/bacaddr.c +++ b/bacnet-stack/src/bacaddr.c @@ -36,6 +36,7 @@ #include #include "config.h" #include "bacdef.h" +#include "bacaddr.h" /** @file bacaddr.c BACnet Address structure utilities */ diff --git a/bacnet-stack/src/bacerror.c b/bacnet-stack/src/bacerror.c index de213111..a918a90c 100644 --- a/bacnet-stack/src/bacerror.c +++ b/bacnet-stack/src/bacerror.c @@ -35,6 +35,7 @@ #include "bacenum.h" #include "bacdcode.h" #include "bacdef.h" +#include "bacerror.h" /** @file bacerror.c Encode/Decode BACnet Errors */ diff --git a/bacnet-stack/src/bacint.c b/bacnet-stack/src/bacint.c index d4856fd2..bfb4ec5a 100644 --- a/bacnet-stack/src/bacint.c +++ b/bacnet-stack/src/bacint.c @@ -37,6 +37,7 @@ #include #include #include "config.h" +#include "bacint.h" /** @file bacint.c Encode/Decode Integer Types */ diff --git a/bacnet-stack/src/bactext.c b/bacnet-stack/src/bactext.c index 7cef0bfe..54952b3c 100644 --- a/bacnet-stack/src/bactext.c +++ b/bacnet-stack/src/bactext.c @@ -35,6 +35,7 @@ #include #include "indtext.h" #include "bacenum.h" +#include "bactext.h" /** @file bactext.c Lookup or Translate BACnet Name Text */ diff --git a/bacnet-stack/src/bvlc.c b/bacnet-stack/src/bvlc.c index 641ec2f1..b47dbcf9 100644 --- a/bacnet-stack/src/bvlc.c +++ b/bacnet-stack/src/bvlc.c @@ -214,7 +214,7 @@ int bvlc_encode_write_bdt_init( return len; } -int bvlc_encode_read_bdt( +static int bvlc_encode_read_bdt( uint8_t * pdu) { int len = 0; @@ -339,7 +339,7 @@ static int bvlc_encode_register_foreign_device( return len; } -int bvlc_encode_read_fdt( +static int bvlc_encode_read_fdt( uint8_t * pdu) { int len = 0; @@ -417,7 +417,7 @@ static int bvlc_encode_read_fdt_ack( return pdu_len; } -int bvlc_encode_delete_fdt_entry( +static int bvlc_encode_delete_fdt_entry( uint8_t * pdu, struct in_addr *address, uint16_t port) @@ -440,7 +440,7 @@ int bvlc_encode_delete_fdt_entry( return len; } -int bvlc_encode_original_unicast_npdu( +static int bvlc_encode_original_unicast_npdu( uint8_t * pdu, uint8_t * npdu, unsigned npdu_length) @@ -466,7 +466,7 @@ int bvlc_encode_original_unicast_npdu( return len; } -int bvlc_encode_original_broadcast_npdu( +static int bvlc_encode_original_broadcast_npdu( uint8_t * pdu, uint8_t * npdu, unsigned npdu_length) @@ -587,9 +587,9 @@ static bool bvlc_register_foreign_device( (FD_Table[i].dest_port == ntohs(sin->sin_port))) { status = true; FD_Table[i].time_to_live = time_to_live; - /* Upon receipt of a BVLL Register-Foreign-Device message, - a BBMD shall start a timer with a value equal to the - Time-to-Live parameter supplied plus a fixed grace + /* Upon receipt of a BVLL Register-Foreign-Device message, + a BBMD shall start a timer with a value equal to the + Time-to-Live parameter supplied plus a fixed grace period of 30 seconds. */ FD_Table[i].seconds_remaining = time_to_live + 30; break; diff --git a/bacnet-stack/src/filename.c b/bacnet-stack/src/filename.c index 6488bc19..4eeebf6f 100644 --- a/bacnet-stack/src/filename.c +++ b/bacnet-stack/src/filename.c @@ -33,6 +33,7 @@ ####COPYRIGHTEND####*/ #include #include +#include "filename.h" /** @file filename.c Function for filename manipulation */ diff --git a/bacnet-stack/src/memcopy.c b/bacnet-stack/src/memcopy.c index 3cb05537..e507a008 100644 --- a/bacnet-stack/src/memcopy.c +++ b/bacnet-stack/src/memcopy.c @@ -32,6 +32,7 @@ ------------------------------------------- ####COPYRIGHTEND####*/ #include +#include "memcopy.h" /** @file memcopy.c Custom memcopy function */ diff --git a/bacnet-stack/src/ptransfer.c b/bacnet-stack/src/ptransfer.c index 86baa7f7..62af22dc 100644 --- a/bacnet-stack/src/ptransfer.c +++ b/bacnet-stack/src/ptransfer.c @@ -40,7 +40,7 @@ /** @file ptransfer.c Encode/Decode Private Transfer data */ /* encode service */ -int pt_encode_apdu( +static int pt_encode_apdu( uint8_t * apdu, uint16_t max_apdu, BACNET_PRIVATE_TRANSFER_DATA * private_data)