Merge branch 'master' of github.com:Duckbox-Developers/libstb-hal-ddt

Origin commit data
------------------
Branch: master
Commit: 14a5c9b79d
Author: TangoCash <eric@loxat.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)


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

------------------
This commit was generated by Migit

include/audio_hal.h

@@ -10,12 +10,12 @@
 #elif HAVE_ARM_HARDWARE
 #include "../libarmbox/audio_lib.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/audio_lib.h"
+#include "../libazbox/audio_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/audio_lib.h"
+#include "../libraspi/audio_lib.h"
 #else
-#include "../generic-pc/audio_lib.h"
+#include "../libgeneric-pc/audio_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

include/ca.h

@@ -1,11 +1,5 @@
-/*
- * dummy functions to implement ca_cs.h interface
- */
-#if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
-#include "ca_ci.h"
-#else
-#ifndef __CA_LIBTRIPLE_H_
-#define __CA_LIBTRIPLE_H_
+#ifndef __ca__
+#define __ca__
 
 #include <stdint.h>
 #include "cs_types.h"
@@ -122,5 +116,4 @@ public:
 	virtual ~cCA();
 };
 
-#endif // __CA_LIBTRIPLE_H_
-#endif // HAVE_DUCKBOX_HARDWARE
+#endif // __ca__

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__

include/ca_cs.h

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

include/ca_hal.h

@@ -0,0 +1,5 @@
+#if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE
+#include "ca_ci.h"
+#else
+#include "ca.h"
+#endif

include/cs_api.h

@@ -4,7 +4,7 @@
 #ifndef __CS_API_H_
 #define __CS_API_H_
 
-#include "init_td.h"
+#include "init.h"
 #include <config.h>
 
 typedef void (*cs_messenger) (unsigned int msg, unsigned int data);

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_

include/dmx_cs.h

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

include/init.h

@@ -0,0 +1,5 @@
+#ifndef __init__
+#define __init__
+void init_td_api();
+void shutdown_td_api();
+#endif // __init__

include/init_cs.h

@@ -1,2 +0,0 @@
-#warning using init_cs.h from libstb-hal
-#include "init_td.h"

include/init_td.h

@@ -1,5 +0,0 @@
-#ifndef __INIT_TD_H
-#define __INIT_TD_H
-void init_td_api();
-void shutdown_td_api();
-#endif

include/playback.h

@@ -1,2 +0,0 @@
-#include <config.h>
-#include "playback_hal.h"

include/playback_hal.h

@@ -12,15 +12,15 @@
 #include "../libarmbox/playback_libeplayer3.h"
 #endif
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/playback.h"
+#include "../libazbox/playback_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/playback.h"
+#include "../libraspi/playback_lib.h"
 #else
 #if ENABLE_GSTREAMER
-#include "../generic-pc/playback_gst.h"
+#include "../libgeneric-pc/playback_gst.h"
 #else
-#include "../generic-pc/playback.h"
+#include "../libgeneric-pc/playback_lib.h"
 #endif
 #endif
 #else

include/record_hal.h

@@ -8,12 +8,12 @@
 #elif HAVE_ARM_HARDWARE
 #include "../libarmbox/record_lib.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/record_lib.h"
+#include "../libazbox/record_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/record_lib.h"
+#include "../libraspi/record_lib.h"
 #else
-#include "../generic-pc/record_lib.h"
+#include "../libgeneric-pc/record_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

include/video_cs.h

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

include/video_hal.h

@@ -9,12 +9,12 @@
 #include "../libarmbox/video_lib.h"
 #include "../libarmbox/hdmi_cec.h"
 #elif HAVE_AZBOX_HARDWARE
-#include "../azbox/video_lib.h"
+#include "../libazbox/video_lib.h"
 #elif HAVE_GENERIC_HARDWARE
 #if BOXMODEL_RASPI
-#include "../raspi/video_lib.h"
+#include "../libraspi/video_lib.h"
 #else
-#include "../generic-pc/video_lib.h"
+#include "../libgeneric-pc/video_lib.h"
 #endif
 #else
 #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined