Index: NVDataMgmt.c
===================================================================
diff -u -r2da9d757cef985b4ad1e8adee3e19fa3430cc4fb -rf7c61d2d14b40cfbbd2fa8e0968a1f972a39e4e0
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 2da9d757cef985b4ad1e8adee3e19fa3430cc4fb)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision f7c61d2d14b40cfbbd2fa8e0968a1f972a39e4e0)
@@ -136,7 +136,7 @@
 {
     NVDATAMGMT_OPERATION_STATE_T memoryOperation;                                                               ///< Memory operation
     NVDATAMGMT_LOCATION_STATE_T  memoryLocation;                                                                ///< Memory location
-    U32* startAddress;                                                                                          ///< Operation start address
+    U32  startAddress;                                                                                          ///< Operation start address
     U08  buffer [ MAX_JOB_DATA_SIZE_BYTES ];                                                                    ///< Buffer
     READ_DATA_T* externalAddress;                                                                               ///< External address of a buffer
     U32  length;                                                                                                ///< Length of a buffer
@@ -1235,20 +1235,20 @@
         dequeue();
         NVDATAMGMT_OPERATION_STATE_T ops      = currentJob.memoryOperation;
         NVDATAMGMT_LOCATION_STATE_T  location = currentJob.memoryLocation;
-        U32* startAddress                     = currentJob.startAddress;
+        U32 startAddress                      = currentJob.startAddress;
         U32 length                            = currentJob.length;
 
         if ( ops == NVDATAMGMT_WRITE && location == NVDATAMGMT_EEPROM )
         {
             currentTime = getMSTimerCount();
-            Fapi_issueProgrammingCommand ( startAddress, currentJob.buffer, length,
+            Fapi_issueProgrammingCommand ( (U32*)startAddress, currentJob.buffer, length,
                                            0x00, 0, Fapi_DataOnly );
             state = NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM;
         }
         else if ( ops == NVDATAMGMT_READ && location == NVDATAMGMT_EEPROM )
         {
             currentTime = getMSTimerCount();
-            Fapi_doMarginRead ( startAddress, (U32*)( currentJob.externalAddress->externalBuffer ),
+            Fapi_doMarginRead ( (U32*)startAddress, (U32*)( currentJob.externalAddress->externalBuffer ),
                                 length, Fapi_NormalRead );
             // Change the status to in progress until the read operation is done
             currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS;
@@ -1257,15 +1257,15 @@
         else if ( ops == NVDATAMGMT_ERASE_SECTOR )
         {
             currentTime = getMSTimerCount();
-            Fapi_issueAsyncCommandWithAddress ( Fapi_EraseSector, startAddress );
+            Fapi_issueAsyncCommandWithAddress ( Fapi_EraseSector, (U32*)startAddress );
             state = NVDATAMGMT_EXEC_STATE_ERASE_EEPROM;
         }
         else if ( ops == NVDATAMGMT_WRITE && location == NVDATAMGMT_RTC )
         {
             if ( getRTCRAMState() == RTC_RAM_STATE_READY )
             {
                 currentTime = getMSTimerCount();
-                writeToRAM ( (U32)startAddress, currentJob.buffer, length );
+                writeToRAM ( startAddress, currentJob.buffer, length );
                 state = NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC;
             }
 
@@ -1275,7 +1275,7 @@
             if ( getRTCRAMState() == RTC_RAM_STATE_READY )
             {
                 currentTime = getMSTimerCount();
-                readFromRAM( (U32)startAddress, length );
+                readFromRAM( startAddress, length );
                 currentJob.externalAddress->status = NVDATAMGMT_READ_IN_PROGRESS;
                 state = NVDATAMGMT_EXEC_STATE_READ_FROM_RTC;
             }
@@ -1435,7 +1435,7 @@
 
         jobQueue [ myAddIndex ].memoryOperation = ops;
         jobQueue [ myAddIndex ].memoryLocation  = location;
-        jobQueue [ myAddIndex ].startAddress    = (U32*)startAddress;
+        jobQueue [ myAddIndex ].startAddress    = startAddress;
         jobQueue [ myAddIndex ].length          = length;
         jobQueue [ myAddIndex ].externalAddress = extAddress;