Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/native_full_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [ main, 'sprint/**', 'release/**', develop ]
pull_request:
branches: [ main, 'sprint/**', 'release/**', topic/RDK*, develop ]
branches: [ main, 'sprint/**', 'release/**', topic/RDK*, feature/RDK*, develop ]

jobs:
build-devicesettings-on-pr:
Expand All @@ -23,4 +23,4 @@ jobs:
sh -e cov_build.sh
env:
GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}
RDK_PLATFORM_SOC: broadcom
RDK_PLATFORM_SOC: broadcom
52 changes: 52 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,54 @@
/install/bin/TODO
/install/lib/TODO

*.o
*.so
# test samples
sample/IsOutputHDR
sample/enableSurroundDecoder
sample/getAudioConfig
sample/getCPUTemp
sample/getDSHalVersion
sample/getDisplayAttributes
sample/getDrmHdmiStatus
sample/getEDIDBytes
sample/getFPBrightness
sample/getHDCPStatus
sample/getHdmiPreference
sample/getHostEDID
sample/getSocIDFromSDK
sample/getVideoOutputPorts
sample/getZoomSettings
sample/hdmiIn
sample/isDisplayConnected
sample/ms12ProfileTest
sample/powerModeTest
sample/resetOutputToSDR
sample/setARCSAD
sample/setAudioDucking
sample/setAudioEnable
sample/setAudioGain
sample/setAudioLevel
sample/setAudioMode
sample/setAudioMute
sample/setBassEnhancer
sample/setDRCMode
sample/setDialogEnhancement
sample/setFPBrightness
sample/setFPColor
sample/setFPColorRGB
sample/setFPTextDisplay
sample/setFPTextTimeFormat
sample/setGraphicEQ
sample/setHdmiPreference
sample/setMISteering
sample/setResolution
sample/setSurroundVirtualizer
sample/setVolumeLeveller
sample/setZoomSettings
sample/testFrontPanel

.cache
.clang-format
compile_commands.json
.harper-dictionary.txt
2 changes: 1 addition & 1 deletion build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ cd rfc
autoreconf -i
./configure --enable-rfctool=yes --enable-tr181set=yes
cd rfcapi
make librfcapi_la_CPPFLAGS="-I/usr/include/cjson"
make CXXFLAGS="-DUSE_IARMBUS" librfcapi_la_CPPFLAGS="-I/usr/include/cjson"
make install
export RFC_PATH=$ROOT/rfc

Expand Down
4 changes: 3 additions & 1 deletion ds/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@ RM := rm -rf
CFLAGS += -std=c++0x -g -fPIC -D_REENTRANT -Wall
LIBNAME := ds
LIBNAMEFULL := lib$(LIBNAME).so
LIBNAMECLI := lib$(LIBNAME)-cli.so
LIBNAMECLI := lib$(LIBNAME)-cli.so
INSTALL := $(PWD)/install
OBJS := $(patsubst %.cpp,%.o,$(wildcard *.cpp))
# In future add a conditional to choose implementation class based on build configuration
OBJS += iarm/IarmImpl.o
#$(PWD)/config should be first include path
# to override generic configs
ifneq ($(STANDALONE_BUILD_ENABLED),y)
Expand Down
37 changes: 22 additions & 15 deletions ds/dslogger.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
* @{
**/

#include <cstdio>
#include <cstdarg>

#include "dslogger.h"
#include <stdarg.h>

#define MAX_LOG_BUFF 500
#define unlikely(x) (__builtin_expect(!!(x), 0))
#define MAX_LOG_BUFF 512

DS_LogCb logCb = NULL;

Expand All @@ -38,26 +40,31 @@ void DS_RegisterForLog(DS_LogCb cb)
logCb = cb;
}

int ds_log(int priority,const char *format, ...)
int ds_log(int priority, const char* fileName, int lineNum, const char *format, ...)
{
char tmp_buff[MAX_LOG_BUFF];
char tmp_buff[MAX_LOG_BUFF] = {'\0'};

int offset = snprintf(tmp_buff, MAX_LOG_BUFF, "[%s:%d] ", fileName, lineNum);

// formatting error
if (unlikely(offset < 0)) {
offset = 0;
tmp_buff[0] = '\0'; // Ensure buffer is null-terminated if snprintf fails
}

va_list args;
va_start(args, format);
vsnprintf(tmp_buff,MAX_LOG_BUFF-1,format, args);
vsnprintf(tmp_buff + offset, MAX_LOG_BUFF - offset, format, args);
va_end(args);
if(logCb != NULL)
{
logCb(priority,tmp_buff);
}
else
{
return printf(tmp_buff);

if (nullptr != logCb) {
logCb(priority, tmp_buff);
} else {
return printf("%s\n", tmp_buff);
}

return 0;
}




/** @} */
/** @} */
Loading
Loading