Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
6b1c739
RDKEMW-4128 : Coverity integration
hgfell683 May 20, 2025
22dd9f0
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
e457ed0
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
c3e3944
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
a01fed2
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
d56825d
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
0533345
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
8f12db5
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
637efd2
RDKEMW-4128 : Coverity integration
hgfell683 May 27, 2025
589d463
RDKEMW-4128 : Coverity integration
hgfell683 Jun 3, 2025
fbee8fd
RDKEMW-4128 : Coverity integration
hgfell683 Jun 3, 2025
3461c60
RDKEMW-4128 : Coverity integration
hgfell683 Jun 3, 2025
194e684
RDKEMW-4128 : Coverity integration
hgfell683 Jun 3, 2025
f3914f9
RDKEMW-4128 : Coverity integration
hgfell683 Jun 4, 2025
3d85734
RDKEMW-4128 : Coverity integration
hgfell683 Jun 4, 2025
f266905
RDKEMW-4128 : Coverity integration
hgfell683 Jun 4, 2025
e58f35f
RDKEMW-4128 : Coverity integration
hgfell683 Jun 4, 2025
cf83025
RDKEMW-4128 : Coverity integration
hgfell683 Jun 5, 2025
9a41a46
RDKEMW-4128 : Coverity integration
hgfell683 Jun 5, 2025
8e5346b
RDKEMW-4128 : Coverity integration
hgfell683 Jun 5, 2025
767f85c
RDKEMW-4128 : Coverity integration
hgfell683 Jun 5, 2025
f775d0d
RDKEMW-4128 : Coverity integration
hgfell683 Jun 5, 2025
4766224
RDKEMW-4128 : Coverity integration
hgfell683 Jun 6, 2025
25a059e
RDKEMW-4128 : Coverity integration
hgfell683 Jun 6, 2025
713431e
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
839fdb2
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
2d67721
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
5cb04f7
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
1430460
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
86ab43d
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
e446fcd
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
c82d172
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
093caba
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
5674772
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
c9afb7e
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
b442bae
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
ed0e28f
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
8726f09
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
d65df1f
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
071d560
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
92c4ac6
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
8d3a390
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
85ff13f
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
9efcd00
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
abf3095
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
dca2be8
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
17f48d6
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
ff3c298
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
23fd3f5
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
def2dbd
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
307d9e5
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
956eb2d
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
c3b94ac
RDKEMW-4128 : Coverity integration
hgfell683 Jun 9, 2025
294c119
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
6c8cdfc
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
8a23702
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
69424ee
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
938b36c
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
cc01602
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
8627848
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
844f379
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
fa94a82
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
7d9c3c2
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
b639a3e
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
540eaad
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
8eec0aa
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
04c6bdd
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
894e511
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
672fb21
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
9dae774
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
53996f5
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
4ae1c49
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
2b9d9b7
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
a9f2005
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
f8bce46
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
dc97807
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
c45779d
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
776b3f5
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
f20bbf8
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
9a50b13
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
e2adcfb
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
60edd73
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
5313082
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
35d11e6
RDKEMW-4128 : Coverity integration
hgfell683 Jun 10, 2025
95f0ba5
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
27ddeca
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
608d5a3
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
8ca0f25
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
6235566
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
92e32c8
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 2025
7d12dec
RDKEMW-4128 : Coverity integration
hgfell683 Jun 11, 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
26 changes: 26 additions & 0 deletions .github/workflows/native_full_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Build Component in Native Environment

on:
push:
branches: [ main, 'sprint/**', 'release/**', develop ]
pull_request:
branches: [ main, 'sprint/**', 'release/**', topic/RDK*, develop ]

jobs:
build-devicesettings-on-pr:
name: Build devicesettings component in github rdkcentral
runs-on: ubuntu-latest
container:
image: ghcr.io/rdkcentral/docker-rdk-ci:latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: native build
run: |
sh -e build_dependencies.sh
sh -e cov_build.sh
env:
GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}
RDK_PLATFORM_SOC: broadcom
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
# limitations under the License.
##########################################################################
all:
ifneq ($(STANDALONE_BUILD_ENABLED),y)
@make -C hal/src uninstall clean all
endif
@make -C rpc/cli uninstall clean all
@make -C rpc/srv uninstall clean all
@make -C ds uninstall clean all
Expand All @@ -27,7 +29,9 @@ clean:
@make -C rpc/srv $@
@make -C rpc/cli $@
@make -C ds $@
ifneq ($(STANDALONE_BUILD_ENABLED),y)
@make -C hal/src $@
endif
# @make -C sample $@
@make -C test $@

Expand Down
82 changes: 82 additions & 0 deletions build_dependencies.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
#!/bin/bash
set -e
set -x

WORKDIR=`pwd`
export ROOT=/usr
export INSTALL_DIR=${ROOT}/local
mkdir -p $INSTALL_DIR

export CC=gcc
export CXX=g++
export AR=ar
export LD=ld
export NM=nm
export RANLIB=ranlib
export STRIP=strip

apt-get update && apt-get install -y libsoup-3.0 libcjson-dev libdbus-1-dev

mkdir -p /usr/local/include/wdmp-c
cp $WORKDIR/stubs/wdmp-c.h /usr/local/include/wdmp-c/

cd $ROOT
rm -rf rdk_logger
git clone https://github.com/rdkcentral/rdk_logger.git
export RDKLOGGER_PATH=$ROOT/rdk_logger
cd rdk_logger

#build log4c
wget --no-check-certificate https://sourceforge.net/projects/log4c/files/log4c/1.2.4/log4c-1.2.4.tar.gz/download -O log4c-1.2.4.tar.gz
tar -xvf log4c-1.2.4.tar.gz
cd log4c-1.2.4
./configure
make clean && make && make install

cd ${RDKLOGGER_PATH}
export PKG_CONFIG_PATH=${INSTALL_DIR}/rdk_logger/log4c-1.2.4:$PKG_CONFIG_PATH
autoreconf -i
./configure
make clean && make && make install

#Build rfc
cd $ROOT
rm -rf rfc
git clone https://github.com/rdkcentral/rfc.git
cd rfc
autoreconf -i
./configure --enable-rfctool=yes --enable-tr181set=yes
cd rfcapi
make librfcapi_la_CPPFLAGS="-I/usr/include/cjson"
make install
export RFC_PATH=$ROOT/rfc

cd $ROOT
rm -rf iarmbus
git clone https://github.com/rdkcentral/iarmbus.git
export IARMBUS_PATH=$ROOT/iarmbus
export IARM_PATH=$IARMBUS_PATH

cd $ROOT
rm -rf iarmmgrs
git clone https://github.com/rdkcentral/iarmmgrs.git
export IARMMGRS_PATH=$ROOT/iarmmgrs

cd $ROOT
rm -rf rdk-halif-power_manager
git clone https://github.com/rdkcentral/rdk-halif-power_manager.git
export POWER_IF_PATH=$ROOT/rdk-halif-power_manager

cd $ROOT
rm -rf devicesettings
git clone https://github.com/rdkcentral/devicesettings.git
export DS_PATH=$ROOT/devicesettings

cd $ROOT
rm -rf rdk-halif-device_settings
git clone --branch 6.0.0 --depth 1 https://github.com/rdkcentral/rdk-halif-device_settings.git
export DS_IF_PATH=$ROOT/rdk-halif-device_settings

cd $WORKDIR
patch -p1 < "$WORKDIR/patches/dsDisplay.patch"

71 changes: 71 additions & 0 deletions cov_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
#!/bin/bash

WORKDIR=`pwd`
export ROOT=/usr
export INSTALL_DIR=${ROOT}/local
mkdir -p $INSTALL_DIR

export CC=gcc
export CXX=g++
export AR=ar
export LD=ld
export NM=nm
export RANLIB=ranlib
export STRIP=strip

export RFC_PATH=$ROOT/rfc
export IARMBUS_PATH=$ROOT/iarmbus
export IARM_PATH=$IARMBUS_PATH
export IARMMGRS_PATH=$ROOT/iarmmgrs
export RDKLOGGER_PATH=$ROOT/rdk_logger
export TELEMETRY_PATH=$ROOT/telemetry
export DS_PATH=$ROOT/devicesettings
export DS_IF_PATH=$ROOT/rdk-halif-device_settings
export POWER_IF_PATH=$ROOT/rdk-halif-power_manager
export DEEPSLEEP_IF_PATH=$ROOT/rdk-halif-deepsleep_manager
export DS_HAL_PATH=$ROOT/rdkvhal-devicesettings-raspberrypi4

# Build and deploy stubs for IARMBus
echo "Building Devicesttings stubs"
cd $WORKDIR
cd ./stubs
g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$WORKDIR/stubs -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$IARMBUS_PATH/core -I$IARMBUS_PATH/core/include -fpermissive
g++ -fPIC -shared -o libWPEFrameworkPowerController.so powerctrl_stubs.cpp -I$WORKDIR/stubs -I${POWER_IF_PATH}/include -fpermissive

gcc -fPIC -shared -o libdshal.so dshal_stubs.c -I${DS_IF_PATH}/include -I$WORKDIR/mfr/include
#g++ -fPIC -shared -o libdshalsrv.so dshalsrv_stubs.c -I${DS_IF_PATH}/include -I${DS_PATH}/rpc/include
#g++ -fPIC -shared -o libds.so ds_stubs.cpp -I${DS_IF_PATH}/include/ -I${DS_PATH}/ds/include -I${DS_PATH}/rpc/include

cp libIARMBus.so /usr/local/lib/
#cp libtelemetry_msgsender.so /usr/local/lib/
cp libWPEFrameworkPowerController.so /usr/local/lib/libWPEFrameworkPowerController.so

#cp libds.so /usr/local/lib/
cp libdshal.so /usr/local/lib/
#cp libdshalsrv.so /usr/local/lib/

echo "##### Building DEVICESETTINGS modules"
cd $WORKDIR

# default PATHs - use `man readlink` for more info
# the path to combined build
export RDK_PROJECT_ROOT_PATH=${RDK_PROJECT_ROOT_PATH-`readlink -m ../../..`}

# path to build script (this script)
export RDK_SCRIPTS_PATH=${RDK_SCRIPTS_PATH-`readlink -m $0 | xargs dirname`}

# path to components sources and target
export RDK_SOURCE_PATH=${RDK_SOURCE_PATH-$RDK_SCRIPTS_PATH}

# default component name
export RDK_COMPONENT_NAME=${RDK_COMPONENT_NAME-`basename $RDK_SOURCE_PATH`}
cd ${RDK_SOURCE_PATH}

export STANDALONE_BUILD_ENABLED=y
export DS_MGRS=$WORKDIR

find $WORKDIR -iname "*.o" -exec rm -v {} \;
find $WORKDIR -iname "*.so*" -exec rm -v {} \;

echo "##### Triggering make"
make CFLAGS+='-fPIC -DDSMGR_LOGGER_ENABLED=ON -DRDK_DSHAL_NAME=\"libdshal.so\" -I${DS_IF_PATH}/include -I${DS_HAL_PATH} -I${DS_MGRS}/stubs -I${IARMBUS_PATH}/core -I${IARMBUS_PATH}/core/include -I${IARM_MGRS}/sysmgr/include -I${DS_PATH}/ds/include -I${DS_PATH}/rpc/include -I${POWER_IF_PATH}/include/ -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I${IARM_MGRS}/mfr/include/ -I${IARM_MGRS}/mfr/common -I${DEEPSLEEP_IF_PATH}/include -I${IARM_MGRS}/hal/include -I${IARM_MGRS}/power -I${IARM_MGRS}/power/include' LDFLAGS="-L/usr/lib/x86_64-linux-gnu/ -L/usr/local/include -lglib-2.0 -lIARMBus -lWPEFrameworkPowerController -ldshal"
12 changes: 11 additions & 1 deletion ds/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##########################################################################

Check failure on line 1 in ds/Makefile

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/Makefile' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/b34ed54, 75 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/b34ed545b533a0cf4d29d221cc23daad47f32644.tar.gz, file: ds/Makefile)
# If not stated otherwise in this file or this component's LICENSE
# file the following copyright and licenses apply:
#
Expand All @@ -25,14 +25,24 @@
OBJS := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
#$(PWD)/config should be first include path
# to override generic configs
ifneq ($(STANDALONE_BUILD_ENABLED),y)
INCLUDE := -I$(PWD) \
-I$(LOG4C_INSTALL_DIR)/include \
-I$(PWD)/config \
-I$(PWD)/hal/include \
-I$(PWD)/hal/src \
-I$(PWD)/ds \
-I$(PWD)/rpc/include \
-I$(PWD)/ds/include \
-I$(PWD)/ds/include
else
INCLUDE := -I$(PWD) \
-I$(LOG4C_INSTALL_DIR)/include \
-I$(PWD)/config \
-I$(PWD)/hal/include \
-I$(PWD)/ds \
-I$(PWD)/rpc/include \
-I$(PWD)/ds/include
endif



Expand Down
2 changes: 1 addition & 1 deletion ds/aspectRatio.cpp
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/aspectRatio.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/aspectRatio.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 143 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/aspectRatio.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -52,7 +52,7 @@
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_ASPECT_RATIO_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsVIDEO_ASPECT_RATIO_MAX, "Aspect ratio names array size mismatch");

const int AspectRatio::k4x3 = dsVIDEO_ASPECT_RATIO_4x3;
const int AspectRatio::k16x9 = dsVIDEO_ASPECT_RATIO_16x9;
Expand Down
2 changes: 1 addition & 1 deletion ds/audioCompression.cpp
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/audioCompression.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/audioCompression.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 153 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/audioCompression.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -56,7 +56,7 @@
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsAUDIO_CMP_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsAUDIO_CMP_MAX, "Audio compression names array size mismatch");

const int AudioCompression::kNone = dsAUDIO_CMP_NONE;
const int AudioCompression::kLight = dsAUDIO_CMP_LIGHT;
Expand Down
2 changes: 1 addition & 1 deletion ds/audioEncoding.cpp
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/audioEncoding.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/audioEncoding.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/b34ed54, 157 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/b34ed545b533a0cf4d29d221cc23daad47f32644.tar.gz, file: ds/audioEncoding.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -57,7 +57,7 @@
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsAUDIO_ENC_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsAUDIO_ENC_MAX, "Audio encoding names array size mismatch");

const int AudioEncoding::kNone = dsAUDIO_ENC_NONE;
const int AudioEncoding::kDisplay = dsAUDIO_ENC_DISPLAY;
Expand Down
2 changes: 1 addition & 1 deletion ds/audioOutputPortType.cpp
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/audioOutputPortType.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/audioOutputPortType.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2102, 285 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/rdk-dev-2102.tar.gz, file: ds/audioOutputPortType.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -61,7 +61,7 @@

namespace device {

typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsAUDIOPORT_TYPE_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsAUDIOPORT_TYPE_MAX, "Audio output port type names array size mismatch");

const int AudioOutputPortType::kIDLR = dsAUDIOPORT_TYPE_ID_LR;
const int AudioOutputPortType::kHDMI = dsAUDIOPORT_TYPE_HDMI;
Expand Down
2 changes: 1 addition & 1 deletion ds/audioStereoMode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ namespace {
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsAUDIO_STEREO_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsAUDIO_STEREO_MAX, "Audio stereo mode names array size mismatch");

const int AudioStereoMode::kMono = dsAUDIO_STEREO_MONO;
const int AudioStereoMode::kStereo = dsAUDIO_STEREO_STEREO;
Expand Down
14 changes: 14 additions & 0 deletions ds/frameRate.cpp
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, 162 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/frameRate.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -45,6 +45,12 @@
29.97,
50,
59.94,
100,
119.94,
120,
200,
239.76,
240
};
const char * _names[] = {
"UnKnown", //unkown
Expand All @@ -56,6 +62,12 @@
"29.97",
"50",
"59.94",
"100",
"119.94",
"120",
"200",
"239.76",
"240"
};

inline bool isValid(int id) {
Expand All @@ -66,7 +78,9 @@

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_values) == dsVIDEO_FRAMERATE_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_values) == dsVIDEO_FRAMERATE_MAX, "Frame rate values array size mismatch");
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_FRAMERATE_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsVIDEO_FRAMERATE_MAX, "Frame rate values array size mismatch");

const int FrameRate::kUnknown = dsVIDEO_FRAMERATE_UNKNOWN;
const int FrameRate::k24 = dsVIDEO_FRAMERATE_24;
Expand Down
4 changes: 2 additions & 2 deletions ds/frontPanelIndicator.cpp
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/frontPanelIndicator.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/frontPanelIndicator.cpp' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/2010, 557 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/RDK-DEV-2010.tar.gz, file: ds/frontPanelIndicator.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -108,8 +108,8 @@

namespace device {

typedef int _SafetyCheck[(dsUTL_DIM(_colorNames) == dsFPD_COLOR_MAX) ? 1 : -1];
typedef int _SafetyCheck[(dsUTL_DIM(_indicatorNames) == dsFPD_INDICATOR_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_indicatorNames) == dsFPD_INDICATOR_MAX, "Indicator names array size mismatch");
static_assert(dsUTL_DIM(_colorNames) == dsFPD_COLOR_MAX, "Color names array size mismatch");

const int FrontPanelIndicator::Color::kBlue = dsFPD_COLOR_BLUE;
const int FrontPanelIndicator::Color::kGreen = dsFPD_COLOR_GREEN;
Expand Down
2 changes: 1 addition & 1 deletion ds/pixelResolution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ namespace {


namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_PIXELRES_MAX) ? 1 : 0];
static_assert(dsUTL_DIM(_names) == dsVIDEO_PIXELRES_MAX, "Pixel resolution names array size mismatch");

const int PixelResolution::k720x480 = dsVIDEO_PIXELRES_720x480;
const int PixelResolution::k720x576 = dsVIDEO_PIXELRES_720x576;
Expand Down
2 changes: 1 addition & 1 deletion ds/stereoScopicMode.cpp
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/stereoScopicMode.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/stereoScopicMode.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 123 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/stereoScopicMode.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -56,7 +56,7 @@


namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_SSMODE_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsVIDEO_SSMODE_MAX, "StereoScopicMode names array size mismatch");

const int StereoScopicMode::kUnkown = dsVIDEO_SSMODE_UNKNOWN;
const int StereoScopicMode::k2D = dsVIDEO_SSMODE_2D;
Expand Down
2 changes: 1 addition & 1 deletion ds/videoDFC.cpp
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/videoDFC.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/videoDFC.cpp' (Match: rdkcmf/rdk-devicesettings/20161031, 162 lines, url: http://github.com/rdkcmf/rdk-devicesettings/archive/CMF-20161031.zip, file: ds/videoDFC.cpp)
*
* Copyright 2016 RDK Management
*
Expand Down Expand Up @@ -65,7 +65,7 @@
}

namespace device {
typedef int _SafetyCheck[(dsUTL_DIM(_names) == dsVIDEO_ZOOM_MAX) ? 1 : -1];
static_assert(dsUTL_DIM(_names) == dsVIDEO_ZOOM_MAX, "Video DFC names array size mismatch");

const int VideoDFC::kUnknown = dsVIDEO_ZOOM_UNKNOWN;
const int VideoDFC::kNone = dsVIDEO_ZOOM_NONE;
Expand Down
13 changes: 13 additions & 0 deletions patches/dsDisplay.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/rpc/srv/dsDisplay.c b/rpc/srv/dsDisplay.c
index 2168206..55a98bc 100644
--- a/rpc/srv/dsDisplay.c
+++ b/rpc/srv/dsDisplay.c
@@ -67,7 +67,7 @@ IARM_Result_t _dsGetDisplayAspectRatio(void *arg);
IARM_Result_t _dsGetEDID(void *arg);
IARM_Result_t _dsGetEDIDBytes(void *arg);
IARM_Result_t _dsDisplayTerm(void *arg);
-void _dsDisplayEventCallback(intptr_t handle, dsDisplayEvent_t event, void *eventData);
+void _dsDisplayEventCallback(int handle, dsDisplayEvent_t event, void *eventData);
static void filterEDIDResolution(intptr_t Shandle, dsDisplayEDID_t *edid);
static void dumpEDIDInformation( dsDisplayEDID_t *edid);
static dsVideoPortType_t _GetDisplayPortType(intptr_t handle);
2 changes: 2 additions & 0 deletions rdk_build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

Check failure on line 1 in rdk_build.sh

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 'rdk_build.sh' (Match: rdk/components/generic/devicesettings/rdk/components/generic/devicesettings/b34ed54, 250 lines, url: https://code.rdkcentral.com/r/plugins/gitiles/rdk/components/generic/devicesettings/+archive/b34ed545b533a0cf4d29d221cc23daad47f32644.tar.gz, file: rdk_build.sh)
##########################################################################
# If not stated otherwise in this file or this component's LICENSE
# file the following copyright and licenses apply:
Expand Down Expand Up @@ -136,6 +136,8 @@
DeviceSettings_PATH=${CC_PATH}
CURR_DIR=`pwd`

echo "DeviceSettings_PATH: $DeviceSettings_PATH"
cat $DeviceSettings_PATH/hal/src/Makefile
cd $DeviceSettings_PATH
echo "Setting Device Settings Build Environment Variables..."

Expand Down
8 changes: 7 additions & 1 deletion rpc/srv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ LIBNAMEFULL := lib$(LIBNAME).so
INSTALL := $(PWD)/install
OBJS := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
OBJS += $(patsubst %.c,%.o,$(wildcard *.c))
ifneq ($(STANDALONE_BUILD_ENABLED),y)
INCLUDE := -I$(PWD) \
-I$(PWD)/hal/include \
-I$(PWD)/hal/src \
-I$(PWD)/rpc/include
-I$(PWD)/rpc/include
else
INCLUDE := -I$(PWD) \
-I$(PWD)/hal/include \
-I$(PWD)/rpc/include
endif


INCLUDE += $(HAL_INCLUDE)
Expand Down
2 changes: 1 addition & 1 deletion rpc/srv/dsFPD.c
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
Loading