From f5bc32606142309a96837e17058228b5654488b4 Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 18 Feb 2010 17:25:58 +0000 Subject: [PATCH] Merged duplicate and different BACnet Renitialized Device State enumerations. --- bacnet-stack/demo/object/device.c | 14 +++++++------- bacnet-stack/include/bacenum.h | 15 ++------------- bacnet-stack/include/device.h | 2 ++ bacnet-stack/ports/at91sam7s/device.c | 6 +++--- bacnet-stack/ports/atmega168/device.c | 2 +- bacnet-stack/ports/atmega8/device.c | 2 +- bacnet-stack/ports/bdk-atxx4-mstp/device.c | 4 ++-- bacnet-stack/ports/pic18f6720/device.c | 7 +++---- 8 files changed, 21 insertions(+), 31 deletions(-) diff --git a/bacnet-stack/demo/object/device.c b/bacnet-stack/demo/object/device.c index a95539ce..073f0beb 100644 --- a/bacnet-stack/demo/object/device.c +++ b/bacnet-stack/demo/object/device.c @@ -309,19 +309,19 @@ bool Device_Reinitialize( if (characterstring_ansi_same(&rd_data->password, "Jesus")) { switch (rd_data->state) { - case REINITIALIZED_STATE_COLD_START: + case BACNET_REINIT_COLDSTART: break; - case REINITIALIZED_STATE_WARM_START: + case BACNET_REINIT_WARMSTART: break; - case REINITIALIZED_STATE_START_BACKUP: + case BACNET_REINIT_STARTBACKUP: break; - case REINITIALIZED_STATE_END_BACKUP: + case BACNET_REINIT_ENDBACKUP: break; - case REINITIALIZED_STATE_START_RESTORE: + case BACNET_REINIT_STARTRESTORE: break; - case REINITIALIZED_STATE_END_RESTORE: + case BACNET_REINIT_ENDRESTORE: break; - case REINITIALIZED_STATE_ABORT_RESTORE: + case BACNET_REINIT_ABORTRESTORE: break; default: break; diff --git a/bacnet-stack/include/bacenum.h b/bacnet-stack/include/bacenum.h index 24ea75da..2ab38db7 100644 --- a/bacnet-stack/include/bacenum.h +++ b/bacnet-stack/include/bacenum.h @@ -1198,18 +1198,6 @@ typedef enum { NETWORK_MESSAGE_INVALID = 0x100 } BACNET_NETWORK_MESSAGE_TYPE; - -typedef enum { - REINITIALIZED_STATE_COLD_START = 0, - REINITIALIZED_STATE_WARM_START = 1, - REINITIALIZED_STATE_START_BACKUP = 2, - REINITIALIZED_STATE_END_BACKUP = 3, - REINITIALIZED_STATE_START_RESTORE = 4, - REINITIALIZED_STATE_END_RESTORE = 5, - REINITIALIZED_STATE_ABORT_RESTORE = 6, - REINITIALIZED_STATE_IDLE = 255 -} BACNET_REINITIALIZED_STATE_OF_DEVICE; - typedef enum { ABORT_REASON_OTHER = 0, ABORT_REASON_BUFFER_OVERFLOW = 1, @@ -1388,7 +1376,8 @@ typedef enum { BACNET_REINIT_STARTRESTORE = 4, BACNET_REINIT_ENDRESTORE = 5, BACNET_REINIT_ABORTRESTORE = 6, - MAX_BACNET_REINITIALIZED_STATE = 7 + MAX_BACNET_REINITIALIZED_STATE = 7, + BACNET_REINIT_IDLE = 255 } BACNET_REINITIALIZED_STATE; typedef enum BACnetNodeType { diff --git a/bacnet-stack/include/device.h b/bacnet-stack/include/device.h index 2758045a..6a3f19b9 100644 --- a/bacnet-stack/include/device.h +++ b/bacnet-stack/include/device.h @@ -72,6 +72,8 @@ extern "C" { bool Device_Reinitialize( BACNET_REINITIALIZE_DEVICE_DATA *rd_data); + + BACNET_REINITIALIZED_STATE Device_Reinitialized_State(void); rr_info_function Device_Objects_RR_Info( BACNET_OBJECT_TYPE object_type); diff --git a/bacnet-stack/ports/at91sam7s/device.c b/bacnet-stack/ports/at91sam7s/device.c index bb2afc46..fd0b70b7 100644 --- a/bacnet-stack/ports/at91sam7s/device.c +++ b/bacnet-stack/ports/at91sam7s/device.c @@ -51,8 +51,8 @@ static uint32_t Object_Instance_Number = 12345; static char My_Object_Name[32] = "ARM7 Device"; static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; -static BACNET_REINITIALIZED_STATE_OF_DEVICE Reinitialize_State = - REINITIALIZED_STATE_IDLE; +static BACNET_REINITIALIZED_STATE Reinitialize_State = + BACNET_REINIT_IDLE; /* forward prototypes */ int Device_Read_Property_Local( @@ -486,7 +486,7 @@ void Device_Init( unsigned index = 0; /* loop counter */ struct object_functions *pObject = NULL; - Reinitialize_State = REINITIALIZED_STATE_IDLE; + Reinitialize_State = BACNET_REINIT_IDLE; dcc_set_status_duration(COMMUNICATION_ENABLE, 0); /* FIXME: Get the data from the eeprom */ /* I2C_Read_Block(EEPROM_DEVICE_ADDRESS, diff --git a/bacnet-stack/ports/atmega168/device.c b/bacnet-stack/ports/atmega168/device.c index 8fafc4e8..3b7b547c 100644 --- a/bacnet-stack/ports/atmega168/device.c +++ b/bacnet-stack/ports/atmega168/device.c @@ -52,7 +52,7 @@ static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; void Device_Init( void) { - /* Reinitialize_State = REINITIALIZED_STATE_IDLE; */ + /* Reinitialize_State = BACNET_REINIT_IDLE; */ /* dcc_set_status_duration(COMMUNICATION_ENABLE, 0); */ /* FIXME: Get the data from the eeprom */ /* I2C_Read_Block(EEPROM_DEVICE_ADDRESS, diff --git a/bacnet-stack/ports/atmega8/device.c b/bacnet-stack/ports/atmega8/device.c index 826165ab..5122a3e7 100644 --- a/bacnet-stack/ports/atmega8/device.c +++ b/bacnet-stack/ports/atmega8/device.c @@ -49,7 +49,7 @@ static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; void Device_Init( void) { - /* Reinitialize_State = REINITIALIZED_STATE_IDLE; */ + /* Reinitialize_State = BACNET_REINIT_IDLE; */ /* dcc_set_status_duration(COMMUNICATION_ENABLE, 0); */ /* FIXME: Get the data from the eeprom */ /* I2C_Read_Block(EEPROM_DEVICE_ADDRESS, diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/device.c b/bacnet-stack/ports/bdk-atxx4-mstp/device.c index 8e8aa027..6c490bf8 100644 --- a/bacnet-stack/ports/bdk-atxx4-mstp/device.c +++ b/bacnet-stack/ports/bdk-atxx4-mstp/device.c @@ -123,8 +123,8 @@ static uint8_t My_Object_Name_Encoding; static uint8_t My_Object_Name_Length; static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; -static BACNET_REINITIALIZED_STATE_OF_DEVICE Reinitialize_State = - REINITIALIZED_STATE_IDLE; +static BACNET_REINITIALIZED_STATE Reinitialize_State = + BACNET_REINIT_IDLE; /* These three arrays are used by the ReadPropertyMultiple handler */ static const int Device_Properties_Required[] = { diff --git a/bacnet-stack/ports/pic18f6720/device.c b/bacnet-stack/ports/pic18f6720/device.c index dce9fdbb..7b94092d 100644 --- a/bacnet-stack/ports/pic18f6720/device.c +++ b/bacnet-stack/ports/pic18f6720/device.c @@ -50,20 +50,19 @@ static uint32_t Object_Instance_Number = 12345; static BACNET_DEVICE_STATUS System_Status = STATUS_OPERATIONAL; -BACNET_REINITIALIZED_STATE_OF_DEVICE Reinitialize_State = - REINITIALIZED_STATE_IDLE; +BACNET_REINITIALIZED_STATE Reinitialize_State = + BACNET_REINIT_IDLE; void Device_Reinit( void) { dcc_set_status_duration(COMMUNICATION_ENABLE, 0); - Device_Set_Object_Instance_Number(BACNET_MAX_INSTANCE); } void Device_Init( void) { - Reinitialize_State = REINITIALIZED_STATE_IDLE; + Reinitialize_State = BACNET_REINIT_IDLE; dcc_set_status_duration(COMMUNICATION_ENABLE, 0); /* FIXME: Get the data from the eeprom */ /* I2C_Read_Block(EEPROM_DEVICE_ADDRESS,