Skip to content

Rebase #100

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

Merged
tharun-kumarv merged 8 commits into from
May 11, 2026
Merged

Rebase #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2056b1
RDKEMW-18086 : Factory Reset takes more than 7 seconds.
natrajmuthusamy May 6, 2026
fe7f162
Update btrMgr.c
natrajmuthusamy May 6, 2026
5a64bf6
Update btrMgr.c
natrajmuthusamy May 6, 2026
850c97c
Update test_btrMgr.c
natrajmuthusamy May 6, 2026
5c11c13
Potential fix for pull request finding
natrajmuthusamy May 6, 2026
6b316c7
Update btmgr_iarm_internal_interface.c
natrajmuthusamy May 7, 2026
a7e7c71
Update btmgr_iarm_internal_interface.c
natrajmuthusamy May 7, 2026
990e3f7
Merge pull request #97 from rdkcentral/RDKEMW-18086
jackogorman10 May 7, 2026
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
5 changes: 2 additions & 3 deletions src/ifce/btrMgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4695,7 +4695,7 @@ BTRMGR_StartDeviceDiscovery_Internal (

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

if (!gIsAdapterDiscovering) {
Expand Down Expand Up @@ -4775,8 +4775,7 @@ BTRMGR_StopDeviceDiscovery_Internal (

{ /* Max 6 sec timeout - Polled at 50ms interval */
unsigned int ui32sleepIdx = 120;

while ((gIsAdapterDiscovering) && (ui32sleepIdx--)) {
while ((gIsAdapterDiscovering) && (ui32sleepIdx--) && !isDeinitInProgress) {
usleep(50000);
}
}
Expand Down
2 changes: 1 addition & 1 deletion unitTest/unitTest_btmgr/test_btrMgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void setUp(void)
gstBTRMgrStreamingInfo.channels = 0;
gstBTRMgrStreamingInfo.bitsPerSample = 0;
gstBTRMgrStreamingInfo.i32BytesToEncode = 0;

isDeinitInProgress = FALSE;
}
void tearDown(void) {
// Clean up any necessary variables or state after each test
Expand Down
Loading