--- a/gsm-fw/services/dar/dar_const_i.h	Sun Mar 16 05:48:58 2014 +0000
+++ b/gsm-fw/services/dar/dar_const_i.h	Sun Mar 16 06:50:26 2014 +0000
@@ -7,7 +7,7 @@
 /*                                                                          */
 /*   Version    0.1                                                         */
 /*                                                                          */
-/*   Date                        Modification                               */
+/*   Date                 Modification                                      */
 /*   ------------------------------------                                   */
 /*   26 Septembre 2001    Create                                            */
 /*                                                                          */
@@ -17,15 +17,13 @@
 /* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#include "rv/rv_defined_swe.h"
+#include "../../riviera/rv/rv_defined_swe.h"
 
 #ifdef RVM_DAR_SWE
 
    #ifndef __DAR_CONST_I_H_
       #define __DAR_CONST_I_H_
 
-       #include "config/chipset.cfg"
-
       #ifdef __cplusplus
          extern "C"
             {
@@ -38,11 +36,12 @@
       /* The DAR task run without any time out */
       #define DAR_NOT_TIME_OUT                            (0)
 
-      /* The DAR entity processes only the messages send to the following mail box */
+      /* The DAR entity processes only the messages send to the following
+	 mail box */
       #define DAR_MBOX                                    (RVF_TASK_MBOX_0)
 
       /* The DAR entity takes into account only the following events: */
-      #define DAR_TASK_MBOX_EVT_MASK                      (RVF_TASK_MBOX_0_EVT_MASK)
+      #define DAR_TASK_MBOX_EVT_MASK                  (RVF_TASK_MBOX_0_EVT_MASK)
 
       /* The DAR entity waits all event type */
       #define DAR_ALL_EVENT_FLAGS                         (0xFFFF)
@@ -65,13 +64,13 @@
       /* Define the Watchdog timer register mode */
       #define WATCHDOG_TIM_MODE                           (0xFFFFF804)
 
-	  
-      #if ((CHIPSET == 7) || (CHIPSET == 8) || (CHIPSET == 10) || (CHIPSET == 11))
-	      /* Define the Debug Unit register mode */
-		  #define DAR_DEBUG_UNIT_REGISTER                     (0x03C00000)
-      #elif	(CHIPSET == 12)
-		 /* Define the Debug Unit register mode */
-		  #define DAR_DEBUG_UNIT_REGISTER                     (0x09F00000)
+
+      #if (CHIPSET == 7 || CHIPSET == 8 || CHIPSET == 10 || CHIPSET == 11)
+          /* Define the Debug Unit register mode */
+	  #define DAR_DEBUG_UNIT_REGISTER                     (0x03C00000)
+      #elif (CHIPSET == 12)
+	  /* Define the Debug Unit register mode */
+	  #define DAR_DEBUG_UNIT_REGISTER                     (0x09F00000)
       #endif  
 
       /* Mask to enable the Debug Unit Module */
@@ -91,10 +90,11 @@
       #define DEBUG_UNIT_WORD_SIZE                        (64) 
 
       /* Define the size of the X_dump _buffer */
-      /* This size is specified in the gsm_cs_amd4_lj3_test.cmd (in "system" directory) */
+      /* This size is specified in the gsm_cs_amd4_lj3_test.cmd
+	 (in "system" directory) */
       /* Its size is 38*32 bits = 38*4 bytes = 152 bytes */
       #define DAR_X_DUMP_BUFFER_SIZE                      (152)
-           
+
       /* Define the exceptions */
       #define DAR_NO_ABORT_EXCEPTION                      (0)
       #define DAR_EXCEPTION_DATA_ABORT                    (1)
@@ -108,6 +108,3 @@
       #endif
    #endif /* __DAR_CONST_I_H_ */
 #endif /* #ifdef RVM_DAR_SWE */
-
-
-