diff --git a/bacnet-stack/demo/object/device-client.c b/bacnet-stack/demo/object/device-client.c index 10877333..311ab206 100644 --- a/bacnet-stack/demo/object/device-client.c +++ b/bacnet-stack/demo/object/device-client.c @@ -512,7 +512,7 @@ unsigned Device_Object_List_Count( * @return True if found, else false. */ bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { @@ -578,7 +578,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct object_functions *pObject = NULL; @@ -808,10 +808,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct object_functions *pObject = NULL; bool found = false; diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index 36ef8e7a..f4b97e23 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -1068,14 +1068,14 @@ unsigned Device_Object_List_Count( * @return True if found, else false. */ bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; - unsigned temp_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; + uint32_t temp_index = 0; struct object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -1134,7 +1134,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct object_functions *pObject = NULL; @@ -1369,10 +1369,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string = { 0 }; BACNET_CHARACTER_STRING char_string = { 0 }; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct object_functions *pObject = NULL; bool found = false; diff --git a/bacnet-stack/demo/object/device.h b/bacnet-stack/demo/object/device.h index c78c9945..e6a31f3e 100644 --- a/bacnet-stack/demo/object/device.h +++ b/bacnet-stack/demo/object/device.h @@ -275,7 +275,7 @@ extern "C" { unsigned Device_Object_List_Count( void); bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance); diff --git a/bacnet-stack/demo/piface/device.c b/bacnet-stack/demo/piface/device.c index 36918eb6..7cb0fcac 100644 --- a/bacnet-stack/demo/piface/device.c +++ b/bacnet-stack/demo/piface/device.c @@ -709,14 +709,14 @@ unsigned Device_Object_List_Count( * @return True if found, else false. */ bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; - unsigned temp_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; + uint32_t temp_index = 0; struct object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -775,7 +775,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct object_functions *pObject = NULL; @@ -931,10 +931,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string = { 0 }; BACNET_CHARACTER_STRING char_string = { 0 }; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct object_functions *pObject = NULL; bool found = false; diff --git a/bacnet-stack/ports/arduino_uno/device.h b/bacnet-stack/ports/arduino_uno/device.h index 9b9695e8..48b31f7b 100644 --- a/bacnet-stack/ports/arduino_uno/device.h +++ b/bacnet-stack/ports/arduino_uno/device.h @@ -66,7 +66,7 @@ extern "C" { bool Device_Set_Object_Instance_Number(uint32_t object_id); bool Device_Valid_Object_Instance_Number(uint32_t object_id); unsigned Device_Object_List_Count(void); - bool Device_Object_List_Identifier(unsigned array_index, + bool Device_Object_List_Identifier(uint32_t array_index, int *object_type, uint32_t * instance); diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c index 341613c3..0b108a0e 100644 --- a/bacnet-stack/ports/at91sam7s/device.c +++ b/bacnet-stack/ports/at91sam7s/device.c @@ -515,13 +515,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; struct my_object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -556,7 +556,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct my_object_functions *pObject = NULL; @@ -623,10 +623,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct my_object_functions *pObject = NULL; diff --git a/bacnet-stack/ports/atmega168/device.c b/bacnet-stack/ports/atmega168/device.c index b303c56f..aaaeb622 100644 --- a/bacnet-stack/ports/atmega168/device.c +++ b/bacnet-stack/ports/atmega168/device.c @@ -113,13 +113,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned object_index = 0; - unsigned object_count = 0; + uint32_t object_index = 0; + uint32_t object_count = 0; /* device object */ if (array_index == 1) { @@ -173,10 +173,10 @@ int Device_Encode_Property_APDU( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; object_instance = object_instance; /* FIXME: change the hardcoded names to suit your application */ diff --git a/bacnet-stack/ports/atmega168/device.h b/bacnet-stack/ports/atmega168/device.h index d0d45609..189b015d 100644 --- a/bacnet-stack/ports/atmega168/device.h +++ b/bacnet-stack/ports/atmega168/device.h @@ -80,7 +80,7 @@ extern "C" { unsigned Device_Object_List_Count( void); bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance); diff --git a/bacnet-stack/ports/atmega8/device.c b/bacnet-stack/ports/atmega8/device.c index eb852af6..79c41a53 100644 --- a/bacnet-stack/ports/atmega8/device.c +++ b/bacnet-stack/ports/atmega8/device.c @@ -117,13 +117,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned object_index = 0; - unsigned object_count = 0; + uint32_t object_index = 0; + uint32_t object_count = 0; /* device object */ if (array_index == 1) { @@ -176,10 +176,10 @@ int Device_Read_Property( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; if ((rpdata->application_data == NULL) || diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c index 1145c6fe..573ecfae 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c @@ -457,13 +457,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; struct my_object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -498,7 +498,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct my_object_functions *pObject = NULL; @@ -565,10 +565,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string = { 0 }; BACNET_CHARACTER_STRING char_string = { 0 }; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct my_object_functions *pObject = NULL; diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c index f0046862..89f507b6 100644 --- a/bacnet-stack/ports/pic18f6720/device.c +++ b/bacnet-stack/ports/pic18f6720/device.c @@ -193,13 +193,13 @@ unsigned Device_Object_List_Count( /* Since many network clients depend on the object list */ /* for discovery, it must be consistent! */ bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned object_index = 0; - unsigned object_count = 0; + uint32_t object_index = 0; + uint32_t object_count = 0; /* device object */ if (array_index == 1) { @@ -272,10 +272,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; BACNET_TIME local_time; BACNET_DATE local_date; uint8_t year = 0; diff --git a/bacnet-stack/ports/pic18f97j60/device.c b/bacnet-stack/ports/pic18f97j60/device.c index f0046862..89f507b6 100644 --- a/bacnet-stack/ports/pic18f97j60/device.c +++ b/bacnet-stack/ports/pic18f97j60/device.c @@ -193,13 +193,13 @@ unsigned Device_Object_List_Count( /* Since many network clients depend on the object list */ /* for discovery, it must be consistent! */ bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned object_index = 0; - unsigned object_count = 0; + uint32_t object_index = 0; + uint32_t object_count = 0; /* device object */ if (array_index == 1) { @@ -272,10 +272,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; BACNET_TIME local_time; BACNET_DATE local_date; uint8_t year = 0; diff --git a/bacnet-stack/ports/rx62n/device.c b/bacnet-stack/ports/rx62n/device.c index 6d927856..cae18b1a 100644 --- a/bacnet-stack/ports/rx62n/device.c +++ b/bacnet-stack/ports/rx62n/device.c @@ -495,13 +495,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; struct my_object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -544,7 +544,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; char *name = NULL; @@ -593,10 +593,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct my_object_functions *pObject = NULL; bool found = false; diff --git a/bacnet-stack/ports/stm32f10x/device.c b/bacnet-stack/ports/stm32f10x/device.c index e2a30b15..56c1cfdb 100644 --- a/bacnet-stack/ports/stm32f10x/device.c +++ b/bacnet-stack/ports/stm32f10x/device.c @@ -516,13 +516,13 @@ unsigned Device_Object_List_Count( } bool Device_Object_List_Identifier( - unsigned array_index, + uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; struct my_object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -557,7 +557,7 @@ bool Device_Valid_Object_Name( bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct my_object_functions *pObject = NULL; @@ -624,10 +624,10 @@ int Device_Read_Property_Local( int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string; BACNET_CHARACTER_STRING char_string; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct my_object_functions *pObject = NULL; diff --git a/bacnet-stack/ports/xplained/device.c b/bacnet-stack/ports/xplained/device.c index ebd769c3..9f6a066a 100644 --- a/bacnet-stack/ports/xplained/device.c +++ b/bacnet-stack/ports/xplained/device.c @@ -505,13 +505,13 @@ unsigned Device_Object_List_Count(void) return count; } -bool Device_Object_List_Identifier(unsigned array_index, +bool Device_Object_List_Identifier(uint32_t array_index, int *object_type, uint32_t * instance) { bool status = false; - unsigned count = 0; - unsigned object_index = 0; + uint32_t count = 0; + uint32_t object_index = 0; struct my_object_functions *pObject = NULL; /* array index zero is length - so invalid */ @@ -545,7 +545,7 @@ bool Device_Valid_Object_Name(BACNET_CHARACTER_STRING * object_name1, bool found = false; int type = 0; uint32_t instance; - unsigned max_objects = 0, i = 0; + uint32_t max_objects = 0, i = 0; bool check_id = false; BACNET_CHARACTER_STRING object_name2; struct my_object_functions *pObject = NULL; @@ -609,10 +609,10 @@ int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA * rpdata) int len = 0; /* apdu len intermediate value */ BACNET_BIT_STRING bit_string = { 0 }; BACNET_CHARACTER_STRING char_string = { 0 }; - unsigned i = 0; + uint32_t i = 0; int object_type = 0; uint32_t instance = 0; - unsigned count = 0; + uint32_t count = 0; uint8_t *apdu = NULL; struct my_object_functions *pObject = NULL;