Merged in J1939Tp

Merge with ea5f3e8eb78eca9e0691c6350a35cb16896bde3f

diff --cc boards/board_common.mk
Simple merge

diff --cc boards/mpc5516it/build_config.mk
index b4019dd7bd62961902ece885cd4af0582a4ae87e,22b3c97b4499410620fdca141c67c0d2a45c0ef0..f3e9149cf2117fbaa25ee2e35bc807bd04173269
--- 1/boards/mpc5516it/build_config.mk
--- 2/boards/mpc5516it/build_config.mk
+++ b/boards/mpc5516it/build_config.mk
@@@ -13,9 -13,9 +13,9 @@@ CFG=PPC BOOKE E200Z1 MPC55XX MPC5516 BR
  # Memory + Peripherals\r
  MOD_AVAIL+=ADC DIO DMA CAN GPT LIN MCU PORT PWM WDG NVM MEMIF FEE FLS SPI EEP \r
  # System + Communication + Diagnostic\r
- MOD_AVAIL+=CANIF CANTP J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
 -MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE\r
++MOD_AVAIL+=CANIF CANTP LINIF COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM RTE J1939TP\r
  # Network management\r
- MOD_AVAIL+=COMM NM CANNM CANSM EA\r
+ MOD_AVAIL+=COMM NM CANNM CANSM EA LINSM\r
  # Additional\r
  MOD_AVAIL+= RAMLOG \r
  \r

diff --cc boards/mpc5606s_xpc560s/build_config.mk
index 2d58b3a595bf710760739eaa76716f58f5b6248e,759783eb978dba8837c1359a3de6762dec6302c5..38c0d26d643e8638f3b1d0490e86ffd969d8ebad
--- 1/boards/mpc5606s_xpc560s/build_config.mk
--- 2/boards/mpc5606s_xpc560s/build_config.mk
+++ b/boards/mpc5606s_xpc560s/build_config.mk
@@@ -13,7 -13,9 +13,9 @@@ CFG=PPC E200Z0 MPC55XX MPC5606S BRD_MPC
  # Memory + Peripherals\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 J1939TP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE\r
 -MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE\r
++MOD_AVAIL+=CANIF CANTP COM DCM DEM DET ECUM IOHWAB KERNEL PDUR WDGM WDGIF RTE J1939TP\r
+ # Network management\r
+ MOD_AVAIL+=COMM NM CANNM CANSM\r
  # Additional\r
  MOD_AVAIL+= RAMLOG \r
  \r

diff --cc communication/CanIf/CanIf.c
index 35724281346e03876f781c385b919ae95766473a,18fda442c2de12d8afe9311b1747d76e712356ad..e20a7ce877512c721ef1f9e1a1da02e025c1db3c
--- 1/communication/CanIf/CanIf.c
--- 2/communication/CanIf/CanIf.c
+++ b/communication/CanIf/CanIf.c
@@@ -877,21 -873,7 +877,19 @@@ void CanIf_RxIndication(uint8 Hrh, Can_
              return;\r
  #endif\r
              break;\r
- \r
 +        case CANIF_USER_TYPE_J1939TP:\r
 +          // Send Can frame to CAN TP\r
 +#if defined(USE_J1939TP)\r
 +            {\r
 +                  PduInfoType J1939TpRxPdu;\r
 +                  J1939TpRxPdu.SduLength = CanDlc;\r
 +                  J1939TpRxPdu.SduDataPtr = (uint8 *)CanSduPtr;\r
 +                  J1939Tp_RxIndication(entry->CanIfCanRxPduId, &J1939TpRxPdu);\r
 +            }\r
 +            return;\r
 +#endif\r
-             break;\r
++            break;            \r
        }\r
- \r
      }\r
  \r
      entry++;\r

diff --cc communication/Com/Com.c
Simple merge