Skip to content

Feature/rdke 539 #19

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

Open
madhubabutt wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Feature/rdke 539 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b00ba4e
Update dsHost.cpp
madhubabutt Feb 17, 2025
a1c8b6d
Update dsAudio.c
madhubabutt Feb 17, 2025
e2d0058
Update dsFPD.c
madhubabutt Feb 17, 2025
148cf16
Update dsFPD.c
madhubabutt Feb 17, 2025
7373cdc
Update dsFPD.c
madhubabutt Feb 17, 2025
216b6f4
Update dsFPD.c
madhubabutt Feb 17, 2025
40a5b20
Update dsMgr.c
madhubabutt Feb 17, 2025
fa22f50
Update dsVideoDevice.c
madhubabutt Feb 17, 2025
9077496
Merge branch 'develop' into feature/RDKE-539
madhubabutt Jun 13, 2025
ebad863
Merge branch 'develop' into feature/RDKE-539
madhubabutt Jun 13, 2025
b62af7e
Merge branch 'feature/RDKE-539' of github.com:rdkcentral/devicesettin…
Jun 13, 2025
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
4 changes: 2 additions & 2 deletions ds/frameRate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in ds/frameRate.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'ds/frameRate.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 160 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/frameRate.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -77,8 +77,8 @@
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_values) == dsVIDEO_FRAMERATE_MAX) ? 1 : -1];
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_FRAMERATE_MAX) ? 1 : -1];
typedef int _SafetyCheck[(dsUTL_DIM(_values) == dsVIDEO_FRAMERATE_MAX) ? 1 : 0];
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_FRAMERATE_MAX) ? 1 : 0];

const int FrameRate::kUnknown = dsVIDEO_FRAMERATE_UNKNOWN;
const int FrameRate::k24 = dsVIDEO_FRAMERATE_24;
Expand Down
5 changes: 5 additions & 0 deletions rpc/srv/dsAudio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ static float m_volumeLevel = 0;
static int m_MuteStatus = false;
static int m_isDuckingInProgress = false;

#ifndef RDK_DSHAL_NAME
#warning "RDK_DSHAL_NAME is not defined"
#define RDK_DSHAL_NAME "RDK_DSHAL_NAME is not defined"
#endif

static pthread_mutex_t dsLock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t audioLevelMutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t audioLevelTimerCV = PTHREAD_COND_INITIALIZER;
Expand Down
2 changes: 1 addition & 1 deletion rpc/srv/dsFPD.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ IARM_Result_t _dsGetFPBrightness(void *arg)
param->eBrightness = _dsPowerBrightness;
}

INT_INFO("_dsGetFPBrightness Power Brightness is %d _dsPowerBrightness: %d from persist: %d \r\n",param->eBrightness,_dsPowerBrightness,param->toPersist)
INT_INFO("_dsGetFPBrightness Power Brightness is %d _dsPowerBrightness: %d from persist: %d \r\n",param->eBrightness,_dsPowerBrightness,param->toPersist);

IARM_BUS_Unlock(lock);
return IARM_RESULT_SUCCESS;
Expand Down
5 changes: 5 additions & 0 deletions rpc/srv/dsHost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in rpc/srv/dsHost.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsHost.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 248 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: rpc/srv/dsHost.cpp)

Check failure on line 3 in rpc/srv/dsHost.cpp

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsHost.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/1901, 248 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/rdk-dev-1901.tar.gz, file: rpc/srv/dsHost.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -70,6 +70,11 @@

using namespace std;

#ifndef RDK_DSHAL_NAME
#warning "RDK_DSHAL_NAME is not defined"
#define RDK_DSHAL_NAME "RDK_DSHAL_NAME is not defined"
#endif

static string enumToString( dsSleepMode_t mode );
static dsSleepMode_t stringToEnum ( string mode );
#define DSHAL_API_VERSION_MAJOR_DEFAULT 1
Expand Down
5 changes: 5 additions & 0 deletions rpc/srv/dsMgr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ profile_t searchRdkProfile(void) {
return ret;
}

void dsServer_Rdklogger_Init()
{

}

IARM_Result_t dsMgr_init()
{
IARM_Result_t ret = IARM_RESULT_SUCCESS;
Expand Down
4 changes: 4 additions & 0 deletions rpc/srv/dsVideoDevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:

Check failure on line 3 in rpc/srv/dsVideoDevice.c

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'rpc/srv/dsVideoDevice.c' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/b34ed54, 502 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/b34ed545b533a0cf4d29d221cc23daad47f32644.tar.gz, file: rpc/srv/dsVideoDevice.c)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -56,6 +56,10 @@
static pthread_mutex_t dsLock = PTHREAD_MUTEX_INITIALIZER;
static dsVideoZoom_t srv_dfc = dsVIDEO_ZOOM_FULL;
static bool force_disable_hdr = true;
#ifndef RDK_DSHAL_NAME
#warning "RDK_DSHAL_NAME is not defined"
#define RDK_DSHAL_NAME "RDK_DSHAL_NAME is not defined"
#endif

#define IARM_BUS_Lock(lock) pthread_mutex_lock(&dsLock)
#define IARM_BUS_Unlock(lock) pthread_mutex_unlock(&dsLock)
Expand Down
Loading