Index: firmware/App/Services/NVMsgQ.c =================================================================== diff -u -r63c3a65e681810f037718377c6ed5a28c897d0ca -re17e1dc97bf8878056f1f7e4aa861c2448db52bc --- firmware/App/Services/NVMsgQ.c (.../NVMsgQ.c) (revision 63c3a65e681810f037718377c6ed5a28c897d0ca) +++ firmware/App/Services/NVMsgQ.c (.../NVMsgQ.c) (revision e17e1dc97bf8878056f1f7e4aa861c2448db52bc) @@ -30,102 +30,94 @@ // ********** private definitions ********** -#define QUEUE_MAX_SIZE 20U ///< Max queue size. -#define QUEUE_START_INDEX 0U ///< Queue start index. -#define MAX_JOB_DATA_SIZE_BYTES 32U ///< Max bytes per job (32 bytes). -#define NUM_OF_BYTES_PER_RECORD_PAYLOAD ( MAX_MSG_PAYLOAD_SIZE - ( sizeof( U32 ) * 3 ) ) ///< Number of bytes per calibration payload. -#define RECORD_DATA_SEND_INTERVAL_COUNT (MS_PER_SECOND / (5 * TASK_GENERAL_INTERVAL)) ///< Calibration data send time interval in counts. -#define RECORD_DATA_RECEIVE_TIMEOUT_MS (4 * MS_PER_SECOND) ///< Record data receive all the data packets timeout in ms. -#define RECORD_DATA_MAX_MESSAGE_DFFIRENCE 1 ///< Calibration data receive message different from the previous message. -#define RECORD_DATA_FIRST_RECEIVING_MSG_NUM 1 ///< Calibration data first receiving message number. - // Once a new calibration data is available the driver, sets a signal for the defined time. Once the time is out, it turns the signal off. -#define NEW_CAL_AVAILABLE_SIGNAL_TIMEOUT_MS (1 * MS_PER_SECOND) ///< New calibration available signal timeout in milliseconds. +#define NEW_CAL_AVAILABLE_SIGNAL_TIMEOUT_MS (1 * MS_PER_SECOND) ///< New calibration available signal timeout in milliseconds.#define QUEUE_MAX_SIZE 20U ///< Max queue size. +#define QUEUE_MAX_SIZE 20U ///< Max queue size. +#define QUEUE_START_INDEX 0U ///< Queue start index. +#define MAX_JOB_DATA_SIZE_BYTES 32U ///< Max bytes per job (32 bytes). +#define NUM_OF_BYTES_PER_RECORD_PAYLOAD ( MAX_MSG_PAYLOAD_SIZE - ( sizeof( U32 ) * 3 ) ) ///< Number of bytes per calibration payload. +#define RECORD_DATA_SEND_INTERVAL_COUNT (MS_PER_SECOND / (5 * TASK_GENERAL_INTERVAL)) ///< Calibration data send time interval in counts. +#define RECORD_DATA_RECEIVE_TIMEOUT_MS (4 * MS_PER_SECOND) ///< Record data receive all the data packets timeout in ms. +#define RECORD_DATA_MAX_MESSAGE_DFFIRENCE 1 ///< Calibration data receive message different from the previous message. +#define RECORD_DATA_FIRST_RECEIVING_MSG_NUM 1 ///< Calibration data first receiving message number. -/// NVDataMgmt send records states -typedef enum NVDataMgmt_Send_Records_States +/// NVM send records states +typedef enum NVM_Send_Records_States { - NVM_SEND_RECORD_STATE_IDLE = 0, ///< NVDataMgmt process record idle state. - NVM_SEND_RECORD_STATE_SEND, ///< NVDataMgmt process record send record state. - NUM_OF_NVM_SEND_RECORD_STATES ///< Number of NVDataMgmt process records state. + NVM_SEND_RECORD_STATE_IDLE = 0, ///< NVM process record idle state. + NVM_SEND_RECORD_STATE_SEND, ///< NVM process record send record state. + NUM_OF_NVM_SEND_RECORD_STATES ///< Number of NVM process records state. } SEND_RECORD_STATE_T; -/// NVDataMgmt receive records states -typedef enum NVDataMgmt_Receive_Records_States +/// NVM receive records states +typedef enum NVM_Receive_Records_States { - NVM_RECEIVE_RECORD_STATE_IDLE = 0, ///< NVDataMgmt receive record idle. - NVM_RECEIVE_RECORD_STATE_RECEIVE, ///< NVDataMgmt receive record receive. - NUM_OF_NVM_RECEIVE_RECORD_STATES ///< Number of NVDataMgmt receive record. + NVM_RECEIVE_RECORD_STATE_IDLE = 0, ///< NVM receive record idle. + NVM_RECEIVE_RECORD_STATE_RECEIVE, ///< NVM receive record receive. + NUM_OF_NVM_RECEIVE_RECORD_STATES ///< Number of NVM receive record. } RECEIVE_RECORD_STATE_T; /// Memory operations structure. typedef struct { - NVDATAMGMT_OPERATION_STATE_T memoryOperation; ///< Memory operation. - U32 recordFlashAddress; ///< Operation start address. - U08 buffer[ MAX_JOB_DATA_SIZE_BYTES ]; ///< Buffer. - U32 length; ///< Length of a buffer. + NVM_OPERATION_T memoryOperation; ///< Memory operation. + U32 recordFlashAddress; ///< Operation start address. + U08 buffer[ MAX_JOB_DATA_SIZE_BYTES ]; ///< Buffer. + U32 length; ///< Length of a buffer. } MEMORY_OPS_T; -typedef struct -{ - U32 payloadCurrNum; - U32 payloadTotalNum; - U32 length; - U08 data[NUM_OF_BYTES_PER_RECORD_PAYLOAD]; -} DD_NVM_RECORD_PAYLOAD_T; - /// DD institutional values structure. typedef struct { - U32 minRORejectionRatioPCT; ///< Min RO rejection ratio in percent. - F32 minInletWaterCondAlarmLimitUSPCM; ///< Min inlet water conductivity alarm limit in uS/cm. + U32 minRORejectionRatioPCT; ///< Min RO rejection ratio in percent. + F32 minInletWaterCondAlarmLimitUSPCM; ///< Min inlet water conductivity alarm limit in uS/cm. } DD_INSTITUTIONAL_VALUES_T; -/// Process records job structure +/// DD NVM Record Payload typedef struct { - RECORD_JOBS_STATE_T job; - U32 currentMessage; - U32 totalMessages; - U32 payloadLength; - U08 payload[NUM_OF_BYTES_PER_RECORD_PAYLOAD]; -} RECEIVE_RECORD_JOB_T; + U32 payloadCurrNum; ///< Current Chunk number out of total number number of chunks + U32 payloadTotalNum; ///< Total number of chunks in which data is broken be sent + U32 length; ///< Length of data in the current chunk + U08 data[NUM_OF_BYTES_PER_RECORD_PAYLOAD]; ///< Data to be sent +} DD_NVM_SEND_RECORD_PAYLOAD_T; // ********** private data ********** -static PROCESS_RECORD_JOB_T recordJobQueue[ QUEUE_MAX_SIZE ]; ///< Record queue jobs. -static U08 recordQueueRearIndex; ///< Record queue rear index. -static U08 recordQueueFrontIndex; ///< Record queue front index. -static U08 recordQueueCount; ///< Record queue count. -static PROCESS_RECORD_JOB_T recordCurrentJob; ///< Record queue current job. -static NVDATAMGMT_RECORDS_READ_STATUS_T recordsReadStatus; ///< NVDataMgmt records read status. -static BOOL isNewNVRecordAvailable; ///< Signal to indicate whether a new NVM data is available. -static RECORD_JOBS_STATE_T recordToPublish; ///< Record to publish (i.e. calibration, system) -static RECORD_JOBS_STATE_T nvPublishRecordType; -static SEND_RECORD_STATE_T nvMExecSendRecordState; ///< NVDataMgmt exec process record state. -static RECEIVE_RECORD_STATE_T nvmExecReceiveRecordState; ///< NVDataMgmt exec receive record state. -static RECORD_JOBS_STATE_T currentRxRecordType; -static BOOL isPublishRecordRequested[ NUM_OF_NVDATMGMT_RECORDS_JOBS ]; ///< Record state machine publish request flag. -static U32 recordPublishMsgCount; ///< Record data publish message counter. -static U32 recordPublishTotalMsgs; ///< Record data total number of messages to be sent. -static U32 recordSendDataIntervalCounter; ///< Record data send to CAN bust interval counter. -static U32 previousRecordMessageNum; ///< Record previous message number. -static U32 recordUpdateAddress; ///< DD record update address for all the write operations. -static U32 recordReceiveStartTime; ///< Time stamp the calibration/service was received. -static U32 newRecordStartTimer; ///< New record availability start timer. +static PROCESS_RECORD_JOB_T recordJobQueue[ QUEUE_MAX_SIZE ]; ///< Record queue jobs. +static U08 recordQueueRearIndex; ///< Record queue rear index. +static U08 recordQueueFrontIndex; ///< Record queue front index. +static U08 recordQueueCount; ///< Record queue count. +static PROCESS_RECORD_JOB_T recordCurrentJob; ///< Record queue current job. +static NVM_RECORDS_READ_STATUS_T recordsReadStatus; ///< NVM records read status. +static BOOL isNewNVRecordAvailable; ///< Signal to indicate whether a new NVM data is available. +static NVM_RECORD_TYPE_T recordToPublish; ///< Record to publish (i.e. calibration, system) +static NVM_RECORD_TYPE_T nvPublishRecordType; +static SEND_RECORD_STATE_T nvMExecSendRecordState; ///< NVM exec process record state. +static RECEIVE_RECORD_STATE_T nvmExecReceiveRecordState; ///< NVM exec receive record state. +static NVM_RECORD_TYPE_T currentRxRecordType; +static BOOL isPublishRecordRequested[ NUM_OF_NVM_RECORD_TYPES ]; ///< Record state machine publish request flag. +static U32 recordPublishMsgCount; ///< Record data publish message counter. +static U32 recordPublishTotalMsgs; ///< Record data total number of messages to be sent. +static U32 recordSendDataIntervalCounter; ///< Record data send to CAN bust interval counter. +static U32 previousRecordMessageNum; ///< Record previous message number. +static U32 recordUpdateAddress; ///< DD record update address for all the write operations. +static U32 recordReceiveStartTime; ///< Time stamp the calibration/service was received. +static U32 newRecordStartTimer; ///< New record availability start timer. // ********** private function prototypes ********** // Process record functions static SEND_RECORD_STATE_T handleExecSendRecordIdleState( void ); static SEND_RECORD_STATE_T handleExecSendRecordSendState( void ); -static BOOL sendDDRecord( MSG_ID_T msgId, U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* calRcrdAddress ); +static BOOL sendDDRecord( MSG_ID_T msgId, U32 payloadCurrNum, U32 payloadTotalNum, + U32 length, U08* calRcrdAddress ); static BOOL receiveDDRecord( MESSAGE_T *message ); -static BOOL verifyAndSaveReceivedRecord( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr ); -static RECORD_JOBS_STATE_T getNVMRecordJobState( MSG_ID_T msgID ); -static MSG_ID_T getNVMRecordResponseMsgId (RECORD_JOBS_STATE_T job ); +static BOOL verifyAndSaveReceivedRecord( NVM_RECORD_TYPE_T job, U32 currentMessage, + U32 totalMessages, U32 length, U08 *addressPtr ); +static NVM_RECORD_TYPE_T getNVMRecordJobState( MSG_ID_T msgID ); +static MSG_ID_T getNVMRecordResponseMsgId (NVM_RECORD_TYPE_T job ); static void monitorNewCalSignal( void ); void initNVMsgQ ( void ) @@ -135,17 +127,17 @@ recordQueueFrontIndex = QUEUE_START_INDEX; recordQueueCount = 0; - recordsReadStatus = NVDATAMGMT_RECORDS_NOT_STARTED; + recordsReadStatus = NVM_RECORDS_NOT_STARTED; isNewNVRecordAvailable = FALSE; nvMExecSendRecordState = NVM_SEND_RECORD_STATE_IDLE; nvmExecReceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; - nvPublishRecordType = NVDATAMGMT_SYSTEM_RECORD; - isPublishRecordRequested[ NVDATAMGMT_SYSTEM_RECORD ] = FALSE; - isPublishRecordRequested[ NVDATAMGMT_SERVICE_RECORD ] = FALSE; - isPublishRecordRequested[ NVDATAMGMT_CALIBRATION_RECORD ] = FALSE; - isPublishRecordRequested[ NVDATAMGMT_INSTITUTIONAL_RECORD ] = FALSE; - isPublishRecordRequested[ NVDATAMGMT_USAGE_INFO_RECORD ] = FALSE; + nvPublishRecordType = NVM_SYSTEM_RECORD; + isPublishRecordRequested[ NVM_SYSTEM_RECORD ] = FALSE; + isPublishRecordRequested[ NVM_SERVICE_RECORD ] = FALSE; + isPublishRecordRequested[ NVM_CALIBRATION_RECORD ] = FALSE; + isPublishRecordRequested[ NVM_INSTITUTIONAL_RECORD ] = FALSE; + isPublishRecordRequested[ NVM_USAGE_INFO_RECORD ] = FALSE; newRecordStartTimer = 0; @@ -158,15 +150,15 @@ /*********************************************************************//** * @brief - * The execNVMSendRecord runs the NVDataMgmt send records related + * The execNVMSendRecord runs the NVM send records related * to tasks. * @details Inputs: nvMExecSendRecordState, * nvmExecReceiveRecordState, recordReceiveStartTime * @details Outputs: nvMExecSendRecordState, * nvmExecReceiveRecordState * @return none *************************************************************************/ -void execNVDataMgmtProcessRecord( void ) +void execNVMProcessRecord( void ) { switch ( nvMExecSendRecordState ) { @@ -194,7 +186,7 @@ if ( TRUE == didTimeout( recordReceiveStartTime, RECORD_DATA_RECEIVE_TIMEOUT_MS ) ) { // Exec receive state machine timed out. Schedule a read to update the structure - enqueueRecordJob( NVDATAMGMT_READ, currentRxRecordType ); + enqueueRecordJob( NVM_OPERATION_READ, currentRxRecordType ); nvmExecReceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; } } @@ -219,7 +211,7 @@ if ( TRUE == isPublishRecordRequested[ nvPublishRecordType ] ) { - recordToPublish = ( RECORD_JOBS_STATE_T )nvPublishRecordType; + recordToPublish = ( NVM_RECORD_TYPE_T )nvPublishRecordType; // Set the publish flag to FALSE isPublishRecordRequested[ recordToPublish ] = FALSE; @@ -239,10 +231,10 @@ state = NVM_SEND_RECORD_STATE_SEND; } - nvPublishRecordType = ( RECORD_JOBS_STATE_T )( nvPublishRecordType + 1 ); - if(nvPublishRecordType >= NUM_OF_NVDATMGMT_RECORDS_JOBS) + nvPublishRecordType = ( NVM_RECORD_TYPE_T )( nvPublishRecordType + 1 ); + if(nvPublishRecordType >= NUM_OF_NVM_RECORD_TYPES) { - nvPublishRecordType = NVDATAMGMT_SYSTEM_RECORD; + nvPublishRecordType = NVM_SYSTEM_RECORD; } return state; @@ -311,7 +303,7 @@ * @param job: type of job (i.e write calibration data) * @return none *************************************************************************/ -void enqueueRecordJob( NVDATAMGMT_OPERATION_STATE_T ops, RECORD_JOBS_STATE_T job ) +void enqueueRecordJob( NVM_OPERATION_T ops, NVM_RECORD_TYPE_T job ) { PROCESS_RECORD_JOB_T currentJob; @@ -396,23 +388,23 @@ return QUEUE_MAX_SIZE - recordQueueCount; } -BOOL enqueueEraseAndWriteSector( RECORD_JOBS_STATE_T job ) +BOOL enqueueEraseAndWriteSector( NVM_RECORD_TYPE_T job ) { BOOL status = FALSE; if ( getAvailableRecordQueueCount() >= MIN_JOBS_NEEDED_TO_WRITE_A_RECORD ) { // Service and Calibration record are stored in the same sector. - if( ( job == NVDATAMGMT_SERVICE_RECORD ) || ( job == NVDATAMGMT_CALIBRATION_RECORD ) ) + if( ( job == NVM_SERVICE_RECORD ) || ( job == NVM_CALIBRATION_RECORD ) ) { - enqueueRecordJob( NVDATAMGMT_ERASE_SECTOR, NVDATAMGMT_SERVICE_RECORD ); - enqueueRecordJob( NVDATAMGMT_WRITE, NVDATAMGMT_SERVICE_RECORD ); - enqueueRecordJob( NVDATAMGMT_WRITE, NVDATAMGMT_CALIBRATION_RECORD ); + enqueueRecordJob( NVM_OPERATION_ERASE, NVM_SERVICE_RECORD ); + enqueueRecordJob( NVM_OPERATION_WRITE, NVM_SERVICE_RECORD ); + enqueueRecordJob( NVM_OPERATION_WRITE, NVM_CALIBRATION_RECORD ); } else { - enqueueRecordJob( NVDATAMGMT_ERASE_SECTOR, job ); - enqueueRecordJob( NVDATAMGMT_WRITE, job ); + enqueueRecordJob( NVM_OPERATION_ERASE, job ); + enqueueRecordJob( NVM_OPERATION_WRITE, job ); } status = TRUE; @@ -427,18 +419,18 @@ if ( getAvailableRecordQueueCount() >= MIN_JOBS_NEEDED_TO_WRITE_ALL_RECORDS ) { - RECORD_JOBS_STATE_T record; + NVM_RECORD_TYPE_T record; // Erase all the sectors - for ( record = NVDATAMGMT_SYSTEM_RECORD; record < NUM_OF_NVDATMGMT_RECORDS_JOBS; record++ ) + for ( record = NVM_SYSTEM_RECORD; record < NUM_OF_NVM_RECORD_TYPES; record++ ) { - enqueueRecordJob( NVDATAMGMT_ERASE_SECTOR, record ); + enqueueRecordJob( NVM_OPERATION_ERASE, record ); } // Write all the records - for ( record = NVDATAMGMT_SYSTEM_RECORD; record < NUM_OF_NVDATMGMT_RECORDS_JOBS; record++ ) + for ( record = NVM_SYSTEM_RECORD; record < NUM_OF_NVM_RECORD_TYPES; record++ ) { - enqueueRecordJob( NVDATAMGMT_WRITE, record ); + enqueueRecordJob( NVM_OPERATION_WRITE, record ); } status = TRUE; @@ -457,20 +449,20 @@ BOOL enqueueReadAllRecords( void ) { BOOL status = FALSE; - RECORD_JOBS_STATE_T record; + NVM_RECORD_TYPE_T record; if ( getAvailableRecordQueueCount() >= MIN_JOBS_NEEDED_TO_READ_ALL_RECORDS ) { - for ( record = NVDATAMGMT_SYSTEM_RECORD; record < NUM_OF_NVDATMGMT_RECORDS_JOBS; record++ ) + for ( record = NVM_SYSTEM_RECORD; record < NUM_OF_NVM_RECORD_TYPES; record++ ) { - enqueueRecordJob( NVDATAMGMT_READ, record ); + enqueueRecordJob( NVM_OPERATION_READ, record ); } status = TRUE; } // Set the status to records were queued successfully - recordsReadStatus = NVDATAMGMT_RECORDS_QUEUED; + recordsReadStatus = NVM_RECORDS_QUEUED; return status; } @@ -482,7 +474,7 @@ * @details Outputs: none * @return recordsReadStatus *************************************************************************/ -NVDATAMGMT_RECORDS_READ_STATUS_T getNVRecordsReadStatus( void ) +NVM_RECORDS_READ_STATUS_T getNVRecordsReadStatus( void ) { return recordsReadStatus; } @@ -502,11 +494,12 @@ * @param recordAddress: start address of the calibration record * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -static BOOL sendDDRecord( MSG_ID_T msgId, U32 payloadCurrNum, U32 payloadTotalNum, U32 length, U08* recordAddress ) +static BOOL sendDDRecord( MSG_ID_T msgId, U32 payloadCurrNum, U32 payloadTotalNum, + U32 length, U08* recordAddress ) { BOOL result = FALSE; U08 payloadLen = 0; - DD_NVM_RECORD_PAYLOAD_T payload; + DD_NVM_SEND_RECORD_PAYLOAD_T payload; payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( U32 ) + length; payload.payloadCurrNum = payloadCurrNum; @@ -528,7 +521,7 @@ U08* payloadPtr = message->payload; U08 minPayloadLen = ( sizeof(currentMessage) + sizeof(totalMessages) + sizeof(payloadLength) ); MSG_ID_T msgID = (MSG_ID_T)message->hdr.msgID; - RECORD_JOBS_STATE_T job = getNVMRecordJobState( msgID ); + NVM_RECORD_TYPE_T job = getNVMRecordJobState( msgID ); // To proceed, the payload length should be valid. And, if it is a service job, then DD mode should also be in service. if ( message->hdr.payloadLen >= minPayloadLen ) @@ -563,7 +556,8 @@ * @param *addressPtr: address to the beginning of the calibration data from Dialin * @return TRUE if the request was successfully registered *************************************************************************/ -static BOOL verifyAndSaveReceivedRecord( RECORD_JOBS_STATE_T job, U32 currentMessage, U32 totalMessages, U32 length, U08 *addressPtr ) +static BOOL verifyAndSaveReceivedRecord( NVM_RECORD_TYPE_T job, U32 currentMessage, + U32 totalMessages, U32 length, U08 *addressPtr ) { BOOL status = TRUE; @@ -606,8 +600,10 @@ // Check if calculated CRC matches the Stored CRC if ( ( calcCRC == recordCRC ) ) { + _disable_IRQ(); // Copy the valid temporary record into the main record spec memcpy(recordSpec.structAddressPtr, tempRxSpec.structAddressPtr, tempRxSpec.sizeofRecord); + _enable_IRQ(); // Enqueue an erase and write of the nvm record status = enqueueEraseAndWriteSector( job ); @@ -644,30 +640,30 @@ return status; } -static RECORD_JOBS_STATE_T getNVMRecordJobState( MSG_ID_T msgID ) +static NVM_RECORD_TYPE_T getNVMRecordJobState( MSG_ID_T msgID ) { - RECORD_JOBS_STATE_T job; + NVM_RECORD_TYPE_T job; switch( msgID ) { case MSG_ID_DD_NVM_SET_CALIBRATION_RECORD: - job = NVDATAMGMT_CALIBRATION_RECORD; + job = NVM_CALIBRATION_RECORD; break; case MSG_ID_DD_NVM_SET_SYSTEM_RECORD: - job = NVDATAMGMT_SYSTEM_RECORD; + job = NVM_SYSTEM_RECORD; break; case MSG_ID_DD_NVM_SET_SERVICE_RECORD: - job = NVDATAMGMT_SERVICE_RECORD; + job = NVM_SERVICE_RECORD; break; case MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD: - job = NVDATAMGMT_INSTITUTIONAL_RECORD; + job = NVM_INSTITUTIONAL_RECORD; break; case MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD: - job = NVDATAMGMT_USAGE_INFO_RECORD; + job = NVM_USAGE_INFO_RECORD; break; default: @@ -679,29 +675,29 @@ return job; } -static MSG_ID_T getNVMRecordResponseMsgId( RECORD_JOBS_STATE_T job ) +static MSG_ID_T getNVMRecordResponseMsgId( NVM_RECORD_TYPE_T job ) { MSG_ID_T msgID; switch( job ) { - case NVDATAMGMT_CALIBRATION_RECORD: + case NVM_CALIBRATION_RECORD: msgID = MSG_ID_DD_NVM_SEND_CALIBRATION_RECORD; break; - case NVDATAMGMT_SYSTEM_RECORD: + case NVM_SYSTEM_RECORD: msgID = MSG_ID_DD_NVM_SEND_SYSTEM_RECORD; break; - case NVDATAMGMT_SERVICE_RECORD: + case NVM_SERVICE_RECORD: msgID = MSG_ID_DD_NVM_SEND_SERVICE_RECORD; break; - case NVDATAMGMT_INSTITUTIONAL_RECORD: + case NVM_INSTITUTIONAL_RECORD: msgID = MSG_ID_DD_NVM_SEND_INSTITUTIONAL_RECORD; break; - case NVDATAMGMT_USAGE_INFO_RECORD: + case NVM_USAGE_INFO_RECORD: msgID = MSG_ID_DD_NVM_SEND_USAGE_INFO_RECORD; break; @@ -749,7 +745,7 @@ isNewNVRecordAvailable = value; } -void updateRecordReadStatus( NVDATAMGMT_RECORDS_READ_STATUS_T status ) +void updateRecordReadStatus( NVM_RECORDS_READ_STATUS_T status ) { recordsReadStatus = status; } @@ -774,15 +770,15 @@ BOOL testDDGetNVRecord( MESSAGE_T *message ) { BOOL result = FALSE; - RECORD_JOBS_STATE_T job; + NVM_RECORD_TYPE_T job; // verify payload length if ( 1 == message->hdr.payloadLen ) { - job = ( RECORD_JOBS_STATE_T )message->payload[ 0 ]; + job = ( NVM_RECORD_TYPE_T )message->payload[ 0 ]; // job = getNVMRecordJobState( msgID ); - if ( ( job < NUM_OF_NVDATMGMT_RECORDS_JOBS ) && + if ( ( job < NUM_OF_NVM_RECORD_TYPES ) && ( NVM_SEND_RECORD_STATE_IDLE == nvMExecSendRecordState ) ) { isPublishRecordRequested[ job ] = TRUE;