]> rtime.felk.cvut.cz Git - arc.git/commitdiff
Merge with 55ab039c2569c5946bde91fa87dbd94dac4aed51
authorjcar <devnull@localhost>
Tue, 29 Nov 2011 08:05:11 +0000 (09:05 +0100)
committerjcar <devnull@localhost>
Tue, 29 Nov 2011 08:05:11 +0000 (09:05 +0100)
1  2 
communication/Com/Com.c
communication/Com/Com_Arc_Types.h
communication/Com/Com_Com.c
communication/Com/Com_misc.c
include/Com_Types.h

index 94e6adb113625ae17a62fc8c13cc52679a69b285,1847b1697814efe187deca097510b651285276d5..6a7b684f335b1ebeacf24ccebbbbdec8d489ddb9
@@@ -245,20 -224,9 +225,21 @@@ BufReq_ReturnType Com_CopyRxData(PduIdT
        } else {\r
                r = BUFREQ_NOT_OK;\r
        }\r
 -      return r;\r
        Irq_Restore(state);\r
 +      return r;\r
 +}\r
 +\r
 +static void Com_SetDynSignalLength(PduIdType ComRxPduId,PduLengthType TpSduLength) {\r
 +      const ComIPdu_type *IPdu = GET_IPdu(ComRxPduId);\r
 +      if (IPdu->ComIPduDynSignalRef == 0) {\r
 +              return;\r
 +      }\r
 +      const ComSignal_type * const dynSignal = IPdu->ComIPduDynSignalRef;\r
 +      Com_Arc_IPdu_type *Arc_IPdu = GET_ArcIPdu(ComRxPduId);\r
 +      Arc_IPdu->Com_Arc_DynSignalLength = TpSduLength - (dynSignal->ComBitPosition/8);\r
 +      return;\r
  }\r
++\r
  BufReq_ReturnType Com_StartOfReception(PduIdType ComRxPduId, PduLengthType TpSduLength, PduLengthType* RxBufferSizePtr) {\r
        PduLengthType ComIPduSize;\r
        imask_t state;\r
index 7cf531405986f3bfa236c82477d2ac89c4885a22,0d1af687a10ab0edbb44fc9836c9dbe3bbe87774..3bb1d6390d06c9a5f2af179cbf743fce71153c5f
@@@ -58,9 -50,7 +50,8 @@@ typedef struct 
  typedef struct {\r
  \r
        Com_Arc_TxIPduTimer_type Com_Arc_TxIPduTimers;\r
-       void *ComIPduDataPtr;\r
        uint8 Com_Arc_IpduStarted;\r
 +      uint16 Com_Arc_DynSignalLength;\r
  } Com_Arc_IPdu_type;\r
  \r
  typedef struct {\r
Simple merge
Simple merge
Simple merge