X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2F5gnrmac%2Flwr_mac_upr_inf.c;h=4432bec65837ee0f0b756e1a57f6ebf2dedb3e21;hb=105199ef642ffe9736ea24a01d4546578fa25e60;hp=0c91610ce8f28dd3e87d9696bbe0f99642c855a3;hpb=0fccb83e55b237d60cf451bab71a0c7242cc6e66;p=o-du%2Fl2.git diff --git a/src/5gnrmac/lwr_mac_upr_inf.c b/src/5gnrmac/lwr_mac_upr_inf.c index 0c91610ce..4432bec65 100644 --- a/src/5gnrmac/lwr_mac_upr_inf.c +++ b/src/5gnrmac/lwr_mac_upr_inf.c @@ -15,7 +15,7 @@ # limitations under the License. # ################################################################################ *******************************************************************************/ - +#include "common_def.h" #include "lwr_mac_upr_inf.h" /******************************************************************* @@ -37,14 +37,11 @@ * ****************************************************************/ uint16_t packCrcInd(Pst *pst, CrcInd *crcInd) { - if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC)) + if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC)) { return ROK; } - else - { - return RFAILED; - } + return RFAILED; } /******************************************************************* @@ -66,7 +63,7 @@ uint16_t packCrcInd(Pst *pst, CrcInd *crcInd) * ****************************************************************/ uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd) { - if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC)) + if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC)) { return ROK; } @@ -96,14 +93,11 @@ uint16_t packRxDataInd(Pst *pst, RxDataInd *rxDataInd) * ****************************************************************/ uint16_t packRachInd(Pst *pst, RachInd *rachInd) { - if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC)) + if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC)) { return ROK; } - else - { - return RFAILED; - } + return RFAILED; } /******************************************************************* @@ -178,7 +172,7 @@ S16 packLwlcSlotInd (Pst *pst, SlotIndInfo *slotInd) * ****************************************************************/ uint16_t packStopInd(Pst *pst) { - if((pst->selector == MAC_SELECTOR_LC) || (pst->selector == MAC_SELECTOR_LWLC)) + if((pst->selector == ODU_SELECTOR_LC) || (pst->selector == ODU_SELECTOR_LWLC)) { return ROK; }