Added DCAN2 for the CAN communication example (not working)

[arc.git] / boards / ti_tms570ls / examples / tms570_hdk_can / config / CanIf_Cfg.c

diff --git a/boards/ti_tms570ls/examples/tms570_hdk_can/config/CanIf_Cfg.c b/boards/ti_tms570ls/examples/tms570_hdk_can/config/CanIf_Cfg.c
index cfcebb83486fda995d36e7b9ecfa3426da483208..4acecfaab41cb404e55fb6aef883c3c48ad24ff7 100644 (file)
--- a/boards/ti_tms570ls/examples/tms570_hdk_can/config/CanIf_Cfg.c
+++ b/boards/ti_tms570ls/examples/tms570_hdk_can/config/CanIf_Cfg.c
@@ -36,9 +36,6 @@
 extern const Can_ControllerConfigType CanControllerConfigData[];\r
 extern const Can_ConfigSetType CanConfigSetData;\r
 \r
-\r
-\r
-\r
 // Contains the mapping from CanIf-specific Channels to Can Controllers\r
 const CanControllerIdType CanIf_Arc_ChannelToControllerMap[CANIF_CHANNEL_CNT] = {\r
        DCAN1, // Channel_1\r
@@ -85,7 +82,7 @@ const CanIf_HthConfigType CanIfHthConfigData_Hoh[] =
 {\r
   { \r
     .CanIfHthType = CAN_ARC_HANDLE_TYPE_BASIC,\r
-    .CanIfCanControllerIdRef = CANIF_Channel_1,                // Transmit: DCAN1\r
+    .CanIfCanControllerIdRef = CANIF_Channel_2,                // Transmit to DCAN2\r
     .CanIfHthIdSymRef = TxHwObject,\r
     .CanIf_Arc_EOL = 1,\r
   },\r
@@ -96,7 +93,7 @@ const CanIf_HrhConfigType CanIfHrhConfigData_Hoh[] =
   {\r
     .CanIfHrhType = CAN_ARC_HANDLE_TYPE_BASIC,\r
     .CanIfSoftwareFilterHrh = TRUE,\r
-    .CanIfCanControllerHrhIdRef = CANIF_Channel_2,     // Receive: DCAN2\r
+    .CanIfCanControllerHrhIdRef = CANIF_Channel_1,     // Receive to DCAN1\r
     .CanIfHrhIdSymRef = RxHwObject,\r
     .CanIf_Arc_EOL = 1,\r
   },\r
@@ -116,26 +113,26 @@ const CanIf_InitHohConfigType CanIfHohConfigData[] = {
 const CanIf_TxPduConfigType CanIfTxPduConfigData[] = {\r
   {\r
     .CanIfTxPduId = PDUR_REVERSE_PDU_ID_TX_PDU,                        // Transmit I-PDU; Reverse = PDUR -----> CANIF\r
-    .CanIfCanTxPduIdCanId = 1, // 2\r
+    .CanIfCanTxPduIdCanId = 2, // 1\r
     .CanIfCanTxPduIdDlc = 8,\r
     .CanIfCanTxPduType = CANIF_PDU_TYPE_STATIC,\r
 #if ( CANIF_READTXPDU_NOTIFY_STATUS_API == STD_ON )\r
     .CanIfReadTxPduNotifyStatus = false,\r
 #endif\r
-    .CanIfTxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,             // 11 == BASIC CAN\r
+    .CanIfTxPduIdCanIdType = CANIF_CAN_ID_TYPE_29,             // 11 == BASIC CAN, 29 == EXTENDED CAN\r
     .CanIfUserTxConfirmation = PduR_CanIfTxConfirmation,\r
     .CanIfCanTxPduHthRef = &CanIfHthConfigData_Hoh[0],\r
     .PduIdRef = NULL,\r
   },\r
   {\r
     .CanIfTxPduId = PDUR_REVERSE_PDU_ID_FreqInd,\r
-    .CanIfCanTxPduIdCanId = 256,       // 258\r
+    .CanIfCanTxPduIdCanId = 258,       // 256\r
     .CanIfCanTxPduIdDlc = 8,\r
     .CanIfCanTxPduType = CANIF_PDU_TYPE_STATIC,\r
 #if ( CANIF_READTXPDU_NOTIFY_STATUS_API == STD_ON )\r
     .CanIfReadTxPduNotifyStatus = false,\r
 #endif\r
-    .CanIfTxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,\r
+    .CanIfTxPduIdCanIdType = CANIF_CAN_ID_TYPE_29,\r
     .CanIfUserTxConfirmation = PduR_CanIfTxConfirmation,\r
     .CanIfCanTxPduHthRef = &CanIfHthConfigData_Hoh[0],\r
     .PduIdRef = NULL,\r
@@ -145,7 +142,7 @@ const CanIf_TxPduConfigType CanIfTxPduConfigData[] = {
 const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {\r
   {\r
     .CanIfCanRxPduId = PDUR_PDU_ID_RX_PDU,                     // Receive I-PDU; CANIF -----> PDUR\r
-    .CanIfCanRxPduCanId = 2,   // 1\r
+    .CanIfCanRxPduCanId = 1,   // 2\r
     .CanIfCanRxPduDlc = 8,\r
 #if ( CANIF_CANPDUID_READDATA_API == STD_ON )\r
     .CanIfReadRxPduData = false,\r
@@ -155,7 +152,7 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {
 #endif\r
        .CanIfRxUserType = CANIF_USER_TYPE_CAN_PDUR,    // upper layer\r
     .CanIfCanRxPduHrhRef = &CanIfHrhConfigData_Hoh[1], // [0] ??\r
-    .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,\r
+    .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_29,  // CANIF_CAN_ID_TYPE_11\r
     .CanIfUserRxIndication = NULL,\r
     .CanIfSoftwareFilterType = CANIF_SOFTFILTER_TYPE_MASK,\r
     .CanIfCanRxPduCanIdMask = 0xFFF,\r
@@ -163,7 +160,7 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {
   },\r
   {\r
     .CanIfCanRxPduId = PDUR_PDU_ID_FreqReq,\r
-    .CanIfCanRxPduCanId = 258, // 256\r
+    .CanIfCanRxPduCanId = 256, // 258\r
     .CanIfCanRxPduDlc = 8,\r
 #if ( CANIF_CANPDUID_READDATA_API == STD_ON )\r
     .CanIfReadRxPduData = false,\r
@@ -173,7 +170,7 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {
 #endif\r
        .CanIfRxUserType = CANIF_USER_TYPE_CAN_PDUR,\r
     .CanIfCanRxPduHrhRef = &CanIfHrhConfigData_Hoh[1], // [0] ??\r
-    .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_11,\r
+    .CanIfRxPduIdCanIdType = CANIF_CAN_ID_TYPE_29, // CANIF_CAN_ID_TYPE_11\r
     .CanIfUserRxIndication = NULL,\r
     .CanIfSoftwareFilterType = CANIF_SOFTFILTER_TYPE_MASK,\r
     .CanIfCanRxPduCanIdMask = 0xFFF,\r
@@ -186,8 +183,8 @@ const CanIf_RxPduConfigType CanIfRxPduConfigData[] = {
 const CanIf_InitConfigType CanIfInitConfig =\r
 {\r
   .CanIfConfigSet = 0, // Not used  \r
-  .CanIfNumberOfCanRxPduIds = 2,       // 1\r
-  .CanIfNumberOfCanTXPduIds = 2,       // 1\r
+  .CanIfNumberOfCanRxPduIds = 1,       // 2\r
+  .CanIfNumberOfCanTXPduIds = 1,       // 2\r
   .CanIfNumberOfDynamicCanTXPduIds = 0, // Not used\r
 \r
   // Containers\r