dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make most of functions const correct (#714)

Browse Source 
* Make most of the functions const correct

Used clang-tidy and sonarlint to help find places where const could
pretty easily applied. Also lot of hand work.

This commit does not yet touch handlers and typedefs of those.

* Fix Arduino uno handler_who_is() has extra parenthesis

For some reason there is extra parenthesis. Remove it this is more
likely buildable.

* Bugfix/bacapp: Fix uninitilized array_index

We have changed bacapp_snprintf_value() to be const correct. After that
we got

```
/home/runner/work/bacnet-stack/bacnet-stack/src/bacnet/bacapp.c:3183:27: warning: 4th function call argument is an uninitialized value [core.CallAndMessage]
                ret_val = bacapp_snprintf_weeklyschedule(
                          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.
```

So analyzer could now spot that we do not actually initilize array_index
at all. Fix this by setting array_index to zero. Note that I actually do
not know if zeroing is right thing to do here. I choose zero as if this
has worked before it is most likely that it will work with zero value.

* cmake: Add and ignore Wwrite-strings compiler option

Wwrite-strings helps find places where const correctness is broken.

Example it will warn about these

```C

void func1(char* str);

func("test") /* "test" is const so we should not pass it to func1().

char* func2()
{
  return "test"; /* func2() should return const char*.
}
```

We still need to ignore it as not all are fixed but let's add it already
so we remember that it should be opened at some point.

---------

Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
Kari Argillander
2024-08-29 22:08:02 +03:00
committed by GitHub
parent 0177c59f4a
commit a2f1d6959d
408 changed files with 2608 additions and 2336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/acc.h
+1 -1
View File
@@ -56,7 +56,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Accumulator_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool Accumulator_Object_Name(
src/bacnet/basic/object/access_door.h
+1 -1
View File
@@ -113,7 +113,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Access_Door_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool Access_Door_Out_Of_Service(
src/bacnet/basic/object/ai.c
+6 -5
View File
@@ -261,7 +261,7 @@ bool Analog_Input_Object_Name(
*
* @return true if object-name was set
*/
bool Analog_Input_Name_Set(uint32_t object_instance, char *new_name)
bool Analog_Input_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false;
struct analog_input_descr *pObject;
@@ -322,10 +322,10 @@ unsigned Analog_Input_Event_State(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Analog_Input_Description(uint32_t object_instance)
const char *Analog_Input_Description(uint32_t object_instance)
{
char *name = NULL;
struct analog_input_descr *pObject;
const char *name = NULL;
const struct analog_input_descr *pObject;
pObject = Analog_Input_Object(object_instance);
if (pObject) {
@@ -341,7 +341,8 @@ char *Analog_Input_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Analog_Input_Description_Set(uint32_t object_instance, char *new_name)
bool Analog_Input_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct analog_input_descr *pObject;
src/bacnet/basic/object/ai.h
+5 -5
View File
@@ -32,8 +32,8 @@ typedef struct analog_input_descr {
float Prior_Value;
float COV_Increment;
bool Changed;
char* Object_Name;
char* Description;
const char* Object_Name;
const char* Description;
#if defined(INTRINSIC_REPORTING)
uint32_t Time_Delay;
uint32_t Notification_Class;
@@ -85,18 +85,18 @@ extern "C" {
BACNET_STACK_EXPORT
bool Analog_Input_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char * Analog_Input_Name_ASCII(
uint32_t object_instance);
BACNET_STACK_EXPORT
char *Analog_Input_Description(
const char *Analog_Input_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Analog_Input_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Analog_Input_Reliability(
src/bacnet/basic/object/ao.c
+8 -7
View File
@@ -508,7 +508,7 @@ bool Analog_Output_Object_Name(
*
* @return true if object-name was set
*/
bool Analog_Output_Name_Set(uint32_t object_instance, char *new_name)
bool Analog_Output_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -684,7 +684,7 @@ BACNET_RELIABILITY Analog_Output_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Analog_Output_Object_Fault(struct object_data *pObject)
static bool Analog_Output_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -744,14 +744,14 @@ static bool Analog_Output_Fault(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Analog_Output_Description(uint32_t object_instance)
const char *Analog_Output_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
name = (char *)pObject->Description;
name = pObject->Description;
}
return name;
@@ -763,7 +763,8 @@ char *Analog_Output_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Analog_Output_Description_Set(uint32_t object_instance, char *new_name)
bool Analog_Output_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/ao.h
+3 -3
View File
@@ -104,18 +104,18 @@ extern "C" {
BACNET_STACK_EXPORT
bool Analog_Output_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char * Analog_Output_Name_ASCII(
uint32_t object_instance);
BACNET_STACK_EXPORT
char *Analog_Output_Description(
const char *Analog_Output_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Analog_Output_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool Analog_Output_Units_Set(
src/bacnet/basic/object/av.c
+6 -5
View File
@@ -273,7 +273,7 @@ bool Analog_Value_Object_Name(
*
* @return true if object-name was set
*/
bool Analog_Value_Name_Set(uint32_t object_instance, char *new_name)
bool Analog_Value_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false;
struct analog_value_descr *pObject;
@@ -330,10 +330,10 @@ unsigned Analog_Value_Event_State(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Analog_Value_Description(uint32_t object_instance)
const char *Analog_Value_Description(uint32_t object_instance)
{
char *name = NULL;
struct analog_value_descr *pObject;
const char *name = NULL;
const struct analog_value_descr *pObject;
pObject = Analog_Value_Object(object_instance);
if (pObject) {
@@ -349,7 +349,8 @@ char *Analog_Value_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Analog_Value_Description_Set(uint32_t object_instance, char *new_name)
bool Analog_Value_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct analog_value_descr *pObject;
src/bacnet/basic/object/av.h
+4 -4
View File
@@ -34,7 +34,7 @@ typedef struct analog_value_descr {
float COV_Increment;
bool Changed;
const char* Object_Name;
char* Description;
const char* Description;
BACNET_RELIABILITY Reliability;
#if defined(INTRINSIC_REPORTING)
uint32_t Time_Delay;
@@ -82,7 +82,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Analog_Value_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Analog_Value_Name_ASCII(
uint32_t object_instance);
@@ -131,12 +131,12 @@ extern "C" {
float value);
BACNET_STACK_EXPORT
char *Analog_Value_Description(
const char *Analog_Value_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Analog_Value_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Analog_Value_Reliability(
src/bacnet/basic/object/bacfile.c
+8 -8
View File
@@ -331,7 +331,7 @@ uint32_t bacfile_read(uint32_t object_instance, uint8_t *buffer,
* @param buffer_size - in bytes
* @return file size in bytes
*/
uint32_t bacfile_write(uint32_t object_instance, uint8_t *buffer,
uint32_t bacfile_write(uint32_t object_instance, const uint8_t *buffer,
uint32_t buffer_size)
{
const char *pFilename = NULL;
@@ -877,14 +877,14 @@ bool bacfile_write_stream_data(BACNET_ATOMIC_WRITE_FILE_DATA *data)
return found;
}
bool bacfile_write_record_data(BACNET_ATOMIC_WRITE_FILE_DATA *data)
bool bacfile_write_record_data(const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
const char *pFilename = NULL;
bool found = false;
FILE *pFile = NULL;
uint32_t i = 0;
char dummy_data[FILE_RECORD_SIZE];
char *pData = NULL;
const char *pData = NULL;
pFilename = bacfile_pathname(data->object_instance);
if (pFilename) {
@@ -913,7 +913,7 @@ bool bacfile_write_record_data(BACNET_ATOMIC_WRITE_FILE_DATA *data)
}
}
for (i = 0; i < data->type.record.returnedRecordCount; i++) {
if (fwrite(octetstring_value(&data->fileData[i]),
if (fwrite(octetstring_value((BACNET_OCTET_STRING*)&data->fileData[i]),
octetstring_length(&data->fileData[i]), 1,
pFile) != 1) {
/* do something if it fails? */
@@ -927,7 +927,7 @@ bool bacfile_write_record_data(BACNET_ATOMIC_WRITE_FILE_DATA *data)
}
bool bacfile_read_ack_stream_data(
uint32_t instance, BACNET_ATOMIC_READ_FILE_DATA *data)
uint32_t instance, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
bool found = false;
FILE *pFile = NULL;
@@ -939,7 +939,7 @@ bool bacfile_read_ack_stream_data(
pFile = fopen(pFilename, "rb+");
if (pFile) {
(void)fseek(pFile, data->type.stream.fileStartPosition, SEEK_SET);
if (fwrite(octetstring_value(&data->fileData[0]),
if (fwrite(octetstring_value((BACNET_OCTET_STRING*)&data->fileData[0]),
octetstring_length(&data->fileData[0]), 1, pFile) != 1) {
#if PRINT_ENABLED
fprintf(stderr, "Failed to write to %s (%lu)!\n", pFilename,
@@ -954,7 +954,7 @@ bool bacfile_read_ack_stream_data(
}
bool bacfile_read_ack_record_data(
uint32_t instance, BACNET_ATOMIC_READ_FILE_DATA *data)
uint32_t instance, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
bool found = false;
FILE *pFile = NULL;
@@ -978,7 +978,7 @@ bool bacfile_read_ack_record_data(
}
}
for (i = 0; i < data->type.record.RecordCount; i++) {
if (fwrite(octetstring_value(&data->fileData[i]),
if (fwrite(octetstring_value((BACNET_OCTET_STRING*)&data->fileData[i]),
octetstring_length(&data->fileData[i]), 1,
pFile) != 1) {
#if PRINT_ENABLED
src/bacnet/basic/object/bacfile.h
+4 -4
View File
@@ -110,7 +110,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool bacfile_read_ack_stream_data(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data);
const BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
bool bacfile_write_stream_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data);
@@ -120,10 +120,10 @@ extern "C" {
BACNET_STACK_EXPORT
bool bacfile_read_ack_record_data(
uint32_t instance,
BACNET_ATOMIC_READ_FILE_DATA * data);
const BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
bool bacfile_write_record_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data);
const BACNET_ATOMIC_WRITE_FILE_DATA * data);
/* handling for read property service */
BACNET_STACK_EXPORT
@@ -154,7 +154,7 @@ extern "C" {
BACNET_STACK_EXPORT
uint32_t bacfile_write(
uint32_t object_instance,
uint8_t *buffer,
const uint8_t *buffer,
uint32_t buffer_size);
BACNET_STACK_EXPORT
src/bacnet/basic/object/bi.c
+20 -17
View File
@@ -361,7 +361,7 @@ BACNET_RELIABILITY Binary_Input_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Binary_Input_Object_Fault(struct object_data *pObject)
static bool Binary_Input_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -607,7 +607,7 @@ bool Binary_Input_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Binary_Input_Name_Set(uint32_t object_instance, char *new_name)
bool Binary_Input_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false;
struct object_data *pObject;
@@ -682,17 +682,17 @@ bool Binary_Input_Polarity_Set(
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Binary_Input_Description(uint32_t object_instance)
const char *Binary_Input_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Input_Object(object_instance);
if (pObject) {
if (pObject->Description == NULL) {
name = "";
} else {
name = (char *)pObject->Description;
name = pObject->Description;
}
}
@@ -705,7 +705,8 @@ char *Binary_Input_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Binary_Input_Description_Set(uint32_t object_instance, char *new_name)
bool Binary_Input_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -725,14 +726,14 @@ bool Binary_Input_Description_Set(uint32_t object_instance, char *new_name)
* @param object_instance - object-instance number of the object
* @return inactive-text property value
*/
char *Binary_Input_Inactive_Text(uint32_t object_instance)
const char *Binary_Input_Inactive_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Input_Object(object_instance);
if (pObject) {
name = (char *)pObject->Inactive_Text;
name = pObject->Inactive_Text;
}
return name;
@@ -745,7 +746,8 @@ char *Binary_Input_Inactive_Text(uint32_t object_instance)
* @param new_name - holds the inactive-text to be set
* @return true if the inactive-text property value was set
*/
bool Binary_Input_Inactive_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Input_Inactive_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false;
struct object_data *pObject;
@@ -765,14 +767,14 @@ bool Binary_Input_Inactive_Text_Set(uint32_t object_instance, char *new_name)
* @param object_instance - object-instance number of the object
* @return active-text property value
*/
char *Binary_Input_Active_Text(uint32_t object_instance)
const char *Binary_Input_Active_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Input_Object(object_instance);
if (pObject) {
name = (char *)pObject->Active_Text;
name = pObject->Active_Text;
}
return name;
@@ -785,7 +787,8 @@ char *Binary_Input_Active_Text(uint32_t object_instance)
* @param new_name - holds the active-text to be set
* @return true if the active-text property value was set
*/
bool Binary_Input_Active_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Input_Active_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false;
struct object_data *pObject;
src/bacnet/basic/object/bi.h
+7 -7
View File
@@ -68,7 +68,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Binary_Input_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Binary_Input_Name_ASCII(
uint32_t object_instance);
@@ -82,12 +82,12 @@ extern "C" {
BACNET_BINARY_PV value);
BACNET_STACK_EXPORT
char *Binary_Input_Description(
const char *Binary_Input_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Input_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Binary_Input_Reliability(
@@ -98,20 +98,20 @@ extern "C" {
BACNET_RELIABILITY value);
BACNET_STACK_EXPORT
char *Binary_Input_Inactive_Text(
const char *Binary_Input_Inactive_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Input_Inactive_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
char *Binary_Input_Active_Text(
const char *Binary_Input_Active_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Input_Active_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_POLARITY Binary_Input_Polarity(
src/bacnet/basic/object/bitstring_value.c
+8 -8
View File
@@ -172,7 +172,7 @@ bool BitString_Value_Present_Value(
* @return true if value is within range and copied
*/
bool BitString_Value_Present_Value_Set(
uint32_t object_instance, BACNET_BIT_STRING *value)
uint32_t object_instance, const BACNET_BIT_STRING *value)
{
bool status = false;
struct object_data *pObject;
@@ -306,7 +306,7 @@ BACNET_RELIABILITY BitString_Value_Reliablity(
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool BitString_Value_Object_Fault(struct object_data *pObject)
static bool BitString_Value_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -460,7 +460,7 @@ bool BitString_Value_Object_Name(
*
* @return true if object-name was set
*/
bool BitString_Value_Name_Set(uint32_t object_instance, char *new_name)
bool BitString_Value_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -498,15 +498,15 @@ const char *BitString_Value_Name_ASCII(uint32_t object_instance)
* @return C-string pointer to the description,
* or NULL if object doesn't exist
*/
char *BitString_Value_Description(uint32_t object_instance)
const char *BitString_Value_Description(uint32_t object_instance)
{
char *name = NULL; /* return value */
struct object_data *pObject;
const char *name = NULL; /* return value */
const struct object_data *pObject;
pObject = BitString_Value_Object(object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -525,7 +525,7 @@ char *BitString_Value_Description(uint32_t object_instance)
* @return True on success, false otherwise.
*/
bool BitString_Value_Description_Set(
uint32_t object_instance, char *value)
uint32_t object_instance, const char *value)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/bitstring_value.h
+4 -4
View File
@@ -76,7 +76,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool BitString_Value_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *BitString_Value_Name_ASCII(
uint32_t object_instance);
@@ -88,15 +88,15 @@ extern "C" {
BACNET_STACK_EXPORT
bool BitString_Value_Present_Value_Set(
uint32_t object_instance,
BACNET_BIT_STRING * value);
const BACNET_BIT_STRING * value);
BACNET_STACK_EXPORT
char *BitString_Value_Description(
const char *BitString_Value_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool BitString_Value_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
bool BitString_Value_Out_Of_Service(
src/bacnet/basic/object/blo.c
+11 -10
View File
@@ -171,7 +171,7 @@ unsigned Binary_Lighting_Output_Instance_To_Index(uint32_t object_instance)
* @return the priority-array active status for the specific priority
*/
static bool Priority_Array_Active(
struct object_data *pObject, BACNET_ARRAY_INDEX priority)
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
bool active = false;
@@ -193,7 +193,7 @@ static bool Priority_Array_Active(
* @return The priority-array value for the specific priority
*/
static BACNET_BINARY_LIGHTING_PV Priority_Array_Next_Value(
struct object_data *pObject, BACNET_ARRAY_INDEX priority)
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
BACNET_BINARY_LIGHTING_PV value = BINARY_LIGHTING_PV_OFF;
unsigned p = 0;
@@ -238,7 +238,7 @@ BACNET_BINARY_LIGHTING_PV Binary_Lighting_Output_Present_Value(
* @return The priority-array value for the specific priority
*/
static BACNET_BINARY_LIGHTING_PV Priority_Array_Value(
struct object_data *pObject, BACNET_ARRAY_INDEX priority)
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
BACNET_BINARY_LIGHTING_PV value = BINARY_LIGHTING_PV_OFF;
@@ -290,7 +290,7 @@ static int Binary_Lighting_Output_Priority_Array_Encode(
*
* @return active priority 1..16, or 0 if no priority is active
*/
static unsigned Present_Value_Priority(struct object_data *pObject)
static unsigned Present_Value_Priority(const struct object_data *pObject)
{
unsigned p = 0; /* loop counter */
unsigned priority = 0; /* return value */
@@ -787,7 +787,8 @@ bool Binary_Lighting_Output_Object_Name(
*
* @return true if object-name was set
*/
bool Binary_Lighting_Output_Name_Set(uint32_t object_instance, char *new_name)
bool Binary_Lighting_Output_Name_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -826,15 +827,15 @@ const char *Binary_Lighting_Output_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Binary_Lighting_Output_Description(uint32_t object_instance)
const char *Binary_Lighting_Output_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -852,7 +853,7 @@ char *Binary_Lighting_Output_Description(uint32_t object_instance)
* @return true if object-name was set
*/
bool Binary_Lighting_Output_Description_Set(
uint32_t object_instance, char *new_name)
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/blo.h
+5 -3
View File
@@ -84,14 +84,16 @@ BACNET_STACK_EXPORT
bool Binary_Lighting_Output_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Binary_Lighting_Output_Name_Set(uint32_t object_instance, char *new_name);
bool Binary_Lighting_Output_Name_Set(
uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Binary_Lighting_Output_Name_ASCII(uint32_t object_instance);
BACNET_STACK_EXPORT
char *Binary_Lighting_Output_Description(uint32_t instance);
const char *Binary_Lighting_Output_Description(uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Lighting_Output_Description_Set(uint32_t instance, char *new_name);
bool Binary_Lighting_Output_Description_Set(
uint32_t instance, const char *new_name);
BACNET_STACK_EXPORT
bool Binary_Lighting_Output_Out_Of_Service(uint32_t instance);
src/bacnet/basic/object/bo.c
+20 -17
View File
@@ -537,7 +537,7 @@ bool Binary_Output_Object_Name(
*
* @return true if object-name was set
*/
bool Binary_Output_Name_Set(uint32_t object_instance, char *new_name)
bool Binary_Output_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -701,7 +701,7 @@ BACNET_RELIABILITY Binary_Output_Reliability(uint32_t object_instance)
*
* @return true the status flag is in Fault
*/
static bool Binary_Output_Object_Fault(struct object_data *pObject)
static bool Binary_Output_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -767,14 +767,14 @@ static bool Binary_Output_Fault(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Binary_Output_Description(uint32_t object_instance)
const char *Binary_Output_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
name = (char *)pObject->Description;
name = pObject->Description;
}
return name;
@@ -788,7 +788,8 @@ char *Binary_Output_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Binary_Output_Description_Set(uint32_t object_instance, char *new_name)
bool Binary_Output_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -809,14 +810,14 @@ bool Binary_Output_Description_Set(uint32_t object_instance, char *new_name)
*
* @return active text or NULL if not found
*/
char *Binary_Output_Active_Text(uint32_t object_instance)
const char *Binary_Output_Active_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
name = (char *)pObject->Active_Text;
name = pObject->Active_Text;
}
return name;
@@ -830,7 +831,8 @@ char *Binary_Output_Active_Text(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Binary_Output_Active_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Output_Active_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -851,14 +853,14 @@ bool Binary_Output_Active_Text_Set(uint32_t object_instance, char *new_name)
*
* @return active text or NULL if not found
*/
char *Binary_Output_Inactive_Text(uint32_t object_instance)
const char *Binary_Output_Inactive_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
name = (char *)pObject->Inactive_Text;
name = pObject->Inactive_Text;
}
return name;
@@ -872,7 +874,8 @@ char *Binary_Output_Inactive_Text(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Binary_Output_Inactive_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Output_Inactive_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/bo.h
+7 -7
View File
@@ -66,25 +66,25 @@ extern "C" {
BACNET_STACK_EXPORT
bool Binary_Output_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Binary_Output_Name_ASCII(
uint32_t object_instance);
BACNET_STACK_EXPORT
char *Binary_Output_Inactive_Text(
const char *Binary_Output_Inactive_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Inactive_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
char *Binary_Output_Active_Text(
const char *Binary_Output_Active_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Active_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_BINARY_PV Binary_Output_Present_Value(
@@ -115,12 +115,12 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
char *Binary_Output_Description(
const char *Binary_Output_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Output_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
BACNET_POLARITY Binary_Output_Polarity(
src/bacnet/basic/object/bv.c
+20 -17
View File
@@ -362,7 +362,7 @@ BACNET_RELIABILITY Binary_Value_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Binary_Value_Object_Fault(struct object_data *pObject)
static bool Binary_Value_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -610,7 +610,7 @@ bool Binary_Value_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Binary_Value_Name_Set(uint32_t object_instance, char *new_name)
bool Binary_Value_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false;
struct object_data *pObject;
@@ -685,17 +685,17 @@ bool Binary_Value_Polarity_Set(
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Binary_Value_Description(uint32_t object_instance)
const char *Binary_Value_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Value_Object(object_instance);
if (pObject) {
if (pObject->Description == NULL) {
name = "";
} else {
name = (char *)pObject->Description;
name = pObject->Description;
}
}
@@ -708,7 +708,8 @@ char *Binary_Value_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Binary_Value_Description_Set(uint32_t object_instance, char *new_name)
bool Binary_Value_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -729,14 +730,14 @@ bool Binary_Value_Description_Set(uint32_t object_instance, char *new_name)
*
* @return active text or NULL if not found
*/
char *Binary_Value_Active_Text(uint32_t object_instance)
const char *Binary_Value_Active_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Value_Object(object_instance);
if (pObject) {
name = (char *)pObject->Active_Text;
name = pObject->Active_Text;
}
return name;
@@ -750,7 +751,8 @@ char *Binary_Value_Active_Text(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Binary_Value_Active_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Value_Active_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -771,14 +773,14 @@ bool Binary_Value_Active_Text_Set(uint32_t object_instance, char *new_name)
*
* @return active text or NULL if not found
*/
char *Binary_Value_Inactive_Text(uint32_t object_instance)
const char *Binary_Value_Inactive_Text(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Binary_Value_Object(object_instance);
if (pObject) {
name = (char *)pObject->Inactive_Text;
name = pObject->Inactive_Text;
}
return name;
@@ -792,7 +794,8 @@ char *Binary_Value_Inactive_Text(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Binary_Value_Inactive_Text_Set(uint32_t object_instance, char *new_name)
bool Binary_Value_Inactive_Text_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/bv.h
+7 -7
View File
@@ -71,7 +71,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Binary_Value_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Binary_Value_Name_ASCII(
uint32_t object_instance);
@@ -130,27 +130,27 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
char *Binary_Value_Description(
const char *Binary_Value_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Value_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
char *Binary_Value_Inactive_Text(
const char *Binary_Value_Inactive_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Value_Inactive_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
char *Binary_Value_Active_Text(
const char *Binary_Value_Active_Text(
uint32_t instance);
BACNET_STACK_EXPORT
bool Binary_Value_Active_Text_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_POLARITY Binary_Value_Polarity(
src/bacnet/basic/object/calendar.c
+7 -7
View File
@@ -239,7 +239,7 @@ Calendar_Date_List_Get(uint32_t object_instance, uint8_t index)
* @return true if the entity is add successfully.
*/
bool Calendar_Date_List_Add(
uint32_t object_instance, BACNET_CALENDAR_ENTRY *value)
uint32_t object_instance, const BACNET_CALENDAR_ENTRY *value)
{
bool st = false;
BACNET_CALENDAR_ENTRY *entry;
@@ -403,7 +403,7 @@ bool Calendar_Object_Name(
*
* @return true if object-name was set
*/
bool Calendar_Name_Set(uint32_t object_instance, char *new_name)
bool Calendar_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -442,15 +442,15 @@ const char *Calendar_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Calendar_Description(uint32_t object_instance)
const char *Calendar_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -467,7 +467,7 @@ char *Calendar_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Calendar_Description_Set(uint32_t object_instance, char *new_name)
bool Calendar_Description_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/calendar.h
+4 -4
View File
@@ -47,7 +47,7 @@ BACNET_STACK_EXPORT
bool Calendar_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Calendar_Name_Set(uint32_t object_instance, char *new_name);
bool Calendar_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Calendar_Name_ASCII(uint32_t object_instance);
@@ -68,7 +68,7 @@ BACNET_CALENDAR_ENTRY *Calendar_Date_List_Get(
uint32_t object_instance, uint8_t index);
BACNET_STACK_EXPORT
bool Calendar_Date_List_Add(
uint32_t object_instance, BACNET_CALENDAR_ENTRY *value);
uint32_t object_instance, const BACNET_CALENDAR_ENTRY *value);
BACNET_STACK_EXPORT
bool Calendar_Date_List_Delete_All(uint32_t object_instance);
BACNET_STACK_EXPORT
@@ -78,9 +78,9 @@ int Calendar_Date_List_Encode(
uint32_t object_instance, uint8_t *apdu, int max_apdu);
BACNET_STACK_EXPORT
char *Calendar_Description(uint32_t object_instance);
const char *Calendar_Description(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Calendar_Description_Set(uint32_t object_instance, char *new_name);
bool Calendar_Description_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
bool Calendar_Write_Enabled(uint32_t instance);
src/bacnet/basic/object/channel.c
+22 -22
View File
@@ -99,7 +99,7 @@ void Channel_Property_Lists(
*/
bool Channel_Valid_Instance(uint32_t object_instance)
{
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -179,7 +179,7 @@ BACNET_CHANNEL_VALUE *Channel_Present_Value(uint32_t object_instance)
unsigned Channel_Last_Priority(uint32_t object_instance)
{
unsigned priority = 0;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -199,7 +199,7 @@ unsigned Channel_Last_Priority(uint32_t object_instance)
BACNET_WRITE_STATUS Channel_Write_Status(uint32_t object_instance)
{
BACNET_WRITE_STATUS write_status = BACNET_WRITE_STATUS_IDLE;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -219,7 +219,7 @@ BACNET_WRITE_STATUS Channel_Write_Status(uint32_t object_instance)
uint16_t Channel_Number(uint32_t object_instance)
{
uint16_t value = 0;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -266,7 +266,7 @@ static int Channel_Reference_List_Member_Element_Encode(
uint32_t object_instance, BACNET_ARRAY_INDEX array_index, uint8_t *apdu)
{
int apdu_len = BACNET_STATUS_ERROR;
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value;
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value;
unsigned count = 0;
count = Channel_Reference_List_Member_Count(object_instance);
@@ -287,7 +287,7 @@ static int Channel_Reference_List_Member_Element_Encode(
* @return member count
*/
static bool Channel_Reference_List_Member_Valid(
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember)
{
bool status = false;
@@ -348,7 +348,7 @@ BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *Channel_Reference_List_Member_Element(
*/
bool Channel_Reference_List_Member_Element_Set(uint32_t object_instance,
unsigned array_index,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc)
{
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember = NULL;
bool status = false;
@@ -378,7 +378,7 @@ bool Channel_Reference_List_Member_Element_Set(uint32_t object_instance,
* zero if not added
*/
unsigned Channel_Reference_List_Member_Element_Add(uint32_t object_instance,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc)
{
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember = NULL;
unsigned array_index = 0;
@@ -414,7 +414,7 @@ uint16_t Channel_Control_Groups_Element(
uint32_t object_instance, int32_t array_index)
{
uint16_t value = 0;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -469,7 +469,7 @@ static int Channel_Control_Groups_Element_Encode(
{
int apdu_len = BACNET_STATUS_ERROR;
uint16_t value = 1;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject && (array_index < CONTROL_GROUPS_MAX)) {
@@ -490,7 +490,7 @@ static int Channel_Control_Groups_Element_Encode(
* @return true if values are able to be copied
*/
bool Channel_Value_Copy(
BACNET_CHANNEL_VALUE *cvalue, BACNET_APPLICATION_DATA_VALUE *value)
BACNET_CHANNEL_VALUE *cvalue, const BACNET_APPLICATION_DATA_VALUE *value)
{
bool status = false;
@@ -631,7 +631,7 @@ bool Channel_Value_Copy(
* @return number of bytes in the APDU, or BACNET_STATUS_ERROR
*/
int Channel_Value_Encode(
uint8_t *apdu, int apdu_max, BACNET_CHANNEL_VALUE *value)
uint8_t *apdu, int apdu_max, const BACNET_CHANNEL_VALUE *value)
{
int apdu_len = BACNET_STATUS_ERROR;
@@ -743,7 +743,7 @@ int Channel_Value_Encode(
* @return number of bytes in the APDU, or BACNET_STATUS_ERROR if error.
*/
static int Coerce_Data_Encode(uint8_t *apdu,
BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_APPLICATION_DATA_VALUE *value,
BACNET_APPLICATION_TAG tag)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -1060,7 +1060,7 @@ static int Coerce_Data_Encode(uint8_t *apdu,
*/
int Channel_Coerce_Data_Encode(uint8_t *apdu,
size_t apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_APPLICATION_DATA_VALUE *value,
BACNET_APPLICATION_TAG tag)
{
int len;
@@ -1084,7 +1084,7 @@ int Channel_Coerce_Data_Encode(uint8_t *apdu,
* @return true if values are within range and present-value is sent.
*/
bool Channel_Write_Member_Value(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_APPLICATION_DATA_VALUE *value)
BACNET_WRITE_PROPERTY_DATA *wp_data, const BACNET_APPLICATION_DATA_VALUE *value)
{
bool status = false;
int apdu_len = 0;
@@ -1191,13 +1191,13 @@ bool Channel_Write_Member_Value(
* @return true if values are within range and present-value is sent.
*/
static bool Channel_Write_Members(struct object_data *pObject,
BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_APPLICATION_DATA_VALUE *value,
uint8_t priority)
{
BACNET_WRITE_PROPERTY_DATA wp_data = { 0 };
bool status = false;
unsigned m = 0;
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember = NULL;
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMember = NULL;
if (pObject && value) {
pObject->Write_Status = BACNET_WRITE_STATUS_IN_PROGRESS;
@@ -1244,7 +1244,7 @@ static bool Channel_Write_Members(struct object_data *pObject,
* @return true if values are within range and present-value is sent.
*/
bool Channel_Present_Value_Set(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_APPLICATION_DATA_VALUE *value)
BACNET_WRITE_PROPERTY_DATA *wp_data, const BACNET_APPLICATION_DATA_VALUE *value)
{
bool status = false;
struct object_data *pObject;
@@ -1291,7 +1291,7 @@ bool Channel_Object_Name(
{
bool status = false;
char name_text[24] = "CHANNEL-4194303";
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -1316,7 +1316,7 @@ bool Channel_Object_Name(
*
* @return true if object-name was set
*/
bool Channel_Name_Set(uint32_t object_instance, char *new_name)
bool Channel_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -1359,7 +1359,7 @@ const char *Channel_Name_ASCII(uint32_t object_instance)
bool Channel_Out_Of_Service(uint32_t object_instance)
{
bool value = false;
struct object_data *pObject;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
@@ -1402,7 +1402,7 @@ int Channel_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
int apdu_len = 0; /* return value */
BACNET_BIT_STRING bit_string;
BACNET_CHARACTER_STRING char_string;
BACNET_CHANNEL_VALUE *cvalue = NULL;
const BACNET_CHANNEL_VALUE *cvalue = NULL;
uint32_t unsigned_value = 0;
unsigned count = 0;
bool state = false;
src/bacnet/basic/object/channel.h
+8 -8
View File
@@ -119,7 +119,7 @@ BACNET_STACK_EXPORT
bool Channel_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Channel_Name_Set(uint32_t object_instance, char *new_name);
bool Channel_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Channel_Name_ASCII(uint32_t object_instance);
@@ -132,7 +132,7 @@ BACNET_STACK_EXPORT
BACNET_CHANNEL_VALUE *Channel_Present_Value(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Channel_Present_Value_Set(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_APPLICATION_DATA_VALUE *value);
BACNET_WRITE_PROPERTY_DATA *wp_data, const BACNET_APPLICATION_DATA_VALUE *value);
BACNET_STACK_EXPORT
bool Channel_Out_Of_Service(uint32_t object_instance);
@@ -155,10 +155,10 @@ BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *Channel_Reference_List_Member_Element(
BACNET_STACK_EXPORT
bool Channel_Reference_List_Member_Element_Set(uint32_t object_instance,
unsigned array_index,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc);
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc);
BACNET_STACK_EXPORT
unsigned Channel_Reference_List_Member_Element_Add(uint32_t object_instance,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc);
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *pMemberSrc);
BACNET_STACK_EXPORT
uint16_t Channel_Control_Groups_Element(
uint32_t object_instance, int32_t array_index);
@@ -167,18 +167,18 @@ bool Channel_Control_Groups_Element_Set(
uint32_t object_instance, int32_t array_index, uint16_t value);
BACNET_STACK_EXPORT
bool Channel_Value_Copy(
BACNET_CHANNEL_VALUE *cvalue, BACNET_APPLICATION_DATA_VALUE *value);
BACNET_CHANNEL_VALUE *cvalue, const BACNET_APPLICATION_DATA_VALUE *value);
BACNET_STACK_EXPORT
int Channel_Value_Encode(
uint8_t *apdu, int apdu_max, BACNET_CHANNEL_VALUE *value);
uint8_t *apdu, int apdu_max, const BACNET_CHANNEL_VALUE *value);
BACNET_STACK_EXPORT
int Channel_Coerce_Data_Encode(uint8_t *apdu,
size_t apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_APPLICATION_DATA_VALUE *value,
BACNET_APPLICATION_TAG tag);
BACNET_STACK_EXPORT
bool Channel_Write_Member_Value(
BACNET_WRITE_PROPERTY_DATA *wp_data, BACNET_APPLICATION_DATA_VALUE *value);
BACNET_WRITE_PROPERTY_DATA *wp_data, const BACNET_APPLICATION_DATA_VALUE *value);
BACNET_STACK_EXPORT
void Channel_Write_Property_Internal_Callback_Set(
src/bacnet/basic/object/client/device-client.c
+2 -2
View File
@@ -383,7 +383,7 @@ bool Device_Object_Name(
return status;
}
bool Device_Set_Object_Name(BACNET_CHARACTER_STRING *object_name)
bool Device_Set_Object_Name(const BACNET_CHARACTER_STRING *object_name)
{
bool status = false; /*return value */
@@ -724,7 +724,7 @@ int Device_Object_List_Element_Encode(
* Object.
* @return True on success or else False if not found.
*/
bool Device_Valid_Object_Name(BACNET_CHARACTER_STRING *object_name1,
bool Device_Valid_Object_Name(const BACNET_CHARACTER_STRING *object_name1,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance)
{
src/bacnet/basic/object/color_object.c
+17 -14
View File
@@ -188,7 +188,7 @@ bool Color_Present_Value(uint32_t object_instance, BACNET_XY_COLOR *value)
*
* @return true if values are within range and present-value is set.
*/
bool Color_Present_Value_Set(uint32_t object_instance, BACNET_XY_COLOR *value)
bool Color_Present_Value_Set(uint32_t object_instance, const BACNET_XY_COLOR *value)
{
bool status = false;
struct object_data *pObject;
@@ -214,7 +214,7 @@ bool Color_Present_Value_Set(uint32_t object_instance, BACNET_XY_COLOR *value)
* @return true if values are within range and present-value is set.
*/
static bool Color_Present_Value_Write(uint32_t object_instance,
BACNET_XY_COLOR *value,
const BACNET_XY_COLOR *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -273,7 +273,8 @@ bool Color_Tracking_Value(uint32_t object_instance, BACNET_XY_COLOR *value)
*
* @return true if values are within range and present-value is set.
*/
bool Color_Tracking_Value_Set(uint32_t object_instance, BACNET_XY_COLOR *value)
bool Color_Tracking_Value_Set(
uint32_t object_instance, const BACNET_XY_COLOR *value)
{
bool status = false;
struct object_data *pObject;
@@ -315,7 +316,8 @@ bool Color_Command(uint32_t object_instance, BACNET_COLOR_COMMAND *value)
* @param value - color command data
* @return true if values are within range and value is set.
*/
bool Color_Command_Set(uint32_t object_instance, BACNET_COLOR_COMMAND *value)
bool Color_Command_Set(
uint32_t object_instance, const BACNET_COLOR_COMMAND *value)
{
bool status = false;
struct object_data *pObject;
@@ -341,7 +343,7 @@ bool Color_Command_Set(uint32_t object_instance, BACNET_COLOR_COMMAND *value)
* @return true if values are within range and present-value is set.
*/
static bool Color_Command_Write(uint32_t object_instance,
BACNET_COLOR_COMMAND *value,
const BACNET_COLOR_COMMAND *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -440,7 +442,8 @@ bool Color_Default_Color(uint32_t object_instance, BACNET_XY_COLOR *value)
*
* @return true if values are within range and present-value is set.
*/
bool Color_Default_Color_Set(uint32_t object_instance, BACNET_XY_COLOR *value)
bool Color_Default_Color_Set(
uint32_t object_instance, const BACNET_XY_COLOR *value)
{
bool status = false;
struct object_data *pObject;
@@ -466,7 +469,7 @@ bool Color_Default_Color_Set(uint32_t object_instance, BACNET_XY_COLOR *value)
* @return true if values are within range and present-value is set.
*/
static bool Color_Default_Color_Write(uint32_t object_instance,
BACNET_XY_COLOR *value,
const BACNET_XY_COLOR *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -708,7 +711,7 @@ bool Color_Object_Name(
*
* @return true if object-name was set
*/
bool Color_Name_Set(uint32_t object_instance, char *new_name)
bool Color_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -747,15 +750,15 @@ const char *Color_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Color_Description(uint32_t object_instance)
const char *Color_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -772,7 +775,7 @@ char *Color_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Color_Description_Set(uint32_t object_instance, char *new_name)
bool Color_Description_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -987,7 +990,7 @@ bool Color_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
int len = 0;
BACNET_APPLICATION_DATA_VALUE value;
int apdu_size = 0;
uint8_t *apdu = NULL;
const uint8_t *apdu = NULL;
/* decode the some of the request */
apdu = wp_data->application_data;
src/bacnet/basic/object/color_object.h
+11 -7
View File
@@ -48,7 +48,7 @@ BACNET_STACK_EXPORT
bool Color_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Color_Name_Set(uint32_t object_instance, char *new_name);
bool Color_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Color_Name_ASCII(uint32_t object_instance);
@@ -59,7 +59,8 @@ BACNET_STACK_EXPORT
bool Color_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data);
BACNET_STACK_EXPORT
bool Color_Present_Value_Set(uint32_t object_instance, BACNET_XY_COLOR *value);
bool Color_Present_Value_Set(
uint32_t object_instance, const BACNET_XY_COLOR *value);
BACNET_STACK_EXPORT
bool Color_Present_Value(uint32_t object_instance, BACNET_XY_COLOR *value);
BACNET_STACK_EXPORT
@@ -67,17 +68,20 @@ void Color_Write_Present_Value_Callback_Set(
color_write_present_value_callback cb);
BACNET_STACK_EXPORT
bool Color_Tracking_Value_Set(uint32_t object_instance, BACNET_XY_COLOR *value);
bool Color_Tracking_Value_Set(
uint32_t object_instance, const BACNET_XY_COLOR *value);
BACNET_STACK_EXPORT
bool Color_Tracking_Value(uint32_t object_instance, BACNET_XY_COLOR *value);
BACNET_STACK_EXPORT
bool Color_Command(uint32_t object_instance, BACNET_COLOR_COMMAND *value);
BACNET_STACK_EXPORT
bool Color_Command_Set(uint32_t object_instance, BACNET_COLOR_COMMAND *value);
bool Color_Command_Set(
uint32_t object_instance, const BACNET_COLOR_COMMAND *value);
BACNET_STACK_EXPORT
bool Color_Default_Color_Set(uint32_t object_instance, BACNET_XY_COLOR *value);
bool Color_Default_Color_Set(
uint32_t object_instance, const BACNET_XY_COLOR *value);
BACNET_STACK_EXPORT
bool Color_Default_Color(uint32_t object_instance, BACNET_XY_COLOR *value);
@@ -99,9 +103,9 @@ bool Color_Transition_Set(
uint32_t object_instance, BACNET_COLOR_TRANSITION value);
BACNET_STACK_EXPORT
char *Color_Description(uint32_t instance);
const char *Color_Description(uint32_t instance);
BACNET_STACK_EXPORT
bool Color_Description_Set(uint32_t instance, char *new_name);
bool Color_Description_Set(uint32_t instance, const char *new_name);
BACNET_STACK_EXPORT
bool Color_Write_Enabled(uint32_t instance);
src/bacnet/basic/object/color_temperature.c
+9 -8
View File
@@ -410,7 +410,7 @@ bool Color_Temperature_Command(
* @return true if values are within range and value is set.
*/
bool Color_Temperature_Command_Set(
uint32_t object_instance, BACNET_COLOR_COMMAND *value)
uint32_t object_instance, const BACNET_COLOR_COMMAND *value)
{
bool status = false;
struct object_data *pObject;
@@ -945,7 +945,7 @@ bool Color_Temperature_Object_Name(
*
* @return true if object-name was set
*/
bool Color_Temperature_Name_Set(uint32_t object_instance, char *new_name)
bool Color_Temperature_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -984,15 +984,15 @@ const char *Color_Temperature_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Color_Temperature_Description(uint32_t object_instance)
const char *Color_Temperature_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -1009,7 +1009,8 @@ char *Color_Temperature_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Color_Temperature_Description_Set(uint32_t object_instance, char *new_name)
bool Color_Temperature_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -1406,7 +1407,7 @@ bool Color_Temperature_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
int len = 0;
BACNET_APPLICATION_DATA_VALUE value;
int apdu_size = 0;
uint8_t *apdu = NULL;
const uint8_t *apdu = NULL;
/* decode the some of the request */
apdu = wp_data->application_data;
src/bacnet/basic/object/color_temperature.h
+6 -4
View File
@@ -45,7 +45,8 @@ BACNET_STACK_EXPORT
bool Color_Temperature_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Color_Temperature_Name_Set(uint32_t object_instance, char *new_name);
bool Color_Temperature_Name_Set(
uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Color_Temperature_Name_ASCII(uint32_t object_instance);
@@ -87,7 +88,7 @@ bool Color_Temperature_Command(
uint32_t object_instance, BACNET_COLOR_COMMAND *value);
BACNET_STACK_EXPORT
bool Color_Temperature_Command_Set(
uint32_t object_instance, BACNET_COLOR_COMMAND *value);
uint32_t object_instance, const BACNET_COLOR_COMMAND *value);
BACNET_STACK_EXPORT
bool Color_Temperature_Default_Color_Temperature_Set(
@@ -129,9 +130,10 @@ bool Color_Temperature_Transition_Set(
uint32_t object_instance, BACNET_COLOR_TRANSITION value);
BACNET_STACK_EXPORT
char *Color_Temperature_Description(uint32_t instance);
const char *Color_Temperature_Description(uint32_t instance);
BACNET_STACK_EXPORT
bool Color_Temperature_Description_Set(uint32_t instance, char *new_name);
bool Color_Temperature_Description_Set(
uint32_t instance, const char *new_name);
BACNET_STACK_EXPORT
bool Color_Temperature_Write_Enabled(uint32_t instance);
src/bacnet/basic/object/command.h
+1 -1
View File
@@ -72,7 +72,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Command_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
int Command_Read_Property(
src/bacnet/basic/object/csv.c
+4 -3
View File
@@ -186,7 +186,7 @@ bool CharacterString_Value_Present_Value(
* @return true if values are within range and present-value is set.
*/
bool CharacterString_Value_Present_Value_Set(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name)
uint32_t object_instance, const BACNET_CHARACTER_STRING *object_name)
{
bool status = false;
unsigned index = 0; /* offset from instance lookup */
@@ -332,7 +332,7 @@ static char *CharacterString_Value_Description(uint32_t object_instance)
* @return True on success, false otherwise.
*/
bool CharacterString_Value_Description_Set(
uint32_t object_instance, char *new_descr)
uint32_t object_instance, const char *new_descr)
{
unsigned index = 0; /* offset from instance lookup */
size_t i = 0; /* loop counter */
@@ -390,7 +390,8 @@ bool CharacterString_Value_Object_Name(
*
* @return True on success, false otherwise.
*/
bool CharacterString_Value_Name_Set(uint32_t object_instance, char *new_name)
bool CharacterString_Value_Name_Set(
uint32_t object_instance, const char *new_name)
{
unsigned index = 0; /* offset from instance lookup */
size_t i = 0; /* loop counter */
src/bacnet/basic/object/csv.h
+3 -3
View File
@@ -59,7 +59,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool CharacterString_Value_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool CharacterString_Value_Present_Value(
@@ -68,11 +68,11 @@ extern "C" {
BACNET_STACK_EXPORT
bool CharacterString_Value_Present_Value_Set(
uint32_t object_instance,
BACNET_CHARACTER_STRING * value);
const BACNET_CHARACTER_STRING * value);
BACNET_STACK_EXPORT
bool CharacterString_Value_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
bool CharacterString_Value_Out_Of_Service(
uint32_t object_instance);
src/bacnet/basic/object/device.c
+5 -5
View File
@@ -574,7 +574,7 @@ bool Device_Objects_Property_List_Member(
static uint32_t Object_Instance_Number = 260001;
static BACNET_CHARACTER_STRING My_Object_Name;
static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL;
static char *Vendor_Name = BACNET_VENDOR_NAME;
static const char *Vendor_Name = BACNET_VENDOR_NAME;
static uint16_t Vendor_Identifier = BACNET_VENDOR_ID;
static char Model_Name[MAX_DEV_MOD_LEN + 1] = "GNU";
static char Application_Software_Version[MAX_DEV_VER_LEN + 1] = "1.0";
@@ -783,7 +783,7 @@ bool Device_Object_Name(
return status;
}
bool Device_Set_Object_Name(BACNET_CHARACTER_STRING *object_name)
bool Device_Set_Object_Name(const BACNET_CHARACTER_STRING *object_name)
{
bool status = false; /*return value */
@@ -1124,7 +1124,7 @@ int Device_Object_List_Element_Encode(
* Object.
* @return True on success or else False if not found.
*/
bool Device_Valid_Object_Name(BACNET_CHARACTER_STRING *object_name1,
bool Device_Valid_Object_Name(const BACNET_CHARACTER_STRING *object_name1,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance)
{
@@ -1519,7 +1519,7 @@ int Device_Read_Property_Local(BACNET_READ_PROPERTY_DATA *rpdata)
* @return The length of the APDU on success, else BACNET_STATUS_ERROR
*/
static int Read_Property_Common(
struct object_functions *pObject, BACNET_READ_PROPERTY_DATA *rpdata)
const struct object_functions *pObject, BACNET_READ_PROPERTY_DATA *rpdata)
{
int apdu_len = BACNET_STATUS_ERROR;
BACNET_CHARACTER_STRING char_string;
@@ -1852,7 +1852,7 @@ static bool Device_Write_Property_Object_Name(
BACNET_OBJECT_TYPE object_type = OBJECT_NONE;
uint32_t object_instance = 0;
int apdu_size = 0;
uint8_t *apdu = NULL;
const uint8_t *apdu = NULL;
if (!wp_data) {
return false;
src/bacnet/basic/object/device.h
+8 -8
View File
@@ -312,7 +312,7 @@ extern "C" {
void);
BACNET_STACK_EXPORT
void Device_UUID_Set(
uint8_t *new_uuid,
const uint8_t *new_uuid,
size_t length);
BACNET_STACK_EXPORT
void Device_UUID_Get(
@@ -353,7 +353,7 @@ extern "C" {
BACNET_CHARACTER_STRING * object_name);
BACNET_STACK_EXPORT
bool Device_Set_Object_Name(
BACNET_CHARACTER_STRING * object_name);
const BACNET_CHARACTER_STRING * object_name);
/* Copy a child object name, given its ID. */
BACNET_STACK_EXPORT
bool Device_Object_Name_Copy(
@@ -443,7 +443,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Device_Valid_Object_Name(
BACNET_CHARACTER_STRING * object_name,
const BACNET_CHARACTER_STRING * object_name,
BACNET_OBJECT_TYPE *object_type,
uint32_t * object_instance);
BACNET_STACK_EXPORT
@@ -498,7 +498,7 @@ extern "C" {
BACNET_STACK_EXPORT
uint16_t Add_Routed_Device(
uint32_t Object_Instance,
BACNET_CHARACTER_STRING * Object_Name,
const BACNET_CHARACTER_STRING * Object_Name,
const char *Description);
BACNET_STACK_EXPORT
DEVICE_OBJECT_DATA *Get_Routed_Device_Object(
@@ -511,16 +511,16 @@ extern "C" {
bool Routed_Device_Address_Lookup(
int idx,
uint8_t address_len,
uint8_t * mac_adress);
const uint8_t * mac_adress);
BACNET_STACK_EXPORT
bool Routed_Device_GetNext(
BACNET_ADDRESS * dest,
int *DNET_list,
const BACNET_ADDRESS * dest,
const int *DNET_list,
int *cursor);
BACNET_STACK_EXPORT
bool Routed_Device_Is_Valid_Network(
uint16_t dest_net,
int *DNET_list);
const int *DNET_list);
BACNET_STACK_EXPORT
uint32_t Routed_Device_Index_To_Instance(
src/bacnet/basic/object/gateway/gw_device.c
+5 -4
View File
@@ -89,7 +89,7 @@ uint16_t iCurrent_Device_Idx = 0;
* there isn't enough room to add this Device.
*/
uint16_t Add_Routed_Device(uint32_t Object_Instance,
BACNET_CHARACTER_STRING *sObject_Name,
const BACNET_CHARACTER_STRING *sObject_Name,
const char *sDescription)
{
int i = Num_Managed_Devices;
@@ -192,7 +192,7 @@ void routed_get_my_address(BACNET_ADDRESS *my_address)
* meaning MAC broadcast, so it's an automatic match).
* Else False if no match or invalid idx is given.
*/
bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, uint8_t *dadr)
bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, const uint8_t *dadr)
{
bool result = false;
DEVICE_OBJECT_DATA *pDev;
@@ -245,7 +245,8 @@ bool Routed_Device_Address_Lookup(int idx, uint8_t dlen, uint8_t *dadr)
* match). Else False if no match or invalid idx is given; the cursor will be
* returned as -1 in these cases.
*/
bool Routed_Device_GetNext(BACNET_ADDRESS *dest, int *DNET_list, int *cursor)
bool Routed_Device_GetNext(
const BACNET_ADDRESS *dest, const int *DNET_list, int *cursor)
{
int dnet = DNET_list[0]; /* Get the DNET of our virtual network */
int idx = *cursor;
@@ -315,7 +316,7 @@ bool Routed_Device_GetNext(BACNET_ADDRESS *dest, int *DNET_list, int *cursor)
* Device (the gateway), or is BACNET_BROADCAST_NETWORK,
* which is an automatic match. Else False if not a reachable network.
*/
bool Routed_Device_Is_Valid_Network(uint16_t dest_net, int *DNET_list)
bool Routed_Device_Is_Valid_Network(uint16_t dest_net, const int *DNET_list)
{
int dnet = DNET_list[0]; /* Get the DNET of our virtual network */
bool bSuccess = false;
src/bacnet/basic/object/lc.c
+10 -8
View File
@@ -259,7 +259,7 @@ bool Load_Control_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Load_Control_Name_Set(uint32_t object_instance, char *new_name)
bool Load_Control_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false;
struct object_data *pObject;
@@ -359,7 +359,8 @@ static float Requested_Shed_Level_Value(struct object_data *pObject)
* @param dest - destination data
* @param src - source data
*/
static void Shed_Level_Copy(BACNET_SHED_LEVEL *dest, BACNET_SHED_LEVEL *src)
static void Shed_Level_Copy(
BACNET_SHED_LEVEL *dest, const BACNET_SHED_LEVEL *src)
{
if (dest && src) {
dest->type = src->type;
@@ -445,7 +446,7 @@ static bool Able_To_Meet_Shed_Request(struct object_data *pObject)
* @param object_index - object index in the list
* @param bdatetime - current date and time
*/
void Load_Control_State_Machine(int object_index, BACNET_DATE_TIME *bdatetime)
void Load_Control_State_Machine(int object_index, const BACNET_DATE_TIME *bdatetime)
{
int diff = 0; /* used for datetime comparison */
float amount;
@@ -799,7 +800,7 @@ bool Load_Control_Manipulated_Variable_Reference(
*/
bool Load_Control_Manipulated_Variable_Reference_Set(
uint32_t object_instance,
BACNET_OBJECT_PROPERTY_REFERENCE *object_property_reference)
const BACNET_OBJECT_PROPERTY_REFERENCE *object_property_reference)
{
bool status = false;
struct object_data *pObject;
@@ -908,7 +909,8 @@ static int Load_Control_Shed_Level_Descriptions_Encode(
* @param value [in] The value to encode
* @return The length of the apdu encoded
*/
static int BACnet_Shed_Level_Encode(uint8_t *apdu, BACNET_SHED_LEVEL *value)
static int BACnet_Shed_Level_Encode(
uint8_t *apdu, const BACNET_SHED_LEVEL *value)
{
int apdu_len = 0;
@@ -1095,7 +1097,7 @@ int Load_Control_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
*/
static bool Load_Control_Requested_Shed_Level_Write(
uint32_t object_instance,
BACNET_SHED_LEVEL *value,
const BACNET_SHED_LEVEL *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -1188,7 +1190,7 @@ static bool Load_Control_Requested_Shed_Level_Write(
*/
static bool Load_Control_Start_Time_Write(
uint32_t object_instance,
BACNET_DATE_TIME *value,
const BACNET_DATE_TIME *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -1602,7 +1604,7 @@ void Load_Control_Manipulated_Object_Read_Callback_Set(
bool Load_Control_Shed_Level_Array_Set(
uint32_t object_instance,
uint32_t array_index,
struct shed_level_data *value)
const struct shed_level_data *value)
{
int key_index;
struct shed_level_data *entry;
src/bacnet/basic/object/lc.h
+4 -4
View File
@@ -92,7 +92,7 @@ BACNET_STACK_EXPORT
bool Load_Control_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Load_Control_Name_Set(uint32_t object_instance, char *new_name);
bool Load_Control_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Load_Control_Name_ASCII(uint32_t object_instance);
@@ -103,7 +103,7 @@ BACNET_STACK_EXPORT
bool Load_Control_Shed_Level_Array_Set(
uint32_t object_instance,
uint32_t array_index,
struct shed_level_data *value);
const struct shed_level_data *value);
BACNET_STACK_EXPORT
bool Load_Control_Shed_Level_Array(
uint32_t object_instance,
@@ -133,7 +133,7 @@ bool Load_Control_Manipulated_Variable_Reference(
BACNET_STACK_EXPORT
bool Load_Control_Manipulated_Variable_Reference_Set(
uint32_t object_instance,
BACNET_OBJECT_PROPERTY_REFERENCE *object_property_reference);
const BACNET_OBJECT_PROPERTY_REFERENCE *object_property_reference);
BACNET_STACK_EXPORT
void Load_Control_Manipulated_Object_Write_Callback_Set(
@@ -158,7 +158,7 @@ bool Load_Control_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data);
/* functions used for unit testing */
BACNET_STACK_EXPORT
void Load_Control_State_Machine(int object_index, BACNET_DATE_TIME *bdatetime);
void Load_Control_State_Machine(int object_index, const BACNET_DATE_TIME *bdatetime);
#ifdef __cplusplus
}
src/bacnet/basic/object/lo.c
+17 -14
View File
@@ -198,7 +198,8 @@ unsigned Lighting_Output_Instance_To_Index(uint32_t object_instance)
* @return the priority-array active status for the specific priority
*/
static bool
Priority_Array_Active(struct object_data *pObject, BACNET_ARRAY_INDEX priority)
Priority_Array_Active(
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
bool active = false;
@@ -219,7 +220,8 @@ Priority_Array_Active(struct object_data *pObject, BACNET_ARRAY_INDEX priority)
* @return The priority-array value for the specific priority
*/
static float
Priority_Array_Value(struct object_data *pObject, BACNET_ARRAY_INDEX priority)
Priority_Array_Value(
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
float real_value = 0.0;
@@ -241,7 +243,7 @@ Priority_Array_Value(struct object_data *pObject, BACNET_ARRAY_INDEX priority)
* @return The priority-array value for the specific priority
*/
static float Priority_Array_Next_Value(
struct object_data *pObject, BACNET_ARRAY_INDEX priority)
const struct object_data *pObject, BACNET_ARRAY_INDEX priority)
{
float real_value = 0.0;
unsigned p = 0;
@@ -316,7 +318,7 @@ static int Lighting_Output_Priority_Array_Encode(
*
* @return active priority 1..16, or 0 if no priority is active
*/
static unsigned Present_Value_Priority(struct object_data *pObject)
static unsigned Present_Value_Priority(const struct object_data *pObject)
{
unsigned p = 0; /* loop counter */
unsigned priority = 0; /* return value */
@@ -837,7 +839,7 @@ bool Lighting_Output_Object_Name(
*
* @return true if object-name was set
*/
bool Lighting_Output_Name_Set(uint32_t object_instance, char *new_name)
bool Lighting_Output_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -876,15 +878,15 @@ const char *Lighting_Output_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Lighting_Output_Description(uint32_t object_instance)
const char *Lighting_Output_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -901,7 +903,8 @@ char *Lighting_Output_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Lighting_Output_Description_Set(uint32_t object_instance, char *new_name)
bool Lighting_Output_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -924,7 +927,7 @@ bool Lighting_Output_Description_Set(uint32_t object_instance, char *new_name)
* @return true if lighting command was set
*/
bool Lighting_Output_Lighting_Command_Set(
uint32_t object_instance, BACNET_LIGHTING_COMMAND *value)
uint32_t object_instance, const BACNET_LIGHTING_COMMAND *value)
{
bool status = false;
struct object_data *pObject;
@@ -970,7 +973,7 @@ Lighting_Command_Stop(struct object_data *pObject, unsigned priority)
*/
static bool Lighting_Output_Lighting_Command_Write(
uint32_t object_instance,
BACNET_LIGHTING_COMMAND *value,
const BACNET_LIGHTING_COMMAND *value,
uint8_t priority,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -1858,7 +1861,7 @@ bool Lighting_Output_Color_Reference(
* @return true if property value was set
*/
bool Lighting_Output_Color_Reference_Set(
uint32_t object_instance, BACNET_OBJECT_ID *value)
uint32_t object_instance, const BACNET_OBJECT_ID *value)
{
bool status = false;
struct object_data *pObject;
@@ -1922,7 +1925,7 @@ bool Lighting_Output_Override_Color_Reference(
* @return true if property value was set
*/
bool Lighting_Output_Override_Color_Reference_Set(
uint32_t object_instance, BACNET_OBJECT_ID *value)
uint32_t object_instance, const BACNET_OBJECT_ID *value)
{
bool status = false;
struct object_data *pObject;
src/bacnet/basic/object/lo.h
+6 -6
View File
@@ -99,18 +99,18 @@ extern "C" {
BACNET_STACK_EXPORT
bool Lighting_Output_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Lighting_Output_Name_ASCII(
uint32_t object_instance);
BACNET_STACK_EXPORT
char *Lighting_Output_Description(
const char *Lighting_Output_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Lighting_Output_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool Lighting_Output_Out_Of_Service(
@@ -123,7 +123,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Lighting_Output_Lighting_Command_Set(
uint32_t object_instance,
BACNET_LIGHTING_COMMAND *value);
const BACNET_LIGHTING_COMMAND *value);
BACNET_STACK_EXPORT
bool Lighting_Output_Lighting_Command(
uint32_t object_instance,
@@ -219,7 +219,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Lighting_Output_Color_Reference_Set(
uint32_t object_instance,
BACNET_OBJECT_ID *value);
const BACNET_OBJECT_ID *value);
BACNET_STACK_EXPORT
bool Lighting_Output_Override_Color_Reference(
@@ -228,7 +228,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Lighting_Output_Override_Color_Reference_Set(
uint32_t object_instance,
BACNET_OBJECT_ID *value);
const BACNET_OBJECT_ID *value);
BACNET_STACK_EXPORT
void Lighting_Output_Timer(
src/bacnet/basic/object/lsz.c
+2 -2
View File
@@ -507,7 +507,7 @@ static int Life_Safety_Zone_Members_Encode(
*/
bool Life_Safety_Zone_Members_Add(
uint32_t object_instance,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *data)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *data)
{
bool status = false;
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *entry;
@@ -553,7 +553,7 @@ void Life_Safety_Zone_Members_Clear(
static bool Life_Safety_Zone_Members_Write(BACNET_WRITE_PROPERTY_DATA *wp_data)
{
int len = 0, apdu_len = 0, apdu_size = 0;
uint8_t *apdu = NULL;
const uint8_t *apdu = NULL;
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE data = { 0 };
if (wp_data == NULL) {
src/bacnet/basic/object/lsz.h
+1 -1
View File
@@ -98,7 +98,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Life_Safety_Zone_Members_Add(
uint32_t object_instance,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *data);
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *data);
BACNET_STACK_EXPORT
void Life_Safety_Zone_Members_Clear(
uint32_t object_instance);
src/bacnet/basic/object/ms-input.c
+13 -12
View File
@@ -215,16 +215,16 @@ uint32_t Multistate_Input_Max_States(uint32_t object_instance)
* @param state_index - state index number 1..N of the text requested
* @return C string retrieved
*/
char *Multistate_Input_State_Text(
const char *Multistate_Input_State_Text(
uint32_t object_instance, uint32_t state_index)
{
char *pName = NULL; /* return value */
struct object_data *pObject;
const char *pName = NULL; /* return value */
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (state_index > 0) {
pName = (char *)state_name_by_index(pObject->State_Text,
pName = state_name_by_index(pObject->State_Text,
state_index);
}
}
@@ -246,7 +246,7 @@ static int Multistate_Input_State_Text_Encode(
uint32_t object_instance, BACNET_ARRAY_INDEX index, uint8_t *apdu)
{
int apdu_len = BACNET_STATUS_ERROR;
char *pName = NULL; /* return value */
const char *pName = NULL; /* return value */
BACNET_CHARACTER_STRING char_string = { 0 };
uint32_t state_index = 1;
@@ -482,7 +482,7 @@ bool Multistate_Input_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Multistate_Input_Name_Set(uint32_t object_instance, char *new_name)
bool Multistate_Input_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -537,7 +537,7 @@ BACNET_RELIABILITY Multistate_Input_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Multistate_Input_Object_Fault(struct object_data *pObject)
static bool Multistate_Input_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -597,14 +597,14 @@ static bool Multistate_Input_Fault(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Multistate_Input_Description(uint32_t object_instance)
const char *Multistate_Input_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Multistate_Input_Object(object_instance);
if (pObject) {
name = (char *)pObject->Description;
name = pObject->Description;
}
return name;
@@ -616,7 +616,8 @@ char *Multistate_Input_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Multistate_Input_Description_Set(uint32_t object_instance, char *new_name)
bool Multistate_Input_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/ms-input.h
+4 -4
View File
@@ -70,7 +70,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Multistate_Input_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Multistate_Input_Name_ASCII(
uint32_t object_instance);
@@ -106,12 +106,12 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
char *Multistate_Input_Description(
const char *Multistate_Input_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Multistate_Input_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Multistate_Input_Reliability(
@@ -138,7 +138,7 @@ extern "C" {
uint32_t Multistate_Input_Max_States(
uint32_t instance);
BACNET_STACK_EXPORT
char *Multistate_Input_State_Text(
const char *Multistate_Input_State_Text(
uint32_t object_instance,
uint32_t state_index);
src/bacnet/basic/object/mso.c
+14 -13
View File
@@ -218,7 +218,7 @@ uint32_t Multistate_Output_Max_States(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return present-value of the object
*/
static uint32_t Object_Present_Value(struct object_data *pObject)
static uint32_t Object_Present_Value(const struct object_data *pObject)
{
uint32_t value = 1;
uint8_t priority = 0; /* loop counter */
@@ -599,7 +599,7 @@ bool Multistate_Output_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Multistate_Output_Name_Set(uint32_t object_instance, char *new_name)
bool Multistate_Output_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -638,16 +638,16 @@ const char *Multistate_Output_Name_ASCII(uint32_t object_instance)
* @param state_index - state index number 1..N of the text requested
* @return C string retrieved
*/
char *Multistate_Output_State_Text(
const char *Multistate_Output_State_Text(
uint32_t object_instance, uint32_t state_index)
{
char *pName = NULL; /* return value */
struct object_data *pObject;
const char *pName = NULL; /* return value */
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (state_index > 0) {
pName = (char *)state_name_by_index(pObject->State_Text,
pName = state_name_by_index(pObject->State_Text,
state_index);
}
}
@@ -669,7 +669,7 @@ static int Multistate_Output_State_Text_Encode(
uint32_t object_instance, BACNET_ARRAY_INDEX index, uint8_t *apdu)
{
int apdu_len = BACNET_STATUS_ERROR;
char *pName = NULL; /* return value */
const char *pName = NULL; /* return value */
BACNET_CHARACTER_STRING char_string = { 0 };
uint32_t state_index = 1;
@@ -741,7 +741,7 @@ BACNET_RELIABILITY Multistate_Output_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Multistate_Output_Object_Fault(struct object_data *pObject)
static bool Multistate_Output_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -801,14 +801,14 @@ static bool Multistate_Output_Fault(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Multistate_Output_Description(uint32_t object_instance)
const char *Multistate_Output_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
name = (char *)pObject->Description;
name = pObject->Description;
}
return name;
@@ -820,7 +820,8 @@ char *Multistate_Output_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Multistate_Output_Description_Set(uint32_t object_instance, char *new_name)
bool Multistate_Output_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/mso.h
+4 -4
View File
@@ -65,7 +65,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Multistate_Output_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Multistate_Output_Name_ASCII(
uint32_t object_instance);
@@ -109,12 +109,12 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
char *Multistate_Output_Description(
const char *Multistate_Output_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Multistate_Output_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
bool Multistate_Output_State_Text_List_Set(
@@ -133,7 +133,7 @@ extern "C" {
uint32_t Multistate_Output_Max_States(
uint32_t instance);
BACNET_STACK_EXPORT
char *Multistate_Output_State_Text(
const char *Multistate_Output_State_Text(
uint32_t object_instance,
uint32_t state_index);
src/bacnet/basic/object/msv.c
+13 -13
View File
@@ -217,17 +217,16 @@ uint32_t Multistate_Value_Max_States(uint32_t object_instance)
* @param state_index - state index number 1..N of the text requested
* @return C string retrieved
*/
char *Multistate_Value_State_Text(
const char *Multistate_Value_State_Text(
uint32_t object_instance, uint32_t state_index)
{
char *pName = NULL; /* return value */
struct object_data *pObject;
const char *pName = NULL; /* return value */
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (state_index > 0) {
pName =
(char *)state_name_by_index(pObject->State_Text, state_index);
pName = state_name_by_index(pObject->State_Text, state_index);
}
}
@@ -248,7 +247,7 @@ static int Multistate_Value_State_Text_Encode(
uint32_t object_instance, BACNET_ARRAY_INDEX index, uint8_t *apdu)
{
int apdu_len = BACNET_STATUS_ERROR;
char *pName = NULL; /* return value */
const char *pName = NULL; /* return value */
BACNET_CHARACTER_STRING char_string = { 0 };
uint32_t state_index = 1;
@@ -482,7 +481,7 @@ bool Multistate_Value_Object_Name(
* @param new_name - holds the object-name to be set
* @return true if object-name was set
*/
bool Multistate_Value_Name_Set(uint32_t object_instance, char *new_name)
bool Multistate_Value_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -537,7 +536,7 @@ BACNET_RELIABILITY Multistate_Value_Reliability(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return true the status flag is in Fault
*/
static bool Multistate_Value_Object_Fault(struct object_data *pObject)
static bool Multistate_Value_Object_Fault(const struct object_data *pObject)
{
bool fault = false;
@@ -597,14 +596,14 @@ static bool Multistate_Value_Fault(uint32_t object_instance)
* @param object_instance - object-instance number of the object
* @return description text or NULL if not found
*/
char *Multistate_Value_Description(uint32_t object_instance)
const char *Multistate_Value_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Multistate_Value_Object(object_instance);
if (pObject) {
name = (char *)pObject->Description;
name = pObject->Description;
}
return name;
@@ -616,7 +615,8 @@ char *Multistate_Value_Description(uint32_t object_instance)
* @param new_name - holds the description to be set
* @return true if object-name was set
*/
bool Multistate_Value_Description_Set(uint32_t object_instance, char *new_name)
bool Multistate_Value_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/msv.h
+4 -4
View File
@@ -69,7 +69,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Multistate_Value_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Multistate_Value_Name_ASCII(
uint32_t object_instance);
@@ -105,12 +105,12 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
char *Multistate_Value_Description(
const char *Multistate_Value_Description(
uint32_t instance);
BACNET_STACK_EXPORT
bool Multistate_Value_Description_Set(
uint32_t object_instance,
char *text_string);
const char *text_string);
BACNET_STACK_EXPORT
bool Multistate_Value_State_Text_List_Set(
@@ -129,7 +129,7 @@ extern "C" {
uint32_t Multistate_Value_Max_States(
uint32_t instance);
BACNET_STACK_EXPORT
char *Multistate_Value_State_Text(
const char *Multistate_Value_State_Text(
uint32_t object_instance,
uint32_t state_index);
src/bacnet/basic/object/netport.c
+10 -10
View File
@@ -92,7 +92,7 @@ struct mstp_port {
struct object_data {
uint32_t Instance_Number;
char *Object_Name;
const char *Object_Name;
BACNET_RELIABILITY Reliability;
bool Out_Of_Service : 1;
bool Changes_Pending : 1;
@@ -314,7 +314,7 @@ bool Network_Port_Object_Name(
*
* @return true if object-name was set
*/
bool Network_Port_Name_Set(uint32_t object_instance, char *new_name)
bool Network_Port_Name_Set(uint32_t object_instance, const char *new_name)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -746,7 +746,7 @@ bool Network_Port_MAC_Address(
* @return true if object-name was set
*/
bool Network_Port_MAC_Address_Set(
uint32_t object_instance, uint8_t *mac_src, uint8_t mac_len)
uint32_t object_instance, const uint8_t *mac_src, uint8_t mac_len)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2109,7 +2109,7 @@ bool Network_Port_Remote_BBMD_IP6_Address(
* @return true if ip-address was set
*/
bool Network_Port_Remote_BBMD_IP6_Address_Set(
uint32_t object_instance, uint8_t *addr)
uint32_t object_instance, const uint8_t *addr)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2326,7 +2326,7 @@ bool Network_Port_IPv6_Address(
* @return true if ip-address was set
*/
bool Network_Port_IPv6_Address_Set(
uint32_t object_instance, uint8_t *ip_address)
uint32_t object_instance, const uint8_t *ip_address)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2437,7 +2437,7 @@ bool Network_Port_IPv6_Gateway(
* @return true if ip-address was set
*/
bool Network_Port_IPv6_Gateway_Set(
uint32_t object_instance, uint8_t *ip_address)
uint32_t object_instance, const uint8_t *ip_address)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2529,7 +2529,7 @@ static int Network_Port_IPv6_DNS_Server_Encode(
* @return true if ip-address was set
*/
bool Network_Port_IPv6_DNS_Server_Set(
uint32_t object_instance, unsigned dns_index, uint8_t *ip_address)
uint32_t object_instance, unsigned dns_index, const uint8_t *ip_address)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2588,7 +2588,7 @@ bool Network_Port_IPv6_Multicast_Address(
* @return true if ip-address was set
*/
bool Network_Port_IPv6_Multicast_Address_Set(
uint32_t object_instance, uint8_t *ip_address)
uint32_t object_instance, const uint8_t *ip_address)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2646,7 +2646,7 @@ bool Network_Port_IPv6_DHCP_Server(
* @return true if ip-address was set
*/
bool Network_Port_IPv6_DHCP_Server_Set(
uint32_t object_instance, uint8_t *ip_address)
uint32_t object_instance, const uint8_t *ip_address)
{
unsigned index = 0; /* offset from instance lookup */
bool status = false;
@@ -2837,7 +2837,7 @@ bool Network_Port_IPv6_Gateway_Zone_Index_Set(
*/
static bool Network_Port_FD_BBMD_Address_Write(
uint32_t object_instance,
BACNET_HOST_N_PORT *value,
const BACNET_HOST_N_PORT *value,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{
src/bacnet/basic/object/netport.h
+9 -9
View File
@@ -40,7 +40,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_Name_Set(
uint32_t object_instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
const char *Network_Port_Object_Name_ASCII(
uint32_t object_instance);
@@ -51,7 +51,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_Description_Set(
uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
BACNET_RELIABILITY Network_Port_Reliability(
@@ -105,7 +105,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_MAC_Address_Set(
uint32_t object_instance,
uint8_t *mac_src,
const uint8_t *mac_src,
uint8_t mac_len);
BACNET_STACK_EXPORT
@@ -308,7 +308,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_Remote_BBMD_IP6_Address_Set(
uint32_t object_instance,
uint8_t *addr);
const uint8_t *addr);
BACNET_STACK_EXPORT
uint16_t Network_Port_Remote_BBMD_BIP6_Port(
uint32_t object_instance);
@@ -340,7 +340,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_IPv6_Address_Set(
uint32_t object_instance,
uint8_t *ip_address);
const uint8_t *ip_address);
BACNET_STACK_EXPORT
bool Network_Port_IPv6_Multicast_Address(
@@ -349,7 +349,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_IPv6_Multicast_Address_Set(
uint32_t object_instance,
uint8_t *ip_address);
const uint8_t *ip_address);
BACNET_STACK_EXPORT
uint8_t Network_Port_IPv6_Subnet_Prefix(
@@ -366,7 +366,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_IPv6_Gateway_Set(
uint32_t object_instance,
uint8_t *ip_address);
const uint8_t *ip_address);
BACNET_STACK_EXPORT
bool Network_Port_IPv6_DNS_Server(
@@ -377,7 +377,7 @@ extern "C" {
bool Network_Port_IPv6_DNS_Server_Set(
uint32_t object_instance,
unsigned dns_index,
uint8_t *ip_address);
const uint8_t *ip_address);
BACNET_STACK_EXPORT
bool Network_Port_IPv6_DHCP_Server(
@@ -386,7 +386,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool Network_Port_IPv6_DHCP_Server_Set(
uint32_t object_instance,
uint8_t *ip_address);
const uint8_t *ip_address);
BACNET_STACK_EXPORT
bool Network_Port_IPv6_Zone_Index(
src/bacnet/basic/object/osv.c
+3 -1
View File
@@ -114,7 +114,9 @@ unsigned OctetString_Value_Instance_To_Index(uint32_t object_instance)
* @return true if values are within range and present-value is set.
*/
bool OctetString_Value_Present_Value_Set(
uint32_t object_instance, BACNET_OCTET_STRING *value, uint8_t priority)
uint32_t object_instance,
const BACNET_OCTET_STRING *value,
uint8_t priority)
{
unsigned index = 0;
bool status = false;
src/bacnet/basic/object/osv.h
+2 -2
View File
@@ -53,7 +53,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool OctetString_Value_Present_Value_Set(uint32_t object_instance,
BACNET_OCTET_STRING * value,
const BACNET_OCTET_STRING * value,
uint8_t priority);
BACNET_STACK_EXPORT
BACNET_OCTET_STRING *OctetString_Value_Present_Value(uint32_t
@@ -71,7 +71,7 @@ extern "C" {
char *OctetString_Value_Description(uint32_t instance);
BACNET_STACK_EXPORT
bool OctetString_Value_Description_Set(uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool OctetString_Value_Out_Of_Service(uint32_t instance);
src/bacnet/basic/object/piv.h
+1 -1
View File
@@ -70,7 +70,7 @@ extern "C" {
char *PositiveInteger_Value_Description(uint32_t instance);
BACNET_STACK_EXPORT
bool PositiveInteger_Value_Description_Set(uint32_t instance,
char *new_name);
const char *new_name);
BACNET_STACK_EXPORT
bool PositiveInteger_Value_Out_Of_Service(uint32_t instance);
src/bacnet/basic/object/schedule.c
+3 -2
View File
@@ -459,7 +459,8 @@ bool Schedule_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
* @param date - date to check
* @return true if the calendar entry is within the effective period
*/
bool Schedule_In_Effective_Period(SCHEDULE_DESCR *desc, BACNET_DATE *date)
bool Schedule_In_Effective_Period(
const SCHEDULE_DESCR *desc, const BACNET_DATE *date)
{
bool res = false;
@@ -480,7 +481,7 @@ bool Schedule_In_Effective_Period(SCHEDULE_DESCR *desc, BACNET_DATE *date)
* @param time - time of the day
*/
void Schedule_Recalculate_PV(
SCHEDULE_DESCR *desc, BACNET_WEEKDAY wday, BACNET_TIME *time)
SCHEDULE_DESCR *desc, BACNET_WEEKDAY wday, const BACNET_TIME *time)
{
int i;
desc->Present_Value.tag = BACNET_APPLICATION_TAG_NULL;
src/bacnet/basic/object/schedule.h
+3 -3
View File
@@ -107,12 +107,12 @@ extern "C" {
/* utility functions for calculating current Present Value
* if Exception Schedule is to be added, these functions must take that into account */
BACNET_STACK_EXPORT
bool Schedule_In_Effective_Period(SCHEDULE_DESCR * desc,
BACNET_DATE * date);
bool Schedule_In_Effective_Period(const SCHEDULE_DESCR * desc,
const BACNET_DATE * date);
BACNET_STACK_EXPORT
void Schedule_Recalculate_PV(SCHEDULE_DESCR * desc,
BACNET_WEEKDAY wday,
BACNET_TIME * time);
const BACNET_TIME * time);
#ifdef __cplusplus
}
src/bacnet/basic/object/structured_view.c
+14 -12
View File
@@ -195,7 +195,7 @@ bool Structured_View_Object_Name(
*
* @return true if object-name was set
*/
bool Structured_View_Name_Set(uint32_t object_instance, char *new_name)
bool Structured_View_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -234,15 +234,15 @@ const char *Structured_View_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Structured_View_Description(uint32_t object_instance)
const char *Structured_View_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -259,7 +259,8 @@ char *Structured_View_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Structured_View_Description_Set(uint32_t object_instance, char *new_name)
bool Structured_View_Description_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -317,15 +318,15 @@ bool Structured_View_Node_Type_Set(
* @param object_instance - object-instance number of the object
* @return Node_Subtype text or NULL if not found
*/
char *Structured_View_Node_Subtype(uint32_t object_instance)
const char *Structured_View_Node_Subtype(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Node_Subtype;
name = pObject->Node_Subtype;
} else {
name = "";
}
@@ -340,7 +341,8 @@ char *Structured_View_Node_Subtype(uint32_t object_instance)
* @param new_name - holds the Node_Subtype to be set
* @return true if Node_Subtype was set
*/
bool Structured_View_Node_Subtype_Set(uint32_t object_instance, char *new_name)
bool Structured_View_Node_Subtype_Set(
uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -460,7 +462,7 @@ Structured_View_Represents(uint32_t object_instance)
* @return true if Represents was set
*/
bool Structured_View_Represents_Set(
uint32_t object_instance, BACNET_DEVICE_OBJECT_REFERENCE *represents)
uint32_t object_instance, const BACNET_DEVICE_OBJECT_REFERENCE *represents)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/structured_view.h
+7 -6
View File
@@ -49,7 +49,7 @@ BACNET_STACK_EXPORT
bool Structured_View_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Structured_View_Name_Set(uint32_t object_instance, char *new_name);
bool Structured_View_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Structured_View_Name_ASCII(uint32_t object_instance);
@@ -57,9 +57,9 @@ BACNET_STACK_EXPORT
int Structured_View_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata);
BACNET_STACK_EXPORT
char *Structured_View_Description(uint32_t object_instance);
const char *Structured_View_Description(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Structured_View_Description_Set(uint32_t object_instance, char *new_name);
bool Structured_View_Description_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
BACNET_NODE_TYPE Structured_View_Node_Type(uint32_t object_instance);
@@ -68,9 +68,9 @@ bool Structured_View_Node_Type_Set(
uint32_t object_instance, BACNET_NODE_TYPE node_type);
BACNET_STACK_EXPORT
char *Structured_View_Node_Subtype(uint32_t object_instance);
const char *Structured_View_Node_Subtype(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Structured_View_Node_Subtype_Set(uint32_t object_instance, char *new_name);
bool Structured_View_Node_Subtype_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
BACNET_SUBORDINATE_DATA *
@@ -110,7 +110,8 @@ BACNET_DEVICE_OBJECT_REFERENCE *
Structured_View_Represents(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Structured_View_Represents_Set(
uint32_t object_instance, BACNET_DEVICE_OBJECT_REFERENCE *represents);
uint32_t object_instance,
const BACNET_DEVICE_OBJECT_REFERENCE *represents);
BACNET_STACK_EXPORT
uint32_t Structured_View_Create(uint32_t object_instance);
src/bacnet/basic/object/time_value.c
+9 -8
View File
@@ -179,7 +179,7 @@ bool Time_Value_Present_Value(uint32_t object_instance, BACNET_TIME *value)
* @param value - floating point analog value
*/
static void Time_Value_Present_Value_COV_Detect(
struct object_data *pObject, BACNET_TIME *value)
struct object_data *pObject, const BACNET_TIME *value)
{
if (pObject && value) {
if (datetime_compare_time(&pObject->Present_Value, value) != 0) {
@@ -196,7 +196,8 @@ static void Time_Value_Present_Value_COV_Detect(
*
* @return true if values are within range and present-value is set.
*/
bool Time_Value_Present_Value_Set(uint32_t object_instance, BACNET_TIME *value)
bool Time_Value_Present_Value_Set(
uint32_t object_instance, const BACNET_TIME *value)
{
bool status = false;
struct object_data *pObject;
@@ -342,7 +343,7 @@ bool Time_Value_Object_Name(
*
* @return true if object-name was set
*/
bool Time_Value_Name_Set(uint32_t object_instance, char *new_name)
bool Time_Value_Name_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
@@ -382,15 +383,15 @@ const char *Time_Value_Name_ASCII(uint32_t object_instance)
*
* @return description text or NULL if not found
*/
char *Time_Value_Description(uint32_t object_instance)
const char *Time_Value_Description(uint32_t object_instance)
{
char *name = NULL;
struct object_data *pObject;
const char *name = NULL;
const struct object_data *pObject;
pObject = Keylist_Data(Object_List, object_instance);
if (pObject) {
if (pObject->Description) {
name = (char *)pObject->Description;
name = pObject->Description;
} else {
name = "";
}
@@ -407,7 +408,7 @@ char *Time_Value_Description(uint32_t object_instance)
*
* @return true if object-name was set
*/
bool Time_Value_Description_Set(uint32_t object_instance, char *new_name)
bool Time_Value_Description_Set(uint32_t object_instance, const char *new_name)
{
bool status = false; /* return value */
struct object_data *pObject;
src/bacnet/basic/object/time_value.h
+5 -4
View File
@@ -47,7 +47,7 @@ BACNET_STACK_EXPORT
bool Time_Value_Object_Name(
uint32_t object_instance, BACNET_CHARACTER_STRING *object_name);
BACNET_STACK_EXPORT
bool Time_Value_Name_Set(uint32_t object_instance, char *new_name);
bool Time_Value_Name_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
const char *Time_Value_Name_ASCII(uint32_t object_instance);
@@ -58,7 +58,8 @@ BACNET_STACK_EXPORT
bool Time_Value_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data);
BACNET_STACK_EXPORT
bool Time_Value_Present_Value_Set(uint32_t object_instance, BACNET_TIME *value);
bool Time_Value_Present_Value_Set(
uint32_t object_instance, const BACNET_TIME *value);
BACNET_STACK_EXPORT
bool Time_Value_Present_Value(uint32_t object_instance, BACNET_TIME *value);
BACNET_STACK_EXPORT
@@ -74,9 +75,9 @@ BACNET_STACK_EXPORT
bool Time_Value_Out_Of_Service_Set(uint32_t object_instance, bool oos_flag);
BACNET_STACK_EXPORT
char *Time_Value_Description(uint32_t object_instance);
const char *Time_Value_Value_Description(uint32_t object_instance);
BACNET_STACK_EXPORT
bool Time_Value_Description_Set(uint32_t object_instance, char *new_name);
bool Time_Value_Description_Set(uint32_t object_instance, const char *new_name);
BACNET_STACK_EXPORT
bool Time_Value_Write_Enabled(uint32_t instance);
src/bacnet/basic/object/trendlog.c
+2 -2
View File
@@ -910,7 +910,7 @@ bool TL_Is_Enabled(int iLog)
* Convert a BACnet time into a local time in seconds since the local epoch *
*****************************************************************************/
bacnet_time_t TL_BAC_Time_To_Local(BACNET_DATE_TIME *bdatetime)
bacnet_time_t TL_BAC_Time_To_Local(const BACNET_DATE_TIME *bdatetime)
{
return datetime_seconds_since_epoch(bdatetime);
}
@@ -1498,7 +1498,7 @@ int TL_encode_entry(uint8_t *apdu, int iLog, int iEntry)
static int local_read_property(uint8_t *value,
uint8_t *status,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *Source,
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *Source,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
{
src/bacnet/basic/object/trendlog.h
+1 -1
View File
@@ -158,7 +158,7 @@ extern "C" {
BACNET_STACK_EXPORT
bacnet_time_t TL_BAC_Time_To_Local(
BACNET_DATE_TIME * SourceTime);
const BACNET_DATE_TIME * SourceTime);
BACNET_STACK_EXPORT
void TL_Local_Time_To_BAC(