From 1a52592421a38ed54b3acffc381cfb78d8910cae Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sat, 22 Dec 2018 20:17:14 +0100
Subject: [PATCH] unify handling of ca header

Origin commit data
------------------
Branch: master
Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/467aedcdbc88ac87f95c5c97854da46c61e1e96a
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-22 (Sat, 22 Dec 2018)

Origin message was:
------------------
- unify handling of ca header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 Makefile.am                | 3 +--
 include/ca_ci.h            | 6 +++---
 include/ca_cs.h            | 1 -
 include/{ca.h => ca_hal.h} | 6 +++---
 include/cs_frontpanel.h    | 6 +++---
 libdvbci/dvbci_mmi.cpp     | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 include/ca_cs.h
 rename include/{ca.h => ca_hal.h} (98%)

diff --git a/Makefile.am b/Makefile.am
index 0f2f2d6..3503a30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,8 +67,7 @@ endif
 
 pkginclude_HEADERS = \
 	include/audio_hal.h \
-	include/ca_cs.h \
-	include/ca.h \
+	include/ca_hal.h \
 	include/cs_api.h \
 	include/ca_ci.h \
 	include/cs_types.h \
diff --git a/include/ca_ci.h b/include/ca_ci.h
index ee15f94..1ef8d48 100644
--- a/include/ca_ci.h
+++ b/include/ca_ci.h
@@ -1,5 +1,5 @@
-#ifndef __CA_H_
-#define __CA_H_
+#ifndef __ca_ci__
+#define __ca_ci__
 
 #include <config.h>
 #include <stdint.h>
@@ -362,4 +362,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif ///__CA_H_
+#endif // __ca_ci__
diff --git a/include/ca_cs.h b/include/ca_cs.h
deleted file mode 100644
index dae70d6..0000000
--- a/include/ca_cs.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ca.h"
diff --git a/include/ca.h b/include/ca_hal.h
similarity index 98%
rename from include/ca.h
rename to include/ca_hal.h
index a087805..67796e3 100644
--- a/include/ca.h
+++ b/include/ca_hal.h
@@ -4,8 +4,8 @@
 #if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
 #include "ca_ci.h"
 #else
-#ifndef __CA_LIBTRIPLE_H_
-#define __CA_LIBTRIPLE_H_
+#ifndef __ca_hal__
+#define __ca_hal__
 
 #include <stdint.h>
 #include "cs_types.h"
@@ -122,5 +122,5 @@ public:
 	virtual ~cCA();
 };
 
-#endif // __CA_LIBTRIPLE_H_
+#endif // __ca_hal__
 #endif // HAVE_DUCKBOX_HARDWARE
diff --git a/include/cs_frontpanel.h b/include/cs_frontpanel.h
index ce35f11..9d9336b 100644
--- a/include/cs_frontpanel.h
+++ b/include/cs_frontpanel.h
@@ -1,5 +1,5 @@
-#ifndef __DUCKBOX_VFD__
-#define __DUCKBOX_VFD__
+#ifndef __CS_FRONTPANEL_H_
+#define __CS_FRONTPANEL_H_
 
 #define VFDDISPLAYCHARS      0xc0425a00
 #define VFDWRITECGRAM        0x40425a01
@@ -317,4 +317,4 @@ typedef struct {
 	bool			number_support;
 } fp_display_caps_t;
 
-#endif /* __DUCKBOX_VFD__ */
+#endif // __CS_FRONTPANEL_H_
diff --git a/libdvbci/dvbci_mmi.cpp b/libdvbci/dvbci_mmi.cpp
index b8c2794..2bd1928 100644
--- a/libdvbci/dvbci_mmi.cpp
+++ b/libdvbci/dvbci_mmi.cpp
@@ -5,7 +5,7 @@
 #include <stdio.h>
 
 #include "dvbci_mmi.h"
-#include <ca_cs.h>
+#include <ca_hal.h>
 
 eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot)
 {