From 513490e787e1abcb09548d6d497352e56390ee46 Mon Sep 17 00:00:00 2001 From: Punnaiah Choudary Kalluri Date: Mon, 2 Feb 2015 19:45:17 +0530 Subject: [PATCH] emacps: Remove the alignment check for the adjacent BD gap Removed the alignment check for the adjacent BD gap as the controller expects all the BDs are organized in linear order. Signed-off-by: Punnaiah Choudary Kalluri --- XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c | 3 +-- XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.h | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c index 43302d13..26ba2048 100755 --- a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c +++ b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.c @@ -234,8 +234,7 @@ LONG XEmacPs_BdRingCreate(XEmacPs_BdRing * RingPtr, UINTPTR PhysAddr, } /* Figure out how many bytes will be between the start of adjacent BDs */ - RingPtr->Separation = - ((u32)sizeof(XEmacPs_Bd) + (Alignment - (u32)1)) & ~(Alignment - (u32)1); + RingPtr->Separation = ((u32)sizeof(XEmacPs_Bd)); /* Must make sure the ring doesn't span address 0x00000000. If it does, * then the next/prev BD traversal macros will fail. diff --git a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.h b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.h index d98c1d93..fc691690 100755 --- a/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.h +++ b/XilinxProcessorIPLib/drivers/emacps/src/xemacps_bdring.h @@ -108,8 +108,7 @@ typedef struct { * ******************************************************************************/ #define XEmacPs_BdRingCntCalc(Alignment, Bytes) \ - (u32)((Bytes) / ((sizeof(XEmacPs_Bd) + ((Alignment)-1)) & \ - ~((Alignment)-1))) + (u32)((Bytes) / (sizeof(XEmacPs_Bd))) /*****************************************************************************/ /** @@ -130,8 +129,7 @@ typedef struct { * ******************************************************************************/ #define XEmacPs_BdRingMemCalc(Alignment, NumBd) \ - (u32)((sizeof(XEmacPs_Bd) + ((Alignment)-1)) & \ - ~((Alignment)-1)) * ((NumBd)) + (u32)(sizeof(XEmacPs_Bd) * (NumBd)) /****************************************************************************/ /**