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

Fixed EOL, indent.

Browse Source
This commit is contained in:
skarg
2009-10-24 17:02:59 +00:00
parent 857d0c185d
commit c04e69da8c
118 changed files with 2633 additions and 2629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/include/address.h
+4 -4
View File
@@ -48,7 +48,7 @@ extern "C" {
void address_init_partial(
void);
void address_add(
uint32_t device_id,
unsigned max_apdu,
@@ -92,12 +92,12 @@ extern "C" {
int address_list_encode(
uint8_t * apdu,
unsigned apdu_len);
void address_set_device_TTL(
uint32_t device_id,
uint32_t TimeOut,
bool StaticFlag);
bool StaticFlag);
void address_cache_timer(
uint16_t uSeconds);
bacnet-stack/include/ai.h
+5 -5
View File
@@ -32,11 +32,11 @@
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
void Analog_Input_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
void Analog_Input_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
bool Analog_Input_Valid_Instance(
uint32_t object_instance);
unsigned Analog_Input_Count(
bacnet-stack/include/ao.h
+2 -1
View File
@@ -81,7 +81,8 @@ extern "C" {
uint32_t instance);
void Analog_Output_Init(void);
void Analog_Output_Init(
void);
int Analog_Output_Encode_Property_APDU(
uint8_t * apdu,
bacnet-stack/include/bacapp.h
+4 -4
View File
@@ -129,10 +129,10 @@ extern "C" {
unsigned max_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value);
bool bacapp_decode_application_data_safe(
uint8_t * new_apdu,
uint32_t new_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value);
bool bacapp_decode_application_data_safe(
uint8_t * new_apdu,
uint32_t new_apdu_len,
BACNET_APPLICATION_DATA_VALUE * value);
int bacapp_encode_application_data(
uint8_t * apdu,
bacnet-stack/include/bacdcode.h
+20 -20
View File
@@ -71,11 +71,11 @@ extern "C" {
uint8_t * apdu,
uint8_t * tag_number,
uint32_t * value);
int decode_tag_number_and_value_safe(
uint8_t * apdu,
uint32_t apdu_len_remaining,
uint8_t * tag_number,
uint32_t * value);
int decode_tag_number_and_value_safe(
uint8_t * apdu,
uint32_t apdu_len_remaining,
uint8_t * tag_number,
uint32_t * value);
/* returns true if the tag is an opening tag and matches */
bool decode_is_opening_tag_number(
uint8_t * apdu,
@@ -174,11 +174,11 @@ extern "C" {
uint16_t * object_type,
uint32_t * instance);
int decode_object_id_safe(
uint8_t * apdu,
uint32_t len_value,
uint16_t * object_type,
uint32_t * instance);
int decode_object_id_safe(
uint8_t * apdu,
uint32_t len_value,
uint16_t * object_type,
uint32_t * instance);
int decode_context_object_id(
uint8_t * apdu,
@@ -325,11 +325,11 @@ extern "C" {
int decode_bacnet_time(
uint8_t * apdu,
BACNET_TIME * btime);
int decode_bacnet_time_safe(
uint8_t * apdu,
uint32_t len_value,
BACNET_TIME * btime);
int encode_context_time(
int decode_bacnet_time_safe(
uint8_t * apdu,
uint32_t len_value,
BACNET_TIME * btime);
int encode_context_time(
uint8_t * apdu,
uint8_t tag_number,
BACNET_TIME * btime);
@@ -364,11 +364,11 @@ extern "C" {
int decode_date(
uint8_t * apdu,
BACNET_DATE * bdate);
int decode_date_safe(
uint8_t * apdu,
uint32_t len_value,
BACNET_DATE * bdate);
int decode_application_date(
int decode_date_safe(
uint8_t * apdu,
uint32_t len_value,
BACNET_DATE * bdate);
int decode_application_date(
uint8_t * apdu,
BACNET_DATE * bdate);
int decode_context_date(
bacnet-stack/include/bacenum.h
+1 -1
View File
@@ -1428,7 +1428,7 @@ typedef enum BACnetDaysOfWeek {
BACNET_DAYS_OF_WEEK_FRIDAY = 4,
BACNET_DAYS_OF_WEEK_SATURDAY = 5,
BACNET_DAYS_OF_WEEK_SUNDAY = 6,
MAX_BACNET_DAYS_OF_WEEK = 7
MAX_BACNET_DAYS_OF_WEEK = 7
} BACNET_DAYS_OF_WEEK;
typedef enum BACnetEventTransitionBits {
bacnet-stack/include/bacfile.h
+2 -1
View File
@@ -74,7 +74,8 @@ extern "C" {
bool bacfile_write_stream_data(
BACNET_ATOMIC_WRITE_FILE_DATA * data);
void bacfile_init(void);
void bacfile_init(
void);
/* handling for read property service */
int bacfile_encode_property_apdu(
bacnet-stack/include/bacreal.h
+9 -9
View File
@@ -42,10 +42,10 @@
extern "C" {
#endif /* __cplusplus */
int decode_real_safe(
uint8_t * apdu,
uint32_t len_value,
float *real_value);
int decode_real_safe(
uint8_t * apdu,
uint32_t len_value,
float *real_value);
int decode_real(
uint8_t * apdu,
@@ -65,12 +65,12 @@ extern "C" {
uint8_t * apdu,
uint8_t tag_number,
double *double_value);
int decode_double_safe(
uint8_t * apdu,
uint32_t len_value,
double *double_value);
int decode_double_safe(
uint8_t * apdu,
uint32_t len_value,
double *double_value);
int encode_bacnet_double(
int encode_bacnet_double(
double value,
uint8_t * apdu);
bacnet-stack/include/bacstr.h
+3 -3
View File
@@ -98,9 +98,9 @@ extern "C" {
BACNET_BIT_STRING * dest,
BACNET_BIT_STRING * src);
bool bitstring_same(
BACNET_BIT_STRING * bitstring1,
BACNET_BIT_STRING * bitstring2);
bool bitstring_same(
BACNET_BIT_STRING * bitstring1,
BACNET_BIT_STRING * bitstring2);
/* returns false if the string exceeds capacity
initialize by using length=0 */
bacnet-stack/include/bactext.h
+3 -3
View File
@@ -62,8 +62,8 @@ extern "C" {
const char *bactext_object_type_name(
unsigned index);
bool bactext_object_type_index(
const char *search_name,
unsigned *found_index);
const char *search_name,
unsigned *found_index);
const char *bactext_property_name(
unsigned index);
bool bactext_property_index(
@@ -103,7 +103,7 @@ extern "C" {
unsigned index);
const char *bactext_segmentation_name(
unsigned index);
const char *bactext_event_transition_name(
unsigned index);
bool bactext_event_transition_index(
bacnet-stack/include/bv.h
+1 -1
View File
@@ -55,7 +55,7 @@ extern "C" {
void Binary_Value_Init(
void);
int Binary_Value_Encode_Property_APDU(
uint8_t * apdu,
uint32_t object_instance,
bacnet-stack/include/client.h
+1 -1
View File
@@ -164,7 +164,7 @@ extern "C" {
void Send_UnconfirmedPrivateTransfer(
BACNET_ADDRESS * dest,
BACNET_PRIVATE_TRANSFER_DATA *private_data);
BACNET_PRIVATE_TRANSFER_DATA * private_data);
#ifdef __cplusplus
}
bacnet-stack/include/device.h
+11 -5
View File
@@ -40,11 +40,17 @@
#include "bacenum.h"
#include "wp.h"
typedef unsigned (*object_count_function) (void);
typedef uint32_t (*object_index_to_instance_function)
(unsigned index);
typedef char * (*object_name_function)
(uint32_t object_instance);
typedef unsigned (
*object_count_function) (
void);
typedef uint32_t(
*object_index_to_instance_function)
(
unsigned index);
typedef char *(
*object_name_function)
(
uint32_t object_instance);
#ifdef __cplusplus
extern "C" {
bacnet-stack/include/getevent.h
+45 -44
View File
@@ -56,65 +56,66 @@ typedef struct BACnet_Get_Event_Information_Data {
/* return 0 if no active event at this index
return -1 if end of list
return +1 if active event */
typedef int (*get_event_info_function) (
typedef int (
*get_event_info_function) (
unsigned index,
BACNET_GET_EVENT_INFORMATION_DATA *getevent_data);
BACNET_GET_EVENT_INFORMATION_DATA * getevent_data);
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
int getevent_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_OBJECT_ID * lastReceivedObjectIdentifier);
int getevent_encode_apdu(
uint8_t * apdu,
uint8_t invoke_id,
BACNET_OBJECT_ID * lastReceivedObjectIdentifier);
int getevent_decode_service_request(
uint8_t * apdu,
unsigned apdu_len,
BACNET_OBJECT_ID * object_id);
int getevent_decode_service_request(
uint8_t * apdu,
unsigned apdu_len,
BACNET_OBJECT_ID * object_id);
int getevent_ack_encode_apdu_init(
uint8_t * apdu,
size_t max_apdu,
uint8_t invoke_id);
int getevent_ack_encode_apdu_init(
uint8_t * apdu,
size_t max_apdu,
uint8_t invoke_id);
int getevent_ack_encode_apdu_data(
uint8_t * apdu,
size_t max_apdu,
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data);
int getevent_ack_encode_apdu_end(
uint8_t * apdu,
size_t max_apdu,
bool moreEvents);
int getevent_ack_decode_service_request(
uint8_t * apdu,
int apdu_len, /* total length of the apdu */
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data,
bool *moreEvents);
int getevent_ack_encode_apdu_data(
uint8_t * apdu,
size_t max_apdu,
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data);
int getevent_ack_encode_apdu_end(
uint8_t * apdu,
size_t max_apdu,
bool moreEvents);
int getevent_ack_decode_service_request(
uint8_t * apdu,
int apdu_len, /* total length of the apdu */
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data,
bool * moreEvents);
#ifdef TEST
#include "ctest.h"
int getevent_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_OBJECT_ID * lastReceivedObjectIdentifier);
int getevent_decode_apdu(
uint8_t * apdu,
unsigned apdu_len,
uint8_t * invoke_id,
BACNET_OBJECT_ID * lastReceivedObjectIdentifier);
int getevent_ack_decode_apdu(
uint8_t * apdu,
int apdu_len, /* total length of the apdu */
uint8_t * invoke_id,
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data,
bool *moreEvents);
int getevent_ack_decode_apdu(
uint8_t * apdu,
int apdu_len, /* total length of the apdu */
uint8_t * invoke_id,
BACNET_GET_EVENT_INFORMATION_DATA * get_event_data,
bool * moreEvents);
void testGetEventInformationAck(
Test * pTest);
void testGetEventInformationAck(
Test * pTest);
void testGetEventInformation(
Test * pTest);
void testGetEventInformation(
Test * pTest);
#endif
bacnet-stack/include/handlers.h
+9 -9
View File
@@ -81,9 +81,9 @@ extern "C" {
void handler_read_property_object_set(
BACNET_OBJECT_TYPE object_type,
read_property_function pFunction1,
object_valid_instance_function pFunction2);
object_valid_instance_function pFunction2);
void handler_read_property_ack(
void handler_read_property_ack(
uint8_t * service_request,
uint16_t service_len,
BACNET_ADDRESS * src,
@@ -94,7 +94,7 @@ extern "C" {
uint16_t service_len,
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_write_property_object_set(
BACNET_OBJECT_TYPE object_type,
write_property_function pFunction);
@@ -152,9 +152,9 @@ extern "C" {
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_read_property_multiple_list_set(
BACNET_OBJECT_TYPE object_type,
rpm_property_lists_function pFunction);
void handler_read_property_multiple_list_set(
BACNET_OBJECT_TYPE object_type,
rpm_property_lists_function pFunction);
void handler_read_property_multiple_ack(
uint8_t * service_request,
@@ -207,7 +207,7 @@ extern "C" {
uint16_t service_len,
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
void handler_conf_private_trans_ack(
uint8_t * service_request,
uint16_t service_len,
@@ -230,7 +230,7 @@ extern "C" {
uint16_t service_len,
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_ACK_DATA * service_data);
void handler_get_event_information_set(
BACNET_OBJECT_TYPE object_type,
get_event_info_function pFunction);
@@ -240,7 +240,7 @@ extern "C" {
uint16_t service_len,
BACNET_ADDRESS * src,
BACNET_CONFIRMED_SERVICE_DATA * service_data);
#ifdef __cplusplus
}
bacnet-stack/include/indtext.h
+3 -3
View File
@@ -101,9 +101,9 @@ extern "C" {
#if !defined(__BORLANDC__) && !defined(_MSC_VER)
int stricmp(
const char *s1,
const char *s2);
int stricmp(
const char *s1,
const char *s2);
#endif
#ifdef TEST
bacnet-stack/include/ms-input.h
+2 -2
View File
@@ -39,7 +39,7 @@ extern "C" {
const int **pRequired,
const int **pOptional,
const int **pProprietary);
bool Multistate_Input_Valid_Instance(
uint32_t object_instance);
unsigned Multistate_Input_Count(
@@ -47,7 +47,7 @@ extern "C" {
uint32_t Multistate_Input_Index_To_Instance(
unsigned index);
unsigned Multistate_Input_Instance_To_Index(
uint32_t instance);
uint32_t instance);
int Multistate_Input_Encode_Property_APDU(
uint8_t * apdu,
bacnet-stack/include/mydata.h
+4 -7
View File
@@ -14,11 +14,8 @@
#define MY_ERR_BAD_INDEX 1
typedef struct MyData {
uint8_t cMyByte1;
uint8_t cMyByte2;
float fMyReal;
int8_t sMyString[MY_MAX_STR+1]; /* A little extra for the nul */
uint8_t cMyByte1;
uint8_t cMyByte2;
float fMyReal;
int8_t sMyString[MY_MAX_STR + 1]; /* A little extra for the nul */
} DATABLOCK;
bacnet-stack/include/readrange.h
+14 -14
View File
@@ -35,21 +35,21 @@
struct BACnet_Read_Range_Data;
typedef struct BACnet_Read_Range_Data {
BACNET_OBJECT_TYPE object_type;
uint32_t object_instance;
uint32_t object_instance;
BACNET_PROPERTY_ID object_property;
uint32_t array_index;
uint8_t *application_data;
int application_data_len;
BACNET_BIT_STRING ResultFlags; /* FIRST_ITEM, LAST_ITEM, MORE_ITEMS */
int RequestType; /* Index, sequence or time based request */
uint32_t ItemCount;
uint32_t FirstSequence;
union { /* Pick the appropriate data type */
uint32_t array_index;
uint8_t *application_data;
int application_data_len;
BACNET_BIT_STRING ResultFlags; /* FIRST_ITEM, LAST_ITEM, MORE_ITEMS */
int RequestType; /* Index, sequence or time based request */
uint32_t ItemCount;
uint32_t FirstSequence;
union { /* Pick the appropriate data type */
uint32_t RefIndex;
uint32_t RefSeqNum;
BACNET_DATE_TIME RefTime;
} Range;
int32_t Count; /* SIGNED value as +ve vs -ve is important */
} Range;
int32_t Count; /* SIGNED value as +ve vs -ve is important */
} BACNET_READ_RANGE_DATA;
/* Defines to indicate which type of read range request it is */
@@ -57,12 +57,12 @@ typedef struct BACnet_Read_Range_Data {
#define RR_BY_POSITION 0
#define RR_BY_SEQUENCE 1
#define RR_BY_TIME 2
#define RR_READ_ALL 4 /* Read all of array - so don't send any range in the request */
#define RR_READ_ALL 4 /* Read all of array - so don't send any range in the request */
/* Bit String Enumerations */
typedef enum {
RESULT_FLAG_FIRST_ITEM = 0,
RESULT_FLAG_LAST_ITEM = 1,
RESULT_FLAG_LAST_ITEM = 1,
RESULT_FLAG_MORE_ITEMS = 2
} BACNET_RESULT_FLAGS;
@@ -88,4 +88,4 @@ int rr_ack_decode_service_request(
uint8_t Send_ReadRange_Request(
uint32_t device_id, /* destination device */
BACNET_READ_RANGE_DATA * read_access_data);
BACNET_READ_RANGE_DATA * read_access_data);
bacnet-stack/include/rp.h
+5 -3
View File
@@ -48,7 +48,8 @@ typedef struct BACnet_Read_Property_Data {
int application_data_len;
} BACNET_READ_PROPERTY_DATA;
typedef int (*read_property_function) (
typedef int (
*read_property_function) (
uint8_t * apdu,
uint32_t object_instance,
BACNET_PROPERTY_ID property,
@@ -56,8 +57,9 @@ typedef int (*read_property_function) (
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
typedef bool (*object_valid_instance_function) (
uint32_t object_instance);
typedef bool(
*object_valid_instance_function) (
uint32_t object_instance);
#ifdef __cplusplus
extern "C" {
bacnet-stack/include/rpm.h
+2 -1
View File
@@ -49,7 +49,8 @@ typedef struct BACnet_Read_Access_Data {
struct BACnet_Read_Access_Data *next;
} BACNET_READ_ACCESS_DATA;
typedef void (*rpm_property_lists_function) (
typedef void (
*rpm_property_lists_function) (
const int **pRequired,
const int **pOptional,
const int **pProprietary);
bacnet-stack/include/timestamp.h
+2 -2
View File
@@ -67,8 +67,8 @@ extern "C" {
uint8_t * apdu,
BACNET_TIMESTAMP * value);
int bacapp_decode_timestamp(
uint8_t * apdu,
BACNET_TIMESTAMP * value);
uint8_t * apdu,
BACNET_TIMESTAMP * value);
int bacapp_encode_context_timestamp(
bacnet-stack/include/wp.h
+3 -2
View File
@@ -53,7 +53,8 @@ typedef struct BACnet_Write_Property_Data {
uint8_t priority; /* use BACNET_NO_PRIORITY if no priority */
} BACNET_WRITE_PROPERTY_DATA;
typedef bool (*write_property_function) (
typedef bool(
*write_property_function) (
BACNET_WRITE_PROPERTY_DATA * wp_data,
BACNET_ERROR_CLASS * error_class,
BACNET_ERROR_CODE * error_code);
@@ -61,7 +62,7 @@ typedef bool (*write_property_function) (
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
/* encode service */
int wp_encode_apdu(
uint8_t * apdu,