Skip to content

RDKEMW-18305 : ~6sDelaySquash for 8.5 #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ANANTHMARIMUTHU wants to merge 1 commit into from
+2 −12
Closed

RDKEMW-18305 : ~6sDelaySquash for 8.5 #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions src/ifce/btrMgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4093,7 +4093,6 @@ BTRMGR_DeInit (
BTRMGR_DiscoveryHandle_t* ldiscoveryHdl = NULL;
unsigned short ui16LoopIdx = 0;
BTRMGR_ConnectedDevicesList_t lstConnectedDevices;
unsigned int ui32sleepTimeOut = 1;
gboolean isRemoteDev = FALSE;

isDeinitInProgress = TRUE;
Expand All @@ -4115,7 +4114,6 @@ BTRMGR_DeInit (
BTRMGRLOG_DEBUG ("Connected Devices = %d\n", lstConnectedDevices.m_numOfDevices);

for (ui16LoopIdx = 0; ui16LoopIdx < lstConnectedDevices.m_numOfDevices; ui16LoopIdx++) {
unsigned int ui32confirmIdx = 2;
enBTRCoreDeviceType lenBtrCoreDevTy = enBTRCoreUnknown;
enBTRCoreDeviceClass lenBtrCoreDevCl = enBTRCore_DC_Unknown;

Expand All @@ -4126,14 +4124,6 @@ BTRMGR_DeInit (
if (BTRCore_DisconnectDevice(ghBTRCoreHdl, lstConnectedDevices.m_deviceProperty[ui16LoopIdx].m_deviceHandle, lenBtrCoreDevTy) != enBTRCoreSuccess) {
BTRMGRLOG_ERROR ("Failed to Disconnect - %llu\n", lstConnectedDevices.m_deviceProperty[ui16LoopIdx].m_deviceHandle);
}
do {
unsigned int ui32sleepIdx = 2;

do {
sleep(ui32sleepTimeOut);
lenBtrCoreRet = BTRCore_GetDeviceDisconnected(ghBTRCoreHdl, lstConnectedDevices.m_deviceProperty[ui16LoopIdx].m_deviceHandle, lenBtrCoreDevTy);
} while ((lenBtrCoreRet != enBTRCoreSuccess) && (--ui32sleepIdx));
} while (--ui32confirmIdx);
}
}
}
Expand Down Expand Up @@ -4695,7 +4685,7 @@ BTRMGR_StartDeviceDiscovery_Internal (

do {
usleep(5000);
} while ((!gIsAdapterDiscovering) && (--ui32sleepIdx));
} while ((!gIsAdapterDiscovering) && (--ui32sleepIdx) && !isDeinitInProgress);
}

if (!gIsAdapterDiscovering) {
Expand Down Expand Up @@ -4776,7 +4766,7 @@ BTRMGR_StopDeviceDiscovery_Internal (
{ /* Max 3 sec timeout - Polled at 50ms second interval */
unsigned int ui32sleepIdx = 60;

while ((gIsAdapterDiscovering) && (ui32sleepIdx--)) {
while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) {
usleep(50000);
}
}
Expand Down
Loading