Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145)
This commit is contained in:
@@ -75,7 +75,7 @@ static char Description[MAX_DEV_DESC_LEN + 1] = "Renesas Rulz!";
|
||||
static uint32_t Database_Revision = 0;
|
||||
|
||||
/* These three arrays are used by the ReadPropertyMultiple handler */
|
||||
static const int Device_Properties_Required[] = {
|
||||
static const int32_t Device_Properties_Required[] = {
|
||||
PROP_OBJECT_IDENTIFIER,
|
||||
PROP_OBJECT_NAME,
|
||||
PROP_OBJECT_TYPE,
|
||||
@@ -101,9 +101,9 @@ static const int Device_Properties_Required[] = {
|
||||
-1
|
||||
};
|
||||
|
||||
static const int Device_Properties_Optional[] = { PROP_DESCRIPTION, -1 };
|
||||
static const int32_t Device_Properties_Optional[] = { PROP_DESCRIPTION, -1 };
|
||||
|
||||
static const int Device_Properties_Proprietary[] = { -1 };
|
||||
static const int32_t Device_Properties_Proprietary[] = { -1 };
|
||||
|
||||
static struct my_object_functions *
|
||||
Device_Objects_Find_Functions(BACNET_OBJECT_TYPE Object_Type)
|
||||
@@ -181,7 +181,7 @@ static int Read_Property_Common(
|
||||
return apdu_len;
|
||||
}
|
||||
|
||||
static unsigned property_list_count(const int *pList)
|
||||
static unsigned property_list_count(const int32_t *pList)
|
||||
{
|
||||
unsigned property_count = 0;
|
||||
|
||||
@@ -247,7 +247,9 @@ void Device_Objects_Property_List(
|
||||
}
|
||||
|
||||
void Device_Property_Lists(
|
||||
const int **pRequired, const int **pOptional, const int **pProprietary)
|
||||
const int32_t **pRequired,
|
||||
const int32_t **pOptional,
|
||||
const int32_t **pProprietary)
|
||||
{
|
||||
if (pRequired) {
|
||||
*pRequired = Device_Properties_Required;
|
||||
|
||||
Reference in New Issue
Block a user