diff --git a/azbox/cs_api.h b/azbox/cs_api.h deleted file mode 120000 index a794ffd..0000000 --- a/azbox/cs_api.h +++ /dev/null @@ -1 +0,0 @@ -../libspark/cs_api.h \ No newline at end of file diff --git a/azbox/init.cpp b/azbox/init.cpp index 273cc04..a15a962 100644 --- a/azbox/init.cpp +++ b/azbox/init.cpp @@ -1,5 +1,5 @@ #include -#include "init_lib.h" +#include "init_td.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) #define lt_info(args...) _lt_info(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/azbox/init_lib.h b/azbox/init_lib.h deleted file mode 100644 index d9a6f09..0000000 --- a/azbox/init_lib.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif diff --git a/generic-pc/cs_api.h b/generic-pc/cs_api.h deleted file mode 120000 index a794ffd..0000000 --- a/generic-pc/cs_api.h +++ /dev/null @@ -1 +0,0 @@ -../libspark/cs_api.h \ No newline at end of file diff --git a/generic-pc/init.cpp b/generic-pc/init.cpp index f3493b8..641f608 100644 --- a/generic-pc/init.cpp +++ b/generic-pc/init.cpp @@ -2,7 +2,7 @@ #include #include -#include "init_lib.h" +#include "init_td.h" #include "lt_debug.h" #include "glfb.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/generic-pc/init_lib.h b/generic-pc/init_lib.h deleted file mode 100644 index d9a6f09..0000000 --- a/generic-pc/init_lib.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif diff --git a/include/cs_api.h b/include/cs_api.h index fff64d5..292430d 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -1,16 +1,66 @@ -#include -#if HAVE_TRIPLEDRAGON -#include "../libtriple/cs_api.h" -#elif HAVE_SPARK_HARDWARE -#include "../libspark/cs_api.h" -#elif HAVE_AZBOX_HARDWARE -#include "../azbox/cs_api.h" -#elif HAVE_GENERIC_HARDWARE -#if BOXMODEL_RASPI -#include "../raspi/cs_api.h" -#else -#include "../generic-pc/cs_api.h" +/* compatibility header for tripledragon. I'm lazy, so I just left it + as "cs_api.h" so that I don't need too many ifdefs in the code */ + +#ifndef __CS_API_H_ +#define __CS_API_H_ + +#include "init_td.h" +typedef void (*cs_messenger) (unsigned int msg, unsigned int data); + +#if 0 +enum CS_LOG_MODULE { + CS_LOG_CI = 0, + CS_LOG_HDMI_CEC, + CS_LOG_HDMI, + CS_LOG_VIDEO, + CS_LOG_VIDEO_DRM, + CS_LOG_AUDIO, + CS_LOG_DEMUX, + CS_LOG_DENC, + CS_LOG_PVR_RECORD, + CS_LOG_PVR_PLAY, + CS_LOG_POWER_CTRL, + CS_LOG_POWER_CLK, + CS_LOG_MEM, + CS_LOG_API, +}; #endif -#else -#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined + +inline void cs_api_init() +{ + init_td_api(); +}; + +inline void cs_api_exit() +{ + shutdown_td_api(); +}; + +#define cs_malloc_uncached malloc +#define cs_free_uncached free + +// Callback function helpers +static inline void cs_register_messenger(cs_messenger) { return; }; +static inline void cs_deregister_messenger(void) { return; }; +//cs_messenger cs_get_messenger(void); + +#if 0 +// Logging functions +void cs_log_enable(void); +void cs_log_disable(void); +void cs_log_message(const char *prefix, const char *fmt, ...); +void cs_log_module_enable(enum CS_LOG_MODULE module); +void cs_log_module_disable(enum CS_LOG_MODULE module); +void cs_log_module_message(enum CS_LOG_MODULE module, const char *fmt, ...); + +// TS Routing +unsigned int cs_get_ts_output(void); +int cs_set_ts_output(unsigned int port); + +// Serial nr and revision accessors +unsigned long long cs_get_serial(void); #endif +/* compat... HD1 seems to be version 6. everything newer ist > 6... */ +static inline unsigned int cs_get_revision(void) { return 1; }; +extern int cnxt_debug; +#endif //__CS_API_H_ diff --git a/libspark/cs_api.h b/libspark/cs_api.h deleted file mode 100644 index fb5d613..0000000 --- a/libspark/cs_api.h +++ /dev/null @@ -1,66 +0,0 @@ -/* compatibility header for tripledragon. I'm lazy, so I just left it - as "cs_api.h" so that I don't need too many ifdefs in the code */ - -#ifndef __CS_API_H_ -#define __CS_API_H_ - -#include "init_lib.h" -typedef void (*cs_messenger) (unsigned int msg, unsigned int data); - -#if 0 -enum CS_LOG_MODULE { - CS_LOG_CI = 0, - CS_LOG_HDMI_CEC, - CS_LOG_HDMI, - CS_LOG_VIDEO, - CS_LOG_VIDEO_DRM, - CS_LOG_AUDIO, - CS_LOG_DEMUX, - CS_LOG_DENC, - CS_LOG_PVR_RECORD, - CS_LOG_PVR_PLAY, - CS_LOG_POWER_CTRL, - CS_LOG_POWER_CLK, - CS_LOG_MEM, - CS_LOG_API, -}; -#endif - -inline void cs_api_init() -{ - init_td_api(); -}; - -inline void cs_api_exit() -{ - shutdown_td_api(); -}; - -#define cs_malloc_uncached malloc -#define cs_free_uncached free - -// Callback function helpers -static inline void cs_register_messenger(cs_messenger) { return; }; -static inline void cs_deregister_messenger(void) { return; }; -//cs_messenger cs_get_messenger(void); - -#if 0 -// Logging functions -void cs_log_enable(void); -void cs_log_disable(void); -void cs_log_message(const char *prefix, const char *fmt, ...); -void cs_log_module_enable(enum CS_LOG_MODULE module); -void cs_log_module_disable(enum CS_LOG_MODULE module); -void cs_log_module_message(enum CS_LOG_MODULE module, const char *fmt, ...); - -// TS Routing -unsigned int cs_get_ts_output(void); -int cs_set_ts_output(unsigned int port); - -// Serial nr and revision accessors -unsigned long long cs_get_serial(void); -#endif -/* compat... HD1 seems to be version 6. everything newer ist > 6... */ -static inline unsigned int cs_get_revision(void) { return 1; }; -extern int cnxt_debug; -#endif //__CS_API_H_ diff --git a/libspark/init.cpp b/libspark/init.cpp index d66ee89..362425e 100644 --- a/libspark/init.cpp +++ b/libspark/init.cpp @@ -1,6 +1,6 @@ #include -#include "init_lib.h" +#include "init_td.h" #include #include #include diff --git a/libspark/init_cs.h b/libspark/init_cs.h deleted file mode 100644 index 7f9e341..0000000 --- a/libspark/init_cs.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning using init_cs.h from libspark -#include "init_lib.h" diff --git a/libspark/init_lib.h b/libspark/init_lib.h deleted file mode 100644 index d9a6f09..0000000 --- a/libspark/init_lib.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif diff --git a/libtriple/cs_api.h b/libtriple/cs_api.h deleted file mode 100644 index 292430d..0000000 --- a/libtriple/cs_api.h +++ /dev/null @@ -1,66 +0,0 @@ -/* compatibility header for tripledragon. I'm lazy, so I just left it - as "cs_api.h" so that I don't need too many ifdefs in the code */ - -#ifndef __CS_API_H_ -#define __CS_API_H_ - -#include "init_td.h" -typedef void (*cs_messenger) (unsigned int msg, unsigned int data); - -#if 0 -enum CS_LOG_MODULE { - CS_LOG_CI = 0, - CS_LOG_HDMI_CEC, - CS_LOG_HDMI, - CS_LOG_VIDEO, - CS_LOG_VIDEO_DRM, - CS_LOG_AUDIO, - CS_LOG_DEMUX, - CS_LOG_DENC, - CS_LOG_PVR_RECORD, - CS_LOG_PVR_PLAY, - CS_LOG_POWER_CTRL, - CS_LOG_POWER_CLK, - CS_LOG_MEM, - CS_LOG_API, -}; -#endif - -inline void cs_api_init() -{ - init_td_api(); -}; - -inline void cs_api_exit() -{ - shutdown_td_api(); -}; - -#define cs_malloc_uncached malloc -#define cs_free_uncached free - -// Callback function helpers -static inline void cs_register_messenger(cs_messenger) { return; }; -static inline void cs_deregister_messenger(void) { return; }; -//cs_messenger cs_get_messenger(void); - -#if 0 -// Logging functions -void cs_log_enable(void); -void cs_log_disable(void); -void cs_log_message(const char *prefix, const char *fmt, ...); -void cs_log_module_enable(enum CS_LOG_MODULE module); -void cs_log_module_disable(enum CS_LOG_MODULE module); -void cs_log_module_message(enum CS_LOG_MODULE module, const char *fmt, ...); - -// TS Routing -unsigned int cs_get_ts_output(void); -int cs_set_ts_output(unsigned int port); - -// Serial nr and revision accessors -unsigned long long cs_get_serial(void); -#endif -/* compat... HD1 seems to be version 6. everything newer ist > 6... */ -static inline unsigned int cs_get_revision(void) { return 1; }; -extern int cnxt_debug; -#endif //__CS_API_H_ diff --git a/libtriple/init_cs.h b/libtriple/init_cs.h deleted file mode 100644 index 5894a14..0000000 --- a/libtriple/init_cs.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning using init_cs.h from libtriple -#include "init_td.h" diff --git a/libtriple/init_td.h b/libtriple/init_td.h deleted file mode 100644 index d9a6f09..0000000 --- a/libtriple/init_td.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif diff --git a/raspi/cs_api.h b/raspi/cs_api.h deleted file mode 120000 index a794ffd..0000000 --- a/raspi/cs_api.h +++ /dev/null @@ -1 +0,0 @@ -../libspark/cs_api.h \ No newline at end of file diff --git a/raspi/init.cpp b/raspi/init.cpp index 49c22d1..cce73e1 100644 --- a/raspi/init.cpp +++ b/raspi/init.cpp @@ -34,7 +34,7 @@ #include #include -#include "init_lib.h" +#include "init_td.h" #include "lt_debug.h" #include "glfb.h" #include "avdec.h" diff --git a/raspi/init_lib.h b/raspi/init_lib.h deleted file mode 100644 index d9a6f09..0000000 --- a/raspi/init_lib.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef __INIT_TD_H -#define __INIT_TD_H -void init_td_api(); -void shutdown_td_api(); -#endif