Merge branch 'mikulka' of git@rtime.felk.cvut.cz:arc into mikulka

[arc.git] / include / CanTp_Types.h

diff --git a/include/CanTp_Types.h b/include/CanTp_Types.h
index e2f2c9e55f7c32e4bb1c6d4edcbd02fe960a69d4..8aa714b7391cbe60e6b0c466bace6cc15beb4bea 100644 (file)
--- a/include/CanTp_Types.h
+++ b/include/CanTp_Types.h
@@ -65,7 +65,7 @@ typedef struct {
 } CanTp_NSaType; /** @req CANTP253 */\r
 \r
 typedef struct {\r
-       uint32 CanTpNTa; /** @req CANTP255 */\r
+       uint32 CanTpNTa; /** @req CANTP255 */ /* TODO John: Why is this 32-bit */\r
 } CanTp_NTaType; /** @req CANTP139 */\r
 \r
 typedef struct {\r
@@ -89,6 +89,7 @@ typedef struct {
 \r
 \r
 typedef struct {\r
+       const PduIdType CanTp_FcPduId; // When recieving this Pdu this conf can be used (if TA match in extended).\r
        const PduIdType CanIf_FcPduId; // The polite CanIf PDU index.\r
        const PduIdType PduR_PduId; // The polite PduR index.\r
        const CanTp_AddressingFormantType CanTpAddressingFormant;       /** @req CANTP242 */\r
@@ -114,6 +115,7 @@ typedef struct {
 typedef struct {\r
        const PduIdType CanIf_PduId; // The polite CanIf index.\r
        const PduIdType PduR_PduId; // The polite PduR index.\r
+       const PduIdType CanTp_FcPduId;\r
        const CanTp_AddressingFormantType CanTpAddressingMode; /** @req CANTP262 */\r
        const uint16 CanTpNas; /** @req CANTP263 */ /* N_As timeout for transmission of any CAN frame. */\r
        const uint16 CanTpNbs; /** @req CANTP264 */ /* N_Bs timeout of transmission until reception of next Flow Control. */\r
@@ -156,6 +158,12 @@ typedef struct {
        } configData;\r
 } CanTp_NSduType;\r
 \r
+typedef struct {\r
+       const CanTp_AddressingFormantType CanTpAddressingMode;\r
+       const PduIdType CanTpNSduIndex;\r
+       const PduIdType CanTpReferringTxIndex;\r
+} CanTp_RxIdType;\r
+\r
 // - - - - - - - - - - -\r
 \r
 /** Top level config container for CANTP implementation. */\r
@@ -166,6 +174,8 @@ typedef struct {
        /** */\r
        const CanTp_NSduType *CanTpNSduList;\r
 \r
+       const CanTp_RxIdType *CanTpRxIdList;\r
+\r
        /**  */\r
        //const CanTp_RxNSduType        *CanTpRxNSduList;\r
 \r