Fixed BACNET_REINITIALIZED_STATE enum broken in merge

bacnet-stack/demo/handler/h_rd.c

@@ -120,7 +120,7 @@ void handler_reinitialize_device(
         goto RD_ABORT;
     }
     /* check the data from the request */
-    if (rd_data.state >= MAX_BACNET_REINITIALIZED_STATE) {
+    if (rd_data.state >= BACNET_REINIT_MAX) {
         len =
             reject_encode_apdu(&Handler_Transmit_Buffer[pdu_len],
             service_data->invoke_id, REJECT_REASON_UNDEFINED_ENUMERATION);

bacnet-stack/include/bacenum.h

@@ -1580,17 +1580,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,
@@ -1834,8 +1823,9 @@ typedef enum {
     BACNET_REINIT_STARTRESTORE = 4,
     BACNET_REINIT_ENDRESTORE = 5,
     BACNET_REINIT_ABORTRESTORE = 6,
-    MAX_BACNET_REINITIALIZED_STATE = 7,
-    BACNET_REINIT_IDLE = 255
+    BACNET_REINIT_ACTIVATE_CHANGES = 7,
+    BACNET_REINIT_IDLE = 255,
+    BACNET_REINIT_MAX = 255
 } BACNET_REINITIALIZED_STATE;
 
 typedef enum BACnetNodeType {