Integration of EA in build system and boards.

diff --git a/boards/board_common.mk b/boards/board_common.mk
index 15190cb5ed3c768c7901c9fabd5b249af13b35be..44f344fc1cd17b4b11721dd284f6926eab4ed093 100644 (file)
--- a/boards/board_common.mk
+++ b/boards/board_common.mk
@@ -42,6 +42,7 @@ vpath-$(USE_ECUM) += $(ROOTDIR)/system/EcuM
 \r
 #Ea\r
 obj-$(USE_EA) += Ea.o\r
+obj-$(USE_EA) += Ea_Lcfg.o\r
 vpath-$(USE_EA) += $(ROOTDIR)/memory/Ea\r
 \r
 # Gpt\r

diff --git a/boards/generic/EcuM_Callout_template.c b/boards/generic/EcuM_Callout_template.c
index f3ed3faecb13ddd96a4bb57080802fb17a974358..ea1f9bc332f7de7a8919d07209bee7f0501b962f 100644 (file)
--- a/boards/generic/EcuM_Callout_template.c
+++ b/boards/generic/EcuM_Callout_template.c
@@ -192,7 +192,7 @@ void EcuM_AL_DriverInitTwo(const EcuM_ConfigType* ConfigPtr)
 
 #if defined(USE_EA)
        // Setup EA
-       Ea_init();
+       Ea_Init();
 #endif
 
 #if defined(USE_NVM)

diff --git a/boards/hcs12x_elmicro_tboard/build_config.mk b/boards/hcs12x_elmicro_tboard/build_config.mk
index 15ed15d9dbca2863d5a6551ebfc4d7b3206a3247..59b21807c8934fbd8831762d76f6de587b22c7f7 100644 (file)
--- a/boards/hcs12x_elmicro_tboard/build_config.mk
+++ b/boards/hcs12x_elmicro_tboard/build_config.mk
@@ -11,7 +11,7 @@ CFG=HC1X HCS12XD MC912XDP512 BRD_HCS12X_ELMICRO_TBOARD SIMULATOR
 # default or private (These become MOD_XXX=y )\r
 MOD_AVAIL+=KERNEL MCU GPT DIO PORT COM CAN CANIF PWM ADC DEM DCM PDUR CANTP RTE IOHWAB DET ECUM RAMLOG\r
 # Network management\r
-MOD_AVAIL+=COMM NM CANNM CANSM\r
+MOD_AVAIL+=COMM NM CANNM CANSM NVM MEMIF EA FEE\r
 \r
 # Needed by us (These become USE_XXX=y and def-y += USE_XXX )\r
 MOD_USE=KERNEL MCU\r

diff --git a/boards/mpc5516it/build_config.mk b/boards/mpc5516it/build_config.mk
index 5f5ba1613b953aaa73356c300decb48fd7bc4c9d..3e96f4831d9d43d466db5cbb457e5bfd144bb74a 100644 (file)
--- a/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@ -15,7 +15,7 @@ MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
 # Network management\r
-MOD_AVAIL+=COMM NM CANNM CANSM\r
+MOD_AVAIL+=COMM NM CANNM CANSM EA\r
 # Additional\r
 MOD_AVAIL+= RAMLOG \r
 \r

diff --git a/boards/mpc5606s_xpc560s/build_config.mk b/boards/mpc5606s_xpc560s/build_config.mk
index 1078901a191664b42a7d075d8e4f913e83d06d4b..bb4481a0df382f763ee64a54e33ee96634cf7c7a 100644 (file)
--- a/boards/mpc5606s_xpc560s/build_config.mk
+++ b/boards/mpc5606s_xpc560s/build_config.mk
@@ -11,7 +11,7 @@ CFG=PPC E200Z0 MPC55XX MPC5606S BRD_MPC560X_XPC560S VLE
 # default or private\r
 \r
 # Memory + Peripherals\r
-MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP  \r
+MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP EA\r
 # System + Communication + Diagnostic\r
 MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE\r
 # Additional\r

diff --git a/memory/Ea/Ea.c b/memory/Ea/Ea.c
index c45ebe162e1cc6c4b55de1d03113bd66eece25c8..e509711fcbc5a1d1fd8f99dfd2a10b8549e227f3 100644 (file)
--- a/memory/Ea/Ea.c
+++ b/memory/Ea/Ea.c
@@ -123,7 +123,6 @@ typedef struct {
        const Ea_BlockConfigType *EaBlockConfig;\r
        const Ea_GeneralType    *EaGeneralPtr;\r
        uint8                                   CurBlockIndex;\r
-       uint16                                  EaBlockBaseNum;\r
        MemIf_StatusType        ModuleStatus;\r
        MemIf_JobResultType     JobResult;\r
        Ea_JobType                      JobType;\r
@@ -167,7 +166,6 @@ void Ea_Init(void)
        /*init internal variables*/\r
        Ea_Global.EaBlockConfig = Ea_BlockConfigData;\r
        Ea_Global.EaGeneralPtr = &Ea_GeneralData;\r
-       Ea_Global.EaBlockBaseNum = Ea_BlockConfigData[0].EaBlockNumber >> NVM_DATASET_SEL_BITS;\r
        Ea_Global.JobResult = MEMIF_JOB_OK;\r
        Ea_Global.JobType = EA_JOB_NONE;\r
        Ea_Global.JobStatus = EA_PENDING_NONE;\r
@@ -195,6 +193,8 @@ Std_ReturnType Ea_Read(uint16 BlockNumber, uint16 BlockOffset, uint8* DataBuffer
        const Ea_BlockConfigType *EaBlockCon;\r
        Std_ReturnType ReturnValue;\r
 \r
+       /*@req <EA137>\r
+       */\r
        /* Lock down the module to ourself */\r
        imask_t mask = McuE_EnterCriticalSection();\r
        if (Ea_Global.ModuleStatus != MEMIF_IDLE)\r
@@ -258,6 +258,8 @@ Std_ReturnType Ea_Write(uint16 BlockNumber, uint8* DataBufferPtr)
        uint16 BlockIndex;\r
        const Ea_BlockConfigType *EaBlockCon;\r
 \r
+       /*@req <EA137>\r
+       */\r
        /* Lock down the module to ourself */\r
        imask_t mask = McuE_EnterCriticalSection();\r
        if (Ea_Global.ModuleStatus != MEMIF_IDLE)\r
@@ -350,6 +352,8 @@ Std_ReturnType Ea_InvalidateBlock(uint16 BlockNumber)
        const Ea_BlockConfigType *EaBlockCon;\r
        Std_ReturnType ReturnValue;\r
 \r
+       /*@req <EA137>\r
+       */\r
        /* Lock down the module to ourself */\r
        imask_t mask = McuE_EnterCriticalSection();\r
        if (Ea_Global.ModuleStatus != MEMIF_IDLE)\r