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/abort.c
+1 -1
View File
@@ -214,7 +214,7 @@ int abort_encode_apdu(
* @return Total length of the apdu, typically 2 on success, zero otherwise.
*/
int abort_decode_service_request(
uint8_t *apdu, unsigned apdu_len, uint8_t *invoke_id, uint8_t *abort_reason)
const uint8_t *apdu, unsigned apdu_len, uint8_t *invoke_id, uint8_t *abort_reason)
{
int len = 0;
src/bacnet/abort.h
+1 -1
View File
@@ -37,7 +37,7 @@ extern "C" {
BACNET_STACK_EXPORT
int abort_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
uint8_t * abort_reason);
src/bacnet/access_rule.c
+4 -4
View File
@@ -10,7 +10,7 @@
#include "bacnet/access_rule.h"
#include "bacnet/bacdcode.h"
int bacapp_encode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
int bacapp_encode_access_rule(uint8_t *apdu, const BACNET_ACCESS_RULE *rule)
{
int len;
int apdu_len = 0;
@@ -49,7 +49,7 @@ int bacapp_encode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
}
int bacapp_encode_context_access_rule(
uint8_t *apdu, uint8_t tag_number, BACNET_ACCESS_RULE *rule)
uint8_t *apdu, uint8_t tag_number, const BACNET_ACCESS_RULE *rule)
{
int len;
int apdu_len = 0;
@@ -66,7 +66,7 @@ int bacapp_encode_context_access_rule(
return apdu_len;
}
int bacapp_decode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
int bacapp_decode_access_rule(const uint8_t *apdu, BACNET_ACCESS_RULE *rule)
{
int len;
int apdu_len = 0;
@@ -148,7 +148,7 @@ int bacapp_decode_access_rule(uint8_t *apdu, BACNET_ACCESS_RULE *rule)
}
int bacapp_decode_context_access_rule(
uint8_t *apdu, uint8_t tag_number, BACNET_ACCESS_RULE *rule)
const uint8_t *apdu, uint8_t tag_number, BACNET_ACCESS_RULE *rule)
{
int len = 0;
int section_length;
src/bacnet/access_rule.h
+4 -4
View File
@@ -44,19 +44,19 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_encode_access_rule(
uint8_t * apdu,
BACNET_ACCESS_RULE * rule);
const BACNET_ACCESS_RULE * rule);
BACNET_STACK_EXPORT
int bacapp_encode_context_access_rule(
uint8_t * apdu,
uint8_t tag_number,
BACNET_ACCESS_RULE * rule);
const BACNET_ACCESS_RULE * rule);
BACNET_STACK_EXPORT
int bacapp_decode_access_rule(
uint8_t * apdu,
const uint8_t * apdu,
BACNET_ACCESS_RULE * rule);
BACNET_STACK_EXPORT
int bacapp_decode_context_access_rule(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag_number,
BACNET_ACCESS_RULE * rule);
src/bacnet/alarm_ack.c
+4 -4
View File
@@ -20,7 +20,7 @@
* @return number of bytes encoded
*/
int alarm_ack_encode_apdu(
uint8_t *apdu, uint8_t invoke_id, BACNET_ALARM_ACK_DATA *data)
uint8_t *apdu, uint8_t invoke_id, const BACNET_ALARM_ACK_DATA *data)
{
int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */
@@ -54,7 +54,7 @@ int alarm_ack_encode_apdu(
* @param data Pointer to the service data used for encoding values
* @return number of bytes encoded
*/
int alarm_ack_encode_service_request(uint8_t *apdu, BACNET_ALARM_ACK_DATA *data)
int alarm_ack_encode_service_request(uint8_t *apdu, const BACNET_ALARM_ACK_DATA *data)
{
int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */
@@ -104,7 +104,7 @@ int alarm_ack_encode_service_request(uint8_t *apdu, BACNET_ALARM_ACK_DATA *data)
size_t bacnet_acknowledge_alarm_info_request_encode(
uint8_t *apdu,
size_t apdu_size,
BACNET_ALARM_ACK_DATA *data)
const BACNET_ALARM_ACK_DATA *data)
{
size_t apdu_len = 0; /* total length of the apdu, return value */
@@ -128,7 +128,7 @@ size_t bacnet_acknowledge_alarm_info_request_encode(
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error.
*/
int alarm_ack_decode_service_request(
uint8_t *apdu, unsigned apdu_size, BACNET_ALARM_ACK_DATA *data)
const uint8_t *apdu, unsigned apdu_size, BACNET_ALARM_ACK_DATA *data)
{
int len = 0;
int apdu_len = 0;
src/bacnet/alarm_ack.h
+4 -4
View File
@@ -42,22 +42,22 @@ extern "C" {
int alarm_ack_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_ALARM_ACK_DATA * data);
const BACNET_ALARM_ACK_DATA * data);
BACNET_STACK_EXPORT
int alarm_ack_encode_service_request(
uint8_t * apdu,
BACNET_ALARM_ACK_DATA * data);
const BACNET_ALARM_ACK_DATA * data);
BACNET_STACK_EXPORT
size_t bacnet_acknowledge_alarm_info_request_encode(
uint8_t *apdu,
size_t apdu_size,
BACNET_ALARM_ACK_DATA *data);
const BACNET_ALARM_ACK_DATA *data);
BACNET_STACK_EXPORT
int alarm_ack_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
BACNET_ALARM_ACK_DATA * data);
src/bacnet/arf.c
+9 -9
View File
@@ -33,7 +33,7 @@
* @param data Pointer to the service data used for encoding values
* @return number of bytes encoded
*/
int arf_service_encode_apdu(uint8_t *apdu, BACNET_ATOMIC_READ_FILE_DATA *data)
int arf_service_encode_apdu(uint8_t *apdu, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -102,7 +102,7 @@ int arf_service_encode_apdu(uint8_t *apdu, BACNET_ATOMIC_READ_FILE_DATA *data)
* @return number of bytes encoded, or zero if unable to encode or too large
*/
size_t atomicreadfile_service_request_encode(
uint8_t *apdu, size_t apdu_size, BACNET_ATOMIC_READ_FILE_DATA *data)
uint8_t *apdu, size_t apdu_size, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
size_t apdu_len = 0; /* total length of the apdu, return value */
@@ -124,7 +124,7 @@ size_t atomicreadfile_service_request_encode(
* @return number of bytes encoded
*/
int arf_encode_apdu(
uint8_t *apdu, uint8_t invoke_id, BACNET_ATOMIC_READ_FILE_DATA *data)
uint8_t *apdu, uint8_t invoke_id, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -171,7 +171,7 @@ int arf_encode_apdu(
* @return number of bytes decoded or BACNET_STATUS_ERROR on error.
*/
int arf_decode_service_request(
uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_READ_FILE_DATA *data)
const uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_READ_FILE_DATA *data)
{
int tag_len = 0;
int apdu_len = 0;
@@ -269,7 +269,7 @@ int arf_decode_service_request(
* or NULL for length
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
int arf_decode_apdu(uint8_t *apdu,
int arf_decode_apdu(const uint8_t *apdu,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_ATOMIC_READ_FILE_DATA *data)
@@ -327,7 +327,7 @@ int arf_decode_apdu(uint8_t *apdu,
* @return number of bytes encoded
*/
int arf_ack_service_encode_apdu(
uint8_t *apdu, BACNET_ATOMIC_READ_FILE_DATA *data)
uint8_t *apdu, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -403,7 +403,7 @@ int arf_ack_service_encode_apdu(
* @return number of bytes encoded
*/
int arf_ack_encode_apdu(
uint8_t *apdu, uint8_t invoke_id, BACNET_ATOMIC_READ_FILE_DATA *data)
uint8_t *apdu, uint8_t invoke_id, const BACNET_ATOMIC_READ_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -449,7 +449,7 @@ int arf_ack_encode_apdu(
* @return Bytes encoded or BACNET_STATUS_ERROR on error.
*/
int arf_ack_decode_service_request(
uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_READ_FILE_DATA *data)
const uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_READ_FILE_DATA *data)
{
int apdu_len = 0;
int len = 0;
@@ -560,7 +560,7 @@ int arf_ack_decode_service_request(
* or NULL for length
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
int arf_ack_decode_apdu(uint8_t *apdu,
int arf_ack_decode_apdu(const uint8_t *apdu,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_ATOMIC_READ_FILE_DATA *data)
src/bacnet/arf.h
+9 -9
View File
@@ -49,27 +49,27 @@ extern "C" {
int arf_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
const BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
int arf_service_encode_apdu(
uint8_t *apdu,
BACNET_ATOMIC_READ_FILE_DATA *data);
const BACNET_ATOMIC_READ_FILE_DATA *data);
BACNET_STACK_EXPORT
size_t atomicreadfile_service_request_encode(
uint8_t *apdu,
size_t apdu_size,
BACNET_ATOMIC_READ_FILE_DATA *data);
const BACNET_ATOMIC_READ_FILE_DATA *data);
/* decode the service request only */
BACNET_STACK_EXPORT
int arf_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
int arf_decode_apdu(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
@@ -81,22 +81,22 @@ extern "C" {
int arf_ack_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
const BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
int arf_ack_service_encode_apdu(
uint8_t *apdu,
BACNET_ATOMIC_READ_FILE_DATA *data);
const BACNET_ATOMIC_READ_FILE_DATA *data);
/* decode the service request only */
BACNET_STACK_EXPORT
int arf_ack_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
BACNET_ATOMIC_READ_FILE_DATA * data);
BACNET_STACK_EXPORT
int arf_ack_decode_apdu(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_ATOMIC_READ_FILE_DATA * data);
src/bacnet/assigned_access_rights.c
+4 -4
View File
@@ -10,7 +10,7 @@
#include "bacnet/bacdcode.h"
int bacapp_encode_assigned_access_rights(
uint8_t *apdu, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
uint8_t *apdu, const BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
{
int len;
int apdu_len = 0;
@@ -34,7 +34,7 @@ int bacapp_encode_assigned_access_rights(
}
int bacapp_encode_context_assigned_access_rights(
uint8_t *apdu, uint8_t tag, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
uint8_t *apdu, uint8_t tag, const BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
{
int len;
int apdu_len = 0;
@@ -52,7 +52,7 @@ int bacapp_encode_context_assigned_access_rights(
}
int bacapp_decode_assigned_access_rights(
uint8_t *apdu, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
const uint8_t *apdu, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
{
int len;
int apdu_len = 0;
@@ -84,7 +84,7 @@ int bacapp_decode_assigned_access_rights(
}
int bacapp_decode_context_assigned_access_rights(
uint8_t *apdu, uint8_t tag, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
const uint8_t *apdu, uint8_t tag, BACNET_ASSIGNED_ACCESS_RIGHTS *aar)
{
int len = 0;
int section_length;
src/bacnet/assigned_access_rights.h
+4 -4
View File
@@ -28,19 +28,19 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_encode_assigned_access_rights(
uint8_t * apdu,
BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
const BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
BACNET_STACK_EXPORT
int bacapp_encode_context_assigned_access_rights(
uint8_t * apdu,
uint8_t tag,
BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
const BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
BACNET_STACK_EXPORT
int bacapp_decode_assigned_access_rights(
uint8_t * apdu,
const uint8_t * apdu,
BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
BACNET_STACK_EXPORT
int bacapp_decode_context_assigned_access_rights(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag,
BACNET_ASSIGNED_ACCESS_RIGHTS * aar);
src/bacnet/authentication_factor.c
+4 -4
View File
@@ -16,7 +16,7 @@
* @return number of bytes encoded, or zero if unable to encode
*/
int bacapp_encode_authentication_factor(
uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR *af)
uint8_t *apdu, const BACNET_AUTHENTICATION_FACTOR *af)
{
int len;
int apdu_len = 0;
@@ -56,7 +56,7 @@ int bacapp_encode_authentication_factor(
* @return number of bytes encoded, or zero if unable to encode
*/
int bacapp_encode_context_authentication_factor(
uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR *af)
uint8_t *apdu, uint8_t tag, const BACNET_AUTHENTICATION_FACTOR *af)
{
int len;
int apdu_len = 0;
@@ -84,7 +84,7 @@ int bacapp_encode_context_authentication_factor(
* @return Bytes decoded or BACNET_STATUS_REJECT on error.
*/
int bacapp_decode_authentication_factor(
uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR *af)
const uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR *af)
{
int len;
int apdu_len = 0;
@@ -140,7 +140,7 @@ int bacapp_decode_authentication_factor(
* @return Bytes decoded or BACNET_STATUS_REJECT on error.
*/
int bacapp_decode_context_authentication_factor(
uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR *af)
const uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR *af)
{
int len = 0;
int section_length;
src/bacnet/authentication_factor.h
+4 -4
View File
@@ -28,19 +28,19 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_encode_authentication_factor(
uint8_t * apdu,
BACNET_AUTHENTICATION_FACTOR * af);
const BACNET_AUTHENTICATION_FACTOR * af);
BACNET_STACK_EXPORT
int bacapp_encode_context_authentication_factor(
uint8_t * apdu,
uint8_t tag,
BACNET_AUTHENTICATION_FACTOR * af);
const BACNET_AUTHENTICATION_FACTOR * af);
BACNET_STACK_EXPORT
int bacapp_decode_authentication_factor(
uint8_t * apdu,
const uint8_t * apdu,
BACNET_AUTHENTICATION_FACTOR * af);
BACNET_STACK_EXPORT
int bacapp_decode_context_authentication_factor(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag,
BACNET_AUTHENTICATION_FACTOR * af);
src/bacnet/authentication_factor_format.c
+4 -4
View File
@@ -10,7 +10,7 @@
#include "bacnet/authentication_factor_format.h"
int bacapp_encode_authentication_factor_format(
uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
uint8_t *apdu, const BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
{
int len;
int apdu_len = 0;
@@ -41,7 +41,7 @@ int bacapp_encode_authentication_factor_format(
}
int bacapp_encode_context_authentication_factor_format(
uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
uint8_t *apdu, uint8_t tag, const BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
{
int len;
int apdu_len = 0;
@@ -59,7 +59,7 @@ int bacapp_encode_context_authentication_factor_format(
}
int bacapp_decode_authentication_factor_format(
uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
const uint8_t *apdu, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
{
int len;
int apdu_len = 0;
@@ -113,7 +113,7 @@ int bacapp_decode_authentication_factor_format(
}
int bacapp_decode_context_authentication_factor_format(
uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
const uint8_t *apdu, uint8_t tag, BACNET_AUTHENTICATION_FACTOR_FORMAT *aff)
{
int len = 0;
int section_length;
src/bacnet/authentication_factor_format.h
+4 -4
View File
@@ -25,19 +25,19 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_encode_authentication_factor_format(
uint8_t * apdu,
BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
const BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
BACNET_STACK_EXPORT
int bacapp_encode_context_authentication_factor_format(
uint8_t * apdu,
uint8_t tag_number,
BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
const BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
BACNET_STACK_EXPORT
int bacapp_decode_authentication_factor_format(
uint8_t * apdu,
const uint8_t * apdu,
BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
BACNET_STACK_EXPORT
int bacapp_decode_context_authentication_factor_format(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag_number,
BACNET_AUTHENTICATION_FACTOR_FORMAT * aff);
src/bacnet/awf.c
+9 -9
View File
@@ -34,7 +34,7 @@
* @param data Pointer to the service data used for encoding values
* @return number of bytes encoded
*/
int awf_service_encode_apdu(uint8_t *apdu, BACNET_ATOMIC_WRITE_FILE_DATA *data)
int awf_service_encode_apdu(uint8_t *apdu, const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -110,7 +110,7 @@ int awf_service_encode_apdu(uint8_t *apdu, BACNET_ATOMIC_WRITE_FILE_DATA *data)
* @return number of bytes encoded, or zero if unable to encode or too large
*/
int atomicwritefile_service_request_encode(
uint8_t *apdu, size_t apdu_size, BACNET_ATOMIC_WRITE_FILE_DATA *data)
uint8_t *apdu, size_t apdu_size, const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
size_t apdu_len = 0; /* total length of the apdu, return value */
@@ -132,7 +132,7 @@ int atomicwritefile_service_request_encode(
* @return number of bytes encoded
*/
int awf_encode_apdu(
uint8_t *apdu, uint8_t invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA *data)
uint8_t *apdu, uint8_t invoke_id, const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -180,7 +180,7 @@ int awf_encode_apdu(
* @return number of bytes decoded or BACNET_STATUS_ERROR on error.
*/
int awf_decode_service_request(
uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_WRITE_FILE_DATA *data)
const uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
/* return value */
int apdu_len = 0;
@@ -299,7 +299,7 @@ int awf_decode_service_request(
* or NULL for length
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
int awf_decode_apdu(uint8_t *apdu,
int awf_decode_apdu(const uint8_t *apdu,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA *data)
@@ -346,7 +346,7 @@ int awf_decode_apdu(uint8_t *apdu,
* @return number of bytes encoded
*/
int awf_ack_service_encode_apdu(
uint8_t *apdu, BACNET_ATOMIC_WRITE_FILE_DATA *data)
uint8_t *apdu, const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -374,7 +374,7 @@ int awf_ack_service_encode_apdu(
* @return number of bytes encoded
*/
int awf_ack_encode_apdu(
uint8_t *apdu, uint8_t invoke_id, BACNET_ATOMIC_WRITE_FILE_DATA *data)
uint8_t *apdu, uint8_t invoke_id, const BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len = 0;
@@ -410,7 +410,7 @@ int awf_ack_encode_apdu(
* @return number of bytes encoded or BACNET_STATUS_ERROR on error.
*/
int awf_ack_decode_service_request(
uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_WRITE_FILE_DATA *data)
const uint8_t *apdu, unsigned apdu_size, BACNET_ATOMIC_WRITE_FILE_DATA *data)
{
int len = 0, apdu_len = 0;
int32_t signed_integer;
@@ -463,7 +463,7 @@ int awf_ack_decode_service_request(
* or NULL for length
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
int awf_ack_decode_apdu(uint8_t *apdu,
int awf_ack_decode_apdu(const uint8_t *apdu,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA *data)
src/bacnet/awf.h
+9 -9
View File
@@ -42,27 +42,27 @@ extern "C" {
BACNET_STACK_EXPORT
int awf_service_encode_apdu(
uint8_t *apdu,
BACNET_ATOMIC_WRITE_FILE_DATA *data);
const BACNET_ATOMIC_WRITE_FILE_DATA *data);
BACNET_STACK_EXPORT
int atomicwritefile_service_request_encode(
uint8_t *apdu,
size_t apdu_size,
BACNET_ATOMIC_WRITE_FILE_DATA *data);
const BACNET_ATOMIC_WRITE_FILE_DATA *data);
BACNET_STACK_EXPORT
int awf_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
const BACNET_ATOMIC_WRITE_FILE_DATA * data);
BACNET_STACK_EXPORT
int awf_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
BACNET_STACK_EXPORT
int awf_decode_apdu(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
uint8_t * invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
@@ -70,21 +70,21 @@ extern "C" {
BACNET_STACK_EXPORT
int awf_ack_service_encode_apdu(
uint8_t *apdu,
BACNET_ATOMIC_WRITE_FILE_DATA *data);
const BACNET_ATOMIC_WRITE_FILE_DATA *data);
BACNET_STACK_EXPORT
int awf_ack_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
const BACNET_ATOMIC_WRITE_FILE_DATA * data);
BACNET_STACK_EXPORT
int awf_ack_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
BACNET_STACK_EXPORT
int awf_ack_decode_apdu(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
uint8_t * invoke_id,
BACNET_ATOMIC_WRITE_FILE_DATA * data);
src/bacnet/bacaction.c
+7 -6
View File
@@ -22,7 +22,7 @@
* @return number of bytes encoded
*/
int bacnet_action_property_value_encode(
uint8_t *apdu, BACNET_ACTION_PROPERTY_VALUE *value)
uint8_t *apdu, const BACNET_ACTION_PROPERTY_VALUE *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -85,7 +85,7 @@ int bacnet_action_property_value_encode(
* @return number of bytes encoded
*/
int bacnet_action_property_value_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_ACTION_PROPERTY_VALUE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_ACTION_PROPERTY_VALUE *value)
{
int len = 0;
int apdu_len = 0;
@@ -159,7 +159,8 @@ int bacnet_action_property_value_decode(
* @return true if the two structures are the same
*/
bool bacnet_action_property_value_same(
BACNET_ACTION_PROPERTY_VALUE *value1, BACNET_ACTION_PROPERTY_VALUE *value2)
const BACNET_ACTION_PROPERTY_VALUE *value1,
const BACNET_ACTION_PROPERTY_VALUE *value2)
{
bool status = false; /*return value */
@@ -255,7 +256,7 @@ bool bacnet_action_property_value_same(
* @param entry [in] The BACNET_ACTION_LIST structure to encode
* @return The length of the encoded data, or BACNET_STATUS_REJECT on error
*/
int bacnet_action_command_encode(uint8_t *apdu, BACNET_ACTION_LIST *entry)
int bacnet_action_command_encode(uint8_t *apdu, const BACNET_ACTION_LIST *entry)
{
int len = 0;
int apdu_len = 0;
@@ -349,7 +350,7 @@ int bacnet_action_command_encode(uint8_t *apdu, BACNET_ACTION_LIST *entry)
* @return The length of the decoded data, or BACNET_STATUS_ERROR on error
*/
int bacnet_action_command_decode(
uint8_t *apdu, size_t apdu_size, BACNET_ACTION_LIST *entry)
const uint8_t *apdu, size_t apdu_size, BACNET_ACTION_LIST *entry)
{
int len = 0;
int apdu_len = 0;
@@ -525,7 +526,7 @@ int bacnet_action_command_decode(
* @return True if the two structures are the same, else False
*/
bool bacnet_action_command_same(
BACNET_ACTION_LIST *entry1, BACNET_ACTION_LIST *entry2)
const BACNET_ACTION_LIST *entry1, const BACNET_ACTION_LIST *entry2)
{
if (!entry1 || !entry2) {
return false;
src/bacnet/bacaction.h
+10 -6
View File
@@ -83,24 +83,28 @@ extern "C" {
BACNET_STACK_EXPORT
int bacnet_action_property_value_encode(
uint8_t *apdu, BACNET_ACTION_PROPERTY_VALUE *value);
uint8_t *apdu, const BACNET_ACTION_PROPERTY_VALUE *value);
BACNET_STACK_EXPORT
int bacnet_action_property_value_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_ACTION_PROPERTY_VALUE *value);
const uint8_t *apdu,
uint32_t apdu_size,
BACNET_ACTION_PROPERTY_VALUE *value);
BACNET_STACK_EXPORT
bool bacnet_action_property_value_same(
BACNET_ACTION_PROPERTY_VALUE *value1, BACNET_ACTION_PROPERTY_VALUE *value2);
const BACNET_ACTION_PROPERTY_VALUE *value1,
const BACNET_ACTION_PROPERTY_VALUE *value2);
BACNET_STACK_EXPORT
int bacnet_action_command_encode(uint8_t *apdu, BACNET_ACTION_LIST *entry);
int bacnet_action_command_encode(
uint8_t *apdu, const BACNET_ACTION_LIST *entry);
BACNET_STACK_EXPORT
int bacnet_action_command_decode(
uint8_t *apdu, size_t apdu_size, BACNET_ACTION_LIST *entry);
const uint8_t *apdu, size_t apdu_size, BACNET_ACTION_LIST *entry);
BACNET_STACK_EXPORT
bool bacnet_action_command_same(
BACNET_ACTION_LIST *entry1, BACNET_ACTION_LIST *entry2);
const BACNET_ACTION_LIST *entry1, const BACNET_ACTION_LIST *entry2);
#ifdef __cplusplus
}
src/bacnet/bacaddr.c
+14 -12
View File
@@ -23,7 +23,7 @@
* @param dest - #BACNET_ADDRESS to be copied into
* @param src - #BACNET_ADDRESS to be copied from
*/
void bacnet_address_copy(BACNET_ADDRESS *dest, BACNET_ADDRESS *src)
void bacnet_address_copy(BACNET_ADDRESS *dest, const BACNET_ADDRESS *src)
{
int i = 0;
@@ -46,7 +46,7 @@ void bacnet_address_copy(BACNET_ADDRESS *dest, BACNET_ADDRESS *src)
* @param src - #BACNET_ADDRESS to be compared
* @return true if the same values
*/
bool bacnet_address_same(BACNET_ADDRESS *dest, BACNET_ADDRESS *src)
bool bacnet_address_same(const BACNET_ADDRESS *dest, const BACNET_ADDRESS *src)
{
uint8_t i = 0; /* loop counter */
@@ -96,9 +96,9 @@ bool bacnet_address_same(BACNET_ADDRESS *dest, BACNET_ADDRESS *src)
* @return true if configured
*/
bool bacnet_address_init(BACNET_ADDRESS *dest,
BACNET_MAC_ADDRESS *mac,
const BACNET_MAC_ADDRESS *mac,
uint16_t dnet,
BACNET_MAC_ADDRESS *adr)
const BACNET_MAC_ADDRESS *adr)
{
uint8_t i = 0; /* loop counter */
@@ -146,7 +146,8 @@ bool bacnet_address_init(BACNET_ADDRESS *dest,
* @param src - #BACNET_MAC_ADDRESS to be compared
* @return true if the same values
*/
bool bacnet_address_mac_same(BACNET_MAC_ADDRESS *dest, BACNET_MAC_ADDRESS *src)
bool bacnet_address_mac_same(
const BACNET_MAC_ADDRESS *dest, const BACNET_MAC_ADDRESS *src)
{
uint8_t i = 0; /* loop counter */
@@ -173,7 +174,8 @@ bool bacnet_address_mac_same(BACNET_MAC_ADDRESS *dest, BACNET_MAC_ADDRESS *src)
* @param adr [in] address to initialize, null if empty
* @param len [in] length of address in bytes
*/
void bacnet_address_mac_init(BACNET_MAC_ADDRESS *mac, uint8_t *adr, uint8_t len)
void bacnet_address_mac_init(
BACNET_MAC_ADDRESS *mac, const uint8_t *adr, uint8_t len)
{
uint8_t i = 0;
@@ -251,7 +253,7 @@ bool bacnet_address_mac_from_ascii(BACNET_MAC_ADDRESS *mac, const char *arg)
* @return the number of apdu bytes consumed, or #BACNET_STATUS_ERROR (-1)
*/
int bacnet_address_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_ADDRESS *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_ADDRESS *value)
{
int len = 0;
int apdu_len = 0;
@@ -304,7 +306,7 @@ int bacnet_address_decode(
* @param value - parameter to store the value after decoding
* @return length of the APDU buffer decoded, or BACNET_STATUS_ERROR
*/
int bacnet_address_context_decode(uint8_t *apdu,
int bacnet_address_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
BACNET_ADDRESS *value)
@@ -339,7 +341,7 @@ int bacnet_address_context_decode(uint8_t *apdu,
*
* @return number of apdu bytes created
*/
int encode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *destination)
int encode_bacnet_address(uint8_t *apdu, const BACNET_ADDRESS *destination)
{
int apdu_len = 0;
BACNET_OCTET_STRING mac_addr;
@@ -368,7 +370,7 @@ int encode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *destination)
* @return length of the APDU buffer decoded, or BACNET_STATUS_ERROR
* @deprecated use bacnet_address_decode() instead
*/
int decode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *value)
int decode_bacnet_address(const uint8_t *apdu, BACNET_ADDRESS *value)
{
return bacnet_address_decode(apdu, MAX_APDU, value);
}
@@ -380,7 +382,7 @@ int decode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *value)
* @return number of apdu bytes created
*/
int encode_context_bacnet_address(
uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *destination)
uint8_t *apdu, uint8_t tag_number, const BACNET_ADDRESS *destination)
{
int len = 0;
uint8_t *apdu_offset = NULL;
@@ -406,7 +408,7 @@ int encode_context_bacnet_address(
* @deprecated use bacnet_address_context_decode() instead
*/
int decode_context_bacnet_address(
uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *value)
const uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *value)
{
return bacnet_address_context_decode(apdu, MAX_APDU, tag_number, value);
}
src/bacnet/bacaddr.h
+14 -12
View File
@@ -19,45 +19,47 @@ extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
void bacnet_address_copy(BACNET_ADDRESS *dest, BACNET_ADDRESS *src);
void bacnet_address_copy(BACNET_ADDRESS *dest, const BACNET_ADDRESS *src);
BACNET_STACK_EXPORT
bool bacnet_address_same(BACNET_ADDRESS *dest, BACNET_ADDRESS *src);
bool bacnet_address_same(
const BACNET_ADDRESS *dest, const BACNET_ADDRESS *src);
BACNET_STACK_EXPORT
bool bacnet_address_init(BACNET_ADDRESS *dest,
BACNET_MAC_ADDRESS *mac,
const BACNET_MAC_ADDRESS *mac,
uint16_t dnet,
BACNET_MAC_ADDRESS *adr);
const BACNET_MAC_ADDRESS *adr);
BACNET_STACK_EXPORT
bool bacnet_address_mac_same(BACNET_MAC_ADDRESS *dest, BACNET_MAC_ADDRESS *src);
bool bacnet_address_mac_same(
const BACNET_MAC_ADDRESS *dest, const BACNET_MAC_ADDRESS *src);
BACNET_STACK_EXPORT
void bacnet_address_mac_init(
BACNET_MAC_ADDRESS *mac, uint8_t *adr, uint8_t len);
BACNET_MAC_ADDRESS *mac, const uint8_t *adr, uint8_t len);
BACNET_STACK_EXPORT
bool bacnet_address_mac_from_ascii(BACNET_MAC_ADDRESS *mac, const char *arg);
BACNET_STACK_EXPORT
int bacnet_address_decode(
uint8_t *apdu, uint32_t adpu_size, BACNET_ADDRESS *value);
const uint8_t *apdu, uint32_t adpu_size, BACNET_ADDRESS *value);
BACNET_STACK_EXPORT
int bacnet_address_context_decode(uint8_t *apdu,
int bacnet_address_context_decode(const uint8_t *apdu,
uint32_t adpu_size,
uint8_t tag_number,
BACNET_ADDRESS *value);
BACNET_STACK_EXPORT
int encode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *destination);
int encode_bacnet_address(uint8_t *apdu, const BACNET_ADDRESS *destination);
BACNET_STACK_EXPORT
int encode_context_bacnet_address(
uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *destination);
uint8_t *apdu, uint8_t tag_number, const BACNET_ADDRESS *destination);
BACNET_STACK_DEPRECATED("Use bacnet_address_decode() instead")
BACNET_STACK_EXPORT
int decode_bacnet_address(uint8_t *apdu, BACNET_ADDRESS *destination);
int decode_bacnet_address(const uint8_t *apdu, BACNET_ADDRESS *destination);
BACNET_STACK_DEPRECATED("Use bacnet_address_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_bacnet_address(
uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *destination);
const uint8_t *apdu, uint8_t tag_number, BACNET_ADDRESS *destination);
#ifdef __cplusplus
}
src/bacnet/bacapp.c
+72 -64
View File
@@ -47,7 +47,7 @@
* @param value - value to encode
* @return number of bytes encoded
*/
static int bacnet_scale_encode(uint8_t *apdu, BACNET_SCALE *value)
static int bacnet_scale_encode(uint8_t *apdu, const BACNET_SCALE *value)
{
int apdu_len = 0;
@@ -79,7 +79,7 @@ static int bacnet_scale_encode(uint8_t *apdu, BACNET_SCALE *value)
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
static int
bacnet_scale_decode(uint8_t *apdu, size_t apdu_size, BACNET_SCALE *value)
bacnet_scale_decode(const uint8_t *apdu, size_t apdu_size, BACNET_SCALE *value)
{
int apdu_len = 0;
BACNET_TAG tag = { 0 };
@@ -119,7 +119,7 @@ bacnet_scale_decode(uint8_t *apdu, size_t apdu_size, BACNET_SCALE *value)
#endif
#if defined(BACAPP_SCALE)
static bool bacnet_scale_same(BACNET_SCALE *value1, BACNET_SCALE *value2)
static bool bacnet_scale_same(const BACNET_SCALE *value1, const BACNET_SCALE *value2)
{
bool status = false;
@@ -158,7 +158,7 @@ static bool bacnet_scale_same(BACNET_SCALE *value1, BACNET_SCALE *value2)
* @param value - value to encode
* @return number of bytes 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;
@@ -202,7 +202,7 @@ static int bacnet_shed_level_encode(uint8_t *apdu, BACNET_SHED_LEVEL *value)
* @return number of bytes decoded, or BACNET_STATUS_ERROR on error
*/
static int
bacnet_shed_level_decode(uint8_t *apdu, size_t apdu_size, BACNET_SHED_LEVEL *value)
bacnet_shed_level_decode(const uint8_t *apdu, size_t apdu_size, BACNET_SHED_LEVEL *value)
{
int apdu_len = 0;
BACNET_TAG tag = { 0 };
@@ -254,7 +254,7 @@ bacnet_shed_level_decode(uint8_t *apdu, size_t apdu_size, BACNET_SHED_LEVEL *val
#if defined(BACAPP_SHED_LEVEL)
static bool
bacnet_shed_level_same(BACNET_SHED_LEVEL *value1, BACNET_SHED_LEVEL *value2)
bacnet_shed_level_same(const BACNET_SHED_LEVEL *value1, const BACNET_SHED_LEVEL *value2)
{
bool status = false;
@@ -297,7 +297,7 @@ bacnet_shed_level_same(BACNET_SHED_LEVEL *value1, BACNET_SHED_LEVEL *value2)
* @return number of bytes encoded
*/
int bacapp_encode_application_data(
uint8_t *apdu, BACNET_APPLICATION_DATA_VALUE *value)
uint8_t *apdu, const BACNET_APPLICATION_DATA_VALUE *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -527,7 +527,7 @@ int bacapp_encode_application_data(
* in the decoding, or BACNET_STATUS_ERROR/ABORT/REJECT if malformed.
*/
int bacapp_data_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_data_type,
uint32_t len_value_type,
@@ -645,7 +645,7 @@ int bacapp_data_decode(
* @deprecated Use bacapp_data_decode() instead.
*/
int bacapp_decode_data(
uint8_t *apdu,
const uint8_t *apdu,
uint8_t tag_data_type,
uint32_t len_value_type,
BACNET_APPLICATION_DATA_VALUE *value)
@@ -665,7 +665,7 @@ int bacapp_decode_data(
* BACNET_STATUS_ERROR
*/
int bacapp_decode_application_data(
uint8_t *apdu, uint32_t apdu_size, BACNET_APPLICATION_DATA_VALUE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_APPLICATION_DATA_VALUE *value)
{
int len = 0;
int apdu_len = 0;
@@ -711,12 +711,12 @@ int bacapp_decode_application_data(
*/
bool bacapp_decode_application_data_safe(
uint8_t *new_apdu,
const uint8_t *new_apdu,
uint32_t new_apdu_len,
BACNET_APPLICATION_DATA_VALUE *value)
{
/* The static variables that store the apdu buffer between function calls */
static uint8_t *apdu = NULL;
static const uint8_t *apdu = NULL;
static uint32_t apdu_len_remaining = 0;
static uint32_t apdu_len = 0;
int len = 0;
@@ -770,7 +770,7 @@ bool bacapp_decode_application_data_safe(
* @deprecated Use bacnet_application_data_length() instead.
*/
int bacapp_decode_data_len(
uint8_t *apdu, uint8_t tag_number, uint32_t len_value_type)
const uint8_t *apdu, uint8_t tag_number, uint32_t len_value_type)
{
(void)apdu;
return bacnet_application_data_length(tag_number, len_value_type);
@@ -783,7 +783,7 @@ int bacapp_decode_data_len(
* @return number of bytes decoded, or zero if errors occur
* @deprecated Use bacnet_enclosed_data_length() instead.
*/
int bacapp_decode_application_data_len(uint8_t *apdu, unsigned apdu_size)
int bacapp_decode_application_data_len(const uint8_t *apdu, unsigned apdu_size)
{
int len = 0;
int tag_len = 0;
@@ -814,7 +814,7 @@ int bacapp_decode_application_data_len(uint8_t *apdu, unsigned apdu_size)
int bacapp_encode_context_data_value(
uint8_t *apdu,
uint8_t context_tag_number,
BACNET_APPLICATION_DATA_VALUE *value)
const BACNET_APPLICATION_DATA_VALUE *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
int len;
@@ -993,7 +993,7 @@ int bacapp_encode_context_data(
* @deprecated Use bacapp_decode_known_property() instead.
*/
int bacapp_decode_context_data(
uint8_t *apdu,
const uint8_t *apdu,
unsigned apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_PROPERTY_ID property)
@@ -1016,7 +1016,7 @@ int bacapp_decode_context_data(
* @deprecated Use bacapp_decode_known_property() instead.
*/
int bacapp_decode_generic_property(
uint8_t *apdu,
const uint8_t *apdu,
int apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_PROPERTY_ID prop)
@@ -1063,7 +1063,7 @@ int bacapp_decode_generic_property(
* @return number of bytes decoded, or #BACNET_STATUS_ERROR
*/
static int decode_priority_array_value(
uint8_t *apdu,
const uint8_t *apdu,
unsigned apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_OBJECT_TYPE object_type)
@@ -1308,7 +1308,7 @@ int bacapp_known_property_tag(
* @return number of bytes decoded (0..N), or #BACNET_STATUS_ERROR
*/
int bacapp_decode_application_tag_value(
uint8_t *apdu,
const uint8_t *apdu,
size_t apdu_size,
BACNET_APPLICATION_TAG tag,
BACNET_APPLICATION_DATA_VALUE *value)
@@ -1607,7 +1607,7 @@ int bacapp_decode_application_tag_value(
* @note number of bytes can be 0 for empty lists, etc.
*/
int bacapp_decode_known_property(
uint8_t *apdu,
const uint8_t *apdu,
int apdu_size,
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_OBJECT_TYPE object_type,
@@ -1653,7 +1653,7 @@ int bacapp_decode_known_property(
* @deprecated use bacnet_enclosed_data_length() instead
*/
int bacapp_decode_context_data_len(
uint8_t *apdu, unsigned apdu_len_max, BACNET_PROPERTY_ID property)
const uint8_t *apdu, unsigned apdu_len_max, BACNET_PROPERTY_ID property)
{
int apdu_len = 0, len = 0;
BACNET_TAG tag = { 0 };
@@ -1675,7 +1675,7 @@ int bacapp_decode_context_data_len(
* @param value Pointer to the application value structure
* @return Length of the encoded data in bytes
*/
int bacapp_encode_data(uint8_t *apdu, BACNET_APPLICATION_DATA_VALUE *value)
int bacapp_encode_data(uint8_t *apdu, const BACNET_APPLICATION_DATA_VALUE *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -1831,7 +1831,7 @@ bool bacapp_copy(
* @deprecated Use bacnet_enclosed_data_length() instead.
*/
int bacapp_data_len(
uint8_t *apdu, unsigned apdu_size, BACNET_PROPERTY_ID property)
const uint8_t *apdu, unsigned apdu_size, BACNET_PROPERTY_ID property)
{
(void)property;
return bacnet_enclosed_data_length(apdu, apdu_size);
@@ -1894,7 +1894,7 @@ int bacapp_snprintf_shift(int len, char **buf, size_t *buf_size)
* @return number of characters written to the string
*/
static int bacapp_snprintf_shed_level(
char *str, size_t str_len, BACNET_SHED_LEVEL *value)
char *str, size_t str_len, const BACNET_SHED_LEVEL *value)
{
int length = 0;
@@ -2149,7 +2149,8 @@ static int bacapp_snprintf_enumerated(
* The omission of day of week implies that the day is unspecified:
* (24-January-1998);
*/
static int bacapp_snprintf_date(char *str, size_t str_len, BACNET_DATE *bdate)
static int bacapp_snprintf_date(
char *str, size_t str_len, const BACNET_DATE *bdate)
{
int ret_val = 0;
int slen = 0;
@@ -2188,7 +2189,8 @@ static int bacapp_snprintf_date(char *str, size_t str_len, BACNET_DATE *bdate)
* in the format hh:mm:ss.xx: 2:05:44.00, 16:54:59.99.
* Any "wild card" field is shown by an asterisk (X'2A'): 16:54:*.*;
*/
static int bacapp_snprintf_time(char *str, size_t str_len, BACNET_TIME *btime)
static int bacapp_snprintf_time(
char *str, size_t str_len, const BACNET_TIME *btime)
{
int ret_val = 0;
int slen = 0;
@@ -2232,7 +2234,7 @@ static int bacapp_snprintf_time(char *str, size_t str_len, BACNET_TIME *btime)
* @return number of characters written
*/
static int bacapp_snprintf_object_id(
char *str, size_t str_len, BACNET_OBJECT_ID *object_id)
char *str, size_t str_len, const BACNET_OBJECT_ID *object_id)
{
int ret_val = 0;
int slen = 0;
@@ -2266,8 +2268,8 @@ static int bacapp_snprintf_object_id(
* @param value - value to print
* @return number of characters written
*/
static int
bacapp_snprintf_datetime(char *str, size_t str_len, BACNET_DATE_TIME *value)
static int bacapp_snprintf_datetime(
char *str, size_t str_len, const BACNET_DATE_TIME *value)
{
int ret_val = 0;
int slen = 0;
@@ -2294,8 +2296,8 @@ bacapp_snprintf_datetime(char *str, size_t str_len, BACNET_DATE_TIME *value)
* @param value - value to print
* @return number of characters written
*/
static int
bacapp_snprintf_daterange(char *str, size_t str_len, BACNET_DATE_RANGE *value)
static int bacapp_snprintf_daterange(
char *str, size_t str_len, const BACNET_DATE_RANGE *value)
{
int ret_val = 0;
int slen = 0;
@@ -2328,8 +2330,8 @@ bacapp_snprintf_daterange(char *str, size_t str_len, BACNET_DATE_RANGE *value)
* The omission of day of week implies that the day is unspecified:
* (24-January-1998);
*/
static int
bacapp_snprintf_weeknday(char *str, size_t str_len, BACNET_WEEKNDAY *value)
static int bacapp_snprintf_weeknday(
char *str, size_t str_len, const BACNET_WEEKNDAY *value)
{
int ret_val = 0;
int slen = 0;
@@ -2381,7 +2383,9 @@ bacapp_snprintf_weeknday(char *str, size_t str_len, BACNET_WEEKNDAY *value)
* @return number of characters written
*/
static int bacapp_snprintf_device_object_property_reference(
char *str, size_t str_len, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
char *str,
size_t str_len,
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
int slen;
int ret_val = 0;
@@ -2427,7 +2431,7 @@ static int bacapp_snprintf_device_object_property_reference(
* @return number of characters written
*/
static int bacapp_snprintf_device_object_reference(
char *str, size_t str_len, BACNET_DEVICE_OBJECT_REFERENCE *value)
char *str, size_t str_len, const BACNET_DEVICE_OBJECT_REFERENCE *value)
{
int slen;
int ret_val = 0;
@@ -2460,7 +2464,7 @@ static int bacapp_snprintf_device_object_reference(
* @return number of characters written
*/
static int bacapp_snprintf_object_property_reference(
char *str, size_t str_len, BACNET_OBJECT_PROPERTY_REFERENCE *value)
char *str, size_t str_len, const BACNET_OBJECT_PROPERTY_REFERENCE *value)
{
int slen;
int ret_val = 0;
@@ -2504,7 +2508,7 @@ static int bacapp_snprintf_object_property_reference(
static int bacapp_snprintf_weeklyschedule(
char *str,
size_t str_len,
BACNET_WEEKLY_SCHEDULE *ws,
const BACNET_WEEKLY_SCHEDULE *ws,
BACNET_ARRAY_INDEX arrayIndex)
{
int slen;
@@ -2520,7 +2524,7 @@ static int bacapp_snprintf_weeklyschedule(
/* Find what inner type it uses */
int inner_tag = -1;
for (wi = 0; wi < loopend; wi++) {
BACNET_DAILY_SCHEDULE *ds = &ws->weeklySchedule[wi];
const BACNET_DAILY_SCHEDULE *ds = &ws->weeklySchedule[wi];
for (ti = 0; ti < ds->TV_Count; ti++) {
int tag = ds->Time_Values[ti].Value.tag;
if (inner_tag == -1) {
@@ -2541,7 +2545,7 @@ static int bacapp_snprintf_weeklyschedule(
}
ret_val += bacapp_snprintf_shift(slen, &str, &str_len);
for (wi = 0; wi < loopend; wi++) {
BACNET_DAILY_SCHEDULE *ds = &ws->weeklySchedule[wi];
const BACNET_DAILY_SCHEDULE *ds = &ws->weeklySchedule[wi];
if (arrayIndex == BACNET_ARRAY_ALL) {
slen = bacapp_snprintf(str, str_len, "%s: [", weekdaynames[wi]);
} else {
@@ -2563,6 +2567,7 @@ static int bacapp_snprintf_weeklyschedule(
dummyPropValue.value = &dummyDataValue;
dummyPropValue.object_property = PROP_PRESENT_VALUE;
dummyPropValue.object_type = OBJECT_SCHEDULE;
dummyPropValue.array_index = 0;
slen = bacapp_snprintf_value(str, str_len, &dummyPropValue);
ret_val += bacapp_snprintf_shift(slen, &str, &str_len);
if (ti < ds->TV_Count - 1) {
@@ -2590,31 +2595,32 @@ static int bacapp_snprintf_weeklyschedule(
* @return number of characters written
*/
static int bacapp_snprintf_host_n_port(
char *str, size_t str_len, BACNET_HOST_N_PORT *value)
char *str, size_t str_len, const BACNET_HOST_N_PORT *value)
{
int slen, len, i;
char *char_str;
const char *char_str;
int ret_val = 0;
slen = bacapp_snprintf(str, str_len, "{");
ret_val += bacapp_snprintf_shift(slen, &str, &str_len);
if (value->host_ip_address) {
uint8_t *octet_str;
octet_str = octetstring_value(&value->host.ip_address);
const uint8_t *octet_str;
octet_str = octetstring_value(
(BACNET_OCTET_STRING *)&value->host.ip_address);
slen = bacapp_snprintf(
str, str_len, "%u.%u.%u.%u:%u", (unsigned)octet_str[0],
(unsigned)octet_str[1], (unsigned)octet_str[2],
(unsigned)octet_str[3], (unsigned)value->port);
ret_val += slen;
} else if (value->host_name) {
BACNET_CHARACTER_STRING *name;
const BACNET_CHARACTER_STRING *name;
name = &value->host.name;
len = characterstring_length(name);
char_str = characterstring_value(name);
slen = bacapp_snprintf(str, str_len, "\"");
ret_val += bacapp_snprintf_shift(slen, &str, &str_len);
for (i = 0; i < len; i++) {
if (isprint(*((unsigned char *)char_str))) {
if (isprint(*((const unsigned char *)char_str))) {
slen = bacapp_snprintf(str, str_len, "%c", *char_str);
} else {
slen = bacapp_snprintf(str, str_len, "%c", '.');
@@ -2641,7 +2647,7 @@ static int bacapp_snprintf_host_n_port(
* @return number of characters written
*/
static int bacapp_snprintf_calendar_entry(
char *str, size_t str_len, BACNET_CALENDAR_ENTRY *value)
char *str, size_t str_len, const BACNET_CALENDAR_ENTRY *value)
{
int slen;
int ret_val = 0;
@@ -2683,7 +2689,7 @@ static int bacapp_snprintf_calendar_entry(
* @return number of characters written
*/
static int bacapp_snprintf_primitive_data_value(
char *str, size_t str_len, BACNET_PRIMITIVE_DATA_VALUE *value)
char *str, size_t str_len, const BACNET_PRIMITIVE_DATA_VALUE *value)
{
int ret_val = 0;
@@ -2747,7 +2753,7 @@ static int bacapp_snprintf_primitive_data_value(
* @return number of characters written
*/
static int bacapp_snprintf_daily_schedule(
char *str, size_t str_len, BACNET_DAILY_SCHEDULE *value)
char *str, size_t str_len, const BACNET_DAILY_SCHEDULE *value)
{
int slen;
int ret_val = 0;
@@ -2785,7 +2791,7 @@ static int bacapp_snprintf_daily_schedule(
* @return number of characters written
*/
static int bacapp_snprintf_special_event(
char *str, size_t str_len, BACNET_SPECIAL_EVENT *value)
char *str, size_t str_len, const BACNET_SPECIAL_EVENT *value)
{
int slen;
int ret_val = 0;
@@ -2825,7 +2831,7 @@ static int bacapp_snprintf_special_event(
* @return number of characters written
*/
static int bacapp_snprintf_action_property_value(
char *str, size_t str_len, BACNET_ACTION_PROPERTY_VALUE *value)
char *str, size_t str_len, const BACNET_ACTION_PROPERTY_VALUE *value)
{
int ret_val = 0;
@@ -2889,7 +2895,7 @@ static int bacapp_snprintf_action_property_value(
* @return number of characters written
*/
static int bacapp_snprintf_action_command(
char *str, size_t str_len, BACNET_ACTION_LIST *value)
char *str, size_t str_len, const BACNET_ACTION_LIST *value)
{
int slen;
int ret_val = 0;
@@ -2960,11 +2966,11 @@ static int bacapp_snprintf_action_command(
* to the output string.
*/
int bacapp_snprintf_value(
char *str, size_t str_len, BACNET_OBJECT_PROPERTY_VALUE *object_value)
char *str, size_t str_len, const BACNET_OBJECT_PROPERTY_VALUE *object_value)
{
size_t len = 0, i = 0;
char *char_str;
BACNET_APPLICATION_DATA_VALUE *value;
const char *char_str;
const BACNET_APPLICATION_DATA_VALUE *value;
BACNET_PROPERTY_ID property = PROP_ALL;
BACNET_OBJECT_TYPE object_type = MAX_BACNET_OBJECT_TYPE;
int ret_val = 0;
@@ -3019,8 +3025,9 @@ int bacapp_snprintf_value(
case BACNET_APPLICATION_TAG_OCTET_STRING:
len = octetstring_length(&value->type.Octet_String);
if (len > 0) {
uint8_t *octet_str;
octet_str = octetstring_value(&value->type.Octet_String);
const uint8_t *octet_str;
octet_str = octetstring_value(
(BACNET_OCTET_STRING *)&value->type.Octet_String);
for (i = 0; i < len; i++) {
slen =
bacapp_snprintf(str, str_len, "%02X", *octet_str);
@@ -3067,7 +3074,7 @@ int bacapp_snprintf_value(
#endif
{
for (i = 0; i < len; i++) {
if (isprint(*((unsigned char *)char_str))) {
if (isprint(*((const unsigned char *)char_str))) {
slen =
bacapp_snprintf(str, str_len, "%c", *char_str);
} else {
@@ -3291,7 +3298,7 @@ int bacapp_snprintf_value(
* @return true if the value was sent to the stream
*/
bool bacapp_print_value(
FILE *stream, BACNET_OBJECT_PROPERTY_VALUE *object_value)
FILE *stream, const BACNET_OBJECT_PROPERTY_VALUE *object_value)
{
bool retval = false;
int str_len = 0;
@@ -3326,7 +3333,7 @@ bool bacapp_print_value(
}
#else
bool bacapp_print_value(
FILE *stream, BACNET_OBJECT_PROPERTY_VALUE *object_value)
FILE *stream, const BACNET_OBJECT_PROPERTY_VALUE *object_value)
{
(void)stream;
(void)object_value;
@@ -3999,11 +4006,12 @@ void bacapp_property_value_list_link(
*
* @return Bytes encoded or zero on error.
*/
int bacapp_property_value_encode(uint8_t *apdu, BACNET_PROPERTY_VALUE *value)
int bacapp_property_value_encode(
uint8_t *apdu, const BACNET_PROPERTY_VALUE *value)
{
int len = 0; /* length of each encoding */
int apdu_len = 0; /* total length of the apdu, return value */
BACNET_APPLICATION_DATA_VALUE *app_data = NULL;
const BACNET_APPLICATION_DATA_VALUE *app_data = NULL;
if (value) {
/* tag 0 - propertyIdentifier */
@@ -4072,7 +4080,7 @@ int bacapp_property_value_encode(uint8_t *apdu, BACNET_PROPERTY_VALUE *value)
* @return Bytes decoded or BACNET_STATUS_ERROR on error.
*/
int bacapp_property_value_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_PROPERTY_VALUE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_PROPERTY_VALUE *value)
{
int len = 0;
int apdu_len = 0;
@@ -4190,8 +4198,8 @@ int bacapp_property_value_decode(
/* generic - can be used by other unit tests
returns true if matching or same, false if different */
bool bacapp_same_value(
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_APPLICATION_DATA_VALUE *test_value)
const BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_APPLICATION_DATA_VALUE *test_value)
{
bool status = false; /*return value */
src/bacnet/bacapp.h
+21 -21
View File
@@ -225,17 +225,17 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_property_value_encode(
uint8_t *apdu,
BACNET_PROPERTY_VALUE *value);
const BACNET_PROPERTY_VALUE *value);
BACNET_STACK_EXPORT
int bacapp_property_value_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_size,
BACNET_PROPERTY_VALUE *value);
BACNET_STACK_EXPORT
int bacapp_encode_data(
uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value);
const BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_EXPORT
int bacapp_encode_known_property(
uint8_t *apdu,
@@ -244,7 +244,7 @@ extern "C" {
BACNET_PROPERTY_ID property);
BACNET_STACK_EXPORT
int bacapp_data_decode(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t apdu_size,
uint8_t tag_data_type,
uint32_t len_value_type,
@@ -252,31 +252,31 @@ extern "C" {
BACNET_STACK_DEPRECATED("Use bacapp_data_decode() instead")
BACNET_STACK_EXPORT
int bacapp_decode_data(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag_data_type,
uint32_t len_value_type,
BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_EXPORT
int bacapp_decode_application_data(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t apdu_size,
BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_EXPORT
bool bacapp_decode_application_data_safe(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t apdu_size,
BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_EXPORT
int bacapp_encode_application_data(
uint8_t * apdu,
BACNET_APPLICATION_DATA_VALUE * value);
const BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_EXPORT
int bacapp_decode_context_data(
uint8_t * apdu,
const uint8_t * apdu,
unsigned max_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID property);
@@ -292,7 +292,7 @@ extern "C" {
int bacapp_encode_context_data_value(
uint8_t * apdu,
uint8_t context_tag_number,
BACNET_APPLICATION_DATA_VALUE * value);
const BACNET_APPLICATION_DATA_VALUE * value);
BACNET_STACK_DEPRECATED("Use bacapp_known_property_tag() instead")
BACNET_STACK_EXPORT
@@ -302,19 +302,19 @@ extern "C" {
BACNET_STACK_DEPRECATED("Use bacapp_encode_known_property() instead")
BACNET_STACK_EXPORT
int bacapp_decode_generic_property(
uint8_t * apdu,
const uint8_t * apdu,
int max_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_PROPERTY_ID prop);
BACNET_STACK_EXPORT
int bacapp_decode_application_tag_value(
uint8_t *apdu,
const uint8_t *apdu,
size_t apdu_size,
BACNET_APPLICATION_TAG tag,
BACNET_APPLICATION_DATA_VALUE *value);
BACNET_STACK_EXPORT
int bacapp_decode_known_property(uint8_t *apdu,
int bacapp_decode_known_property(const uint8_t *apdu,
int max_apdu_len,
BACNET_APPLICATION_DATA_VALUE *value,
BACNET_OBJECT_TYPE object_type,
@@ -333,27 +333,27 @@ extern "C" {
BACNET_STACK_DEPRECATED("Use bacnet_enclosed_data_length() instead")
BACNET_STACK_EXPORT
int bacapp_data_len(
uint8_t * apdu,
const uint8_t * apdu,
unsigned max_apdu_len,
BACNET_PROPERTY_ID property);
BACNET_STACK_DEPRECATED("Use bacnet_application_data_length() instead")
BACNET_STACK_EXPORT
int bacapp_decode_data_len(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag_data_type,
uint32_t len_value_type);
BACNET_STACK_DEPRECATED("Use bacnet_enclosed_data_length() instead")
BACNET_STACK_EXPORT
int bacapp_decode_application_data_len(
uint8_t * apdu,
const uint8_t * apdu,
unsigned max_apdu_len);
BACNET_STACK_DEPRECATED("Use bacnet_enclosed_data_length() instead")
BACNET_STACK_EXPORT
int bacapp_decode_context_data_len(
uint8_t * apdu,
const uint8_t * apdu,
unsigned max_apdu_len,
BACNET_PROPERTY_ID property);
@@ -371,7 +371,7 @@ extern "C" {
int bacapp_snprintf_value(
char *str,
size_t str_len,
BACNET_OBJECT_PROPERTY_VALUE * object_value);
const BACNET_OBJECT_PROPERTY_VALUE * object_value);
BACNET_STACK_EXPORT
bool bacapp_parse_application_data(
@@ -382,12 +382,12 @@ extern "C" {
BACNET_STACK_EXPORT
bool bacapp_print_value(
FILE * stream,
BACNET_OBJECT_PROPERTY_VALUE * value);
const BACNET_OBJECT_PROPERTY_VALUE * value);
BACNET_STACK_EXPORT
bool bacapp_same_value(
BACNET_APPLICATION_DATA_VALUE * value,
BACNET_APPLICATION_DATA_VALUE * test_value);
const BACNET_APPLICATION_DATA_VALUE * value,
const BACNET_APPLICATION_DATA_VALUE * test_value);
#ifdef __cplusplus
}
src/bacnet/bacdcode.c
+112 -108
View File
@@ -370,7 +370,7 @@ int encode_closing_tag(uint8_t *apdu, uint8_t tag_number)
* @return Returns the number of apdu bytes consumed.
* @deprecated Use bacnet_tag_number_decode() instead
*/
int decode_tag_number(uint8_t *apdu, uint8_t *tag_number)
int decode_tag_number(const uint8_t *apdu, uint8_t *tag_number)
{
int len = 1; /* return value */
@@ -421,7 +421,7 @@ int decode_tag_number(uint8_t *apdu, uint8_t *tag_number)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_tag_number_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number)
const uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number)
{
int len = 0; /* return value */
@@ -459,7 +459,7 @@ int bacnet_tag_number_decode(
* @return returns the number of apdu bytes consumed,
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_tag_encode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag)
int bacnet_tag_encode(uint8_t *apdu, uint32_t apdu_size, const BACNET_TAG *tag)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -503,7 +503,7 @@ int bacnet_tag_encode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag)
*
* @return the number of apdu bytes consumed, or zero if malformed
*/
int bacnet_tag_decode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag)
int bacnet_tag_decode(const uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag)
{
int len = 0;
uint8_t tag_number = 0;
@@ -583,7 +583,7 @@ int bacnet_tag_decode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag)
* @return true/false
* @deprecated Use bacnet_is_opening_tag() instead
*/
bool decode_is_opening_tag(uint8_t *apdu)
bool decode_is_opening_tag(const uint8_t *apdu)
{
return (bool)((apdu[0] & 0x07) == 6);
}
@@ -596,7 +596,7 @@ bool decode_is_opening_tag(uint8_t *apdu)
*
* @return true if an opening tag has been found.
*/
bool bacnet_is_opening_tag(uint8_t *apdu, uint32_t apdu_size)
bool bacnet_is_opening_tag(const uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
@@ -616,7 +616,7 @@ bool bacnet_is_opening_tag(uint8_t *apdu, uint32_t apdu_size)
* @return true/false
* @deprecated Use bacnet_is_closing_tag() instead
*/
bool decode_is_closing_tag(uint8_t *apdu)
bool decode_is_closing_tag(const uint8_t *apdu)
{
return (bool)((apdu[0] & 0x07) == 7);
}
@@ -629,7 +629,7 @@ bool decode_is_closing_tag(uint8_t *apdu)
*
* @return true if a closing tag has been found.
*/
bool bacnet_is_closing_tag(uint8_t *apdu, uint32_t apdu_size)
bool bacnet_is_closing_tag(const uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
@@ -650,7 +650,7 @@ bool bacnet_is_closing_tag(uint8_t *apdu, uint32_t apdu_size)
*
* @return true if a context specific tag has been found.
*/
bool bacnet_is_context_specific(uint8_t *apdu, uint32_t apdu_size)
bool bacnet_is_context_specific(const uint8_t *apdu, uint32_t apdu_size)
{
bool tag = false;
@@ -678,7 +678,7 @@ bool bacnet_is_context_specific(uint8_t *apdu, uint32_t apdu_size)
* @deprecated Use bacnet_tag_decode() instead
*/
int decode_tag_number_and_value(
uint8_t *apdu, uint8_t *tag_number, uint32_t *value)
const uint8_t *apdu, uint8_t *tag_number, uint32_t *value)
{
int len = 1;
uint16_t value16;
@@ -738,7 +738,7 @@ int decode_tag_number_and_value(
* @deprecated use bacnet_tag_decode() instead
*/
int bacnet_tag_number_and_value_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number, uint32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number, uint32_t *value)
{
int len = 0;
BACNET_TAG tag = { 0 };
@@ -805,7 +805,7 @@ int bacnet_application_data_length(
* or BACNET_STATUS_ERROR.
*/
int bacnet_enclosed_data_length(
uint8_t *apdu, size_t apdu_size)
const uint8_t *apdu, size_t apdu_size)
{
int len = 0;
int total_len = 0;
@@ -898,7 +898,7 @@ int bacnet_enclosed_data_length(
* @return true on a match, false otherwise.
* @deprecated Use bacnet_is_context_tag_number() instead
*/
bool decode_is_context_tag(uint8_t *apdu, uint8_t tag_number)
bool decode_is_context_tag(const uint8_t *apdu, uint8_t tag_number)
{
uint8_t my_tag_number = 0;
@@ -921,7 +921,7 @@ bool decode_is_context_tag(uint8_t *apdu, uint8_t tag_number)
* @deprecated Use bacnet_is_context_tag_number() instead
*/
bool decode_is_context_tag_with_length(
uint8_t *apdu, uint8_t tag_number, int *tag_length)
const uint8_t *apdu, uint8_t tag_number, int *tag_length)
{
uint8_t my_tag_number = 0;
@@ -946,8 +946,8 @@ bool decode_is_context_tag_with_length(
* @return true on a match, false otherwise.
*/
bool bacnet_is_context_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length,
uint32_t *len_value_type)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number,
int *tag_length, uint32_t *len_value_type)
{
bool match = false;
int len;
@@ -980,7 +980,7 @@ bool bacnet_is_context_tag_number(
* @return true on a match, false otherwise.
* @deprecated Use bacnet_is_opening_tag_number() instead
*/
bool decode_is_opening_tag_number(uint8_t *apdu, uint8_t tag_number)
bool decode_is_opening_tag_number(const uint8_t *apdu, uint8_t tag_number)
{
uint8_t my_tag_number = 0;
@@ -1006,7 +1006,7 @@ bool decode_is_opening_tag_number(uint8_t *apdu, uint8_t tag_number)
* @return true if the tag number matches and is an opening tag.
*/
bool bacnet_is_opening_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length)
{
bool match = false;
int len;
@@ -1036,7 +1036,7 @@ bool bacnet_is_opening_tag_number(
* @return true on a match, false otherwise.
* @deprecated Use bacnet_is_closing_tag_number() instead
*/
bool decode_is_closing_tag_number(uint8_t *apdu, uint8_t tag_number)
bool decode_is_closing_tag_number(const uint8_t *apdu, uint8_t tag_number)
{
uint8_t my_tag_number = 0;
@@ -1060,7 +1060,7 @@ bool decode_is_closing_tag_number(uint8_t *apdu, uint8_t tag_number)
* @return true if the tag number matches is an closing tag.
*/
bool bacnet_is_closing_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length)
{
bool match = false;
int len;
@@ -1136,7 +1136,7 @@ int encode_context_boolean(
* @return true/false
* @deprecated Use bacnet_boolean_context_decode() instead
*/
bool decode_context_boolean(uint8_t *apdu)
bool decode_context_boolean(const uint8_t *apdu)
{
bool boolean_value = false;
@@ -1160,7 +1160,7 @@ bool decode_context_boolean(uint8_t *apdu)
* @deprecated Use bacnet_boolean_context_decode() instead
*/
int decode_context_boolean2(
uint8_t *apdu, uint8_t tag_number, bool *boolean_value)
const uint8_t *apdu, uint8_t tag_number, bool *boolean_value)
{
int len = 0;
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
@@ -1239,7 +1239,7 @@ int bacnet_boolean_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_boolean_application_decode(
uint8_t *apdu, uint32_t apdu_size, bool *boolean_value)
const uint8_t *apdu, uint32_t apdu_size, bool *boolean_value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -1284,7 +1284,7 @@ int bacnet_boolean_application_decode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_boolean_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, bool *boolean_value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, bool *boolean_value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -1392,7 +1392,7 @@ static uint8_t byte_reverse_bits(uint8_t in_byte)
* @deprecated Use bacnet_bitstring_decode() instead.
*/
int decode_bitstring(
uint8_t *apdu, uint32_t len_value, BACNET_BIT_STRING *bit_string)
const uint8_t *apdu, uint32_t len_value, BACNET_BIT_STRING *bit_string)
{
int len = 0; /* Return value */
uint8_t unused_bits;
@@ -1435,7 +1435,7 @@ int decode_bitstring(
*
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_bitstring_decode(uint8_t *apdu,
int bacnet_bitstring_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint32_t len_value,
BACNET_BIT_STRING *value)
@@ -1483,7 +1483,7 @@ int bacnet_bitstring_decode(uint8_t *apdu,
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_bitstring_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_BIT_STRING *value)
uint8_t *apdu, uint32_t apdu_size, const BACNET_BIT_STRING *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -1510,7 +1510,7 @@ int bacnet_bitstring_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_bitstring_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_BIT_STRING *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_BIT_STRING *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -1548,7 +1548,7 @@ int bacnet_bitstring_application_decode(
* @return number of bytes decoded, or zero if tag number mismatch, or
* #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_bitstring_context_decode(uint8_t *apdu,
int bacnet_bitstring_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_BIT_STRING *value)
@@ -1590,7 +1590,7 @@ int bacnet_bitstring_context_decode(uint8_t *apdu,
* @deprecated Use bacnet_bitstring_context_decode() instead.
*/
int decode_context_bitstring(
uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *bit_string)
const uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *bit_string)
{
uint32_t len_value;
int len = 0;
@@ -1616,7 +1616,7 @@ int decode_context_bitstring(
*
* @return the number of apdu bytes encoded
*/
int encode_bitstring(uint8_t *apdu, BACNET_BIT_STRING *bit_string)
int encode_bitstring(uint8_t *apdu, const BACNET_BIT_STRING *bit_string)
{
int len = 0;
uint8_t remaining_used_bits = 0;
@@ -1659,7 +1659,7 @@ int encode_bitstring(uint8_t *apdu, BACNET_BIT_STRING *bit_string)
*
* @return the number of apdu bytes encoded
*/
int encode_application_bitstring(uint8_t *apdu, BACNET_BIT_STRING *value)
int encode_application_bitstring(uint8_t *apdu, const BACNET_BIT_STRING *value)
{
int len = 0;
uint32_t bit_string_encoded_length = 1; /* 1 for the bits remaining octet */
@@ -1689,7 +1689,7 @@ int encode_application_bitstring(uint8_t *apdu, BACNET_BIT_STRING *value)
* @return the number of apdu bytes encoded
*/
int encode_context_bitstring(
uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *value)
uint8_t *apdu, uint8_t tag_number, const BACNET_BIT_STRING *value)
{
int len = 0;
uint32_t bit_string_encoded_length = 1; /* 1 for the bits remaining octet */
@@ -1717,7 +1717,7 @@ int encode_context_bitstring(
*
* @return the number of apdu bytes consumed
*/
int decode_object_id_safe(uint8_t *apdu,
int decode_object_id_safe(const uint8_t *apdu,
uint32_t len_value_type,
BACNET_OBJECT_TYPE *object_type,
uint32_t *instance)
@@ -1754,7 +1754,7 @@ int decode_object_id_safe(uint8_t *apdu,
* @return the number of apdu bytes consumed
*/
int decode_object_id(
uint8_t *apdu, BACNET_OBJECT_TYPE *object_type, uint32_t *instance)
const uint8_t *apdu, BACNET_OBJECT_TYPE *object_type, uint32_t *instance)
{
const uint32_t len_value = 4;
@@ -1772,7 +1772,7 @@ int decode_object_id(
*
* @return the number of apdu bytes consumed, or 0 if apdu is too small
*/
int bacnet_object_id_decode(uint8_t *apdu,
int bacnet_object_id_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint32_t len_value_type,
BACNET_OBJECT_TYPE *object_type,
@@ -1833,7 +1833,7 @@ int bacnet_object_id_application_encode(
* @return number of bytes decoded, zero if wrong tag number,
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_object_id_application_decode(uint8_t *apdu,
int bacnet_object_id_application_decode(const uint8_t *apdu,
uint32_t apdu_size,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance)
@@ -1875,7 +1875,7 @@ int bacnet_object_id_application_decode(uint8_t *apdu,
* @return number of bytes decoded, zero if wrong tag number,
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_object_id_context_decode(uint8_t *apdu,
int bacnet_object_id_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_OBJECT_TYPE *object_type,
@@ -1918,7 +1918,7 @@ int bacnet_object_id_context_decode(uint8_t *apdu,
* if wrong tag number or malformed
* @deprecated Use bacnet_object_id_context_decode() instead
*/
int decode_context_object_id(uint8_t *apdu,
int decode_context_object_id(const uint8_t *apdu,
uint8_t tag_number,
BACNET_OBJECT_TYPE *object_type,
uint32_t *instance)
@@ -2029,15 +2029,15 @@ int encode_application_object_id(
*
* @return returns the number of apdu bytes consumed
*/
int encode_octet_string(uint8_t *apdu, BACNET_OCTET_STRING *octet_string)
int encode_octet_string(uint8_t *apdu, const BACNET_OCTET_STRING *octet_string)
{
int len = 0; /* return value */
uint8_t *value;
const uint8_t *value;
int i = 0; /* loop counter */
if (octet_string) {
len = (int)octetstring_length(octet_string);
value = octetstring_value(octet_string);
value = octetstring_value((BACNET_OCTET_STRING *)octet_string);
if (value && apdu) {
for (i = 0; i < len; i++) {
apdu[i] = value[i];
@@ -2058,7 +2058,7 @@ int encode_octet_string(uint8_t *apdu, BACNET_OCTET_STRING *octet_string)
*
* @return returns the number of apdu bytes consumed
*/
int encode_application_octet_string(uint8_t *apdu, BACNET_OCTET_STRING *value)
int encode_application_octet_string(uint8_t *apdu, const BACNET_OCTET_STRING *value)
{
int len = 0;
@@ -2086,7 +2086,7 @@ int encode_application_octet_string(uint8_t *apdu, BACNET_OCTET_STRING *value)
* @return returns the number of apdu bytes consumed
*/
int encode_context_octet_string(
uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *value)
uint8_t *apdu, uint8_t tag_number, const BACNET_OCTET_STRING *value)
{
int len = 0;
@@ -2114,7 +2114,7 @@ int encode_context_octet_string(
*
* @return number of bytes decoded (0..N), or BACNET_STATUS_ERROR on error
*/
int bacnet_octet_string_decode(uint8_t *apdu,
int bacnet_octet_string_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint32_t len_value,
BACNET_OCTET_STRING *value)
@@ -2146,7 +2146,7 @@ int bacnet_octet_string_decode(uint8_t *apdu,
* @deprecated use bacnet_octet_string_decode() instead
*/
int decode_octet_string(
uint8_t *apdu, uint32_t len_value, BACNET_OCTET_STRING *value)
const uint8_t *apdu, uint32_t len_value, BACNET_OCTET_STRING *value)
{
const uint16_t apdu_len_max = MAX_APDU;
@@ -2167,7 +2167,7 @@ int decode_octet_string(
* @deprecated use bacnet_octet_string_context_decode() instead
*/
int decode_context_octet_string(
uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *octet_string)
const uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *octet_string)
{
int len = 0; /* return value */
bool status = false;
@@ -2205,7 +2205,7 @@ int decode_context_octet_string(
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_octet_string_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_OCTET_STRING *value)
uint8_t *apdu, uint32_t apdu_size, const BACNET_OCTET_STRING *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -2232,7 +2232,7 @@ int bacnet_octet_string_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_octet_string_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_OCTET_STRING *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_OCTET_STRING *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -2270,7 +2270,7 @@ int bacnet_octet_string_application_decode(
* @return number of bytes decoded, or zero if tag number mismatch, or
* #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_octet_string_context_decode(uint8_t *apdu,
int bacnet_octet_string_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_OCTET_STRING *value)
@@ -2316,7 +2316,7 @@ int bacnet_octet_string_context_decode(uint8_t *apdu,
uint32_t encode_bacnet_character_string_safe(uint8_t *apdu,
uint32_t max_apdu,
uint8_t encoding,
char *value,
const char *value,
uint32_t length)
{
uint32_t apdu_len = 1 /*encoding */;
@@ -2348,12 +2348,12 @@ uint32_t encode_bacnet_character_string_safe(uint8_t *apdu,
* @return returns the number of apdu bytes consumed
*/
int encode_bacnet_character_string(
uint8_t *apdu, BACNET_CHARACTER_STRING *char_string)
uint8_t *apdu, const BACNET_CHARACTER_STRING *char_string)
{
uint32_t apdu_len = 1 /*encoding */;
uint32_t i;
size_t length;
char *value;
const char *value;
length = characterstring_length(char_string);
if (apdu) {
@@ -2379,7 +2379,7 @@ int encode_bacnet_character_string(
* @return returns the number of apdu bytes consumed
*/
int encode_application_character_string(
uint8_t *apdu, BACNET_CHARACTER_STRING *char_string)
uint8_t *apdu, const BACNET_CHARACTER_STRING *char_string)
{
int len = 0;
uint8_t *apdu_offset = NULL;
@@ -2407,7 +2407,7 @@ int encode_application_character_string(
* @return returns the number of apdu bytes consumed
*/
int encode_context_character_string(
uint8_t *apdu, uint8_t tag_number, BACNET_CHARACTER_STRING *char_string)
uint8_t *apdu, uint8_t tag_number, const BACNET_CHARACTER_STRING *char_string)
{
int len = 0;
uint8_t *apdu_offset = NULL;
@@ -2434,12 +2434,12 @@ int encode_context_character_string(
*
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_character_string_decode(uint8_t *apdu,
int bacnet_character_string_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint32_t len_value,
BACNET_CHARACTER_STRING *char_string)
{
char *string_value = NULL;
const char *string_value = NULL;
int len = 0;
uint8_t encoding;
@@ -2448,7 +2448,7 @@ int bacnet_character_string_decode(uint8_t *apdu,
if (len_value > 0) {
encoding = apdu[0];
if (len_value > 1) {
string_value = (char *)&apdu[1];
string_value = (const char *)&apdu[1];
(void)characterstring_init(
char_string, encoding, string_value, len_value - 1);
}
@@ -2472,7 +2472,7 @@ int bacnet_character_string_decode(uint8_t *apdu,
* @deprecated use bacnet_character_string_decode() instead
*/
int decode_character_string(
uint8_t *apdu, uint32_t len_value, BACNET_CHARACTER_STRING *value)
const uint8_t *apdu, uint32_t len_value, BACNET_CHARACTER_STRING *value)
{
const uint32_t apdu_size = MAX_APDU;
@@ -2492,7 +2492,7 @@ int decode_character_string(
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_character_string_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_CHARACTER_STRING *value)
uint8_t *apdu, uint32_t apdu_size, const BACNET_CHARACTER_STRING *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -2519,7 +2519,7 @@ int bacnet_character_string_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_character_string_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_CHARACTER_STRING *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_CHARACTER_STRING *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -2557,7 +2557,7 @@ int bacnet_character_string_application_decode(
* @return number of bytes decoded, or zero if tag number mismatch, or
* #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_character_string_context_decode(uint8_t *apdu,
int bacnet_character_string_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_CHARACTER_STRING *value)
@@ -2599,7 +2599,7 @@ int bacnet_character_string_context_decode(uint8_t *apdu,
* @deprecated use bacnet_character_string_context_decode() instead
*/
int decode_context_character_string(
uint8_t *apdu, uint8_t tag_value, BACNET_CHARACTER_STRING *value)
const uint8_t *apdu, uint8_t tag_value, BACNET_CHARACTER_STRING *value)
{
int len = 0; /* return value */
const uint32_t apdu_size = MAX_APDU;
@@ -2625,7 +2625,7 @@ int decode_context_character_string(
*
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_unsigned_decode(uint8_t *apdu,
int bacnet_unsigned_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint32_t len_value,
BACNET_UNSIGNED_INTEGER *value)
@@ -2720,7 +2720,7 @@ int bacnet_unsigned_decode(uint8_t *apdu,
* @return number of bytes decoded, zero if wrong tag number,
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_unsigned_context_decode(uint8_t *apdu,
int bacnet_unsigned_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_UNSIGNED_INTEGER *value)
@@ -2789,7 +2789,7 @@ int bacnet_unsigned_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_unsigned_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_UNSIGNED_INTEGER *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_UNSIGNED_INTEGER *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -2827,7 +2827,7 @@ int bacnet_unsigned_application_decode(
* @deprecated use bacnet_unsigned_decode() instead
*/
int decode_unsigned(
uint8_t *apdu, uint32_t len_value, BACNET_UNSIGNED_INTEGER *value)
const uint8_t *apdu, uint32_t len_value, BACNET_UNSIGNED_INTEGER *value)
{
#ifdef UINT64_MAX
const uint32_t apdu_size = 8;
@@ -2852,7 +2852,7 @@ int decode_unsigned(
* @deprecated use bacnet_unsigned_context_decode() instead
*/
int decode_context_unsigned(
uint8_t *apdu, uint8_t tag_value, BACNET_UNSIGNED_INTEGER *value)
const uint8_t *apdu, uint8_t tag_value, BACNET_UNSIGNED_INTEGER *value)
{
int len = 0; /* return value */
#ifdef UINT64_MAX
@@ -2976,7 +2976,7 @@ int encode_application_unsigned(uint8_t *apdu, BACNET_UNSIGNED_INTEGER value)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_enumerated_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, uint32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, uint32_t *value)
{
BACNET_UNSIGNED_INTEGER unsigned_value = 0;
int len;
@@ -3002,7 +3002,7 @@ int bacnet_enumerated_decode(
*
* @return number of bytes decoded, or zero if errors occur
*/
int decode_enumerated(uint8_t *apdu, uint32_t len_value, uint32_t *value)
int decode_enumerated(const uint8_t *apdu, uint32_t len_value, uint32_t *value)
{
const uint32_t apdu_size = 4;
@@ -3049,7 +3049,7 @@ int bacnet_enumerated_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_enumerated_application_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3097,7 +3097,7 @@ int bacnet_enumerated_application_decode(
* #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_enumerated_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, uint32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, uint32_t *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3135,7 +3135,7 @@ int bacnet_enumerated_context_decode(
* if wrong tag number or malformed
* @deprecated use bacnet_enumerated_context_decode() instead
*/
int decode_context_enumerated(uint8_t *apdu, uint8_t tag_value, uint32_t *value)
int decode_context_enumerated(const uint8_t *apdu, uint8_t tag_value, uint32_t *value)
{
const uint32_t apdu_size = 6;
int len = 0;
@@ -3229,7 +3229,7 @@ int encode_context_enumerated(uint8_t *apdu, uint8_t tag_number, uint32_t value)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_signed_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, int32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, int32_t *value)
{
int len = 0;
@@ -3272,7 +3272,7 @@ int bacnet_signed_decode(
* or error (-1) if malformed
*/
int bacnet_signed_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, int32_t *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, int32_t *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3337,7 +3337,7 @@ int bacnet_signed_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_signed_application_decode(
uint8_t *apdu, uint32_t apdu_size, int32_t *value)
const uint8_t *apdu, uint32_t apdu_size, int32_t *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3375,7 +3375,7 @@ int bacnet_signed_application_decode(
* wrong tag number, or error (-1) if malformed
* @deprecated use bacnet_signed_decode() instead
*/
int decode_signed(uint8_t *apdu, uint32_t len_value, int32_t *value)
int decode_signed(const uint8_t *apdu, uint32_t len_value, int32_t *value)
{
const unsigned apdu_size = 4;
@@ -3395,7 +3395,7 @@ int decode_signed(uint8_t *apdu, uint32_t len_value, int32_t *value)
* wrong tag number, or error (-1) if malformed
* @deprecated use bacnet_signed_context_decode() instead
*/
int decode_context_signed(uint8_t *apdu, uint8_t tag_value, int32_t *value)
int decode_context_signed(const uint8_t *apdu, uint8_t tag_value, int32_t *value)
{
const uint32_t apdu_size = 6;
int len = 0;
@@ -3555,7 +3555,7 @@ int encode_context_real(uint8_t *apdu, uint8_t tag_number, float value)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_real_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, float *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, float *value)
{
int len = 0;
@@ -3580,7 +3580,7 @@ int bacnet_real_decode(
* or error (-1) if malformed
*/
int bacnet_real_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, float *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, float *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3645,7 +3645,7 @@ int bacnet_real_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_real_application_decode(
uint8_t *apdu, uint32_t apdu_size, float *value)
const uint8_t *apdu, uint32_t apdu_size, float *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3683,7 +3683,7 @@ int bacnet_real_application_decode(
* if wrong tag number or malformed
* @deprecated use bacnet_real_context_decode() instead
*/
int decode_context_real(uint8_t *apdu, uint8_t tag_number, float *real_value)
int decode_context_real(const uint8_t *apdu, uint8_t tag_number, float *real_value)
{
uint32_t len_value;
int len = 0;
@@ -3763,7 +3763,7 @@ int encode_context_double(uint8_t *apdu, uint8_t tag_number, double value)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_double_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, double *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, double *value)
{
int len = 0;
@@ -3788,7 +3788,7 @@ int bacnet_double_decode(
* or error (-1) if malformed
*/
int bacnet_double_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, double *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, double *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3853,7 +3853,7 @@ int bacnet_double_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_double_application_decode(
uint8_t *apdu, uint32_t apdu_size, double *value)
const uint8_t *apdu, uint32_t apdu_size, double *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -3892,7 +3892,7 @@ int bacnet_double_application_decode(
* @deprecated use bacnet_double_context_decode() instead
*/
int decode_context_double(
uint8_t *apdu, uint8_t tag_number, double *double_value)
const uint8_t *apdu, uint8_t tag_number, double *double_value)
{
uint32_t len_value;
int len = 0;
@@ -3917,7 +3917,7 @@ int decode_context_double(
*
* @return the number of apdu bytes consumed.
*/
int encode_bacnet_time(uint8_t *apdu, BACNET_TIME *btime)
int encode_bacnet_time(uint8_t *apdu, const BACNET_TIME *btime)
{
if (apdu) {
apdu[0] = btime->hour;
@@ -3939,7 +3939,7 @@ int encode_bacnet_time(uint8_t *apdu, BACNET_TIME *btime)
*
* @return the number of apdu bytes consumed.
*/
int encode_application_time(uint8_t *apdu, BACNET_TIME *btime)
int encode_application_time(uint8_t *apdu, const BACNET_TIME *btime)
{
int len = 0;
uint8_t *apdu_offset = NULL;
@@ -3965,7 +3965,8 @@ int encode_application_time(uint8_t *apdu, BACNET_TIME *btime)
*
* @return the number of apdu bytes consumed.
*/
int encode_context_time(uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime)
int encode_context_time(
uint8_t *apdu, uint8_t tag_number, const BACNET_TIME *btime)
{
int len = 0; /* return value */
uint8_t *apdu_offset = NULL;
@@ -3993,7 +3994,7 @@ int encode_context_time(uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_time_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, BACNET_TIME *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, BACNET_TIME *value)
{
int len = 0;
@@ -4025,7 +4026,7 @@ int bacnet_time_decode(
* or error (-1) if malformed
*/
int bacnet_time_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, BACNET_TIME *value)
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, BACNET_TIME *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -4063,7 +4064,7 @@ int bacnet_time_context_decode(
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_time_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_TIME *value)
uint8_t *apdu, uint32_t apdu_size, const BACNET_TIME *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -4090,7 +4091,7 @@ int bacnet_time_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_time_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_TIME *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_TIME *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -4126,7 +4127,7 @@ int bacnet_time_application_decode(
* @return number of bytes decoded, or zero if errors occur
* @deprecated use bacnet_time_decode() instead
*/
int decode_bacnet_time(uint8_t *apdu, BACNET_TIME *value)
int decode_bacnet_time(const uint8_t *apdu, BACNET_TIME *value)
{
const uint32_t apdu_size = 4;
const uint32_t len_value = 4;
@@ -4146,7 +4147,7 @@ int decode_bacnet_time(uint8_t *apdu, BACNET_TIME *value)
* @deprecated use bacnet_time_decode() instead
*/
int decode_bacnet_time_safe(
uint8_t *apdu, uint32_t len_value, BACNET_TIME *btime)
const uint8_t *apdu, uint32_t len_value, BACNET_TIME *btime)
{
if (len_value != 4) {
if (btime) {
@@ -4173,7 +4174,7 @@ int decode_bacnet_time_safe(
* or wrong tag number
* @deprecated use bacnet_time_application_decode() instead
*/
int decode_application_time(uint8_t *apdu, BACNET_TIME *btime)
int decode_application_time(const uint8_t *apdu, BACNET_TIME *btime)
{
int len = 0;
uint8_t tag_number;
@@ -4203,7 +4204,7 @@ int decode_application_time(uint8_t *apdu, BACNET_TIME *btime)
* @deprecated use bacnet_time_context_decode() instead
*/
int decode_context_bacnet_time(
uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime)
const uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime)
{
int len = 0;
if (decode_is_context_tag_with_length(&apdu[len], tag_number, &len)) {
@@ -4231,7 +4232,7 @@ int decode_context_bacnet_time(
*
* @return the number of apdu bytes consumed, or #BACNET_STATUS_ERROR
*/
int encode_bacnet_date(uint8_t *apdu, BACNET_DATE *bdate)
int encode_bacnet_date(uint8_t *apdu, const BACNET_DATE *bdate)
{
if (apdu) {
if (bdate->year >= 1900) {
@@ -4264,7 +4265,7 @@ int encode_bacnet_date(uint8_t *apdu, BACNET_DATE *bdate)
*
* @return the number of apdu bytes consumed.
*/
int encode_application_date(uint8_t *apdu, BACNET_DATE *bdate)
int encode_application_date(uint8_t *apdu, const BACNET_DATE *bdate)
{
int len = 0;
uint8_t *apdu_offset = NULL;
@@ -4290,7 +4291,7 @@ int encode_application_date(uint8_t *apdu, BACNET_DATE *bdate)
*
* @return the number of apdu bytes consumed.
*/
int encode_context_date(uint8_t *apdu, uint8_t tag_number, BACNET_DATE *bdate)
int encode_context_date(uint8_t *apdu, uint8_t tag_number, const BACNET_DATE *bdate)
{
int len = 0; /* return value */
uint8_t *apdu_offset = NULL;
@@ -4316,7 +4317,7 @@ int encode_context_date(uint8_t *apdu, uint8_t tag_number, BACNET_DATE *bdate)
* @return number of bytes decoded, or zero if errors occur
* @deprecated use bacnet_date_decode() instead
*/
int decode_date(uint8_t *apdu, BACNET_DATE *bdate)
int decode_date(const uint8_t *apdu, BACNET_DATE *bdate)
{
bdate->year = (uint16_t)apdu[0] + 1900;
bdate->month = apdu[1];
@@ -4338,7 +4339,7 @@ int decode_date(uint8_t *apdu, BACNET_DATE *bdate)
* @return number of bytes decoded, or zero if errors occur
* @deprecated use bacnet_date_decode() instead
*/
int decode_date_safe(uint8_t *apdu, uint32_t len_value, BACNET_DATE *bdate)
int decode_date_safe(const uint8_t *apdu, uint32_t len_value, BACNET_DATE *bdate)
{
if (len_value != 4) {
bdate->day = 0;
@@ -4364,7 +4365,7 @@ int decode_date_safe(uint8_t *apdu, uint32_t len_value, BACNET_DATE *bdate)
* @return number of bytes decoded, or zero if errors occur
*/
int bacnet_date_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, BACNET_DATE *value)
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, BACNET_DATE *value)
{
int len = 0;
@@ -4396,7 +4397,10 @@ int bacnet_date_decode(
* or error (-1) if malformed
*/
int bacnet_date_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, BACNET_DATE *value)
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_value,
BACNET_DATE *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -4434,7 +4438,7 @@ int bacnet_date_context_decode(
* or 0 if apdu_size is too small to fit the data
*/
int bacnet_date_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_DATE *value)
uint8_t *apdu, uint32_t apdu_size, const BACNET_DATE *value)
{
int apdu_len = 0; /* total length of the apdu, return value */
@@ -4461,7 +4465,7 @@ int bacnet_date_application_encode(
* or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacnet_date_application_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_DATE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_DATE *value)
{
int apdu_len = BACNET_STATUS_ERROR;
int len = 0;
@@ -4498,7 +4502,7 @@ int bacnet_date_application_decode(
* or wrong tag number
* @deprecated use bacnet_date_application_decode() instead
*/
int decode_application_date(uint8_t *apdu, BACNET_DATE *value)
int decode_application_date(const uint8_t *apdu, BACNET_DATE *value)
{
int len = 0;
const uint32_t apdu_size = BACNET_TAG_SIZE + 4;
@@ -4525,7 +4529,7 @@ int decode_application_date(uint8_t *apdu, BACNET_DATE *value)
* if wrong tag number or malformed
* @deprecated use bacnet_date_context_decode() instead
*/
int decode_context_date(uint8_t *apdu, uint8_t tag_value, BACNET_DATE *value)
int decode_context_date(const uint8_t *apdu, uint8_t tag_value, BACNET_DATE *value)
{
int len = 0;
const uint32_t apdu_size = BACNET_TAG_SIZE + 4;
src/bacnet/bacdcode.h
+120 -102
View File
@@ -59,68 +59,76 @@ BACNET_STACK_EXPORT
int encode_closing_tag(uint8_t *apdu, uint8_t tag_number);
BACNET_STACK_EXPORT
int bacnet_tag_encode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag);
int bacnet_tag_encode(uint8_t *apdu, uint32_t apdu_size, const BACNET_TAG *tag);
BACNET_STACK_EXPORT
int bacnet_tag_decode(uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag);
int bacnet_tag_decode(
const uint8_t *apdu, uint32_t apdu_size, BACNET_TAG *tag);
BACNET_STACK_EXPORT
bool bacnet_is_opening_tag(uint8_t *apdu, uint32_t apdu_size);
bool bacnet_is_opening_tag(const uint8_t *apdu, uint32_t apdu_size);
BACNET_STACK_EXPORT
bool bacnet_is_closing_tag(uint8_t *apdu, uint32_t apdu_size);
bool bacnet_is_closing_tag(const uint8_t *apdu, uint32_t apdu_size);
BACNET_STACK_EXPORT
bool bacnet_is_context_specific(uint8_t *apdu, uint32_t apdu_size);
bool bacnet_is_context_specific(const uint8_t *apdu, uint32_t apdu_size);
BACNET_STACK_EXPORT
bool bacnet_is_context_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length,
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
int *tag_length,
uint32_t *len_value_type);
BACNET_STACK_EXPORT
int bacnet_tag_number_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number);
const uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number);
BACNET_STACK_EXPORT
bool bacnet_is_opening_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length);
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
int *tag_length);
BACNET_STACK_EXPORT
bool bacnet_is_closing_tag_number(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number, int *tag_length);
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_number,
int *tag_length);
BACNET_STACK_EXPORT
int bacnet_application_data_length(
uint8_t tag_number, uint32_t len_value_type);
BACNET_STACK_EXPORT
int bacnet_enclosed_data_length(
uint8_t *apdu, size_t apdu_size);
const uint8_t *apdu, size_t apdu_size);
BACNET_STACK_DEPRECATED("Use bacnet_tag_decode() instead")
BACNET_STACK_EXPORT
int bacnet_tag_number_and_value_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number, uint32_t *value);
const uint8_t *apdu, uint32_t apdu_size, uint8_t *tag_number, uint32_t *value);
BACNET_STACK_DEPRECATED("Use bacnet_tag_number_decode() instead")
BACNET_STACK_EXPORT
int decode_tag_number(uint8_t *apdu, uint8_t *tag_number);
int decode_tag_number(const uint8_t *apdu, uint8_t *tag_number);
BACNET_STACK_DEPRECATED("Use bacnet_tag_decode() instead")
BACNET_STACK_EXPORT
int decode_tag_number_and_value(
uint8_t *apdu, uint8_t *tag_number, uint32_t *value);
const uint8_t *apdu, uint8_t *tag_number, uint32_t *value);
BACNET_STACK_DEPRECATED("Use bacnet_is_opening_tag_number() instead")
BACNET_STACK_EXPORT
bool decode_is_opening_tag_number(uint8_t *apdu, uint8_t tag_number);
bool decode_is_opening_tag_number(const uint8_t *apdu, uint8_t tag_number);
BACNET_STACK_DEPRECATED("Use bacnet_is_closing_tag_number() instead")
BACNET_STACK_EXPORT
bool decode_is_closing_tag_number(uint8_t *apdu, uint8_t tag_number);
bool decode_is_closing_tag_number(const uint8_t *apdu, uint8_t tag_number);
BACNET_STACK_DEPRECATED("Use bacnet_is_context_tag_number() instead")
BACNET_STACK_EXPORT
bool decode_is_context_tag(uint8_t *apdu, uint8_t tag_number);
bool decode_is_context_tag(const uint8_t *apdu, uint8_t tag_number);
BACNET_STACK_DEPRECATED("Use bacnet_is_context_tag_number() instead")
BACNET_STACK_EXPORT
bool decode_is_context_tag_with_length(
uint8_t *apdu, uint8_t tag_number, int *tag_length);
const uint8_t *apdu, uint8_t tag_number, int *tag_length);
BACNET_STACK_DEPRECATED("Use bacnet_is_opening_tag() instead")
BACNET_STACK_EXPORT
bool decode_is_opening_tag(uint8_t *apdu);
bool decode_is_opening_tag(const uint8_t *apdu);
BACNET_STACK_DEPRECATED("Use bacnet_is_closing_tag() instead")
BACNET_STACK_EXPORT
bool decode_is_closing_tag(uint8_t *apdu);
bool decode_is_closing_tag(const uint8_t *apdu);
BACNET_STACK_EXPORT
int encode_application_null(uint8_t *apdu);
@@ -137,54 +145,54 @@ int encode_context_boolean(
uint8_t *apdu, uint8_t tag_number, bool boolean_value);
BACNET_STACK_DEPRECATED("Use bacnet_boolean_context_decode() instead")
BACNET_STACK_EXPORT
bool decode_context_boolean(uint8_t *apdu);
bool decode_context_boolean(const uint8_t *apdu);
BACNET_STACK_EXPORT
BACNET_STACK_DEPRECATED("Use bacnet_boolean_context_decode() instead")
int decode_context_boolean2(
uint8_t *apdu, uint8_t tag_number, bool *boolean_value);
const uint8_t *apdu, uint8_t tag_number, bool *boolean_value);
BACNET_STACK_EXPORT
int bacnet_boolean_application_encode(
uint8_t *apdu, uint32_t apdu_size, bool value);
BACNET_STACK_EXPORT
int bacnet_boolean_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, bool *value);
const uint8_t *apdu, uint32_t apdu_len_max, bool *value);
BACNET_STACK_EXPORT
int bacnet_boolean_context_decode(uint8_t *apdu,
int bacnet_boolean_context_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
bool *boolean_value);
BACNET_STACK_EXPORT
int encode_bitstring(uint8_t *apdu, BACNET_BIT_STRING *bit_string);
int encode_bitstring(uint8_t *apdu, const BACNET_BIT_STRING *bit_string);
BACNET_STACK_EXPORT
int encode_application_bitstring(uint8_t *apdu, BACNET_BIT_STRING *bit_string);
int encode_application_bitstring(uint8_t *apdu, const BACNET_BIT_STRING *bit_string);
BACNET_STACK_EXPORT
int encode_context_bitstring(
uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *bit_string);
uint8_t *apdu, uint8_t tag_number, const BACNET_BIT_STRING *bit_string);
BACNET_STACK_DEPRECATED("Use bacnet_bitstring_decode() instead")
BACNET_STACK_EXPORT
int decode_bitstring(
uint8_t *apdu, uint32_t len_value, BACNET_BIT_STRING *bit_string);
const uint8_t *apdu, uint32_t len_value, BACNET_BIT_STRING *bit_string);
BACNET_STACK_DEPRECATED("Use bacnet_bitstring_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_bitstring(
uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *bit_string);
const uint8_t *apdu, uint8_t tag_number, BACNET_BIT_STRING *bit_string);
BACNET_STACK_EXPORT
int bacnet_bitstring_decode(uint8_t *apdu,
int bacnet_bitstring_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_BIT_STRING *value);
BACNET_STACK_EXPORT
int bacnet_bitstring_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_BIT_STRING *value);
uint8_t *apdu, uint32_t apdu_size, const BACNET_BIT_STRING *value);
BACNET_STACK_EXPORT
int bacnet_bitstring_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_BIT_STRING *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_BIT_STRING *value);
BACNET_STACK_EXPORT
int bacnet_bitstring_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_BIT_STRING *value);
@@ -195,19 +203,19 @@ BACNET_STACK_EXPORT
int encode_context_real(uint8_t *apdu, uint8_t tag_number, float value);
BACNET_STACK_DEPRECATED("Use bacnet_real_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_real(uint8_t *apdu, uint8_t tag_number, float *real_value);
int decode_context_real(const uint8_t *apdu, uint8_t tag_number, float *real_value);
BACNET_STACK_EXPORT
int bacnet_real_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint32_t len_value, float *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint32_t len_value, float *value);
BACNET_STACK_EXPORT
int bacnet_real_context_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, float *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, float *value);
BACNET_STACK_EXPORT
int bacnet_real_application_encode(
uint8_t *apdu, uint32_t apdu_size, float value);
BACNET_STACK_EXPORT
int bacnet_real_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, float *value);
const uint8_t *apdu, uint32_t apdu_len_max, float *value);
BACNET_STACK_EXPORT
int encode_application_double(uint8_t *apdu, double value);
@@ -216,19 +224,19 @@ int encode_context_double(uint8_t *apdu, uint8_t tag_number, double value);
BACNET_STACK_DEPRECATED("Use bacnet_double_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_double(
uint8_t *apdu, uint8_t tag_number, double *double_value);
const uint8_t *apdu, uint8_t tag_number, double *double_value);
BACNET_STACK_EXPORT
int bacnet_double_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint32_t len_value, double *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint32_t len_value, double *value);
BACNET_STACK_EXPORT
int bacnet_double_context_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, double *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, double *value);
BACNET_STACK_EXPORT
int bacnet_double_application_encode(
uint8_t *apdu, uint32_t apdu_size, double value);
BACNET_STACK_EXPORT
int bacnet_double_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, double *value);
const uint8_t *apdu, uint32_t apdu_len_max, double *value);
BACNET_STACK_EXPORT
int encode_bacnet_object_id(
@@ -244,20 +252,22 @@ int encode_application_object_id(
BACNET_STACK_DEPRECATED("Use bacnet_object_id_decode() instead")
BACNET_STACK_EXPORT
int decode_object_id(
uint8_t *apdu, BACNET_OBJECT_TYPE *object_type, uint32_t *object_instance);
const uint8_t *apdu,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance);
BACNET_STACK_DEPRECATED("Use bacnet_object_id_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_object_id(uint8_t *apdu,
int decode_context_object_id(const uint8_t *apdu,
uint8_t tag_number,
BACNET_OBJECT_TYPE *object_type,
uint32_t *instance);
BACNET_STACK_EXPORT
int decode_object_id_safe(uint8_t *apdu,
int decode_object_id_safe(const uint8_t *apdu,
uint32_t len_value,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance);
BACNET_STACK_EXPORT
int bacnet_object_id_decode(uint8_t *apdu,
int bacnet_object_id_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_OBJECT_TYPE *object_type,
@@ -271,49 +281,49 @@ int bacnet_object_id_application_encode(
uint32_t object_instance);
BACNET_STACK_EXPORT
int bacnet_object_id_application_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
BACNET_OBJECT_TYPE *object_type,
uint32_t *object_instance);
BACNET_STACK_EXPORT
int bacnet_object_id_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_OBJECT_TYPE *object_type,
uint32_t *instance);
BACNET_STACK_EXPORT
int encode_octet_string(uint8_t *apdu, BACNET_OCTET_STRING *octet_string);
int encode_octet_string(uint8_t *apdu, const BACNET_OCTET_STRING *octet_string);
BACNET_STACK_EXPORT
int encode_application_octet_string(
uint8_t *apdu, BACNET_OCTET_STRING *octet_string);
uint8_t *apdu, const BACNET_OCTET_STRING *octet_string);
BACNET_STACK_EXPORT
int encode_context_octet_string(
uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *octet_string);
uint8_t *apdu, uint8_t tag_number, const BACNET_OCTET_STRING *octet_string);
BACNET_STACK_EXPORT
BACNET_STACK_DEPRECATED("Use bacnet_octet_string_decode() instead")
int decode_octet_string(
uint8_t *apdu, uint32_t len_value, BACNET_OCTET_STRING *octet_string);
const uint8_t *apdu, uint32_t len_value, BACNET_OCTET_STRING *octet_string);
BACNET_STACK_DEPRECATED("Use bacnet_octet_string_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_octet_string(
uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *octet_string);
const uint8_t *apdu, uint8_t tag_number, BACNET_OCTET_STRING *octet_string);
BACNET_STACK_EXPORT
int bacnet_octet_string_decode(uint8_t *apdu,
int bacnet_octet_string_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_OCTET_STRING *value);
BACNET_STACK_EXPORT
int bacnet_octet_string_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_OCTET_STRING *value);
uint8_t *apdu, uint32_t apdu_size, const BACNET_OCTET_STRING *value);
BACNET_STACK_EXPORT
int bacnet_octet_string_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_OCTET_STRING *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_OCTET_STRING *value);
BACNET_STACK_EXPORT
int bacnet_octet_string_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_OCTET_STRING *value);
@@ -322,40 +332,44 @@ BACNET_STACK_EXPORT
uint32_t encode_bacnet_character_string_safe(uint8_t *apdu,
uint32_t max_apdu,
uint8_t encoding,
char *pString,
const char *pString,
uint32_t length);
BACNET_STACK_EXPORT
int encode_bacnet_character_string(
uint8_t *apdu, BACNET_CHARACTER_STRING *char_string);
uint8_t *apdu, const BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_EXPORT
int encode_application_character_string(
uint8_t *apdu, BACNET_CHARACTER_STRING *char_string);
uint8_t *apdu, const BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_EXPORT
int encode_context_character_string(
uint8_t *apdu, uint8_t tag_number, BACNET_CHARACTER_STRING *char_string);
uint8_t *apdu, uint8_t tag_number, const BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_DEPRECATED("Use bacnet_character_string_decode() instead")
BACNET_STACK_EXPORT
int decode_character_string(
uint8_t *apdu, uint32_t len_value, BACNET_CHARACTER_STRING *char_string);
const uint8_t *apdu,
uint32_t len_value,
BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_DEPRECATED("Use bacnet_character_string_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_character_string(
uint8_t *apdu, uint8_t tag_number, BACNET_CHARACTER_STRING *char_string);
const uint8_t *apdu,
uint8_t tag_number,
BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_EXPORT
int bacnet_character_string_decode(uint8_t *apdu,
int bacnet_character_string_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_CHARACTER_STRING *char_string);
BACNET_STACK_EXPORT
int bacnet_character_string_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_CHARACTER_STRING *value);
uint8_t *apdu, uint32_t apdu_size, const BACNET_CHARACTER_STRING *value);
BACNET_STACK_EXPORT
int bacnet_character_string_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_CHARACTER_STRING *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_CHARACTER_STRING *value);
BACNET_STACK_EXPORT
int bacnet_character_string_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_CHARACTER_STRING *value);
@@ -370,13 +384,13 @@ int encode_application_unsigned(uint8_t *apdu, BACNET_UNSIGNED_INTEGER value);
BACNET_STACK_DEPRECATED("Use bacnet_unsigned_decode() instead")
BACNET_STACK_EXPORT
int decode_unsigned(
uint8_t *apdu, uint32_t len_value, BACNET_UNSIGNED_INTEGER *value);
const uint8_t *apdu, uint32_t len_value, BACNET_UNSIGNED_INTEGER *value);
BACNET_STACK_DEPRECATED("Use bacnet_unsigned_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_unsigned(
uint8_t *apdu, uint8_t tag_number, BACNET_UNSIGNED_INTEGER *value);
const uint8_t *apdu, uint8_t tag_number, BACNET_UNSIGNED_INTEGER *value);
BACNET_STACK_EXPORT
int bacnet_unsigned_decode(uint8_t *apdu,
int bacnet_unsigned_decode(const uint8_t *apdu,
uint32_t apdu_max_len,
uint32_t len_value,
BACNET_UNSIGNED_INTEGER *value);
@@ -386,10 +400,10 @@ int bacnet_unsigned_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_UNSIGNED_INTEGER value);
BACNET_STACK_EXPORT
int bacnet_unsigned_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_UNSIGNED_INTEGER *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_UNSIGNED_INTEGER *value);
BACNET_STACK_EXPORT
int bacnet_unsigned_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_number,
BACNET_UNSIGNED_INTEGER *value);
@@ -402,23 +416,23 @@ BACNET_STACK_EXPORT
int encode_context_signed(uint8_t *apdu, uint8_t tag_number, int32_t value);
BACNET_STACK_DEPRECATED("Use bacnet_signed_decode() instead")
BACNET_STACK_EXPORT
int decode_signed(uint8_t *apdu, uint32_t len_value, int32_t *value);
int decode_signed(const uint8_t *apdu, uint32_t len_value, int32_t *value);
BACNET_STACK_DEPRECATED("Use bacnet_signed_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_signed(uint8_t *apdu, uint8_t tag_number, int32_t *value);
int decode_context_signed(const uint8_t *apdu, uint8_t tag_number, int32_t *value);
BACNET_STACK_EXPORT
int bacnet_signed_decode(
uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, int32_t *value);
const uint8_t *apdu, uint32_t apdu_size, uint32_t len_value, int32_t *value);
BACNET_STACK_EXPORT
int bacnet_signed_context_decode(
uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, int32_t *value);
const uint8_t *apdu, uint32_t apdu_size, uint8_t tag_value, int32_t *value);
BACNET_STACK_EXPORT
int bacnet_signed_application_encode(
uint8_t *apdu, uint32_t apdu_size, int32_t value);
BACNET_STACK_EXPORT
int bacnet_signed_application_decode(
uint8_t *apdu, uint32_t apdu_size, int32_t *value);
const uint8_t *apdu, uint32_t apdu_size, int32_t *value);
BACNET_STACK_EXPORT
int encode_bacnet_enumerated(uint8_t *apdu, uint32_t value);
@@ -429,14 +443,14 @@ int encode_context_enumerated(
uint8_t *apdu, uint8_t tag_number, uint32_t value);
BACNET_STACK_DEPRECATED("Use bacnet_enumerated_decode() instead")
BACNET_STACK_EXPORT
int decode_enumerated(uint8_t *apdu, uint32_t len_value, uint32_t *value);
int decode_enumerated(const uint8_t *apdu, uint32_t len_value, uint32_t *value);
BACNET_STACK_DEPRECATED("Use bacnet_enumerated_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_enumerated(
uint8_t *apdu, uint8_t tag_value, uint32_t *value);
const uint8_t *apdu, uint8_t tag_value, uint32_t *value);
BACNET_STACK_EXPORT
int bacnet_enumerated_decode(
uint8_t *apdu, uint32_t apdu_max_len, uint32_t len_value, uint32_t *value);
const uint8_t *apdu, uint32_t apdu_max_len, uint32_t len_value, uint32_t *value);
BACNET_STACK_EXPORT
@@ -444,80 +458,84 @@ int bacnet_enumerated_application_encode(
uint8_t *apdu, uint32_t apdu_size, uint32_t value);
BACNET_STACK_EXPORT
int bacnet_enumerated_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint32_t *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint32_t *value);
BACNET_STACK_EXPORT
int bacnet_enumerated_context_decode(
uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, uint32_t *value);
const uint8_t *apdu, uint32_t apdu_len_max, uint8_t tag_value, uint32_t *value);
BACNET_STACK_EXPORT
int encode_bacnet_time(uint8_t *apdu, BACNET_TIME *btime);
int encode_bacnet_time(uint8_t *apdu, const BACNET_TIME *btime);
BACNET_STACK_EXPORT
int encode_application_time(uint8_t *apdu, BACNET_TIME *btime);
int encode_application_time(uint8_t *apdu, const BACNET_TIME *btime);
BACNET_STACK_EXPORT
int encode_context_time(uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime);
int encode_context_time(
uint8_t *apdu, uint8_t tag_number, const BACNET_TIME *btime);
BACNET_STACK_DEPRECATED("Use bacnet_time_decode() instead")
BACNET_STACK_EXPORT
int decode_bacnet_time(uint8_t *apdu, BACNET_TIME *btime);
int decode_bacnet_time(const uint8_t *apdu, BACNET_TIME *btime);
BACNET_STACK_DEPRECATED("Use bacnet_time_decode() instead")
BACNET_STACK_EXPORT
int decode_bacnet_time_safe(
uint8_t *apdu, uint32_t len_value, BACNET_TIME *btime);
const uint8_t *apdu, uint32_t len_value, BACNET_TIME *btime);
BACNET_STACK_DEPRECATED("Use bacnet_time_application_decode() instead")
BACNET_STACK_EXPORT
int decode_application_time(uint8_t *apdu, BACNET_TIME *btime);
int decode_application_time(const uint8_t *apdu, BACNET_TIME *btime);
BACNET_STACK_DEPRECATED("Use bacnet_time_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_bacnet_time(
uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime);
const uint8_t *apdu, uint8_t tag_number, BACNET_TIME *btime);
BACNET_STACK_EXPORT
int bacnet_time_decode(uint8_t *apdu,
int bacnet_time_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_TIME *value);
BACNET_STACK_EXPORT
int bacnet_time_context_decode(uint8_t *apdu,
int bacnet_time_context_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_TIME *value);
BACNET_STACK_EXPORT
int bacnet_time_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_TIME *value);
uint8_t *apdu, uint32_t apdu_size, const BACNET_TIME *value);
BACNET_STACK_EXPORT
int bacnet_time_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_TIME *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_TIME *value);
BACNET_STACK_EXPORT
int encode_bacnet_date(uint8_t *apdu, BACNET_DATE *bdate);
int encode_bacnet_date(uint8_t *apdu, const BACNET_DATE *bdate);
BACNET_STACK_EXPORT
int encode_application_date(uint8_t *apdu, BACNET_DATE *bdate);
int encode_application_date(uint8_t *apdu, const BACNET_DATE *bdate);
BACNET_STACK_EXPORT
int encode_context_date(uint8_t *apdu, uint8_t tag_number, BACNET_DATE *bdate);
int encode_context_date(
uint8_t *apdu, uint8_t tag_number, const BACNET_DATE *bdate);
BACNET_STACK_DEPRECATED("Use bacnet_date_decode() instead")
BACNET_STACK_EXPORT
int decode_date(uint8_t *apdu, BACNET_DATE *bdate);
int decode_date(const uint8_t *apdu, BACNET_DATE *bdate);
BACNET_STACK_DEPRECATED("Use bacnet_date_decode() instead")
BACNET_STACK_EXPORT
int decode_date_safe(uint8_t *apdu, uint32_t len_value, BACNET_DATE *bdate);
int decode_date_safe(
const uint8_t *apdu, uint32_t len_value, BACNET_DATE *bdate);
BACNET_STACK_DEPRECATED("Use bacnet_date_application_decode() instead")
BACNET_STACK_EXPORT
int decode_application_date(uint8_t *apdu, BACNET_DATE *bdate);
int decode_application_date(const uint8_t *apdu, BACNET_DATE *bdate);
BACNET_STACK_DEPRECATED("Use bacnet_date_context_decode() instead")
BACNET_STACK_EXPORT
int decode_context_date(uint8_t *apdu, uint8_t tag_number, BACNET_DATE *bdate);
int decode_context_date(
const uint8_t *apdu, uint8_t tag_number, BACNET_DATE *bdate);
BACNET_STACK_EXPORT
int bacnet_date_decode(uint8_t *apdu,
int bacnet_date_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint32_t len_value,
BACNET_DATE *value);
BACNET_STACK_EXPORT
int bacnet_date_application_encode(
uint8_t *apdu, uint32_t apdu_size, BACNET_DATE *value);
uint8_t *apdu, uint32_t apdu_size, const BACNET_DATE *value);
BACNET_STACK_EXPORT
int bacnet_date_application_decode(
uint8_t *apdu, uint32_t apdu_len_max, BACNET_DATE *value);
const uint8_t *apdu, uint32_t apdu_len_max, BACNET_DATE *value);
BACNET_STACK_EXPORT
int bacnet_date_context_decode(uint8_t *apdu,
int bacnet_date_context_decode(const uint8_t *apdu,
uint32_t apdu_len_max,
uint8_t tag_value,
BACNET_DATE *value);
src/bacnet/bacdest.c
+18 -18
View File
@@ -67,7 +67,8 @@ void bacnet_destination_default_init(BACNET_DESTINATION *destination)
* @param r2 - BACnetRecipient 2 structure
* @return true if r1 and r2 are the same
*/
bool bacnet_recipient_same(BACNET_RECIPIENT *r1, BACNET_RECIPIENT *r2)
bool bacnet_recipient_same(
const BACNET_RECIPIENT *r1, const BACNET_RECIPIENT *r2)
{
bool status = false;
@@ -98,7 +99,7 @@ bool bacnet_recipient_same(BACNET_RECIPIENT *r1, BACNET_RECIPIENT *r2)
* @param src - BACnetRecipient 1 structure
* @param dest - BACnetRecipient 2 structure
*/
void bacnet_recipient_copy(BACNET_RECIPIENT *dest, BACNET_RECIPIENT *src)
void bacnet_recipient_copy(BACNET_RECIPIENT *dest, const BACNET_RECIPIENT *src)
{
if (dest && src) {
memmove(dest, src, sizeof(BACNET_RECIPIENT));
@@ -110,7 +111,7 @@ void bacnet_recipient_copy(BACNET_RECIPIENT *dest, BACNET_RECIPIENT *src)
* @param recipient - BACnetRecipient structure
* @return true if BACnetRecipient is equal to the device object wildcard
*/
bool bacnet_recipient_device_wildcard(BACNET_RECIPIENT *recipient)
bool bacnet_recipient_device_wildcard(const BACNET_RECIPIENT *recipient)
{
bool status = false;
@@ -130,7 +131,7 @@ bool bacnet_recipient_device_wildcard(BACNET_RECIPIENT *recipient)
* @param recipient - BACnetRecipient structure
* @return true if BACnetRecipient is a valid device object instance
*/
bool bacnet_recipient_device_valid(BACNET_RECIPIENT *recipient)
bool bacnet_recipient_device_valid(const BACNET_RECIPIENT *recipient)
{
bool status = false;
@@ -151,7 +152,8 @@ bool bacnet_recipient_device_valid(BACNET_RECIPIENT *recipient)
* @param d2 - BACnetDestination 2 structure
* @return true if dest1 and dest2 are the same
*/
bool bacnet_destination_same(BACNET_DESTINATION *d1, BACNET_DESTINATION *d2)
bool bacnet_destination_same(
const BACNET_DESTINATION *d1, const BACNET_DESTINATION *d2)
{
bool status = false;
@@ -185,7 +187,8 @@ bool bacnet_destination_same(BACNET_DESTINATION *d1, BACNET_DESTINATION *d2)
* @param dest - BACnetDestination 1 structure
* @param src - BACnetDestination 2 structure
*/
void bacnet_destination_copy(BACNET_DESTINATION *dest, BACNET_DESTINATION *src)
void bacnet_destination_copy(
BACNET_DESTINATION *dest, const BACNET_DESTINATION *src)
{
if (dest && src) {
memmove(dest, src, sizeof(BACNET_DESTINATION));
@@ -197,7 +200,7 @@ void bacnet_destination_copy(BACNET_DESTINATION *dest, BACNET_DESTINATION *src)
* @param d1 - BACnetDestination 1 structure
* @return true if d1 and d2 (defaults) are the same
*/
bool bacnet_destination_default(BACNET_DESTINATION *d1)
bool bacnet_destination_default(const BACNET_DESTINATION *d1)
{
BACNET_DESTINATION d2 = { 0 };
@@ -224,7 +227,8 @@ bool bacnet_destination_default(BACNET_DESTINATION *d1)
*
* @return bytes encoded or zero on error.
*/
int bacnet_destination_encode(uint8_t *apdu, BACNET_DESTINATION *destination)
int bacnet_destination_encode(
uint8_t *apdu, const BACNET_DESTINATION *destination)
{
int apdu_len = 0, len = 0;
@@ -300,7 +304,7 @@ int bacnet_destination_encode(uint8_t *apdu, BACNET_DESTINATION *destination)
* @return length of the APDU buffer, or 0 if not able to encode
*/
int bacnet_destination_context_encode(
uint8_t *apdu, uint8_t tag_number, BACNET_DESTINATION *destination)
uint8_t *apdu, uint8_t tag_number, const BACNET_DESTINATION *destination)
{
int len = 0;
int apdu_len = 0;
@@ -343,7 +347,7 @@ int bacnet_destination_context_encode(
* @return bytes encoded or #BACNET_STATUS_REJECT on error.
*/
int bacnet_destination_decode(
uint8_t *apdu, int apdu_size, BACNET_DESTINATION *destination)
const uint8_t *apdu, int apdu_size, BACNET_DESTINATION *destination)
{
int len = 0, apdu_len = 0;
BACNET_APPLICATION_DATA_VALUE value = { 0 };
@@ -519,7 +523,7 @@ int bacnet_destination_to_ascii(
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
comma = false;
for (i = 0; i < 7; i++) {
if (bitstring_bit((BACNET_BIT_STRING *)&bacdest->ValidDays, i)) {
if (bitstring_bit(&bacdest->ValidDays, i)) {
if (comma) {
len = snprintf(buf, buf_size, ",");
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
@@ -602,15 +606,12 @@ int bacnet_destination_to_ascii(
comma = false;
/* TODO remove casting when bitstring_bit() has const added - Github issue
* #320 */
if (bitstring_bit(
(BACNET_BIT_STRING *)&bacdest->Transitions,
TRANSITION_TO_OFFNORMAL)) {
if (bitstring_bit(&bacdest->Transitions, TRANSITION_TO_OFFNORMAL)) {
len = snprintf(buf, buf_size, "to-offnormal");
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
comma = true;
}
if (bitstring_bit(
(BACNET_BIT_STRING *)&bacdest->Transitions, TRANSITION_TO_FAULT)) {
if (bitstring_bit(&bacdest->Transitions, TRANSITION_TO_FAULT)) {
if (comma) {
len = snprintf(buf, buf_size, ",");
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
@@ -619,8 +620,7 @@ int bacnet_destination_to_ascii(
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
comma = true;
}
if (bitstring_bit(
(BACNET_BIT_STRING *)&bacdest->Transitions, TRANSITION_TO_NORMAL)) {
if (bitstring_bit(&bacdest->Transitions, TRANSITION_TO_NORMAL)) {
if (comma) {
len = snprintf(buf, buf_size, ",");
buf_len += bacapp_snprintf_shift(len, &buf, &buf_size);
src/bacnet/bacdest.h
+14 -10
View File
@@ -62,31 +62,35 @@ extern "C" {
#endif /* __cplusplus */
BACNET_STACK_EXPORT
int bacnet_destination_encode(uint8_t *apdu, BACNET_DESTINATION *destination);
int bacnet_destination_encode(
uint8_t *apdu, const BACNET_DESTINATION *destination);
BACNET_STACK_EXPORT
int bacnet_destination_context_encode(
uint8_t *apdu, uint8_t tag_number, BACNET_DESTINATION *destination);
uint8_t *apdu, uint8_t tag_number, const BACNET_DESTINATION *destination);
BACNET_STACK_EXPORT
int bacnet_destination_decode(
uint8_t *apdu, int apdu_len, BACNET_DESTINATION *destination);
const uint8_t *apdu, int apdu_len, BACNET_DESTINATION *destination);
BACNET_STACK_EXPORT
void bacnet_destination_default_init(BACNET_DESTINATION *destination);
BACNET_STACK_EXPORT
bool bacnet_destination_default(BACNET_DESTINATION *destination);
bool bacnet_destination_default(const BACNET_DESTINATION *destination);
BACNET_STACK_EXPORT
bool bacnet_destination_same(
BACNET_DESTINATION *dest1, BACNET_DESTINATION *dest2);
const BACNET_DESTINATION *dest1, const BACNET_DESTINATION *dest2);
BACNET_STACK_EXPORT
void bacnet_destination_copy(BACNET_DESTINATION *dest, BACNET_DESTINATION *src);
void bacnet_destination_copy(
BACNET_DESTINATION *dest, const BACNET_DESTINATION *src);
BACNET_STACK_EXPORT
void bacnet_recipient_copy(BACNET_RECIPIENT *dest, BACNET_RECIPIENT *src);
void bacnet_recipient_copy(
BACNET_RECIPIENT *dest, const BACNET_RECIPIENT *src);
BACNET_STACK_EXPORT
bool bacnet_recipient_same(BACNET_RECIPIENT *r1, BACNET_RECIPIENT *r2);
bool bacnet_recipient_same(
const BACNET_RECIPIENT *r1, const BACNET_RECIPIENT *r2);
BACNET_STACK_EXPORT
bool bacnet_recipient_device_wildcard(BACNET_RECIPIENT *recipient);
bool bacnet_recipient_device_wildcard(const BACNET_RECIPIENT *recipient);
BACNET_STACK_EXPORT
bool bacnet_recipient_device_valid(BACNET_RECIPIENT *recipient);
bool bacnet_recipient_device_valid(const BACNET_RECIPIENT *recipient);
BACNET_STACK_EXPORT
int bacnet_destination_to_ascii(
src/bacnet/bacdevobjpropref.c
+23 -22
View File
@@ -26,7 +26,7 @@
*/
int bacapp_encode_context_device_obj_property_ref(uint8_t *apdu,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
int len;
int apdu_len = 0;
@@ -69,7 +69,7 @@ int bacapp_encode_context_device_obj_property_ref(uint8_t *apdu,
* @return Bytes encoded.
*/
int bacapp_encode_device_obj_property_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
uint8_t *apdu, const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
int len;
int apdu_len = 0;
@@ -131,7 +131,7 @@ int bacapp_encode_device_obj_property_ref(
*
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacnet_device_object_property_reference_decode(uint8_t *apdu,
int bacnet_device_object_property_reference_decode(const uint8_t *apdu,
uint32_t apdu_size,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
@@ -226,7 +226,7 @@ int bacnet_device_object_property_reference_decode(uint8_t *apdu,
*
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacnet_device_object_property_reference_context_decode(uint8_t *apdu,
int bacnet_device_object_property_reference_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
@@ -267,8 +267,8 @@ int bacnet_device_object_property_reference_context_decode(uint8_t *apdu,
* @return true if the values are the same
*/
bool bacnet_device_object_property_reference_same(
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value1,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value2)
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value1,
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value2)
{
bool status = false;
@@ -309,7 +309,7 @@ bool bacnet_device_object_property_reference_same(
* @deprecated Use bacnet_device_object_property_reference_decode() instead
*/
int bacapp_decode_device_obj_property_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
const uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
return bacnet_device_object_property_reference_decode(
apdu, MAX_APDU, value);
@@ -328,7 +328,7 @@ int bacapp_decode_device_obj_property_ref(
* @deprecated Use bacnet_device_object_property_reference_context_decode()
* instead
*/
int bacapp_decode_context_device_obj_property_ref(uint8_t *apdu,
int bacapp_decode_context_device_obj_property_ref(const uint8_t *apdu,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value)
{
@@ -352,7 +352,7 @@ int bacapp_decode_context_device_obj_property_ref(uint8_t *apdu,
* @return Bytes encoded or 0 on failure.
*/
int bacapp_encode_context_device_obj_ref(
uint8_t *apdu, uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE *value)
uint8_t *apdu, uint8_t tag_number, const BACNET_DEVICE_OBJECT_REFERENCE *value)
{
int len;
int apdu_len = 0;
@@ -389,7 +389,7 @@ int bacapp_encode_context_device_obj_ref(
* @return Bytes encoded or 0 on failure.
*/
int bacapp_encode_device_obj_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value)
uint8_t *apdu, const BACNET_DEVICE_OBJECT_REFERENCE *value)
{
int len;
int apdu_len = 0;
@@ -431,7 +431,7 @@ int bacapp_encode_device_obj_ref(
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacnet_device_object_reference_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_DEVICE_OBJECT_REFERENCE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_DEVICE_OBJECT_REFERENCE *value)
{
int len;
int apdu_len = 0;
@@ -489,7 +489,7 @@ int bacnet_device_object_reference_decode(
*
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacnet_device_object_reference_context_decode(uint8_t *apdu,
int bacnet_device_object_reference_context_decode(const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_REFERENCE *value)
@@ -529,8 +529,9 @@ int bacnet_device_object_reference_context_decode(uint8_t *apdu,
* @param value2 - value 2 structure
* @return true if the values are the same
*/
bool bacnet_device_object_reference_same(BACNET_DEVICE_OBJECT_REFERENCE *value1,
BACNET_DEVICE_OBJECT_REFERENCE *value2)
bool bacnet_device_object_reference_same(
const BACNET_DEVICE_OBJECT_REFERENCE *value1,
const BACNET_DEVICE_OBJECT_REFERENCE *value2)
{
bool status = false;
@@ -564,7 +565,7 @@ bool bacnet_device_object_reference_same(BACNET_DEVICE_OBJECT_REFERENCE *value1,
* @deprecated Use bacnet_device_object_reference_decode() instead.
*/
int bacapp_decode_device_obj_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value)
const uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value)
{
return bacnet_device_object_reference_decode(apdu, MAX_APDU, value);
}
@@ -582,7 +583,7 @@ int bacapp_decode_device_obj_ref(
* @deprecated Use bacnet_device_object_reference_context_decode() instead.
*/
int bacapp_decode_context_device_obj_ref(
uint8_t *apdu, uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE *value)
const uint8_t *apdu, uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE *value)
{
return bacnet_device_object_reference_context_decode(
apdu, MAX_APDU, tag_number, value);
@@ -604,7 +605,7 @@ int bacapp_decode_context_device_obj_ref(
* @return length of the APDU buffer
*/
int bacapp_encode_obj_property_ref(
uint8_t *apdu, BACNET_OBJECT_PROPERTY_REFERENCE *reference)
uint8_t *apdu, const BACNET_OBJECT_PROPERTY_REFERENCE *reference)
{
int len = 0;
int apdu_len = 0;
@@ -643,7 +644,7 @@ int bacapp_encode_obj_property_ref(
*/
int bacapp_encode_context_obj_property_ref(uint8_t *apdu,
uint8_t tag_number,
BACNET_OBJECT_PROPERTY_REFERENCE *reference)
const BACNET_OBJECT_PROPERTY_REFERENCE *reference)
{
int len = 0;
int apdu_len = 0;
@@ -683,7 +684,7 @@ int bacapp_encode_context_obj_property_ref(uint8_t *apdu,
* @param reference - BACnetObjectPropertyReference to decode into
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacapp_decode_obj_property_ref(uint8_t *apdu,
int bacapp_decode_obj_property_ref(const uint8_t *apdu,
uint16_t apdu_size,
BACNET_OBJECT_PROPERTY_REFERENCE *reference)
{
@@ -755,7 +756,7 @@ int bacapp_decode_obj_property_ref(uint8_t *apdu,
*
* @return number of bytes decoded or BACNET_STATUS_ERROR on failure.
*/
int bacapp_decode_context_obj_property_ref(uint8_t *apdu,
int bacapp_decode_context_obj_property_ref(const uint8_t *apdu,
uint16_t apdu_size,
uint8_t tag_number,
BACNET_OBJECT_PROPERTY_REFERENCE *value)
@@ -795,8 +796,8 @@ int bacapp_decode_context_obj_property_ref(uint8_t *apdu,
* @return true if the values are the same
*/
bool bacnet_object_property_reference_same(
BACNET_OBJECT_PROPERTY_REFERENCE *value1,
BACNET_OBJECT_PROPERTY_REFERENCE *value2)
const BACNET_OBJECT_PROPERTY_REFERENCE *value1,
const BACNET_OBJECT_PROPERTY_REFERENCE *value2)
{
bool status = false;
src/bacnet/bacdevobjpropref.h
+35 -22
View File
@@ -57,94 +57,107 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_encode_device_obj_property_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
uint8_t *apdu, const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_encode_context_device_obj_property_ref(uint8_t *apdu,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_DEPRECATED(
"Use bacnet_device_object_property_reference_decode() instead")
BACNET_STACK_EXPORT
int bacapp_decode_device_obj_property_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
const uint8_t *apdu, BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_DEPRECATED(
"Use bacnet_device_object_property_reference_context_decode() instead")
BACNET_STACK_EXPORT
int bacapp_decode_context_device_obj_property_ref(uint8_t *apdu,
int bacapp_decode_context_device_obj_property_ref(const uint8_t *apdu,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_encode_device_obj_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value);
uint8_t *apdu, const BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_encode_context_device_obj_ref(
uint8_t *apdu, uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE *value);
uint8_t *apdu,
uint8_t tag_number,
const BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_decode_device_obj_ref(
uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value);
const uint8_t *apdu, BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_decode_context_device_obj_ref(
uint8_t *apdu, uint8_t tag_number, BACNET_DEVICE_OBJECT_REFERENCE *value);
const uint8_t *apdu,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_encode_obj_property_ref(
uint8_t *apdu, BACNET_OBJECT_PROPERTY_REFERENCE *value);
uint8_t *apdu, const BACNET_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_encode_context_obj_property_ref(
uint8_t *apdu, uint8_t tag_number, BACNET_OBJECT_PROPERTY_REFERENCE *value);
uint8_t *apdu,
uint8_t tag_number,
const BACNET_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_decode_obj_property_ref(uint8_t *apdu,
int bacapp_decode_obj_property_ref(
const uint8_t *apdu,
uint16_t apdu_len_max,
BACNET_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacapp_decode_context_obj_property_ref(uint8_t *apdu,
int bacapp_decode_context_obj_property_ref(
const uint8_t *apdu,
uint16_t apdu_len_max,
uint8_t tag_number,
BACNET_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacnet_device_object_property_reference_decode(uint8_t *apdu,
int bacnet_device_object_property_reference_decode(
const uint8_t *apdu,
uint32_t apdu_size,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacnet_device_object_property_reference_context_decode(uint8_t *apdu,
int bacnet_device_object_property_reference_context_decode(
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value);
BACNET_STACK_EXPORT
int bacnet_device_object_reference_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_DEVICE_OBJECT_REFERENCE *value);
const uint8_t *apdu,
uint32_t apdu_size,
BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
int bacnet_device_object_reference_context_decode(uint8_t *apdu,
int bacnet_device_object_reference_context_decode(
const uint8_t *apdu,
uint32_t apdu_size,
uint8_t tag_number,
BACNET_DEVICE_OBJECT_REFERENCE *value);
BACNET_STACK_EXPORT
bool bacnet_device_object_property_reference_same(
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value1,
BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value2);
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value1,
const BACNET_DEVICE_OBJECT_PROPERTY_REFERENCE *value2);
BACNET_STACK_EXPORT
bool bacnet_device_object_reference_same(
BACNET_DEVICE_OBJECT_REFERENCE *value1,
BACNET_DEVICE_OBJECT_REFERENCE *value2);
const BACNET_DEVICE_OBJECT_REFERENCE *value1,
const BACNET_DEVICE_OBJECT_REFERENCE *value2);
BACNET_STACK_EXPORT
bool bacnet_object_property_reference_same(
BACNET_OBJECT_PROPERTY_REFERENCE *value1,
BACNET_OBJECT_PROPERTY_REFERENCE *value2);
const BACNET_OBJECT_PROPERTY_REFERENCE *value1,
const BACNET_OBJECT_PROPERTY_REFERENCE *value2);
#ifdef __cplusplus
}
src/bacnet/bacerror.c
+2 -2
View File
@@ -84,7 +84,7 @@ int bacerror_encode_apdu(uint8_t *apdu,
*
* @return number of bytes decoded, or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacerror_decode_error_class_and_code(uint8_t *apdu,
int bacerror_decode_error_class_and_code(const uint8_t *apdu,
unsigned apdu_size,
BACNET_ERROR_CLASS *error_class,
BACNET_ERROR_CODE *error_code)
@@ -130,7 +130,7 @@ int bacerror_decode_error_class_and_code(uint8_t *apdu,
*
* @return number of bytes decoded, or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacerror_decode_service_request(uint8_t *apdu,
int bacerror_decode_service_request(const uint8_t *apdu,
unsigned apdu_size,
uint8_t *invoke_id,
BACNET_CONFIRMED_SERVICE *service,
src/bacnet/bacerror.h
+2 -2
View File
@@ -27,7 +27,7 @@ extern "C" {
BACNET_STACK_EXPORT
int bacerror_decode_service_request(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
uint8_t * invoke_id,
BACNET_CONFIRMED_SERVICE * service,
@@ -36,7 +36,7 @@ extern "C" {
BACNET_STACK_EXPORT
int bacerror_decode_error_class_and_code(
uint8_t * apdu,
const uint8_t * apdu,
unsigned apdu_size,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
src/bacnet/bacint.c
+11 -11
View File
@@ -23,7 +23,7 @@ int encode_unsigned16(uint8_t *apdu, uint16_t value)
return 2;
}
int decode_unsigned16(uint8_t *apdu, uint16_t *value)
int decode_unsigned16(const uint8_t *apdu, uint16_t *value)
{
if (apdu && value) {
*value = (uint16_t)apdu[0] << 8;
@@ -44,7 +44,7 @@ int encode_unsigned24(uint8_t *apdu, uint32_t value)
return 3;
}
int decode_unsigned24(uint8_t *apdu, uint32_t *value)
int decode_unsigned24(const uint8_t *apdu, uint32_t *value)
{
if (apdu && value) {
*value = (uint32_t)apdu[0] << 16;
@@ -67,7 +67,7 @@ int encode_unsigned32(uint8_t *apdu, uint32_t value)
return 4;
}
int decode_unsigned32(uint8_t *apdu, uint32_t *value)
int decode_unsigned32(const uint8_t *apdu, uint32_t *value)
{
if (apdu && value) {
*value = (uint32_t)apdu[0] << 24;
@@ -105,7 +105,7 @@ int encode_unsigned40(uint8_t *buffer, uint64_t value)
* @param value - pointer to 64-bit value to store the decoded value
* @return Returns the number of bytes decoded
*/
int decode_unsigned40(uint8_t *buffer, uint64_t *value)
int decode_unsigned40(const uint8_t *buffer, uint64_t *value)
{
if (buffer && value) {
*value = (uint64_t)buffer[0] << 32;
@@ -144,7 +144,7 @@ int encode_unsigned48(uint8_t *buffer, uint64_t value)
* @param value - pointer to 64-bit value to store the decoded value
* @return Returns the number of bytes decoded
*/
int decode_unsigned48(uint8_t *buffer, uint64_t *value)
int decode_unsigned48(const uint8_t *buffer, uint64_t *value)
{
if (buffer && value) {
*value = (uint64_t)buffer[0] << 40;
@@ -185,7 +185,7 @@ int encode_unsigned56(uint8_t *buffer, uint64_t value)
* @param value - pointer to 64-bit value to store the decoded value
* @return Returns the number of bytes decoded
*/
int decode_unsigned56(uint8_t *buffer, uint64_t *value)
int decode_unsigned56(const uint8_t *buffer, uint64_t *value)
{
if (buffer && value) {
*value = (uint64_t)buffer[0] << 48;
@@ -228,7 +228,7 @@ int encode_unsigned64(uint8_t *buffer, uint64_t value)
* @param value - pointer to 64-bit value to store the decoded value
* @return Returns the number of bytes decoded
*/
int decode_unsigned64(uint8_t *buffer, uint64_t *value)
int decode_unsigned64(const uint8_t *buffer, uint64_t *value)
{
if (buffer && value) {
*value = (uint64_t)buffer[0] << 56;
@@ -294,7 +294,7 @@ int encode_signed8(uint8_t *apdu, int8_t value)
return 1;
}
int decode_signed8(uint8_t *apdu, int32_t *value)
int decode_signed8(const uint8_t *apdu, int32_t *value)
{
if (apdu && value) {
/* negative - bit 7 is set */
@@ -319,7 +319,7 @@ int encode_signed16(uint8_t *apdu, int16_t value)
return 2;
}
int decode_signed16(uint8_t *apdu, int32_t *value)
int decode_signed16(const uint8_t *apdu, int32_t *value)
{
if (apdu && value) {
/* negative - bit 7 is set */
@@ -346,7 +346,7 @@ int encode_signed24(uint8_t *apdu, int32_t value)
return 3;
}
int decode_signed24(uint8_t *apdu, int32_t *value)
int decode_signed24(const uint8_t *apdu, int32_t *value)
{
if (apdu && value) {
/* negative - bit 7 is set */
@@ -375,7 +375,7 @@ int encode_signed32(uint8_t *apdu, int32_t value)
return 4;
}
int decode_signed32(uint8_t *apdu, int32_t *value)
int decode_signed32(const uint8_t *apdu, int32_t *value)
{
if (apdu && value) {
*value = (int32_t)apdu[0] << 24;
src/bacnet/bacint.h
+11 -11
View File
@@ -25,7 +25,7 @@ extern "C" {
uint16_t value);
BACNET_STACK_EXPORT
int decode_unsigned16(
uint8_t * apdu,
const uint8_t * apdu,
uint16_t * value);
BACNET_STACK_EXPORT
int encode_unsigned24(
@@ -33,7 +33,7 @@ extern "C" {
uint32_t value);
BACNET_STACK_EXPORT
int decode_unsigned24(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t * value);
BACNET_STACK_EXPORT
int encode_unsigned32(
@@ -41,7 +41,7 @@ extern "C" {
uint32_t value);
BACNET_STACK_EXPORT
int decode_unsigned32(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t * value);
#ifdef UINT64_MAX
BACNET_STACK_EXPORT
@@ -50,7 +50,7 @@ extern "C" {
uint64_t value);
BACNET_STACK_EXPORT
int decode_unsigned40(
uint8_t * buffer,
const uint8_t * buffer,
uint64_t * value);
BACNET_STACK_EXPORT
int encode_unsigned48(
@@ -58,7 +58,7 @@ extern "C" {
uint64_t value);
BACNET_STACK_EXPORT
int decode_unsigned48(
uint8_t * buffer,
const uint8_t * buffer,
uint64_t * value);
BACNET_STACK_EXPORT
int encode_unsigned56(
@@ -66,7 +66,7 @@ extern "C" {
uint64_t value);
BACNET_STACK_EXPORT
int decode_unsigned56(
uint8_t * buffer,
const uint8_t * buffer,
uint64_t * value);
BACNET_STACK_EXPORT
int encode_unsigned64(
@@ -74,7 +74,7 @@ extern "C" {
uint64_t value);
BACNET_STACK_EXPORT
int decode_unsigned64(
uint8_t * buffer,
const uint8_t * buffer,
uint64_t * value);
#endif
@@ -92,7 +92,7 @@ extern "C" {
int8_t value);
BACNET_STACK_EXPORT
int decode_signed8(
uint8_t * apdu,
const uint8_t * apdu,
int32_t * value);
BACNET_STACK_EXPORT
int encode_signed16(
@@ -100,7 +100,7 @@ extern "C" {
int16_t value);
BACNET_STACK_EXPORT
int decode_signed16(
uint8_t * apdu,
const uint8_t * apdu,
int32_t * value);
BACNET_STACK_EXPORT
int encode_signed24(
@@ -108,7 +108,7 @@ extern "C" {
int32_t value);
BACNET_STACK_EXPORT
int decode_signed24(
uint8_t * apdu,
const uint8_t * apdu,
int32_t * value);
BACNET_STACK_EXPORT
int encode_signed32(
@@ -116,7 +116,7 @@ extern "C" {
int32_t value);
BACNET_STACK_EXPORT
int decode_signed32(
uint8_t * apdu,
const uint8_t * apdu,
int32_t * value);
#ifdef __cplusplus
src/bacnet/bacprop.c
+1 -1
View File
@@ -45,7 +45,7 @@ PROP_TAG_DATA bacnet_object_device_property_tag_map[] = {
* @return Value found or the default value.
*/
signed bacprop_tag_by_index_default(
PROP_TAG_DATA *data_list, signed index, signed default_ret)
const PROP_TAG_DATA *data_list, signed index, signed default_ret)
{
signed pUnsigned = 0;
src/bacnet/bacprop.h
+1 -1
View File
@@ -25,7 +25,7 @@ extern "C" {
BACNET_STACK_EXPORT
signed bacprop_tag_by_index_default(
PROP_TAG_DATA * data_list,
const PROP_TAG_DATA * data_list,
signed index,
signed default_ret);
src/bacnet/bacpropstates.c
+6 -4
View File
@@ -44,7 +44,7 @@
* @return number of bytes decoded, or #BACNET_STATUS_ERROR (-1) if malformed
*/
int bacapp_property_state_decode(
uint8_t *apdu, uint32_t apdu_size, BACNET_PROPERTY_STATE *value)
const uint8_t *apdu, uint32_t apdu_size, BACNET_PROPERTY_STATE *value)
{
BACNET_TAG tag = { 0 };
uint32_t enum_value = 0;
@@ -298,13 +298,14 @@ int bacapp_property_state_decode(
return apdu_len;
}
int bacapp_decode_property_state(uint8_t *apdu, BACNET_PROPERTY_STATE *value)
int bacapp_decode_property_state(
const uint8_t *apdu, BACNET_PROPERTY_STATE *value)
{
return bacapp_property_state_decode(apdu, MAX_APDU, value);
}
int bacapp_decode_context_property_state(
uint8_t *apdu, uint8_t tag_number, BACNET_PROPERTY_STATE *value)
const uint8_t *apdu, uint8_t tag_number, BACNET_PROPERTY_STATE *value)
{
int len = 0;
int section_length;
@@ -335,7 +336,8 @@ int bacapp_decode_context_property_state(
* @param value Pointer to the value used for encoding
* @return number of bytes encoded, or zero if unable to encode
*/
int bacapp_encode_property_state(uint8_t *apdu, BACNET_PROPERTY_STATE *value)
int bacapp_encode_property_state(
uint8_t *apdu, const BACNET_PROPERTY_STATE *value)
{
int len = 0; /* length of each encoding */
src/bacnet/bacpropstates.h
+4 -4
View File
@@ -89,25 +89,25 @@ extern "C" {
BACNET_STACK_EXPORT
int bacapp_property_state_decode(
uint8_t *apdu,
const uint8_t *apdu,
uint32_t apdu_size,
BACNET_PROPERTY_STATE *value);
BACNET_STACK_EXPORT
int bacapp_decode_property_state(
uint8_t * apdu,
const uint8_t * apdu,
BACNET_PROPERTY_STATE * value);
BACNET_STACK_EXPORT
int bacapp_decode_context_property_state(
uint8_t * apdu,
const uint8_t * apdu,
uint8_t tag_number,
BACNET_PROPERTY_STATE * value);
BACNET_STACK_EXPORT
int bacapp_encode_property_state(
uint8_t * apdu,
BACNET_PROPERTY_STATE * value);
const BACNET_PROPERTY_STATE * value);
#ifdef __cplusplus
}
src/bacnet/bacreal.c
+5 -4
View File
@@ -21,7 +21,7 @@
/* from clause 20.2.6 Encoding of a Real Number Value */
/* returns the number of apdu bytes consumed */
int decode_real(uint8_t *apdu, float *real_value)
int decode_real(const uint8_t *apdu, float *real_value)
{
union {
uint8_t byte[4];
@@ -49,7 +49,7 @@ int decode_real(uint8_t *apdu, float *real_value)
return 4;
}
int decode_real_safe(uint8_t *apdu, uint32_t len_value, float *real_value)
int decode_real_safe(const uint8_t *apdu, uint32_t len_value, float *real_value)
{
if (len_value != 4) {
if (real_value) {
@@ -93,7 +93,7 @@ int encode_bacnet_real(float value, uint8_t *apdu)
/* from clause 20.2.7 Encoding of a Double Precision Real Number Value */
/* returns the number of apdu bytes consumed */
int decode_double(uint8_t *apdu, double *double_value)
int decode_double(const uint8_t *apdu, double *double_value)
{
union {
uint8_t byte[8];
@@ -129,7 +129,8 @@ int decode_double(uint8_t *apdu, double *double_value)
return 8;
}
int decode_double_safe(uint8_t *apdu, uint32_t len_value, double *double_value)
int decode_double_safe(
const uint8_t *apdu, uint32_t len_value, double *double_value)
{
if (len_value != 8) {
if (double_value) {
src/bacnet/bacreal.h
+4 -4
View File
@@ -20,13 +20,13 @@ extern "C" {
BACNET_STACK_EXPORT
int decode_real_safe(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t len_value,
float *real_value);
BACNET_STACK_EXPORT
int decode_real(
uint8_t * apdu,
const uint8_t * apdu,
float *real_value);
BACNET_STACK_EXPORT
@@ -35,11 +35,11 @@ extern "C" {
uint8_t * apdu);
BACNET_STACK_EXPORT
int decode_double(
uint8_t * apdu,
const uint8_t * apdu,
double *real_value);
BACNET_STACK_EXPORT
int decode_double_safe(
uint8_t * apdu,
const uint8_t * apdu,
uint32_t len_value,
double *double_value);
src/bacnet/bacstr.c
+29 -28
View File
@@ -86,7 +86,7 @@ void bitstring_set_bit(
*
* @return Value 0/1
*/
bool bitstring_bit(BACNET_BIT_STRING *bit_string, uint8_t bit_number)
bool bitstring_bit(const BACNET_BIT_STRING *bit_string, uint8_t bit_number)
{
bool value = false;
unsigned byte_number = bit_number / 8;
@@ -111,7 +111,7 @@ bool bitstring_bit(BACNET_BIT_STRING *bit_string, uint8_t bit_number)
*
* @return Bits used [0..(MAX_BITSTRING_BYTES*8)-1]
*/
uint8_t bitstring_bits_used(BACNET_BIT_STRING *bit_string)
uint8_t bitstring_bits_used(const BACNET_BIT_STRING *bit_string)
{
return (bit_string ? bit_string->bits_used : 0);
}
@@ -123,7 +123,7 @@ uint8_t bitstring_bits_used(BACNET_BIT_STRING *bit_string)
*
* @return Bytes used [0..MAX_BITSTRING_BYTES]
*/
uint8_t bitstring_bytes_used(BACNET_BIT_STRING *bit_string)
uint8_t bitstring_bytes_used(const BACNET_BIT_STRING *bit_string)
{
uint8_t len = 0; /* return value */
uint8_t used_bytes = 0;
@@ -148,7 +148,7 @@ uint8_t bitstring_bytes_used(BACNET_BIT_STRING *bit_string)
*
* @return Value of the octet.
*/
uint8_t bitstring_octet(BACNET_BIT_STRING *bit_string, uint8_t octet_index)
uint8_t bitstring_octet(const BACNET_BIT_STRING *bit_string, uint8_t octet_index)
{
uint8_t octet = 0;
@@ -217,7 +217,7 @@ bool bitstring_set_bits_used(
*
* @return Capacitiy in bits [0..(MAX_BITSTRING_BYTES*8)]
*/
unsigned bitstring_bits_capacity(BACNET_BIT_STRING *bit_string)
unsigned bitstring_bits_capacity(const BACNET_BIT_STRING *bit_string)
{
if (bit_string) {
return min((MAX_BITSTRING_BYTES * 8), (UINT8_MAX + 1));
@@ -234,7 +234,7 @@ unsigned bitstring_bits_capacity(BACNET_BIT_STRING *bit_string)
*
* @return true on success, false otherwise.
*/
bool bitstring_copy(BACNET_BIT_STRING *dest, BACNET_BIT_STRING *src)
bool bitstring_copy(BACNET_BIT_STRING *dest, const BACNET_BIT_STRING *src)
{
unsigned i;
bool status = false;
@@ -260,7 +260,7 @@ bool bitstring_copy(BACNET_BIT_STRING *dest, BACNET_BIT_STRING *src)
* the same, false otherwise.
*/
bool bitstring_same(
BACNET_BIT_STRING *bitstring1, BACNET_BIT_STRING *bitstring2)
const BACNET_BIT_STRING *bitstring1, const BACNET_BIT_STRING *bitstring2)
{
int i; /* loop counter */
int bytes_used = 0;
@@ -409,7 +409,7 @@ bool characterstring_init(BACNET_CHARACTER_STRING *char_string,
*/
size_t characterstring_strnlen(const char *str, size_t maxlen)
{
char* p = memchr(str, 0, maxlen);
const char* p = memchr(str, 0, maxlen);
if (p == NULL) {
return maxlen;
}
@@ -460,7 +460,7 @@ bool characterstring_init_ansi(
* @return true/false
*/
bool characterstring_copy(
BACNET_CHARACTER_STRING *dest, BACNET_CHARACTER_STRING *src)
BACNET_CHARACTER_STRING *dest, const BACNET_CHARACTER_STRING *src)
{
if (dest && src) {
return characterstring_init(dest, characterstring_encoding(src),
@@ -480,7 +480,7 @@ bool characterstring_copy(
* @return true/false
*/
bool characterstring_ansi_copy(
char *dest, size_t dest_max_len, BACNET_CHARACTER_STRING *src)
char *dest, size_t dest_max_len, const BACNET_CHARACTER_STRING *src)
{
size_t i; /* counter */
@@ -511,7 +511,7 @@ bool characterstring_ansi_copy(
* @return true if the character encoding and string contents are the same
*/
bool characterstring_same(
BACNET_CHARACTER_STRING *dest, BACNET_CHARACTER_STRING *src)
const BACNET_CHARACTER_STRING *dest, const BACNET_CHARACTER_STRING *src)
{
size_t i; /* counter */
bool same_status = false;
@@ -550,7 +550,7 @@ bool characterstring_same(
*
* @return true if the character encoding and string contents are the same
*/
bool characterstring_ansi_same(BACNET_CHARACTER_STRING *dest, const char *src)
bool characterstring_ansi_same(const BACNET_CHARACTER_STRING *dest, const char *src)
{
size_t i; /* counter */
bool same_status = false;
@@ -643,9 +643,9 @@ bool characterstring_truncate(
*
* @return Pointer to a zero-terminated C-string.
*/
char *characterstring_value(BACNET_CHARACTER_STRING *char_string)
const char *characterstring_value(const BACNET_CHARACTER_STRING *char_string)
{
char *value = NULL;
const char *value = NULL;
if (char_string) {
value = char_string->value;
@@ -662,7 +662,7 @@ char *characterstring_value(BACNET_CHARACTER_STRING *char_string)
* @return Length of the character string, but
* maximum MAX_CHARACTER_STRING_BYTES.
*/
size_t characterstring_length(BACNET_CHARACTER_STRING *char_string)
size_t characterstring_length(const BACNET_CHARACTER_STRING *char_string)
{
size_t length = 0;
@@ -685,7 +685,7 @@ size_t characterstring_length(BACNET_CHARACTER_STRING *char_string)
*
* @return MAX_CHARACTER_STRING_BYTES
*/
size_t characterstring_capacity(BACNET_CHARACTER_STRING *char_string)
size_t characterstring_capacity(const BACNET_CHARACTER_STRING *char_string)
{
size_t length = 0;
@@ -703,7 +703,7 @@ size_t characterstring_capacity(BACNET_CHARACTER_STRING *char_string)
*
* @return Encoding, like CHARACTER_ANSI_X34
*/
uint8_t characterstring_encoding(BACNET_CHARACTER_STRING *char_string)
uint8_t characterstring_encoding(const BACNET_CHARACTER_STRING *char_string)
{
uint8_t encoding = 0;
@@ -754,7 +754,7 @@ bool characterstring_set_encoding(
*
* @return true/false on error
*/
bool characterstring_printable(BACNET_CHARACTER_STRING *char_string)
bool characterstring_printable(const BACNET_CHARACTER_STRING *char_string)
{
bool status = false; /* return value */
size_t i; /* counter */
@@ -825,7 +825,7 @@ bool utf8_isvalid(const char *str, size_t length)
return false;
}
/* Check characters. */
pend = (unsigned char *)str + length;
pend = (const unsigned char *)str + length;
for (p = (const unsigned char *)str; p < pend; p++) {
c = *p;
/* null in middle of string */
@@ -917,7 +917,7 @@ bool utf8_isvalid(const char *str, size_t length)
*
* @return true if the string is valid, false otherwise.
*/
bool characterstring_valid(BACNET_CHARACTER_STRING *char_string)
bool characterstring_valid(const BACNET_CHARACTER_STRING *char_string)
{
bool valid = false; /* return value */
@@ -950,7 +950,7 @@ bool characterstring_valid(BACNET_CHARACTER_STRING *char_string)
* @return true on success, false if the string exceeds capacity.
*/
bool octetstring_init(
BACNET_OCTET_STRING *octet_string, uint8_t *value, size_t length)
BACNET_OCTET_STRING *octet_string, const uint8_t *value, size_t length)
{
bool status = false; /* return value */
size_t i; /* counter */
@@ -1039,10 +1039,11 @@ bool octetstring_init_ascii_hex(
*
* @return true on success, false otherwise.
*/
bool octetstring_copy(BACNET_OCTET_STRING *dest, BACNET_OCTET_STRING *src)
bool octetstring_copy(BACNET_OCTET_STRING *dest, const BACNET_OCTET_STRING *src)
{
return octetstring_init(
dest, octetstring_value(src), octetstring_length(src));
dest, octetstring_value(
(BACNET_OCTET_STRING *)src), octetstring_length(src));
}
/**
@@ -1057,7 +1058,7 @@ bool octetstring_copy(BACNET_OCTET_STRING *dest, BACNET_OCTET_STRING *src)
* the dest cannot hold entire octetstring value.
*/
size_t octetstring_copy_value(
uint8_t *dest, size_t length, BACNET_OCTET_STRING *src)
uint8_t *dest, size_t length, const BACNET_OCTET_STRING *src)
{
size_t bytes_copied = 0;
size_t i; /* counter */
@@ -1084,7 +1085,7 @@ size_t octetstring_copy_value(
* @return false if the string exceeds capacity.
*/
bool octetstring_append(
BACNET_OCTET_STRING *octet_string, uint8_t *value, size_t length)
BACNET_OCTET_STRING *octet_string, const uint8_t *value, size_t length)
{
size_t i; /* counter */
bool status = false; /* return value */
@@ -1153,7 +1154,7 @@ uint8_t *octetstring_value(BACNET_OCTET_STRING *octet_string)
*
* @return Length in bytes. Returns always 0 on error.
*/
size_t octetstring_length(BACNET_OCTET_STRING *octet_string)
size_t octetstring_length(const BACNET_OCTET_STRING *octet_string)
{
size_t length = 0;
@@ -1175,7 +1176,7 @@ size_t octetstring_length(BACNET_OCTET_STRING *octet_string)
*
* @return Capacity in bytes. Returns always 0 on error.
*/
size_t octetstring_capacity(BACNET_OCTET_STRING *octet_string)
size_t octetstring_capacity(const BACNET_OCTET_STRING *octet_string)
{
size_t length = 0;
@@ -1195,7 +1196,7 @@ size_t octetstring_capacity(BACNET_OCTET_STRING *octet_string)
* @return true if the octet strings are the same, false otherwise.
*/
bool octetstring_value_same(
BACNET_OCTET_STRING *octet_string1, BACNET_OCTET_STRING *octet_string2)
const BACNET_OCTET_STRING *octet_string1, const BACNET_OCTET_STRING *octet_string2)
{
size_t i = 0; /* loop counter */
src/bacnet/bacstr.h
+28 -28
View File
@@ -46,22 +46,22 @@ extern "C" {
bool value);
BACNET_STACK_EXPORT
bool bitstring_bit(
BACNET_BIT_STRING * bit_string,
const BACNET_BIT_STRING * bit_string,
uint8_t bit_number);
BACNET_STACK_EXPORT
uint8_t bitstring_bits_used(
BACNET_BIT_STRING * bit_string);
const BACNET_BIT_STRING * bit_string);
/* returns the number of bytes that a bit string is using */
BACNET_STACK_EXPORT
uint8_t bitstring_bytes_used(
BACNET_BIT_STRING * bit_string);
const BACNET_BIT_STRING * bit_string);
BACNET_STACK_EXPORT
unsigned bitstring_bits_capacity(
BACNET_BIT_STRING * bit_string);
const BACNET_BIT_STRING * bit_string);
/* used for encoding and decoding from the APDU */
BACNET_STACK_EXPORT
uint8_t bitstring_octet(
BACNET_BIT_STRING * bit_string,
const BACNET_BIT_STRING * bit_string,
uint8_t octet_index);
BACNET_STACK_EXPORT
bool bitstring_set_octet(
@@ -76,11 +76,11 @@ extern "C" {
BACNET_STACK_EXPORT
bool bitstring_copy(
BACNET_BIT_STRING * dest,
BACNET_BIT_STRING * src);
const BACNET_BIT_STRING * src);
BACNET_STACK_EXPORT
bool bitstring_same(
BACNET_BIT_STRING * bitstring1,
BACNET_BIT_STRING * bitstring2);
const BACNET_BIT_STRING * bitstring1,
const BACNET_BIT_STRING * bitstring2);
BACNET_STACK_EXPORT
bool bitstring_init_ascii(
BACNET_BIT_STRING * bit_string,
@@ -111,20 +111,20 @@ extern "C" {
BACNET_STACK_EXPORT
bool characterstring_copy(
BACNET_CHARACTER_STRING * dest,
BACNET_CHARACTER_STRING * src);
const BACNET_CHARACTER_STRING * src);
BACNET_STACK_EXPORT
bool characterstring_ansi_copy(
char *dest,
size_t dest_max_len,
BACNET_CHARACTER_STRING * src);
const BACNET_CHARACTER_STRING * src);
/* returns true if the strings are the same length, encoding, value */
BACNET_STACK_EXPORT
bool characterstring_same(
BACNET_CHARACTER_STRING * dest,
BACNET_CHARACTER_STRING * src);
const BACNET_CHARACTER_STRING * dest,
const BACNET_CHARACTER_STRING * src);
BACNET_STACK_EXPORT
bool characterstring_ansi_same(
BACNET_CHARACTER_STRING * dest,
const BACNET_CHARACTER_STRING * dest,
const char *src);
/* returns false if the string exceeds capacity */
BACNET_STACK_EXPORT
@@ -145,24 +145,24 @@ extern "C" {
uint8_t encoding);
/* Returns the value */
BACNET_STACK_EXPORT
char *characterstring_value(
BACNET_CHARACTER_STRING * char_string);
const char *characterstring_value(
const BACNET_CHARACTER_STRING * char_string);
/* returns the length */
BACNET_STACK_EXPORT
size_t characterstring_length(
BACNET_CHARACTER_STRING * char_string);
const BACNET_CHARACTER_STRING * char_string);
BACNET_STACK_EXPORT
uint8_t characterstring_encoding(
BACNET_CHARACTER_STRING * char_string);
const BACNET_CHARACTER_STRING * char_string);
BACNET_STACK_EXPORT
size_t characterstring_capacity(
BACNET_CHARACTER_STRING * char_string);
const BACNET_CHARACTER_STRING * char_string);
BACNET_STACK_EXPORT
bool characterstring_printable(
BACNET_CHARACTER_STRING * char_string);
const BACNET_CHARACTER_STRING * char_string);
BACNET_STACK_EXPORT
bool characterstring_valid(
BACNET_CHARACTER_STRING * char_string);
const BACNET_CHARACTER_STRING * char_string);
BACNET_STACK_EXPORT
bool utf8_isvalid(
const char *str,
@@ -173,7 +173,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool octetstring_init(
BACNET_OCTET_STRING * octet_string,
uint8_t * value,
const uint8_t * value,
size_t length);
/* converts an null terminated ASCII Hex string to an octet string.
returns true if successfully converted and fits; false if too long */
@@ -184,17 +184,17 @@ extern "C" {
BACNET_STACK_EXPORT
bool octetstring_copy(
BACNET_OCTET_STRING * dest,
BACNET_OCTET_STRING * src);
const BACNET_OCTET_STRING * src);
BACNET_STACK_EXPORT
size_t octetstring_copy_value(
uint8_t * dest,
size_t length,
BACNET_OCTET_STRING * src);
const BACNET_OCTET_STRING * src);
/* returns false if the string exceeds capacity */
BACNET_STACK_EXPORT
bool octetstring_append(
BACNET_OCTET_STRING * octet_string,
uint8_t * value,
const uint8_t * value,
size_t length);
/* This function sets a new length without changing the value.
If length exceeds capacity, no modification happens and
@@ -210,15 +210,15 @@ extern "C" {
/* Returns the length.*/
BACNET_STACK_EXPORT
size_t octetstring_length(
BACNET_OCTET_STRING * octet_string);
const BACNET_OCTET_STRING * octet_string);
BACNET_STACK_EXPORT
size_t octetstring_capacity(
BACNET_OCTET_STRING * octet_string);
const BACNET_OCTET_STRING * octet_string);
/* returns true if the same length and contents */
BACNET_STACK_EXPORT
bool octetstring_value_same(
BACNET_OCTET_STRING * octet_string1,
BACNET_OCTET_STRING * octet_string2);
const BACNET_OCTET_STRING * octet_string1,
const BACNET_OCTET_STRING * octet_string2);
#ifdef __cplusplus
}
src/bacnet/bactimevalue.c
+13 -10
View File
@@ -65,7 +65,7 @@ static bool is_data_value_schedule_compatible(uint8_t tag)
* @param value - value to be encoded
* @return the number of apdu bytes encoded
*/
int bacnet_time_value_encode(uint8_t *apdu, BACNET_TIME_VALUE *value)
int bacnet_time_value_encode(uint8_t *apdu, const BACNET_TIME_VALUE *value)
{
int len;
int apdu_len = 0;
@@ -86,7 +86,7 @@ int bacnet_time_value_encode(uint8_t *apdu, BACNET_TIME_VALUE *value)
return apdu_len;
}
int bacapp_encode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
int bacapp_encode_time_value(uint8_t *apdu, const BACNET_TIME_VALUE *value)
{
return bacnet_time_value_encode(apdu, value);
}
@@ -100,7 +100,7 @@ int bacapp_encode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
* @return the number of apdu bytes encoded
*/
int bacnet_time_value_context_encode(
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
uint8_t *apdu, uint8_t tag_number, const BACNET_TIME_VALUE *value)
{
int len;
int apdu_len = 0;
@@ -122,7 +122,7 @@ int bacnet_time_value_context_encode(
}
int bacapp_encode_context_time_value(
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
uint8_t *apdu, uint8_t tag_number, const BACNET_TIME_VALUE *value)
{
return bacnet_time_value_context_encode(apdu, tag_number, value);
}
@@ -178,7 +178,7 @@ int bacnet_primitive_to_application_data_value(
* @return number of bytes decoded, or BACNET_STATUS_ERROR if errors occur
*/
int bacnet_time_value_decode(
uint8_t *apdu, int apdu_size, BACNET_TIME_VALUE *value)
const uint8_t *apdu, int apdu_size, BACNET_TIME_VALUE *value)
{
int len;
int apdu_len = 0;
@@ -206,7 +206,7 @@ int bacnet_time_value_decode(
return apdu_len;
}
int bacapp_decode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
int bacapp_decode_time_value(const uint8_t *apdu, BACNET_TIME_VALUE *value)
{
return bacnet_time_value_decode(apdu, MAX_APDU, value);
}
@@ -220,7 +220,10 @@ int bacapp_decode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value)
* @return number of bytes decoded, or BACNET_STATUS_ERROR if an error occurs
*/
int bacnet_time_value_context_decode(
uint8_t *apdu, int apdu_size, uint8_t tag_number, BACNET_TIME_VALUE *value)
const uint8_t *apdu,
int apdu_size,
uint8_t tag_number,
BACNET_TIME_VALUE *value)
{
int len;
int apdu_len = 0;
@@ -249,7 +252,7 @@ int bacnet_time_value_context_decode(
}
int bacapp_decode_context_time_value(
uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
const uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value)
{
return bacnet_time_value_context_decode(apdu, MAX_APDU, tag_number, value);
}
@@ -264,7 +267,7 @@ int bacapp_decode_context_time_value(
* @return number of bytes decoded, or BACNET_STATUS_ERROR if an error occurs
*/
int bacnet_time_values_context_decode(
uint8_t *apdu,
const uint8_t *apdu,
const int apdu_size,
const uint8_t tag_number,
BACNET_TIME_VALUE *time_values,
@@ -332,7 +335,7 @@ int bacnet_time_values_context_decode(
int bacnet_time_values_context_encode(
uint8_t *apdu,
uint8_t tag_number,
BACNET_TIME_VALUE *time_values,
const BACNET_TIME_VALUE *time_values,
unsigned int max_time_values)
{
unsigned int j;
src/bacnet/bactimevalue.h
+12 -10
View File
@@ -79,38 +79,40 @@ extern "C" {
BACNET_STACK_EXPORT
int bacnet_time_value_encode(uint8_t * apdu,
BACNET_TIME_VALUE * value);
const BACNET_TIME_VALUE * value);
BACNET_STACK_DEPRECATED("Use bacnet_time_value_encode() instead")
BACNET_STACK_EXPORT
int bacapp_encode_time_value(uint8_t *apdu, BACNET_TIME_VALUE *value);
int bacapp_encode_time_value(uint8_t *apdu,
const BACNET_TIME_VALUE *value);
BACNET_STACK_EXPORT
int bacnet_time_value_context_encode(uint8_t * apdu,
uint8_t tag_number,
BACNET_TIME_VALUE * value);
const BACNET_TIME_VALUE * value);
BACNET_STACK_DEPRECATED("Use bacnet_time_value_context_encode() instead")
BACNET_STACK_EXPORT
int bacapp_encode_context_time_value(uint8_t *apdu, uint8_t tag_number, BACNET_TIME_VALUE *value);
int bacapp_encode_context_time_value(
uint8_t *apdu, uint8_t tag_number, const BACNET_TIME_VALUE *value);
BACNET_STACK_DEPRECATED("Use bacnet_time_value_decode() instead")
BACNET_STACK_EXPORT
int bacapp_decode_time_value(uint8_t * apdu,
int bacapp_decode_time_value(const uint8_t * apdu,
BACNET_TIME_VALUE * value);
BACNET_STACK_EXPORT
int bacnet_time_value_decode(uint8_t *apdu, int max_apdu_len,
int bacnet_time_value_decode(const uint8_t *apdu, int max_apdu_len,
BACNET_TIME_VALUE *value);
BACNET_STACK_DEPRECATED("Use bacnet_time_value_context_decode() instead")
BACNET_STACK_EXPORT
int bacapp_decode_context_time_value(uint8_t * apdu,
int bacapp_decode_context_time_value(const uint8_t * apdu,
uint8_t tag_number,
BACNET_TIME_VALUE * value);
BACNET_STACK_EXPORT
int bacnet_time_value_context_decode(uint8_t *apdu, int max_apdu_len,
int bacnet_time_value_context_decode(const uint8_t *apdu, int max_apdu_len,
uint8_t tag_number, BACNET_TIME_VALUE *value);
/**
@@ -125,7 +127,7 @@ extern "C" {
*/
BACNET_STACK_EXPORT
int bacnet_time_values_context_decode(
uint8_t * apdu,
const uint8_t * apdu,
int max_apdu_len,
uint8_t tag_number,
BACNET_TIME_VALUE *time_values,
@@ -145,7 +147,7 @@ extern "C" {
int bacnet_time_values_context_encode(
uint8_t * apdu,
uint8_t tag_number,
BACNET_TIME_VALUE * time_values,
const BACNET_TIME_VALUE * time_values,
unsigned int max_time_values);
#ifdef __cplusplus
src/bacnet/basic/bbmd/h_bbmd.c
+21 -17
View File
@@ -253,7 +253,7 @@ void bvlc_maintenance_timer(uint16_t seconds)
*
* @return true if the IP from sin match me
*/
static bool bbmd_address_match_self(BACNET_IP_ADDRESS *addr)
static bool bbmd_address_match_self(const BACNET_IP_ADDRESS *addr)
{
BACNET_IP_ADDRESS my_addr = { 0 };
bool status = false;
@@ -274,7 +274,7 @@ static bool bbmd_address_match_self(BACNET_IP_ADDRESS *addr)
*
* @return True if BDT member is found and has a unicast mask
*/
static bool bbmd_bdt_member_mask_is_unicast(BACNET_IP_ADDRESS *addr)
static bool bbmd_bdt_member_mask_is_unicast(const BACNET_IP_ADDRESS *addr)
{
bool unicast = false;
BACNET_IP_ADDRESS my_addr = { 0 };
@@ -312,7 +312,9 @@ static bool bbmd_bdt_member_mask_is_unicast(BACNET_IP_ADDRESS *addr)
* @return number of bytes encoded in the Forwarded NPDU
*/
static uint16_t bbmd_forward_npdu(
BACNET_IP_ADDRESS *bip_src, uint8_t *npdu, uint16_t npdu_length)
const BACNET_IP_ADDRESS *bip_src,
const uint8_t *npdu,
uint16_t npdu_length)
{
BACNET_IP_ADDRESS broadcast_address = { 0 };
uint8_t mtu[BIP_MPDU_MAX] = { 0 };
@@ -338,8 +340,8 @@ static uint16_t bbmd_forward_npdu(
* @param original - was the message an original (not forwarded)
* @return number of bytes encoded in the Forwarded NPDU
*/
static uint16_t bbmd_bdt_forward_npdu(BACNET_IP_ADDRESS *bip_src,
uint8_t *npdu,
static uint16_t bbmd_bdt_forward_npdu(const BACNET_IP_ADDRESS *bip_src,
const uint8_t *npdu,
uint16_t npdu_length,
bool original)
{
@@ -403,8 +405,8 @@ static uint16_t bbmd_bdt_forward_npdu(BACNET_IP_ADDRESS *bip_src,
* @param original - was the message an original (not forwarded)
* @return number of bytes encoded in the Forwarded NPDU
*/
static uint16_t bbmd_fdt_forward_npdu(BACNET_IP_ADDRESS *bip_src,
uint8_t *npdu,
static uint16_t bbmd_fdt_forward_npdu(const BACNET_IP_ADDRESS *bip_src,
const uint8_t *npdu,
uint16_t npdu_length,
bool original)
{
@@ -468,7 +470,7 @@ static uint16_t bbmd_fdt_forward_npdu(BACNET_IP_ADDRESS *bip_src,
* @param original - was the message an original (not forwarded)
*/
static void bbmd_read_bdt_ack_handler(
BACNET_IP_ADDRESS *addr, uint8_t *npdu, uint16_t npdu_length)
const BACNET_IP_ADDRESS *addr, const uint8_t *npdu, uint16_t npdu_length)
{
#if PRINT_ENABLED
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY bdt_entry = { 0 };
@@ -516,7 +518,7 @@ static void bbmd_read_bdt_ack_handler(
* @param original - was the message an original (not forwarded)
*/
static void bbmd_read_fdt_ack_handler(
BACNET_IP_ADDRESS *addr, uint8_t *npdu, uint16_t npdu_length)
const BACNET_IP_ADDRESS *addr, const uint8_t *npdu, uint16_t npdu_length)
{
#if PRINT_ENABLED
BACNET_IP_FOREIGN_DEVICE_TABLE_ENTRY fdt_entry = { 0 };
@@ -566,9 +568,9 @@ static void bbmd_read_fdt_ack_handler(
* @return Upon successful completion, returns the number of bytes sent.
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
int bvlc_send_pdu(BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
int bvlc_send_pdu(const BACNET_ADDRESS *dest,
const BACNET_NPDU_DATA *npdu_data,
const uint8_t *pdu,
unsigned pdu_len)
{
BACNET_IP_ADDRESS bvlc_dest = { 0 };
@@ -637,7 +639,8 @@ int bvlc_send_pdu(BACNET_ADDRESS *dest,
* @return Upon successful completion, returns the number of bytes sent.
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
static int bvlc_send_result(BACNET_IP_ADDRESS *dest_addr, uint16_t result_code)
static int bvlc_send_result(
const BACNET_IP_ADDRESS *dest_addr, uint16_t result_code)
{
uint8_t mtu[BIP_MPDU_MAX] = { 0 };
uint16_t mtu_len = 0;
@@ -1192,7 +1195,8 @@ int bvlc_broadcast_handler(BACNET_IP_ADDRESS *addr,
* 0 if no registration request is sent, or
* -1 if registration fails.
*/
int bvlc_register_with_bbmd(BACNET_IP_ADDRESS *bbmd_addr, uint16_t ttl_seconds)
int bvlc_register_with_bbmd(
const BACNET_IP_ADDRESS *bbmd_addr, uint16_t ttl_seconds)
{
/* Store the BBMD address and port so that we won't broadcast locally. */
/* We are a foreign device! */
@@ -1232,7 +1236,7 @@ uint16_t bvlc_remote_bbmd_lifetime(void)
* @param bbmd_addr - IPv4 address of BBMD with which to read
* @return Positive number (of bytes sent) on success
*/
int bvlc_bbmd_read_bdt(BACNET_IP_ADDRESS *bbmd_addr)
int bvlc_bbmd_read_bdt(const BACNET_IP_ADDRESS *bbmd_addr)
{
BVLC_Buffer_Len = bvlc_encode_read_broadcast_distribution_table(
&BVLC_Buffer[0], sizeof(BVLC_Buffer));
@@ -1245,7 +1249,7 @@ int bvlc_bbmd_read_bdt(BACNET_IP_ADDRESS *bbmd_addr)
* @param bbmd_addr - IPv4 address of BBMD with which to read
* @return Positive number (of bytes sent) on success
*/
int bvlc_bbmd_write_bdt(BACNET_IP_ADDRESS *bbmd_addr,
int bvlc_bbmd_write_bdt(const BACNET_IP_ADDRESS *bbmd_addr,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list)
{
BVLC_Buffer_Len = bvlc_encode_write_broadcast_distribution_table(
@@ -1259,7 +1263,7 @@ int bvlc_bbmd_write_bdt(BACNET_IP_ADDRESS *bbmd_addr,
* @param bbmd_addr - IPv4 address of BBMD with which to read
* @return Positive number (of bytes sent) on success
*/
int bvlc_bbmd_read_fdt(BACNET_IP_ADDRESS *bbmd_addr)
int bvlc_bbmd_read_fdt(const BACNET_IP_ADDRESS *bbmd_addr)
{
BVLC_Buffer_Len = bvlc_encode_read_foreign_device_table(
&BVLC_Buffer[0], sizeof(BVLC_Buffer));
src/bacnet/basic/bbmd/h_bbmd.h
+7 -7
View File
@@ -47,9 +47,9 @@ int bvlc_bbmd_disabled_handler(BACNET_IP_ADDRESS *addr,
BACNET_STACK_EXPORT
int bvlc_send_pdu(BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
int bvlc_send_pdu(const BACNET_ADDRESS *dest,
const BACNET_NPDU_DATA *npdu_data,
const uint8_t *pdu,
unsigned pdu_len);
BACNET_STACK_EXPORT
@@ -76,18 +76,18 @@ void bvlc_debug_disable(void);
/* send a Read BDT request */
BACNET_STACK_EXPORT
int bvlc_bbmd_read_bdt(BACNET_IP_ADDRESS *bbmd_addr);
int bvlc_bbmd_read_bdt(const BACNET_IP_ADDRESS *bbmd_addr);
BACNET_STACK_EXPORT
int bvlc_bbmd_write_bdt(BACNET_IP_ADDRESS *bbmd_addr,
int bvlc_bbmd_write_bdt(const BACNET_IP_ADDRESS *bbmd_addr,
BACNET_IP_BROADCAST_DISTRIBUTION_TABLE_ENTRY *bdt_list);
/* send a Read FDT request */
BACNET_STACK_EXPORT
int bvlc_bbmd_read_fdt(BACNET_IP_ADDRESS *bbmd_addr);
int bvlc_bbmd_read_fdt(const BACNET_IP_ADDRESS *bbmd_addr);
/* registers with a bbmd as a foreign device */
BACNET_STACK_EXPORT
int bvlc_register_with_bbmd(
BACNET_IP_ADDRESS *address, uint16_t time_to_live_seconds);
const BACNET_IP_ADDRESS *address, uint16_t time_to_live_seconds);
BACNET_STACK_EXPORT
void bvlc_remote_bbmd_address(
BACNET_IP_ADDRESS *address);
src/bacnet/basic/bbmd6/h_bbmd6.c
+18 -16
View File
@@ -114,7 +114,7 @@ void bvlc6_maintenance_timer(uint16_t seconds)
* @return true if the address was set
*/
static bool bbmd6_address_from_vmac(
BACNET_IP6_ADDRESS *addr, struct vmac_data *vmac)
BACNET_IP6_ADDRESS *addr, const struct vmac_data *vmac)
{
bool status = false;
unsigned int i = 0;
@@ -139,7 +139,7 @@ static bool bbmd6_address_from_vmac(
* @return true if the address was set
*/
static bool bbmd6_address_to_vmac(
struct vmac_data *vmac, BACNET_IP6_ADDRESS *addr)
struct vmac_data *vmac, const BACNET_IP6_ADDRESS *addr)
{
bool status = false;
unsigned int i = 0;
@@ -162,7 +162,7 @@ static bool bbmd6_address_to_vmac(
* @param device_id - device ID used as the key-pair
* @param addr - IPv6 source address
*/
static void bbmd6_add_vmac(uint32_t device_id, BACNET_IP6_ADDRESS *addr)
static void bbmd6_add_vmac(uint32_t device_id, const BACNET_IP6_ADDRESS *addr)
{
bool found = false;
uint32_t list_device_id = 0;
@@ -224,7 +224,7 @@ static void bbmd6_add_vmac(uint32_t device_id, BACNET_IP6_ADDRESS *addr)
*
* @return true if the IPv6 from sin match me
*/
static bool bbmd6_address_match_self(BACNET_IP6_ADDRESS *addr)
static bool bbmd6_address_match_self(const BACNET_IP6_ADDRESS *addr)
{
BACNET_IP6_ADDRESS my_addr = { 0 };
bool status = false;
@@ -249,7 +249,7 @@ static bool bbmd6_address_match_self(BACNET_IP6_ADDRESS *addr)
* @return true if the address was in the VMAC table
*/
static bool bbmd6_address_from_bacnet_address(
BACNET_IP6_ADDRESS *addr, uint32_t *vmac_src, BACNET_ADDRESS *baddr)
BACNET_IP6_ADDRESS *addr, uint32_t *vmac_src, const BACNET_ADDRESS *baddr)
{
struct vmac_data *vmac;
bool status = false;
@@ -285,9 +285,9 @@ static bool bbmd6_address_from_bacnet_address(
* @return Upon successful completion, returns the number of bytes sent.
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
int bvlc6_send_pdu(BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
int bvlc6_send_pdu(const BACNET_ADDRESS *dest,
const BACNET_NPDU_DATA *npdu_data,
const uint8_t *pdu,
unsigned pdu_len)
{
BACNET_IP6_ADDRESS bvlc_dest = { 0 };
@@ -451,7 +451,9 @@ static void bbmd6_send_forward_npdu(BACNET_IP6_ADDRESS *address,
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
static int bvlc6_send_result(
BACNET_IP6_ADDRESS *dest_addr, uint32_t vmac_src, uint16_t result_code)
const BACNET_IP6_ADDRESS *dest_addr,
uint32_t vmac_src,
uint16_t result_code)
{
uint8_t mtu[BIP6_MPDU_MAX] = { 0 };
uint16_t mtu_len = 0;
@@ -473,7 +475,7 @@ static int bvlc6_send_result(
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
static int bvlc6_send_address_resolution_ack(
BACNET_IP6_ADDRESS *dest_addr, uint32_t vmac_src, uint32_t vmac_dst)
const BACNET_IP6_ADDRESS *dest_addr, uint32_t vmac_src, uint32_t vmac_dst)
{
uint8_t mtu[BIP6_MPDU_MAX] = { 0 };
uint16_t mtu_len = 0;
@@ -497,7 +499,7 @@ static int bvlc6_send_address_resolution_ack(
* Otherwise, -1 shall be returned and errno set to indicate the error.
*/
static int bvlc6_send_virtual_address_resolution_ack(
BACNET_IP6_ADDRESS *dest_addr, uint32_t vmac_src, uint32_t vmac_dst)
const BACNET_IP6_ADDRESS *dest_addr, uint32_t vmac_src, uint32_t vmac_dst)
{
uint8_t mtu[BIP6_MPDU_MAX] = { 0 };
uint16_t mtu_len = 0;
@@ -516,7 +518,7 @@ static int bvlc6_send_virtual_address_resolution_ack(
* @param pdu_len - How many bytes in NPDU+APDU buffer.
*/
static void bbmd6_virtual_address_resolution_handler(
BACNET_IP6_ADDRESS *addr, uint8_t *pdu, uint16_t pdu_len)
const BACNET_IP6_ADDRESS *addr, const uint8_t *pdu, uint16_t pdu_len)
{
int function_len = 0;
uint32_t vmac_src = 0;
@@ -550,7 +552,7 @@ static void bbmd6_virtual_address_resolution_handler(
* @param pdu_len - How many bytes in NPDU+APDU buffer.
*/
static void bbmd6_virtual_address_resolution_ack_handler(
BACNET_IP6_ADDRESS *addr, uint8_t *pdu, uint16_t pdu_len)
const BACNET_IP6_ADDRESS *addr, const uint8_t *pdu, uint16_t pdu_len)
{
int function_len = 0;
uint32_t vmac_src = 0;
@@ -578,7 +580,7 @@ static void bbmd6_virtual_address_resolution_ack_handler(
* @param pdu_len - How many bytes in NPDU+APDU buffer.
*/
static void bbmd6_address_resolution_handler(
BACNET_IP6_ADDRESS *addr, uint8_t *pdu, uint16_t pdu_len)
const BACNET_IP6_ADDRESS *addr, const uint8_t *pdu, uint16_t pdu_len)
{
int function_len = 0;
uint32_t vmac_src = 0;
@@ -614,7 +616,7 @@ static void bbmd6_address_resolution_handler(
* @param pdu_len - How many bytes in NPDU+APDU buffer.
*/
static void bbmd6_address_resolution_ack_handler(
BACNET_IP6_ADDRESS *addr, uint8_t *pdu, uint16_t pdu_len)
const BACNET_IP6_ADDRESS *addr, const uint8_t *pdu, uint16_t pdu_len)
{
int function_len = 0;
uint32_t vmac_src = 0;
@@ -1039,7 +1041,7 @@ int bvlc6_handler(BACNET_IP6_ADDRESS *addr,
* 0 if no registration request is sent, or
* -1 if registration fails.
*/
int bvlc6_register_with_bbmd(BACNET_IP6_ADDRESS *bbmd_addr,
int bvlc6_register_with_bbmd(const BACNET_IP6_ADDRESS *bbmd_addr,
uint16_t ttl_seconds)
{
uint8_t mtu[BIP6_MPDU_MAX] = { 0 };
src/bacnet/basic/bbmd6/h_bbmd6.h
+4 -4
View File
@@ -41,14 +41,14 @@ extern "C" {
uint16_t mtu_len);
BACNET_STACK_EXPORT
int bvlc6_send_pdu(BACNET_ADDRESS *dest,
BACNET_NPDU_DATA *npdu_data,
uint8_t *pdu,
int bvlc6_send_pdu(const BACNET_ADDRESS *dest,
const BACNET_NPDU_DATA *npdu_data,
const uint8_t *pdu,
unsigned pdu_len);
BACNET_STACK_EXPORT
int bvlc6_register_with_bbmd(
BACNET_IP6_ADDRESS *bbmd_addr,
const BACNET_IP6_ADDRESS *bbmd_addr,
uint16_t time_to_live_seconds);
BACNET_STACK_EXPORT
src/bacnet/basic/bbmd6/vmac.c
+8 -4
View File
@@ -52,7 +52,7 @@ unsigned int VMAC_Count(void)
*
* @return true if the device ID and MAC are added
*/
bool VMAC_Add(uint32_t device_id, struct vmac_data *src)
bool VMAC_Add(uint32_t device_id, const struct vmac_data *src)
{
bool status = false;
struct vmac_data *pVMAC = NULL;
@@ -126,7 +126,9 @@ struct vmac_data *VMAC_Find_By_Key(uint32_t device_id)
*
* @return true if the addresses are different
*/
bool VMAC_Different(struct vmac_data *vmac1, struct vmac_data *vmac2)
bool VMAC_Different(
const struct vmac_data *vmac1,
const struct vmac_data *vmac2)
{
bool status = false;
unsigned int i = 0;
@@ -157,7 +159,9 @@ bool VMAC_Different(struct vmac_data *vmac1, struct vmac_data *vmac2)
*
* @return true if the addresses are the same
*/
bool VMAC_Match(struct vmac_data *vmac1, struct vmac_data *vmac2)
bool VMAC_Match(
const struct vmac_data *vmac1,
const struct vmac_data *vmac2)
{
bool status = false;
unsigned int i = 0;
@@ -190,7 +194,7 @@ bool VMAC_Match(struct vmac_data *vmac1, struct vmac_data *vmac2)
*
* @return true if the VMAC address was found
*/
bool VMAC_Find_By_Data(struct vmac_data *vmac, uint32_t *device_id)
bool VMAC_Find_By_Data(const struct vmac_data *vmac, uint32_t *device_id)
{
bool status = false;
struct vmac_data *list_vmac;
src/bacnet/basic/bbmd6/vmac.h
+6 -6
View File
@@ -35,19 +35,19 @@ extern "C" {
BACNET_STACK_EXPORT
struct vmac_data *VMAC_Find_By_Key(uint32_t device_id);
BACNET_STACK_EXPORT
bool VMAC_Find_By_Data(struct vmac_data *vmac, uint32_t *device_id);
bool VMAC_Find_By_Data(const struct vmac_data *vmac, uint32_t *device_id);
BACNET_STACK_EXPORT
bool VMAC_Add(uint32_t device_id, struct vmac_data *pVMAC);
bool VMAC_Add(uint32_t device_id, const struct vmac_data *pVMAC);
BACNET_STACK_EXPORT
bool VMAC_Delete(uint32_t device_id);
BACNET_STACK_EXPORT
bool VMAC_Different(
struct vmac_data *vmac1,
struct vmac_data *vmac2);
const struct vmac_data *vmac1,
const struct vmac_data *vmac2);
BACNET_STACK_EXPORT
bool VMAC_Match(
struct vmac_data *vmac1,
struct vmac_data *vmac2);
const struct vmac_data *vmac1,
const struct vmac_data *vmac2);
BACNET_STACK_EXPORT
void VMAC_Cleanup(void);
BACNET_STACK_EXPORT
src/bacnet/basic/binding/address.c
+4 -3
View File
@@ -382,7 +382,7 @@ bool address_get_by_device(
*
* @return true/false
*/
bool address_get_device_id(BACNET_ADDRESS *src, uint32_t *device_id)
bool address_get_device_id(const BACNET_ADDRESS *src, uint32_t *device_id)
{
struct Address_Cache_Entry *pMatch;
bool found = false; /* return value */
@@ -413,7 +413,8 @@ bool address_get_device_id(BACNET_ADDRESS *src, uint32_t *device_id)
* @param max_apdu Maximum APDU size.
* @param src Pointer to address structure to add.
*/
void address_add(uint32_t device_id, unsigned max_apdu, BACNET_ADDRESS *src)
void address_add(
uint32_t device_id, unsigned max_apdu, const BACNET_ADDRESS *src)
{
bool found = false; /* return value */
struct Address_Cache_Entry *pMatch;
@@ -594,7 +595,7 @@ bool address_bind_request(
* @param src Pointer to the BACnet address.
*/
void address_add_binding(
uint32_t device_id, unsigned max_apdu, BACNET_ADDRESS *src)
uint32_t device_id, unsigned max_apdu, const BACNET_ADDRESS *src)
{
struct Address_Cache_Entry *pMatch;
unsigned index;
src/bacnet/basic/binding/address.h
+3 -3
View File
@@ -38,7 +38,7 @@ extern "C" {
void address_add(
uint32_t device_id,
unsigned max_apdu,
BACNET_ADDRESS * src);
const BACNET_ADDRESS * src);
BACNET_STACK_EXPORT
void address_remove_device(
@@ -67,7 +67,7 @@ extern "C" {
BACNET_STACK_EXPORT
bool address_get_device_id(
BACNET_ADDRESS * src,
const BACNET_ADDRESS * src,
uint32_t * device_id);
BACNET_STACK_EXPORT
@@ -91,7 +91,7 @@ extern "C" {
void address_add_binding(
uint32_t device_id,
unsigned max_apdu,
BACNET_ADDRESS * src);
const BACNET_ADDRESS * src);
BACNET_STACK_EXPORT
int address_list_encode(
src/bacnet/basic/client/bac-data.c
+3 -3
View File
@@ -109,8 +109,8 @@ static void bacnet_data_object_init(void)
}
static void bacnet_data_object_store(int index,
BACNET_READ_PROPERTY_DATA *rp_data,
BACNET_APPLICATION_DATA_VALUE *value)
const BACNET_READ_PROPERTY_DATA *rp_data,
const BACNET_APPLICATION_DATA_VALUE *value)
{
BACNET_DATA_OBJECT *object = NULL;
@@ -189,7 +189,7 @@ void bacnet_data_value_save(uint32_t device_instance,
* @brief Handles the BACnet Data Analog Value processing
* @param object - BACnet object structure data pointer
*/
static void bacnet_data_object_process(BACNET_DATA_OBJECT *object)
static void bacnet_data_object_process(const BACNET_DATA_OBJECT *object)
{
if (object && (object->Device_ID < BACNET_MAX_INSTANCE) &&
(object->Object_ID < BACNET_MAX_INSTANCE)) {
src/bacnet/basic/client/bac-discover.c
+2 -2
View File
@@ -555,8 +555,8 @@ bool bacnet_discover_object_property_identifier(uint32_t device_id,
* @param device_data [in] Pointer to the device data structure
*/
static void bacnet_device_object_property_add(uint32_t device_id,
BACNET_READ_PROPERTY_DATA *rp_data,
BACNET_APPLICATION_DATA_VALUE *value,
const BACNET_READ_PROPERTY_DATA *rp_data,
const BACNET_APPLICATION_DATA_VALUE *value,
BACNET_DEVICE_DATA *device_data)
{
BACNET_OBJECT_DATA *object_data;
src/bacnet/basic/client/bac-rw.c
+1 -1
View File
@@ -351,7 +351,7 @@ static uint8_t Send_RPM_All_Request(uint32_t device_id,
* @param service_request [in] The contents of the service request.
* @return true if the process is finished
*/
static bool bacnet_read_write_process(TARGET_DATA *target)
static bool bacnet_read_write_process(const TARGET_DATA *target)
{
bool found = false;
unsigned max_apdu = 0;
src/bacnet/basic/npdu/s_router.c
+5 -5
View File
@@ -46,12 +46,12 @@
*/
int Send_Network_Layer_Message(BACNET_NETWORK_MESSAGE_TYPE network_message_type,
BACNET_ADDRESS *dst,
int *iArgs)
const int *iArgs)
{
int len = 0;
int pdu_len = 0;
int bytes_sent = 0;
int *pVal = iArgs; /* Start with first value */
const int *pVal = iArgs; /* Start with first value */
bool data_expecting_reply = false;
BACNET_NPDU_DATA npdu_data;
BACNET_ADDRESS bcastDest;
@@ -209,7 +209,7 @@ void Send_I_Am_Router_To_Network(const int DNET_list[])
{
/* Use a NULL dst here since we want a broadcast MAC address. */
Send_Network_Layer_Message(
NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, NULL, (int *)DNET_list);
NETWORK_MESSAGE_I_AM_ROUTER_TO_NETWORK, NULL, DNET_list);
}
/** Finds a specific router, or all reachable BACnet networks.
@@ -253,7 +253,7 @@ void Send_Initialize_Routing_Table(BACNET_ADDRESS *dst, const int DNET_list[])
{
/* Use a NULL dst here since we want a broadcast MAC address. */
Send_Network_Layer_Message(
NETWORK_MESSAGE_INIT_RT_TABLE, dst, (int *)DNET_list);
NETWORK_MESSAGE_INIT_RT_TABLE, dst, DNET_list);
}
/** Sends our Routing Table, built from our DNET[] array, as an ACK.
@@ -277,7 +277,7 @@ void Send_Initialize_Routing_Table_Ack(
BACNET_ADDRESS *dst, const int DNET_list[])
{
Send_Network_Layer_Message(
NETWORK_MESSAGE_INIT_RT_TABLE_ACK, dst, (int *)DNET_list);
NETWORK_MESSAGE_INIT_RT_TABLE_ACK, dst, DNET_list);
}
/**
src/bacnet/basic/npdu/s_router.h
+1 -1
View File
@@ -25,7 +25,7 @@ extern "C" {
int Send_Network_Layer_Message(
BACNET_NETWORK_MESSAGE_TYPE network_message_type,
BACNET_ADDRESS * dst,
int *iArgs);
const int *iArgs);
BACNET_STACK_EXPORT
void Send_Who_Is_Router_To_Network(
BACNET_ADDRESS * dst,
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);

Some files were not shown because too many files have changed in this diff Show More