Merge with 5eed0471196ddd710647bb8cf83ad6e9aa189c61

diff --cc boards/board_common.mk
Simple merge

diff --cc boards/et_stm32_stamp/build_config.mk
index fd6e6b6d414392e2bb6b6ee58acbdef8a2bca458,1519407afbac7c1dd78068ad88403678bb2369ee..dfbc1ee0dde751154daba2b41ac7375899063772
--- 1/boards/et_stm32_stamp/build_config.mk
--- 2/boards/et_stm32_stamp/build_config.mk
+++ b/boards/et_stm32_stamp/build_config.mk
@@@ -1,22 -1,22 +1,22 @@@
- \r
- # ARCH defines\r
- ARCH=arm_cm3\r
- ARCH_FAM=arm\r
- ARCH_MCU=arm_cm3\r
- \r
- # CFG (y/n) macros\r
- CFG=ARM ARM_CM3 BRD_ET_STM32_STAMP STM32_CL\r
- \r
- # What buildable modules does this board have, \r
- # default or private\r
- MOD_AVAIL=KERNEL MCU PWM ADC SIMPLE_PRINTF ARM_ITM_TERM RAMLOG DEM IOHWAB\r
- #T32_TERM SIMPLE_PRINTF RAMLOG\r
- #\r
- \r
- # Needed by us\r
- MOD_USE=KERNEL MCU\r
- \r
- # Use little head\r
- def-y += HEAPSIZE=4000\r
- def-y += STM32F10X_CL\r
- \r
+ 
+ # ARCH defines
+ ARCH=arm_cm3
+ ARCH_FAM=arm
+ ARCH_MCU=arm_cm3
+ 
+ # CFG (y/n) macros
+ CFG=ARM ARM_CM3 BRD_ET_STM32_STAMP STM32_CL
+ 
+ # What buildable modules does this board have, 
+ # default or private
 -MOD_AVAIL=KERNEL MCU PWM ADC SIMPLE_PRINTF ARM_ITM_TERM RAMLOG DEM DCM
++MOD_AVAIL=KERNEL MCU PWM ADC SIMPLE_PRINTF ARM_ITM_TERM RAMLOG DEM DCM IOHWAB
+ #T32_TERM SIMPLE_PRINTF RAMLOG
+ #
+ 
+ # Needed by us
+ MOD_USE=KERNEL MCU
+ 
+ # Use little head
+ def-y += HEAPSIZE=4000
+ def-y += STM32F10X_CL
+ 

diff --cc boards/mpc5516it/build_config.mk
index 89427dfba5d327fe180b0bd3417f1278c5398e99,8d02d0054420e90cef186df58ef7a5f0282b6016..6dd40e02564b8efd363b7115da741fcec6f3b868
--- 1/boards/mpc5516it/build_config.mk
--- 2/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@@ -1,15 -1,15 +1,15 @@@
- \r
- # ARCH defines\r
- ARCH=mpc55xx\r
- ARCH_FAM=ppc\r
- ARCH_MCU=mpc5516\r
- \r
- # CFG (y/n) macros\r
- CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC5516IT\r
- \r
- # What buildable modules does this board have, \r
- # default or private\r
- MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN CANIF PORT DIO WDG WDGM T32_TERM PWM WINIDEA_TERM COM ADC DMA SIMPLE_PRINTF DEM PDUR IOHWAB\r
- \r
- # Needed by us\r
- MOD_USE=KERNEL MCU\r
+ 
+ # ARCH defines
+ ARCH=mpc55xx
+ ARCH_FAM=ppc
+ ARCH_MCU=mpc5516
+ 
+ # CFG (y/n) macros
+ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC5516IT
+ 
+ # What buildable modules does this board have, 
+ # default or private
 -MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN CANIF PORT DIO WDG WDGM T32_TERM PWM WINIDEA_TERM COM ADC DMA SIMPLE_PRINTF DEM DCM
++MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN CANIF PORT DIO WDG WDGM T32_TERM PWM WINIDEA_TERM COM ADC DMA SIMPLE_PRINTF DEM DCM PDUR IOHWAB
+ 
+ # Needed by us
+ MOD_USE=KERNEL MCU

diff --cc boards/mpc551xsim/build_config.mk
index 729d21ad155880cdd735dca2089dee4a1b8f7345,223f97815d7246992ffe391d5f46efd9bf09313f..ffb6b43ccdeb866c5f141c2515ab2d7cd28bb500
--- 1/boards/mpc551xsim/build_config.mk
--- 2/boards/mpc551xsim/build_config.mk
+++ b/boards/mpc551xsim/build_config.mk
@@@ -1,15 -1,15 +1,15 @@@
- \r
- # ARCH defines\r
- ARCH=mpc55xx\r
- ARCH_FAM=ppc\r
- ARCH_MCU=mpc5516\r
- \r
- # CFG (y/n) macros\r
- CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC551XSIM SIMULATOR\r
- \r
- # What buildable modules does this board have, \r
- # default or private\r
- MOD_AVAIL=KERNEL RAMLOG MCU GPT LIN CAN WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM IOHWAB\r
- \r
- # Needed by us\r
- MOD_USE=KERNEL MCU\r
+ 
+ # ARCH defines
+ ARCH=mpc55xx
+ ARCH_FAM=ppc
+ ARCH_MCU=mpc5516
+ 
+ # CFG (y/n) macros
+ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BRD_MPC551XSIM SIMULATOR
+ 
+ # What buildable modules does this board have, 
+ # default or private
 -MOD_AVAIL=KERNEL RAMLOG MCU GPT LIN CAN WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM DCM
++MOD_AVAIL=KERNEL RAMLOG MCU GPT LIN CAN WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM DCM IOHWAB
+ 
+ # Needed by us
+ MOD_USE=KERNEL MCU

diff --cc boards/mpc5554sim/build_config.mk
index f40d87ed162cc61235b5ad7571756db730763cc1,cc2e5cc9c4307b365bb4bac108b6ee1f246cbdc9..0525403a804c313969d7a800503223732f0089cf
--- 1/boards/mpc5554sim/build_config.mk
--- 2/boards/mpc5554sim/build_config.mk
+++ b/boards/mpc5554sim/build_config.mk
@@@ -1,15 -1,15 +1,15 @@@
- \r
- # ARCH defines\r
- ARCH=mpc55xx\r
- ARCH_FAM=ppc\r
- ARCH_MCU=mpc5554\r
- \r
- # CFG (y/n) macros\r
- CFG=PPC BOOKE SPE E200Z6 MPC55XX MPC5554 BRD_MPC5554SIM SIMULATOR\r
- \r
- # What buildable modules does this board have, \r
- # default or private\r
- MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN COM WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM IOHWAB\r
- \r
- # Needed by kernel\r
- MOD_USE+=KERNEL MCU\r
+ 
+ # ARCH defines
+ ARCH=mpc55xx
+ ARCH_FAM=ppc
+ ARCH_MCU=mpc5554
+ 
+ # CFG (y/n) macros
+ CFG=PPC BOOKE SPE E200Z6 MPC55XX MPC5554 BRD_MPC5554SIM SIMULATOR
+ 
+ # What buildable modules does this board have, 
+ # default or private
 -MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN COM WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM DCM
++MOD_AVAIL+=KERNEL RAMLOG MCU GPT LIN CAN COM WDG WDGM T32_TERM WINIDEA_TERM SIMPLE_PRINTF DEM DCM IOHWAB
+ 
+ # Needed by kernel
+ MOD_USE+=KERNEL MCU

diff --cc boards/mpc5567qrtech/build_config.mk
index 39a85eae08da351130fc8f14b8dad524dc6b0ffb,ca35286387ead886c980aee23be2b5912cbb83d0..a7af2494632c108207d26746dd788322727495a1
--- 1/boards/mpc5567qrtech/build_config.mk
--- 2/boards/mpc5567qrtech/build_config.mk
+++ b/boards/mpc5567qrtech/build_config.mk
@@@ -1,17 -1,17 +1,17 @@@
- \r
- # ARCH defines\r
- ARCH=mpc55xx\r
- ARCH_FAM=ppc\r
- ARCH_MCU=mpc5567\r
- \r
- # CFG (y/n) macros\r
- CFG=PPC BOOKE E200Z6 MPC55XX MPC5567 BRD_MPC5567QRTECH SPE\r
- \r
- # What buildable modules does this board have, \r
- # default or private\r
- MOD_AVAIL=KERNEL RAMLOG MCU WDG WDGM PORT DIO WDG WDGM T32_TERM WINIDEA_TERM PWM CAN CANIF COM ADC DMA SIMPLE_PRINTF DEM PDUR IOHWAB\r
- \r
- # Needed by us\r
- MOD_USE=KERNEL MCU\r
- \r
- \r
+ 
+ # ARCH defines
+ ARCH=mpc55xx
+ ARCH_FAM=ppc
+ ARCH_MCU=mpc5567
+ 
+ # CFG (y/n) macros
+ CFG=PPC BOOKE E200Z6 MPC55XX MPC5567 BRD_MPC5567QRTECH SPE
+ 
+ # What buildable modules does this board have, 
+ # default or private
 -MOD_AVAIL=KERNEL RAMLOG MCU WDG WDGM PORT DIO WDG WDGM T32_TERM WINIDEA_TERM PWM CAN CANIF COM ADC DMA SIMPLE_PRINTF DEM DCM
++MOD_AVAIL=KERNEL RAMLOG MCU WDG WDGM PORT DIO WDG WDGM T32_TERM WINIDEA_TERM PWM CAN CANIF COM ADC DMA SIMPLE_PRINTF DEM DCM PDUR IOHWAB
+ 
+ # Needed by us
+ MOD_USE=KERNEL MCU
+ 
+ 

diff --cc communication/PduR/PduR_If.c
index 8b4712ade8645c65a21e0452815d0a23e603096a,8b4712ade8645c65a21e0452815d0a23e603096a..42ad3b87c2b3253b1588798dd6807965ef4ce212
--- 1/communication/PduR/PduR_If.c
--- 2/communication/PduR/PduR_If.c
+++ b/communication/PduR/PduR_If.c
@@@ -22,7 -22,7 +22,8 @@@
  
  #include <string.h>\r
  #include "PduR_If.h"\r
--#include "Trace.h"\r
++#include "Trace.h"
++#include "Dem.h"\r
  \r
  #ifndef PDUR_ZERO_COST_OPERATION\r
  \r

diff --cc include/Std_Types.h
Simple merge