--- a/gsm-fw/services/dar/dar_api.h	Sun Mar 16 05:48:58 2014 +0000
+++ b/gsm-fw/services/dar/dar_api.h	Sun Mar 16 06:50:26 2014 +0000
@@ -16,13 +16,13 @@
 /* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#include "rv/rv_defined_swe.h"
-#include "rvm/rvm_api.h"
+#include "../../riviera/rv/rv_defined_swe.h"
+#include "../../riviera/rvm/rvm_api.h"
 
 /* file used in recovery case */
-#include "main/sys_types.h" 
+#include "../../include/sys_types.h" 
 
-#include "dar/dar_gen.h"
+#include "dar_gen.h"
 
 #ifdef RVM_DAR_SWE
 
@@ -52,20 +52,22 @@
          INT8       status;
       } T_DAR_STATUS;
 
-      /********************************************************************************/
-      /*                               RECOVERY                                       */
-      /********************************************************************************/
+      /************************************************************************/
+      /*                               RECOVERY                               */
+      /************************************************************************/
 
       /***** Events   *****/
-      #define DAR_RECOVERY_CONFIG                            (0x0001|DAR_EVENT_EXTERN)
-   
+      #define DAR_RECOVERY_CONFIG                     (0x0001|DAR_EVENT_EXTERN)
+
       /***** Definitions ******/
       /* Define return parameters. */
       typedef UINT16 T_DAR_RECOVERY_STATUS;
       /* possible values */
       #define DAR_POWER_ON_OFF            (0x0)       /* Power ON/OFF */
       #define DAR_WATCHDOG                (0xDD11)    /* Watchdog reset */
-      #define DAR_NORMAL_SCUTTLING        (0xDD22)    /* Recovery module has decided to active the reset */
+      #define DAR_NORMAL_SCUTTLING        (0xDD22)    /* Recovery module has
+							 decided to active the
+							 reset */
       #define DAR_EMERGENCY_SCUTTLING     (0xDD33)    /* Emergency detection */
 
       /* Define Recovery configuration parameters */
@@ -82,31 +84,32 @@
       /***** Prototype *****/
       /* Get and reset the status of the DAR entity */
       T_RV_RET dar_recovery_get_status(T_DAR_RECOVERY_STATUS* status);
-      T_RV_RET dar_recovery_config(T_RV_RET (*dar_store_recovery_data)( T_DAR_BUFFER buffer_p,
-                                                                        UINT16 length));
-      T_RV_RET dar_get_recovery_data(T_DAR_BUFFER buffer_p,UINT16 length );                                                         
+      T_RV_RET dar_recovery_config(T_RV_RET (*dar_store_recovery_data)(
+						T_DAR_BUFFER buffer_p,
+						UINT16 length));
+      T_RV_RET dar_get_recovery_data(T_DAR_BUFFER buffer_p,UINT16 length );
 
-     /********************************************************************************/
-     /*                               WATCHDOG                                       */
-     /********************************************************************************/
-    
+     /*************************************************************************/
+     /*                               WATCHDOG                                */
+     /*************************************************************************/
+
      /***** Prototype *****/
      T_RV_RET  dar_start_watchdog_timer(UINT16 timer);
      T_RV_RET  dar_reload_watchdog_timer(void);
      T_RV_RET  dar_stop_watchdog_timer(void);
 
 
-     /********************************************************************************/
-     /*                                RESET                                         */
-     /********************************************************************************/
-    
+     /*************************************************************************/
+     /*                                RESET                                  */
+     /*************************************************************************/
+
      /***** Prototype *****/
      T_RV_RET  dar_reset_system(void);
 
 
-     /********************************************************************************/
-     /*                              DIAGNOSE                                        */
-     /********************************************************************************/
+     /*************************************************************************/
+     /*                              DIAGNOSE                                 */
+     /*************************************************************************/
 
      /***** Definitions *****/
 
@@ -127,7 +130,8 @@
      #define DAR_EXCEPTION                           (0xFF)
      /* Causes a reset, if set when calling dar_diagnose_write_emergency() */
      #define DAR_EMERGENCY_RESET               (0x00000001)
-     /* New data is appended to last entry, if set when calling dar_diagnose_write_emergency() */
+     /* New data is appended to last entry, if set when calling
+	dar_diagnose_write_emergency() */
      #define DAR_NEW_ENTRY                     (0x00000002)
 
      /***** Prototype *****/