Merge pull request #3 from rdkcentral/develop

Initial RDKE release for devicesettings
rdkcentral · Jun 18, 2024 · 63edbcf · 63edbcf
2 parents 461f062 + 1483e98
commit 63edbcf
Show file tree

Hide file tree

Showing 21 changed files with 39 additions and 230 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,10 +1,3 @@
 Contributing
 ============
-
-If you wish to make code contributions to this project, the master source is hosted at [code.rdkcentral.com](https://code.rdkcentral.com/r/#/admin/projects/rdk/devices/raspberrypi/devicesettings).
-You can submit your changes for review via that site.
-
-Please follow the [workflow](https://wiki.rdkcentral.com/display/CMF/Gerrit+Development+Workflow) when making a contribution.
-
-In order to contribute code, first-time users are requested to agree to the [license](https://wiki.rdkcentral.com/signup.action).
-
+If you would like to contribute code to this project you can do so through GitHub by forking the repository and sending a pull request. Before RDK accepts your code into the project you must sign the RDK Contributor License Agreement (CLA).
diff --git a/COPYING b/COPYING
diff --git a/COPYING b/COPYING
@@ -0,0 +1 @@
+LICENSE
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ##########################################################################
-# If not stated otherwise in this file or this component's Licenses.txt
+# If not stated otherwise in this file or this component's LICENSE
 # file the following copyright and licenses apply:
 #
 # Copyright 2017 RDK Management

diff --git a/dsAudio.c b/dsAudio.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsAudioSettings.h b/dsAudioSettings.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsConfig.c b/dsConfig.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsConfig.h b/dsConfig.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsDefinitions.h b/dsDefinitions.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsDisplay.c b/dsDisplay.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsFPD.c b/dsFPD.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsHost.c b/dsHost.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsVideoDevice.c b/dsVideoDevice.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsVideoDeviceSettings.h b/dsVideoDeviceSettings.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsVideoPort.c b/dsVideoPort.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management
@@ -506,11 +506,10 @@ static uint32_t dsGetHdmiMode(dsVideoPortResolution_t *resolution)
  * @param [in] handle         Handle of the video port.
  * @param [in] *resolution    The address of a structure containing the video port
  *                            resolution settings.
- * @oaram [in] persist        enable/disable flag for persistence storage
  * @return    Error Code.
  * @retval    ::dsError_t
  */
-dsError_t  dsSetResolution(intptr_t handle, dsVideoPortResolution_t *resolution, bool persist)
+dsError_t  dsSetResolution(intptr_t handle, dsVideoPortResolution_t *resolution)
 {
 	/* Auto Select uses 720p. Should be converted to dsVideoPortResolution_t = 720p in DS-VOPConfig, not here */
                 printf("Inside dsSetResolution\n");

diff --git a/dsVideoPortSettings.h b/dsVideoPortSettings.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dsVideoResolutionSettings.h b/dsVideoResolutionSettings.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/dshalUtils.c b/dshalUtils.c
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2019 RDK Management

diff --git a/dshalUtils.h b/dshalUtils.h
@@ -1,5 +1,5 @@
 /*
- * If not stated otherwise in this file or this component's Licenses.txt file the
+ * If not stated otherwise in this file or this component's LICENSE file the
  * following copyright and licenses apply:
  *
  * Copyright 2017 RDK Management

diff --git a/resolutionsettings.html b/resolutionsettings.html
@@ -1,5 +1,5 @@
 <!--
- If not stated otherwise in this file or this component's Licenses.txt file the
+ If not stated otherwise in this file or this component's LICENSE file the
  following copyright and licenses apply:
 
  Copyright 2017 RDK Management

diff --git a/scripts/rpiDisplayEnable.sh b/scripts/rpiDisplayEnable.sh
@@ -1,4 +1,22 @@
 #!/bin/sh
+##########################################################################
+# If not stated otherwise in this file or this component's LICENSE
+# file the following copyright and licenses apply:
+#
+# Copyright 2024 RDK Management
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##########################################################################
 
 if [[ "$1" == 2 ]]; then # This call is from rpidisplay.service
      QueryPowerState | grep 'STANDBY' &> /dev/null

diff --git a/systemd/rpiDisplay.service b/systemd/rpiDisplay.service
@@ -1,5 +1,5 @@
 ##########################################################################
-# If not stated otherwise in this file or this component's Licenses.txt
+# If not stated otherwise in this file or this component's LICENSE
 # file the following copyright and licenses apply:
 #
 # Copyright 2016 RDK Management