# HG changeset patch # User Michael Spacefalcon # Date 1394952626 0 # Node ID 81bee6125882488026d6dc88b972bb4d3f61bde0 # Parent 4dccc9d3305fc9740abaa83154c55b901d56ad1a DAR integration: header cleanup diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_api.h --- 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 *****/ diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_const_i.h --- 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 */ - - - diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_diagnose_i.h --- a/gsm-fw/services/dar/dar_diagnose_i.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_diagnose_i.h Sun Mar 16 06:50:26 2014 +0000 @@ -7,7 +7,7 @@ /* */ /* Version 0.1 */ /* */ -/* Date Modification */ +/* Date Modification */ /* ------------------------------------ */ /* 18 October 2001 Create */ /* */ @@ -16,13 +16,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_DIAGNOSE_I_H_ #define __DAR_DIAGNOSE_I_H_ - #include "rvm/rvm_gen.h" + #include "../../riviera/rvm/rvm_gen.h" /* Search a group in the dar array*/ T_RV_RET dar_search_group(UINT16 group, UINT8 *index_p); diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_emergency.h --- a/gsm-fw/services/dar/dar_emergency.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_emergency.h Sun Mar 16 06:50:26 2014 +0000 @@ -7,7 +7,7 @@ /* */ /* Version 0.1 */ /* */ -/* Date Modification */ +/* Date Modification */ /* ------------------------------------ */ /* 17 October 2001 Create */ /* */ @@ -19,11 +19,11 @@ #ifndef __DAR_EMERGENCY_H_ #define __DAR_EMERGENCY_H_ - #include "rv/rv_defined_swe.h" + #include "../../riviera/rv/rv_defined_swe.h" #ifdef RVM_DAR_SWE - #include "rvm/rvm_gen.h" + #include "../../riviera/rvm/rvm_gen.h" /* Functions prototypes */ T_RV_RET dar_process_emergency( T_DAR_INFO *buffer_p, diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_env.h --- a/gsm-fw/services/dar/dar_env.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_env.h Sun Mar 16 06:50:26 2014 +0000 @@ -16,11 +16,11 @@ /* (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 - #include "dar/dar_structs_i.h" + #include "dar_structs_i.h" - #include "dar/dar_pool_size.h" /* Stack & Memory Bank sizes definitions */ + #include "dar_pool_size.h" /* Stack & Memory Bank sizes definitions */ #ifndef __DAR_ENV_H_ diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_error_hdlr_i.h --- a/gsm-fw/services/dar/dar_error_hdlr_i.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_error_hdlr_i.h Sun Mar 16 06:50:26 2014 +0000 @@ -16,7 +16,7 @@ /* (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_ERROR_HDLR_I_H #define _DAR_ERROR_HDLR_I_H diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_gen.h --- a/gsm-fw/services/dar/dar_gen.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_gen.h Sun Mar 16 06:50:26 2014 +0000 @@ -1,23 +1,23 @@ -/********************************************************************************/ -/* */ -/* File Name: dar_gen.h */ -/* */ -/* Purpose: This file contain general definitions of DAR Module. */ -/* */ -/* Note: */ -/* None. */ -/* */ -/* Revision History: */ -/* 9 October 2001 Stephanie Gerthoux Create */ -/* */ -/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ -/* */ -/********************************************************************************/ +/******************************************************************************/ +/* */ +/* File Name: dar_gen.h */ +/* */ +/* Purpose: This file contain general definitions of DAR Module. */ +/* */ +/* Note: */ +/* None. */ +/* */ +/* Revision History: */ +/* 9 October 2001 Stephanie Gerthoux Create */ +/* */ +/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ +/* */ +/******************************************************************************/ #ifndef __DAR_GEN_H__ #define __DAR_GEN_H__ - #include "rv/general.h" + #include "../../riviera/rv/general.h" /**** Type definitions ****/ @@ -41,4 +41,4 @@ /** DAR Level Default definition **/ #define DAR_LEVEL_DEFAULT (DAR_ERROR) -#endif \ No newline at end of file +#endif diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_handle_message.h --- a/gsm-fw/services/dar/dar_handle_message.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_handle_message.h Sun Mar 16 06:50:26 2014 +0000 @@ -7,7 +7,7 @@ /* */ /* Version 0.1 */ /* */ -/* Date Modification */ +/* Date Modification */ /* ------------------------------------ */ /* 17 October 2001 Create */ /* */ @@ -16,13 +16,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_HANDLE_MESSAGE_H_ #define __DAR_HANDLE_MESSAGE_H_ - #include "rvm/rvm_gen.h" + #include "../../riviera/rvm/rvm_gen.h" /* Handle message prototype */ T_RV_RET dar_handle_msg(T_RV_HDR *msg_p); diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_macro_i.h --- a/gsm-fw/services/dar/dar_macro_i.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_macro_i.h Sun Mar 16 06:50:26 2014 +0000 @@ -1,23 +1,23 @@ -/********************************************************************************/ -/* */ -/* File Name: dar_macro_i.h */ -/* */ -/* Purpose: This header contains the generic structures and constants */ -/* that are used by the Diagnose And Recovery layer. */ -/* */ -/* Note: */ -/* None. */ -/* */ -/* Revision History: */ -/* 27 September 2001 Stephanie Gerthoux Create */ -/* */ -/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ -/* */ -/********************************************************************************/ +/******************************************************************************/ +/* */ +/* File Name: dar_macro_i.h */ +/* */ +/* Purpose: This header contains the generic structures and constants */ +/* that are used by the Diagnose And Recovery layer. */ +/* */ +/* Note: */ +/* None. */ +/* */ +/* Revision History: */ +/* 27 September 2001 Stephanie Gerthoux Create */ +/* */ +/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ +/* */ +/******************************************************************************/ -#include "rv/rv_defined_swe.h" -#include "dar/dar_const_i.h" -#include "rvm/rvm_use_id_list.h" +#include "../../riviera/rv/rv_defined_swe.h" +#include "dar_const_i.h" +#include "../../riviera/rvm/rvm_use_id_list.h" #ifdef RVM_DAR_SWE #ifndef _DAR_MACRO_I_H @@ -33,7 +33,8 @@ #define DAR_SEND_TRACE_PARAM(string,param,type) rvf_send_trace (string,(sizeof(string)-1),(UINT32)param,type,DAR_USE_ID) #define DAR_TRACE_WARNING(string) rvf_send_trace (string,(sizeof(string)-1),NULL_PARAM,RV_TRACE_LEVEL_WARNING,DAR_USE_ID) - /* Macro used to calculate the value of the index of the circular buffer */ + /* Macro used to calculate the value of the index */ + /* of the circular buffer */ /* When the end of the buffer is reached, the index = 0 */ #define DAR_PLUS_PLUS(dar_current_index) \ { \ @@ -51,4 +52,4 @@ #endif -#endif /* #ifdef RVM_DAR_SWE */ \ No newline at end of file +#endif /* #ifdef RVM_DAR_SWE */ diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_messages_i.h --- a/gsm-fw/services/dar/dar_messages_i.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_messages_i.h Sun Mar 16 06:50:26 2014 +0000 @@ -17,21 +17,21 @@ /* (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_MESSAGES_I_H_ #define __DAR_MESSAGES_I_H_ - #include "dar/dar_structs_i.h" + #include "dar_structs_i.h" #ifdef __cplusplus extern "C" { #endif - /******************************* Diagnose messages ************************************/ + /************************ Diagnose messages *****************************/ /* Diagnose filter and no filter messages */ - #define DAR_FILTER_REQ (0x0001 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_FILTER_REQ (0x0001 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) /* Diagnose filter structure */ typedef struct @@ -42,7 +42,7 @@ } T_DAR_FILTER_START; /* Diagnose write messages */ - #define DAR_WRITE_REQ (0x0003 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_WRITE_REQ (0x0003 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) /* Diagnose write data structure */ typedef struct @@ -52,10 +52,11 @@ T_RV_RETURN return_path; } T_DAR_WRITE_START; - /******************************* FFS interface ************************************/ + /************************** FFS interface *******************************/ /* FFS RAM to FLASH interface */ /* start message */ - #define DAR_FFS_RAM_2_FLASH_START_REQ (0x0004 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_FFS_RAM_2_FLASH_START_REQ \ + (0x0004 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) typedef struct { T_RV_HDR os_hdr; @@ -63,7 +64,7 @@ } T_DAR_FFS_RAM_2_FLASH_START; /* start confirmation message */ - #define DAR_FFS_INIT_DONE (0x0005 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_FFS_INIT_DONE (0x0005 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) typedef struct { @@ -71,14 +72,14 @@ } T_DAR_FFS_INIT; /* stop message */ - #define DAR_FFS_STOP_REQ (0x0006 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_FFS_STOP_REQ (0x0006 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) typedef struct { T_RV_HDR os_hdr; } T_DAR_FFS_STOP; /* stop confirmation message */ - #define DAR_FFS_STOP_CON (0x0007 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) + #define DAR_FFS_STOP_CON (0x0007 | DAR_EVENT_INTERN | DAR_EVENTS_MASK) #ifdef __cplusplus } diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_msg_ft.h --- a/gsm-fw/services/dar/dar_msg_ft.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_msg_ft.h Sun Mar 16 06:50:26 2014 +0000 @@ -7,7 +7,7 @@ /* */ /* Version 0.1 */ /* */ -/* Date Modification */ +/* Date Modification */ /* ------------------------------------ */ /* 17 October 2001 Create */ /* */ @@ -16,13 +16,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_MSG_FT_H_ #define __DAR_MSG_FT_H_ - #include "rvm/rvm_gen.h" + #include "../../riviera/rvm/rvm_gen.h" /* Functions prototypes */ T_RV_RET dar_filter_request (T_DAR_FILTER_START *msg_p); diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_pool_size.h --- a/gsm-fw/services/dar/dar_pool_size.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_pool_size.h Sun Mar 16 06:50:26 2014 +0000 @@ -13,9 +13,9 @@ /* * History: * - * Date Author Modification - * ------------------------------------------------------------------- - * 07/08/2003 Vincent Oberle Extracted from rvf_pool_size.h + * Date Author Modification + * ------------------------------------------------------------------- + * 07/08/2003 Vincent Oberle Extracted from rvf_pool_size.h * * (C) Copyright 2003 by Texas Instruments Incorporated, All Rights Reserved */ diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_structs_i.h --- a/gsm-fw/services/dar/dar_structs_i.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_structs_i.h Sun Mar 16 06:50:26 2014 +0000 @@ -1,35 +1,35 @@ -/********************************************************************************/ -/* */ -/* File Name: dar_structs_i.h */ -/* */ -/* Purpose: This file contains constants, data type, and data */ -/* structures that are used by the diagnose's task. */ -/* */ -/* Note: */ -/* None. */ -/* */ -/* Revision History: */ -/* 26 september 01 Stephanie Gerthoux Create */ -/* */ -/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ -/* */ -/********************************************************************************/ -#include "rv/rv_defined_swe.h" +/******************************************************************************/ +/* */ +/* File Name: dar_structs_i.h */ +/* */ +/* Purpose: This file contains constants, data type, and data */ +/* structures that are used by the diagnose's task. */ +/* */ +/* Note: */ +/* None. */ +/* */ +/* Revision History: */ +/* 26 september 01 Stephanie Gerthoux Create */ +/* */ +/* (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved. */ +/* */ +/******************************************************************************/ +#include "../../riviera/rv/rv_defined_swe.h" #ifdef RVM_DAR_SWE #ifndef _DAR_STRUCTS_I_ #define _DAR_STRUCTS_I_ - #include "rvm/rvm_gen.h" - #include "dar/dar_gen.h" - #include "dar/dar_const_i.h" + #include "../../riviera/rvm/rvm_gen.h" + #include "dar_gen.h" + #include "dar_const_i.h" #ifdef __cplusplus extern "C" { #endif - /* ***************** DAR internal structures ********************************/ - + /* ***************** DAR internal structures *************************/ + /* Diagnose Use parameter with masks for warning and debug messages */ typedef struct { @@ -38,7 +38,8 @@ UINT16 mask_debug; }T_DAR_FILTER_PARAMETER; - /* Diagnose Use Messages parameter (used to send messages in DAR mailbox) */ + /* Diagnose Use Messages parameter (used to send messages in DAR + mailbox) */ typedef struct { UINT16 group_nb; @@ -56,9 +57,9 @@ }T_DAR_WRITE; - /****************************** DAR'S ENVIRONMENT **************************** */ - /* Define a structure used to store all information related to the DAR's task */ - /* & memory bank identifiers. */ + /****************************** DAR'S ENVIRONMENT **********************/ + /* Define a structure used to store all information related to the */ + /* DAR's task & memory bank identifiers. */ typedef struct { @@ -87,8 +88,8 @@ /* Pointer to the DAR callback function */ T_RV_RET (*entity_dar_callback)(T_DAR_BUFFER buffer_p, UINT16 length); - /* Filter Array that contains the group and the masks ( Warning, debug) */ - /* in order to filter messages */ + /* Filter Array that contains the group and the masks */ + /* (Warning, debug) in order to filter messages */ T_DAR_FILTER_PARAMETER dar_filter_array[DAR_MAX_GROUP_NB]; /* index to indicate the group position in the dar_filter_array */ UINT16 index; @@ -96,7 +97,7 @@ /* dar_filter_array ( to add a new group in the array) */ UINT16 free_index; /* Buffer to store diagnose data*/ - + } T_DAR_ENV_CTRL_BLK; #ifdef __cplusplus diff -r 4dccc9d3305f -r 81bee6125882 gsm-fw/services/dar/dar_watchdog.h --- a/gsm-fw/services/dar/dar_watchdog.h Sun Mar 16 05:48:58 2014 +0000 +++ b/gsm-fw/services/dar/dar_watchdog.h Sun Mar 16 06:50:26 2014 +0000 @@ -7,7 +7,7 @@ /* */ /* Version 0.1 */ /* */ -/* Date Modification */ +/* Date Modification */ /* ------------------------------------ */ /* 18 October 2001 Create */ /* */ @@ -16,13 +16,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_WATCHDOG_H_ #define __DAR_WATCHDOG_H_ - #include "rvm/rvm_gen.h" + #include "../../riviera/rvm/rvm_gen.h" /* Reset the system when the general purpose timer expires*/ void dar_watchdog_reset(void);