Mixed bug fixing..

diff --git a/arch/ppc/mpc55xx/drivers/Mcu.c b/arch/ppc/mpc55xx/drivers/Mcu.c
index a605cff4c1c98c9b4d0795084158736a64ebdf72..a0f1e3dc17b85d0af220df06e66284839a4cb479 100644 (file)
--- a/arch/ppc/mpc55xx/drivers/Mcu.c
+++ b/arch/ppc/mpc55xx/drivers/Mcu.c
@@ -412,7 +412,9 @@ Std_ReturnType Mcu_InitClock(const Mcu_ClockType ClockSetting)
     FMPLL.ESYNCR1.B.EPREDIV = clockSettingsPtr->Pll1;\r
     FMPLL.ESYNCR1.B.EMFD    = clockSettingsPtr->Pll2;\r
 \r
+#if !defined(CFG_SIMULATOR)\r
     while(FMPLL.SYNSR.B.LOCK != 1) {};\r
+#endif\r
 \r
     FMPLL.ESYNCR2.B.ERFD    = clockSettingsPtr->Pll3;\r
     // Connect SYSCLK to FMPLL\r

diff --git a/include/NvM_Types.h b/include/NvM_Types.h
index 4f70b2d41ff0bd36cba29339d32ce84220d96c45..e8799e892f911053cc62f661af4a02b8861cc32b 100644 (file)
--- a/include/NvM_Types.h
+++ b/include/NvM_Types.h
@@ -27,6 +27,9 @@
 #define NVM_TYPES_H_\r
 \r
 #include "Std_Types.h"\r
+#if (NVM_USE_SERVICE_PORTS==STD_ON)\r
+#include "Rte_NvM.h"\r
+#endif\r
 \r
 #if !defined(_DEFINED_TYPEDEF_FOR_NvM_RequestResultType_)\r
 typedef uint8 NvM_RequestResultType;   /** @req NVM470 */\r

diff --git a/include/Spi.h b/include/Spi.h
index 0b389c59c8aa705015a82f2614cffb2766714c1d..5fef937a84129f2350a1e91833283c55c4da056f 100644 (file)
--- a/include/Spi.h
+++ b/include/Spi.h
@@ -236,6 +236,10 @@ typedef enum {
 \r
 #include "Spi_Cfg.h"\r
 \r
+#if (SPI_IMPLEMENTATION==SPI_DMA)\r
+#include "dma.h"\r
+#endif\r
+\r
 // All data needed to configure one SPI-channel\r
 typedef struct Spi_ChannelConfig\r
 {\r
@@ -361,11 +365,13 @@ typedef struct Spi_HwConfig
   /* This channel is to be activated for use. */\r
   uint8 Activated;\r
 \r
+#if (SPI_IMPLEMENTATION==SPI_DMA)\r
   /* Receive DMA channel. */\r
   Dma_ChannelType RxDmaChannel;\r
 \r
   /* Transmit DMA channel. */\r
   Dma_ChannelType TxDmaChannel;\r
+#endif\r
 \r
   /* Peripheral clock source. */\r
 //  McuE_PeriperalClock_t PeripheralClock;\r

diff --git a/makefile b/makefile
index 2af6b8deb17202f9e37b2bc0312820db060ce502..d1ff0a7d6b52c6844a7c4cf24a4ba5122aaba2c1 100644 (file)
--- a/makefile
+++ b/makefile
@@ -126,7 +126,7 @@ help:
        @echo "  BDIR          = ${BDIR}"\r
        @echo "  BOARDDIR      = $(BOARDDIR)"\r
        @echo "  CROSS_COMPILE = $(CROSS_COMPILE)"\r
-       @echo "  CURDIR        = $(CURDIR)"\r
+       @echo "  CURDIR        = $(CURDIR)"     \r
        @echo ""\r
 \r
 \r
@@ -136,10 +136,12 @@ test:
 show_build:\r
        @echo ""\r
        @echo "==========[ BUILD INFO ]==========="\r
-       @echo "  BDIR:          $(BDIR) [$(origin BDIR)]"\r
-       @echo "  BOARDDIR:      $(BOARDDIR) [$(origin BOARDDIR)]"\r
-       @echo "  CROSS_COMPILE: $(CROSS_COMPILE) [$(origin CROSS_COMPILE)]"\r
-       @echo "  CURDIR:        $(CURDIR)"\r
+       @echo "  BDIR:           $(BDIR) [$(origin BDIR)]"\r
+       @echo "  BOARDDIR:       $(BOARDDIR) [$(origin BOARDDIR)]"\r
+       @echo "  CROSS_COMPILE:  $(CROSS_COMPILE) [$(origin CROSS_COMPILE)]"\r
+       @echo "  CURDIR:         $(CURDIR)"\r
+       @echo "  SELECT_CONSOLE: $(SELECT_CONSOLE) [$(origin SELECT_CONSOLE)]"\r
+       \r
        \r
        \r
 $(dir_cmd_goals) :: show_build FORCE   \r
@@ -171,8 +173,8 @@ clean: $(dir_cmd_goals)
        @echo\r
        @echo "  >> Cleaning $(CURDIR)"\r
 #      $(Q)find . -type d -name $(objdir) | xargs rm -rf\r
-       $(Q)find . -type f -name *.a| xargs rm -rf\r
-       $(Q)rm   -rf libs/*\r
+#      $(Q)find . -type f -name *.a | xargs rm -rf\r
+#      $(Q)rm   -rf libs/*\r
        @echo\r
        @echo "  >>>>>>>>>  DONE  <<<<<<<<<"\r
        @echo\r

diff --git a/memory/NvM/NvM.c b/memory/NvM/NvM.c
index 3288324e2c16b5eeaa390c9736077dde308e37f1..ac8378b5cd981ca33346f161396a1c0abe51d8ff 100644 (file)
--- a/memory/NvM/NvM.c
+++ b/memory/NvM/NvM.c
@@ -1175,6 +1175,7 @@ void NvM_GetErrorStatus(NvM_BlockIdType blockId, uint8 *requestResultPtr)
                *requestResultPtr = AdminMultiBlock.ErrorStatus;\r
        } else if (blockId == 1) {\r
                /* TODO */\r
+         *requestResultPtr = NVM_REQ_OK;\r
        } else {\r
                *requestResultPtr = AdminBlock[blockId-1].ErrorStatus;\r
        }\r

diff --git a/system/EcuM/EcuM_Main.c b/system/EcuM/EcuM_Main.c
index d7bc05ef282860708b1caf80006e6a445f2ea349..e7fa41b87240b381d958194241841c7126284898 100644 (file)
--- a/system/EcuM/EcuM_Main.c
+++ b/system/EcuM/EcuM_Main.c
@@ -15,6 +15,7 @@
 \r
 //lint -emacro(904,VALIDATE,VALIDATE_RV,VALIDATE_NO_RV) //904 PC-Lint exception to MISRA 14.7 (validate macros).\r
 \r
+#include "Std_Types.h"\r
 #if (ECUM_USE_SERVICE_PORTS==STD_ON)\r
 /* Rte_EcuM.h will include Rte_Type.h */\r
 #include "Rte_EcuM.h"\r