Commit 6e28024e authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: CARDqGetNextTBTT replace code using do_div.

uBeaconInterval becomes u32

get next TBTT value using vendor's equation as shown.

This patch was checked against the original code
and yields exactly the same value.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9acec059
...@@ -720,28 +720,20 @@ bool CARDbClearCurrentTSF(struct vnt_private *pDevice) ...@@ -720,28 +720,20 @@ bool CARDbClearCurrentTSF(struct vnt_private *pDevice)
*/ */
u64 CARDqGetNextTBTT(u64 qwTSF, u16 wBeaconInterval) u64 CARDqGetNextTBTT(u64 qwTSF, u16 wBeaconInterval)
{ {
u32 uBeaconInterval;
unsigned int uLowNextTBTT; uBeaconInterval = wBeaconInterval * 1024;
unsigned int uHighRemain, uLowRemain;
unsigned int uBeaconInterval;
uBeaconInterval = wBeaconInterval * 1024; /* Next TBTT =
// Next TBTT = ((local_current_TSF / beacon_interval) + 1 ) * beacon_interval * ((local_current_TSF / beacon_interval) + 1) * beacon_interval
uLowNextTBTT = ((qwTSF & 0xffffffffULL) >> 10) << 10; */
uLowRemain = (uLowNextTBTT) % uBeaconInterval; if (uBeaconInterval) {
uHighRemain = ((0x80000000 % uBeaconInterval) * 2 * (u32)(qwTSF >> 32)) do_div(qwTSF, uBeaconInterval);
% uBeaconInterval; qwTSF += 1;
uLowRemain = (uHighRemain + uLowRemain) % uBeaconInterval; qwTSF *= uBeaconInterval;
uLowRemain = uBeaconInterval - uLowRemain; }
// check if carry when add one beacon interval
if ((~uLowNextTBTT) < uLowRemain)
qwTSF = ((qwTSF >> 32) + 1) << 32;
qwTSF = (qwTSF & 0xffffffff00000000ULL) |
(u64)(uLowNextTBTT + uLowRemain);
return (qwTSF); return qwTSF;
} }
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment