- unify handling of ca header

Signed-off-by: Thilo Graf <dbt@novatux.de>

Makefile.am

@@ -67,8 +67,7 @@ endif
 
 pkginclude_HEADERS = \
 	include/audio_hal.h \
-	include/ca_cs.h \
+	include/ca_hal.h \
-	include/ca.h \
 	include/cs_api.h \
 	include/ca_ci.h \
 	include/cs_types.h \

include/ca_ci.h

@@ -1,5 +1,5 @@
-#ifndef __CA_H_
+#ifndef __ca_ci__
-#define __CA_H_
+#define __ca_ci__
 
 #include <config.h>
 #include <stdint.h>
@@ -362,4 +362,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif ///__CA_H_
+#endif // __ca_ci__

include/ca_cs.h

@@ -1 +0,0 @@
-#include "ca.h"

include/ca_hal.h

@@ -4,8 +4,8 @@
 #if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
 #include "ca_ci.h"
 #else
-#ifndef __CA_LIBTRIPLE_H_
+#ifndef __ca_hal__
-#define __CA_LIBTRIPLE_H_
+#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

include/cs_frontpanel.h

@@ -1,5 +1,5 @@
-#ifndef __DUCKBOX_VFD__
+#ifndef __CS_FRONTPANEL_H_
-#define __DUCKBOX_VFD__
+#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_

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)
 {