# HG changeset patch # User Michael Spacefalcon # Date 1388983401 0 # Node ID bdfdea886beabf8ca7eae2a903640f664e1560c6 # Parent ef7d7da61c56a0fe4832e8c385d0316cf8f801ce gsm-fw/services/ffs: ffs_env.c and ffstrace.c compile diff -r ef7d7da61c56 -r bdfdea886bea gsm-fw/services/ffs/Makefile --- a/gsm-fw/services/ffs/Makefile Mon Jan 06 04:20:29 2014 +0000 +++ b/gsm-fw/services/ffs/Makefile Mon Jan 06 04:43:21 2014 +0000 @@ -2,7 +2,7 @@ CFLAGS= -O2 -fno-builtin -mthumb-interwork -mthumb LD= arm-elf-ld -OBJS= cfgffs.o core.o drv.o task.o +OBJS= cfgffs.o core.o drv.o ffs_env.o ffstrace.o task.o HDRS= core.h drv.h ffs.h ffs_api.h ffs_env.h ffs_pool_size.h ffstrace.h \ intctl.h ramffs.h task.h tmffs.h diff -r ef7d7da61c56 -r bdfdea886bea gsm-fw/services/ffs/ffs_env.c --- a/gsm-fw/services/ffs/ffs_env.c Mon Jan 06 04:20:29 2014 +0000 +++ b/gsm-fw/services/ffs/ffs_env.c Mon Jan 06 04:43:21 2014 +0000 @@ -1,36 +1,38 @@ /****************************************************************************/ /* */ -/* File Name: ffs_env.c */ +/* File Name: ffs_env.c */ /* */ -/* Purpose: This file contains definitions for RV manager related */ -/* functions used to get info, start and stop the FFS SWE. */ +/* Purpose: This file contains definitions for RV manager related */ +/* functions used to get info, start and stop the FFS SWE. */ /* */ -/* Version 0.1 */ -/* */ -/* Date Modification */ -/* ------------------------------------ */ -/* 10/24/2000 Create */ -/* */ -/* Author Pascal Puel */ -/* */ +/* Version 0.1 */ +/* */ +/* Date Modification */ +/* ------------------------------------ */ +/* 10/24/2000 Create */ +/* */ +/* Author Pascal Puel */ +/* */ /* (C) Copyright 2000 by Texas Instruments Incorporated, All Rights Reserved*/ /****************************************************************************/ -#include "board.cfg" -#include "ffs.cfg" -#include "ffs/ffs_env.h" -#include "rvm/rvm_gen.h" -#include "rvm/rvm_priorities.h" -#include "rvm/rvm_use_id_list.h" -#include "ffs/board/task.h" +#include "../../include/config.h" +#include "ffs.h" +#include "ffs_env.h" +#include "../../riviera/rvm/rvm_gen.h" +#include "../../riviera/rvm/rvm_priorities.h" +#include "../../riviera/rvm/rvm_use_id_list.h" +#include "task.h" #include extern void ffs_task_init(T_RVF_MB_ID mbid, T_RVF_ADDR_ID addr_id); T_FFS_TASK_INFO ffs_task_info; /* global pointer to the error function */ -static T_RVM_RETURN (*ffs_error_ft)(T_RVM_NAME swe_name, T_RVM_RETURN error_cause, - T_RVM_ERROR_TYPE error_type,T_RVM_STRING error_msg); +static T_RVM_RETURN (*ffs_error_ft)(T_RVM_NAME swe_name, + T_RVM_RETURN error_cause, + T_RVM_ERROR_TYPE error_type, + T_RVM_STRING error_msg); /****************************************************************************** * Function : ffs_get_info @@ -89,12 +91,12 @@ * Function : ffs_set_info * * Description : This function is called by the RV manager to inform -* the driver SWE about task_id, mb_id and error function. +* the driver SWE about task_id, mb_id and error function. * -* Parameters : - T_RVF_ADDR_ID addr_id: unique path to the SWE. -* - T_RV_RETURN ReturnPath[], array of return path for linked SWE -* - T_RVF_MB_ID mbId[]: array of memory bank ids. -* - callback function to call in case of unrecoverable error. +* Parameters : - T_RVF_ADDR_ID addr_id: unique path to the SWE. +* - T_RV_RETURN ReturnPath[], array of return path for linked SWE +* - T_RVF_MB_ID mbId[]: array of memory bank ids. +* - callback function to call in case of unrecoverable error. * * Return : T_RVM_RETURN * @@ -103,17 +105,17 @@ * ******************************************************************************/ T_RVM_RETURN ffs_set_info(T_RVF_ADDR_ID addr_id, - T_RV_RETURN ReturnPath[], - T_RVF_MB_ID mbId[], - T_RVM_RETURN (*callBackFct)(T_RVM_NAME SWEntName, - T_RVM_RETURN errorCause, - T_RVM_ERROR_TYPE errorType, - T_RVM_STRING errorMsg)) + T_RV_RETURN ReturnPath[], + T_RVF_MB_ID mbId[], + T_RVM_RETURN (*callBackFct)(T_RVM_NAME SWEntName, + T_RVM_RETURN errorCause, + T_RVM_ERROR_TYPE errorType, + T_RVM_STRING errorMsg)) { /* store the pointer to the error function */ ffs_error_ft = callBackFct ; - ffs_task_init(mbId[0], addr_id); + ffs_task_init(mbId[0], addr_id); ffs_task_info.addr_id = addr_id; ffs_task_info.mbid = mbId[0]; @@ -126,7 +128,7 @@ * Function : ffs_init * * Description : This function is called by the RV manager to initialize the -* ffs SWE before creating the task and calling ffs_start. +* ffs SWE before creating the task and calling ffs_start. * * Parameters : None * @@ -146,7 +148,7 @@ * Function : ffs_start * * Description : This function is called by the RV manager to start the ffs -* SWE, it is the body of the task. +* SWE, it is the body of the task. * * Parameters : None * @@ -159,7 +161,7 @@ T_RVM_RETURN ffs_start(void) { ffs_task(); - return RV_OK; + return RV_OK; } @@ -188,7 +190,7 @@ * Function : ffs_kill * * Description : This function is called by the RV manager to kill the ffs -* SWE, after the ffs_stop function has been called. +* SWE, after the ffs_stop function has been called. * * Parameters : None * diff -r ef7d7da61c56 -r bdfdea886bea gsm-fw/services/ffs/ffstrace.c --- a/gsm-fw/services/ffs/ffstrace.c Mon Jan 06 04:20:29 2014 +0000 +++ b/gsm-fw/services/ffs/ffstrace.c Mon Jan 06 04:43:21 2014 +0000 @@ -8,28 +8,24 @@ * ******************************************************************************/ -#ifndef TARGET -#include "ffs.cfg" -#endif - -#include "ffs/ffs.h" -#include "ffs/board/drv.h" -#include "ffs/board/ffstrace.h" +#include "ffs.h" +#include "drv.h" +#include "ffstrace.h" #include #include #include #include +#include "../../riviera/rvf/rvf_api.h" +#include "../../riviera/rv/rv_general.h" +#include "../../riviera/rvm/rvm_use_id_list.h" + /****************************************************************************** * LED control *****************************************************************************/ -#if (TARGET == 1) - -#include "rvf/rvf_api.h" -#include "rv/rv_general.h" -#include "rvm/rvm_use_id_list.h" +#if 0 //(TARGET == 1) static uint8 led_state = 0; static uint8 led_countbits = 0; // number of counter bits