aboutsummaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2018-02-04 13:46:43 +0100
committerHans Verkuil <hans.verkuil@cisco.com>2018-02-04 13:46:43 +0100
commit0aedeab00724d3a952359ad07a7560c38a70ff1d (patch)
tree5f82e4022553bf59e9396bff6ba1f8ffd1ee368d /utils
parent82a4a3306712af290d25e745d7b8bf2dd23ba277 (diff)
cec: renamed cec-common to cec-info
We have v4l2-info.cpp, media-info.cpp and cec-common.cpp has the same purpose. Rename to cec-info.cpp for consistency. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/cec-compliance/Makefile.am2
l---------utils/cec-compliance/cec-common.cpp1
-rw-r--r--utils/cec-compliance/cec-compliance.h2
l---------utils/cec-compliance/cec-info.cpp1
-rw-r--r--utils/cec-ctl/Makefile.am2
l---------utils/cec-ctl/cec-common.cpp1
-rw-r--r--utils/cec-ctl/cec-ctl.h3
l---------utils/cec-ctl/cec-info.cpp1
-rw-r--r--utils/cec-follower/Makefile.am2
l---------utils/cec-follower/cec-common.cpp1
-rw-r--r--utils/cec-follower/cec-follower.h2
l---------utils/cec-follower/cec-info.cpp1
-rw-r--r--utils/common/cec-info.cpp (renamed from utils/common/cec-common.cpp)2
-rw-r--r--utils/common/cec-info.h (renamed from utils/common/cec-common.h)4
14 files changed, 12 insertions, 13 deletions
diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am
index 0a1c17bd..5217046c 100644
--- a/utils/cec-compliance/Makefile.am
+++ b/utils/cec-compliance/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = cec-compliance
man_MANS = cec-compliance.1
-cec_compliance_SOURCES = cec-compliance.cpp cec-compliance.h cec-test.cpp cec-test-adapter.cpp cec-test-audio.cpp cec-test-power.cpp cec-common.cpp
+cec_compliance_SOURCES = cec-compliance.cpp cec-compliance.h cec-test.cpp cec-test-adapter.cpp cec-test-audio.cpp cec-test-power.cpp cec-info.cpp
cec_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common
cec_compliance_LDFLAGS = -lrt
diff --git a/utils/cec-compliance/cec-common.cpp b/utils/cec-compliance/cec-common.cpp
deleted file mode 120000
index 083f11d7..00000000
--- a/utils/cec-compliance/cec-common.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../common/cec-common.cpp \ No newline at end of file
diff --git a/utils/cec-compliance/cec-compliance.h b/utils/cec-compliance/cec-compliance.h
index 82b0c94b..71fd2844 100644
--- a/utils/cec-compliance/cec-compliance.h
+++ b/utils/cec-compliance/cec-compliance.h
@@ -33,7 +33,7 @@
#include <config.h>
#endif
-#include <cec-common.h>
+#include <cec-info.h>
#define TAG_AUDIO_RATE_CONTROL 1
#define TAG_ARC_CONTROL (1 << 1)
diff --git a/utils/cec-compliance/cec-info.cpp b/utils/cec-compliance/cec-info.cpp
new file mode 120000
index 00000000..33d3aae6
--- /dev/null
+++ b/utils/cec-compliance/cec-info.cpp
@@ -0,0 +1 @@
+../common/cec-info.cpp \ No newline at end of file
diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am
index 96dd0263..d165531c 100644
--- a/utils/cec-ctl/Makefile.am
+++ b/utils/cec-ctl/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = cec-ctl
man_MANS = cec-ctl.1
-cec_ctl_SOURCES = cec-ctl.cpp cec-pin.cpp cec-ctl.h cec-common.cpp
+cec_ctl_SOURCES = cec-ctl.cpp cec-pin.cpp cec-ctl.h cec-info.cpp
cec_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common
cec_ctl_LDFLAGS = -lrt
diff --git a/utils/cec-ctl/cec-common.cpp b/utils/cec-ctl/cec-common.cpp
deleted file mode 120000
index 083f11d7..00000000
--- a/utils/cec-ctl/cec-common.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../common/cec-common.cpp \ No newline at end of file
diff --git a/utils/cec-ctl/cec-ctl.h b/utils/cec-ctl/cec-ctl.h
index 6ba22a23..540f07da 100644
--- a/utils/cec-ctl/cec-ctl.h
+++ b/utils/cec-ctl/cec-ctl.h
@@ -18,12 +18,11 @@
#ifndef _CEC_CTL_H_
#define _CEC_CTL_H_
-#include <cec-common.h>
+#include <cec-info.h>
// cec-ctl.cpp
extern bool show_info;
std::string ts2s(__u64 ts);
-//const char *la2s(unsigned la);
// cec-pin.cpp
extern __u64 eob_ts;
diff --git a/utils/cec-ctl/cec-info.cpp b/utils/cec-ctl/cec-info.cpp
new file mode 120000
index 00000000..33d3aae6
--- /dev/null
+++ b/utils/cec-ctl/cec-info.cpp
@@ -0,0 +1 @@
+../common/cec-info.cpp \ No newline at end of file
diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am
index 44a57376..3a99fea7 100644
--- a/utils/cec-follower/Makefile.am
+++ b/utils/cec-follower/Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = cec-follower
man_MANS = cec-follower.1
-cec_follower_SOURCES = cec-follower.cpp cec-follower.h cec-processing.cpp cec-log.cpp cec-common.cpp
+cec_follower_SOURCES = cec-follower.cpp cec-follower.h cec-processing.cpp cec-log.cpp cec-info.cpp
cec_follower_CPPFLAGS = -I$(top_srcdir)/utils/common
cec_follower_LDFLAGS = -lrt
diff --git a/utils/cec-follower/cec-common.cpp b/utils/cec-follower/cec-common.cpp
deleted file mode 120000
index 083f11d7..00000000
--- a/utils/cec-follower/cec-common.cpp
+++ /dev/null
@@ -1 +0,0 @@
-../common/cec-common.cpp \ No newline at end of file
diff --git a/utils/cec-follower/cec-follower.h b/utils/cec-follower/cec-follower.h
index e6342660..dfbb12e3 100644
--- a/utils/cec-follower/cec-follower.h
+++ b/utils/cec-follower/cec-follower.h
@@ -48,7 +48,7 @@
#include <config.h>
#endif
-#include <cec-common.h>
+#include <cec-info.h>
#define ARRAY_SIZE(a) \
(sizeof(a) / sizeof(*a))
diff --git a/utils/cec-follower/cec-info.cpp b/utils/cec-follower/cec-info.cpp
new file mode 120000
index 00000000..33d3aae6
--- /dev/null
+++ b/utils/cec-follower/cec-info.cpp
@@ -0,0 +1 @@
+../common/cec-info.cpp \ No newline at end of file
diff --git a/utils/common/cec-common.cpp b/utils/common/cec-info.cpp
index 13f6c0ba..5fd28ef4 100644
--- a/utils/common/cec-common.cpp
+++ b/utils/common/cec-info.cpp
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <string>
-#include <cec-common.h>
+#include <cec-info.h>
static std::string caps2s(unsigned caps)
{
diff --git a/utils/common/cec-common.h b/utils/common/cec-info.h
index 2212bfed..2a743cd5 100644
--- a/utils/common/cec-common.h
+++ b/utils/common/cec-info.h
@@ -17,8 +17,8 @@
* SOFTWARE.
*/
-#ifndef _CEC_COMMON_H_
-#define _CEC_COMMON_H_
+#ifndef _CEC_INFO_H_
+#define _CEC_INFO_H_
#include <linux/cec.h>

Privacy Policy