From 106ab1e4b6de65967c7325cb48b3323f1b96f430 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Sun, 7 Oct 2018 09:57:38 +0200 Subject: [PATCH 01/26] arm hardware: fast forward, mute audio when passthrough AC3 / DTS -thx DboxOldie Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/8b70d8db333d443656efb69912a5ee80ba8eb57e Author: Frankenstone Date: 2018-10-07 (Sun, 07 Oct 2018) ------------------ This commit was generated by Migit --- libeplayer3-arm/playback/playback.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3-arm/playback/playback.c index b8fe5bb..781bf4f 100644 --- a/libeplayer3-arm/playback/playback.c +++ b/libeplayer3-arm/playback/playback.c @@ -399,7 +399,7 @@ static int32_t PlaybackContinue(Context_t *context) if (context->playback->SlowMotion || context->playback->isForwarding || context->playback->BackWard) context->output->Command(context, OUTPUT_CLEAR, NULL); - if (context->playback->BackWard) + if (context->playback->BackWard || context->playback->isForwarding) context->output->Command(context, OUTPUT_AUDIOMUTE, "0"); context->playback->isPaused = 0; @@ -539,6 +539,7 @@ static int PlaybackFastForward(Context_t *context, int *speed) context->playback->Speed = *speed; playback_printf(20, "Speed: %d x {%d}\n", *speed, context->playback->Speed); context->output->Command(context, OUTPUT_FASTFORWARD, NULL); + context->output->Command(context, OUTPUT_AUDIOMUTE, "1"); context->output->Command(context, OUTPUT_CONTINUE, NULL); } else From 6a1687d8c246a5917d72d1ac893e4b541a79bb23 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 14 Oct 2018 10:38:15 +0200 Subject: [PATCH 02/26] libarmbox: hdmi_cec add option to regulate audio systems volume via CEC, better log readability Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/151e70c173c02c98851319c042eb79ad73f8c85f Author: TangoCash Date: 2018-10-14 (Sun, 14 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/video_hal.h | 1 + libarmbox/hdmi_cec.cpp | 72 +++++++++++++++++++++++++++++++++++--- libarmbox/hdmi_cec.h | 24 ++++++++++--- libarmbox/hdmi_cec_types.h | 40 +++++++++++++++++++++ 4 files changed, 128 insertions(+), 9 deletions(-) diff --git a/include/video_hal.h b/include/video_hal.h index db01265..0ea7d6c 100644 --- a/include/video_hal.h +++ b/include/video_hal.h @@ -7,6 +7,7 @@ #include "../libspark/video_lib.h" #elif HAVE_ARM_HARDWARE #include "../libarmbox/video_lib.h" +#include "../libarmbox/hdmi_cec.h" #elif HAVE_AZBOX_HARDWARE #include "../azbox/video_lib.h" #elif HAVE_GENERIC_HARDWARE diff --git a/libarmbox/hdmi_cec.cpp b/libarmbox/hdmi_cec.cpp index 0eed4ab..c34c2a5 100644 --- a/libarmbox/hdmi_cec.cpp +++ b/libarmbox/hdmi_cec.cpp @@ -69,8 +69,9 @@ hdmi_cec * CEC = hdmi_cec::getInstance(); hdmi_cec::hdmi_cec() { - standby_cec_activ = autoview_cec_activ = standby = false; + standby_cec_activ = autoview_cec_activ = standby = muted = false; hdmiFd = -1; + volume = 0; } hdmi_cec::~hdmi_cec() @@ -267,7 +268,7 @@ void hdmi_cec::SendCECMessage(struct cec_message &txmessage) { sprintf(str+(i*6),"[0x%02X]", txmessage.data[i]); } - lt_info("[CEC] send message 0x%02X >> 0x%02X '%s' (%s)\n", txmessage.initiator, txmessage.destination, ToString((cec_opcode)txmessage.data[0]), str); + lt_info("[CEC] send message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n",ToString((cec_logical_address)txmessage.initiator), txmessage.destination == 0xf ? "all" : ToString((cec_logical_address)txmessage.destination), txmessage.initiator, txmessage.destination, ToString((cec_opcode)txmessage.data[0]), str); struct cec_msg msg; cec_msg_init(&msg, txmessage.initiator, txmessage.destination); memcpy(&msg.msg[1], txmessage.data, txmessage.length); @@ -324,6 +325,9 @@ void hdmi_cec::SetCECState(bool state) message.data[2] = physicalAddress[1]; message.length = 3; SendCECMessage(message); + usleep(10000); + + request_audio_status(); } } @@ -517,10 +521,20 @@ void hdmi_cec::Receive() { sprintf(str+(i*6),"[0x%02X]", rxmessage.data[i]); } - lt_info("[CEC] received message 0x%02X << 0x%02X '%s' (%s)\n", rxmessage.destination, rxmessage.initiator, ToString((cec_opcode)rxmessage.opcode), str); + lt_info("[CEC] received message %s to %s (0x%02X>>0x%02X) '%s' (%s)\n",ToString((cec_logical_address)rxmessage.initiator), rxmessage.destination == 0xf ? "all" : ToString((cec_logical_address)rxmessage.destination), rxmessage.initiator, rxmessage.destination, ToString((cec_opcode)rxmessage.opcode), str); switch (rxmessage.opcode) { + case CEC_OPCODE_REPORT_AUDIO_STATUS: + { + muted = ((rxmessage.data[1] & 0x80) == 0x80); + volume = rxmessage.data[1] & 0x7F; + if (muted) + lt_debug("[CEC] %s volume muted\n", ToString((cec_logical_address)rxmessage.initiator)); + else + lt_debug("[CEC] %s volume %d \n", ToString((cec_logical_address)rxmessage.initiator), volume); + break; + } case CEC_OPCODE_DEVICE_VENDOR_ID: case CEC_OPCODE_VENDOR_COMMAND_WITH_ID: { @@ -564,7 +578,7 @@ void hdmi_cec::handleCode(long code, bool keypressed) } if (keypressed) { - if (rc_send(evd, code, KEY_PRESSED) < 0) + if (rc_send(evd, code, CEC_KEY_PRESSED) < 0) { lt_debug("[CEC] writing 'KEY_PRESSED' event failed"); close(evd); @@ -574,7 +588,7 @@ void hdmi_cec::handleCode(long code, bool keypressed) } else { - if (rc_send(evd, code, KEY_RELEASED) < 0) + if (rc_send(evd, code, CEC_KEY_RELEASED) < 0) { lt_debug("[CEC] writing 'KEY_RELEASED' event failed"); close(evd); @@ -605,3 +619,51 @@ void hdmi_cec::rc_sync(int fd) ev.value = 0; write(fd, &ev, sizeof(ev)); } + +void hdmi_cec::send_key(unsigned char key, unsigned char destination) +{ + struct cec_message txmessage; + txmessage.destination = destination; + txmessage.initiator = logicalAddress; + txmessage.data[0] = CEC_OPCODE_USER_CONTROL_PRESSED; + txmessage.data[1] = key; + txmessage.length = 2; + SendCECMessage(txmessage); + usleep(10000); + + txmessage.destination = destination; + txmessage.initiator = logicalAddress; + txmessage.data[0] = CEC_OPCODE_USER_CONTROL_RELEASE; + txmessage.data[1] = key; + txmessage.length = 2; + SendCECMessage(txmessage); +} + +void hdmi_cec::request_audio_status() +{ + struct cec_message txmessage; + txmessage.destination = CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM; + txmessage.initiator = logicalAddress; + txmessage.data[0] = CEC_OPCODE_GIVE_AUDIO_STATUS; + txmessage.length = 1; + SendCECMessage(txmessage); +} + +void hdmi_cec::vol_up() +{ + send_key(CEC_USER_CONTROL_CODE_VOLUME_UP, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); + usleep(50000); + request_audio_status(); +} +void hdmi_cec::vol_down() +{ + send_key(CEC_USER_CONTROL_CODE_VOLUME_DOWN, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); + usleep(50000); + request_audio_status(); +} +void hdmi_cec::toggle_mute() +{ + send_key(CEC_USER_CONTROL_CODE_MUTE, CEC_OP_PRIM_DEVTYPE_AUDIOSYSTEM); + usleep(50000); + request_audio_status(); +} diff --git a/libarmbox/hdmi_cec.h b/libarmbox/hdmi_cec.h index 65604d7..ebd463d 100644 --- a/libarmbox/hdmi_cec.h +++ b/libarmbox/hdmi_cec.h @@ -38,10 +38,11 @@ struct addressinfo unsigned char type; }; -enum { - KEY_RELEASED = 0, - KEY_PRESSED, - KEY_AUTOREPEAT +enum +{ + CEC_KEY_RELEASED = 0, + CEC_KEY_PRESSED, + CEC_KEY_AUTOREPEAT }; class hdmi_cec : public OpenThreads::Thread @@ -62,6 +63,10 @@ private: int rc_send(int fd, unsigned int code, unsigned int value); void rc_sync(int fd); bool standby; + void send_key(unsigned char key, unsigned char destination); + void request_audio_status(); + bool muted; + int volume; protected: bool running; public: @@ -75,4 +80,15 @@ public: void SetCECState(bool state); void ReportPhysicalAddress(); bool standby_cec_activ; + void vol_up(); + void vol_down(); + void toggle_mute(); + int GetVolume() + { + return volume; + }; + bool isMuted() + { + return muted; + }; }; diff --git a/libarmbox/hdmi_cec_types.h b/libarmbox/hdmi_cec_types.h index beb3e4f..7d2453b 100644 --- a/libarmbox/hdmi_cec_types.h +++ b/libarmbox/hdmi_cec_types.h @@ -630,6 +630,46 @@ static const char *ToString(const cec_user_control_code key) } } +static const char *ToString(cec_logical_address la) +{ + switch (la & 0xf) + { + case CECDEVICE_TV: + return "TV"; + case CECDEVICE_RECORDINGDEVICE1: + return "Recording Device 1"; + case CECDEVICE_RECORDINGDEVICE2: + return "Recording Device 2"; + case CECDEVICE_TUNER1: + return "Tuner 1"; + case CECDEVICE_PLAYBACKDEVICE1: + return "Playback Device 1"; + case CECDEVICE_AUDIOSYSTEM: + return "Audio System"; + case CECDEVICE_TUNER2: + return "Tuner 2"; + case CECDEVICE_TUNER3: + return "Tuner 3"; + case CECDEVICE_PLAYBACKDEVICE2: + return "Playback Device 2"; + case CECDEVICE_RECORDINGDEVICE3: + return "Recording Device 3"; + case CECDEVICE_TUNER4: + return "Tuner 4"; + case CECDEVICE_PLAYBACKDEVICE3: + return "Playback Device 3"; + case CECDEVICE_RESERVED1: + return "Reserved 1"; + case CECDEVICE_RESERVED2: + return "Reserved 2"; + case CECDEVICE_FREEUSE: + return "Free use"; + case CECDEVICE_UNREGISTERED: + default: + return "Unregistered"; + } +} + static cec_opcode GetResponseOpcode(cec_opcode opcode) { switch (opcode) From cfb23d61c59bbef2971e045c733cd0edfae825d6 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 19 Oct 2018 16:42:45 +0200 Subject: [PATCH 03/26] liabarmbox: hdmi_cec return volume in percent, correct msg length Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/bd853ec045becb5d0a20555656c375591d567442 Author: TangoCash Date: 2018-10-19 (Fri, 19 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hdmi_cec.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libarmbox/hdmi_cec.cpp b/libarmbox/hdmi_cec.cpp index c34c2a5..8fda736 100644 --- a/libarmbox/hdmi_cec.cpp +++ b/libarmbox/hdmi_cec.cpp @@ -528,7 +528,7 @@ void hdmi_cec::Receive() case CEC_OPCODE_REPORT_AUDIO_STATUS: { muted = ((rxmessage.data[1] & 0x80) == 0x80); - volume = rxmessage.data[1] & 0x7F; + volume = ((rxmessage.data[1] & 0x7F) / 127.0) * 100.0; if (muted) lt_debug("[CEC] %s volume muted\n", ToString((cec_logical_address)rxmessage.initiator)); else @@ -634,8 +634,7 @@ void hdmi_cec::send_key(unsigned char key, unsigned char destination) txmessage.destination = destination; txmessage.initiator = logicalAddress; txmessage.data[0] = CEC_OPCODE_USER_CONTROL_RELEASE; - txmessage.data[1] = key; - txmessage.length = 2; + txmessage.length = 1; SendCECMessage(txmessage); } From b624296e6e83e588a32b1a08da28a90c0cf3c6a0 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Wed, 31 Oct 2018 23:29:51 +0100 Subject: [PATCH 04/26] add first experimental support for ax hd60 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/954a6aa3dcdbf04fcd367ee919ea87a26a6bfa8a Author: TangoCash Date: 2018-10-31 (Wed, 31 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 16 +++++++++++++++- libarmbox/hardware_caps.c | 19 ++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6b9232b..5d68143 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -219,6 +219,10 @@ AC_ARG_WITH(boxtype, BOXTYPE="armbox" BOXMODEL="$withval" ;; + hd60) + BOXTYPE="armbox" + BOXMODEL="$withval" + ;; *) AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; @@ -229,7 +233,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi]) AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: hd51, vusolo4k]), +AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) if test "$BOXTYPE" = "duckbox"; then @@ -259,6 +263,13 @@ AS_HELP_STRING([], [valid for armbox: hd51, vusolo4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + hd60) + if test "$BOXTYPE" = "armbox"; then + BOXMODEL="$withval" + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; raspi) if test "$BOXTYPE" = "generic"; then BOXMODEL="$withval" @@ -310,6 +321,7 @@ AM_CONDITIONAL(BOXMODEL_TF7700, test "$BOXMODEL" = "tf7700") AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") +AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") @@ -385,6 +397,8 @@ elif test "$BOXMODEL" = "hl101"; then AC_DEFINE(BOXMODEL_HL101, 1, [hl101]) elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) +elif test "$BOXMODEL" = "hd60"; then + AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "raspi"; then diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 782e35d..919499c 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -45,7 +45,8 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "VU"); strcpy(caps.boxname, "SOLO4K"); strcpy(caps.boxarch, "BCM7376"); -#else +#endif +#if BOXMODEL_HD51 initialized = 1; caps.has_CI = 1; caps.can_cec = 1; @@ -60,6 +61,22 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD51"); strcpy(caps.boxarch, "BCM7251S"); +#endif +#if BOXMODEL_HD60 + initialized = 1; + caps.has_CI = 0; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "AX-Technologies"); + strcpy(caps.boxname, "HD60"); + strcpy(caps.boxarch, "HI3798M"); #endif return ∩︀ } From e89176813e09991ffd361aa2ad21ea22fce4647f Mon Sep 17 00:00:00 2001 From: TangoCash Date: Wed, 31 Oct 2018 23:29:51 +0100 Subject: [PATCH 05/26] add first experimental support for ax hd60 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e1ee33e4824c78dab856590b6c6e7dfefa44b802 Author: TangoCash Date: 2018-10-31 (Wed, 31 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 16 +++++++++++++++- libarmbox/hardware_caps.c | 19 ++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 6b9232b..5d68143 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -219,6 +219,10 @@ AC_ARG_WITH(boxtype, BOXTYPE="armbox" BOXMODEL="$withval" ;; + hd60) + BOXTYPE="armbox" + BOXMODEL="$withval" + ;; *) AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; @@ -229,7 +233,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi]) AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: hd51, vusolo4k]), +AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) if test "$BOXTYPE" = "duckbox"; then @@ -259,6 +263,13 @@ AS_HELP_STRING([], [valid for armbox: hd51, vusolo4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; + hd60) + if test "$BOXTYPE" = "armbox"; then + BOXMODEL="$withval" + else + AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) + fi + ;; raspi) if test "$BOXTYPE" = "generic"; then BOXMODEL="$withval" @@ -310,6 +321,7 @@ AM_CONDITIONAL(BOXMODEL_TF7700, test "$BOXMODEL" = "tf7700") AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") +AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") @@ -385,6 +397,8 @@ elif test "$BOXMODEL" = "hl101"; then AC_DEFINE(BOXMODEL_HL101, 1, [hl101]) elif test "$BOXMODEL" = "hd51"; then AC_DEFINE(BOXMODEL_HD51, 1, [hd51]) +elif test "$BOXMODEL" = "hd60"; then + AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) elif test "$BOXMODEL" = "raspi"; then diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 782e35d..919499c 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -45,7 +45,8 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "VU"); strcpy(caps.boxname, "SOLO4K"); strcpy(caps.boxarch, "BCM7376"); -#else +#endif +#if BOXMODEL_HD51 initialized = 1; caps.has_CI = 1; caps.can_cec = 1; @@ -60,6 +61,22 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD51"); strcpy(caps.boxarch, "BCM7251S"); +#endif +#if BOXMODEL_HD60 + initialized = 1; + caps.has_CI = 0; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "AX-Technologies"); + strcpy(caps.boxname, "HD60"); + strcpy(caps.boxarch, "HI3798M"); #endif return ∩︀ } From a33a1d4db2efed0abbf697d56c259f125dfabb3a Mon Sep 17 00:00:00 2001 From: max_10 Date: Wed, 14 Nov 2018 23:26:32 +0100 Subject: [PATCH 06/26] acinclude.m4: remove obsolete boxtype code Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0b7614c46901d44dafcb4d6f37c1570a9232e710 Author: max_10 Date: 2018-11-14 (Wed, 14 Nov 2018) Origin message was: ------------------ - acinclude.m4: remove obsolete boxtype code ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 84 ++-------------------------------------------------- 1 file changed, 3 insertions(+), 81 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 5d68143..f332234 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -154,75 +154,11 @@ dnl end workaround AC_DEFUN([TUXBOX_BOXTYPE], [ AC_ARG_WITH(boxtype, - AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox, spark7162]), + AS_HELP_STRING([--with-boxtype], [valid values: tripledragon, spark, azbox, generic, armbox, duckbox]), [case "${withval}" in - tripledragon|azbox|generic|armbox) + tripledragon|spark|azbox|generic|armbox|duckbox) BOXTYPE="$withval" ;; - spark|spark7162) - BOXTYPE="spark" - BOXMODEL="$withval" - ;; - dm*) - BOXTYPE="dreambox" - BOXMODEL="$withval" - ;; - ufs*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - atevio*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - fortis*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - octagon*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - hs7*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - dp*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - cuberevo*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - ipbox*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - arivalink200) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - tf*) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - hl101) - BOXTYPE="duckbox" - BOXMODEL="$withval" - ;; - vusolo4k) - BOXTYPE="armbox" - BOXMODEL="$withval" - ;; - hd51) - BOXTYPE="armbox" - BOXMODEL="$withval" - ;; - hd60) - BOXTYPE="armbox" - BOXMODEL="$withval" - ;; *) AC_MSG_ERROR([bad value $withval for --with-boxtype]) ;; @@ -249,21 +185,7 @@ AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - vusolo4k) - if test "$BOXTYPE" = "armbox"; then - BOXMODEL="$withval" - else - AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) - fi - ;; - hd51) - if test "$BOXTYPE" = "armbox"; then - BOXMODEL="$withval" - else - AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) - fi - ;; - hd60) + hd51|hd60|vusolo4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else From a664590fb0956eec3ba73eea365ba1a1b73605ce Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Fri, 16 Nov 2018 20:45:11 +0100 Subject: [PATCH 07/26] acinclude.m4: simplify and unify code Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1811d90597a719d84adc5b4d78b5176b437abbec Author: Frankenstone Date: 2018-11-16 (Fri, 16 Nov 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 5d68143..b4b470e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -211,15 +211,7 @@ AC_ARG_WITH(boxtype, BOXTYPE="duckbox" BOXMODEL="$withval" ;; - vusolo4k) - BOXTYPE="armbox" - BOXMODEL="$withval" - ;; - hd51) - BOXTYPE="armbox" - BOXMODEL="$withval" - ;; - hd60) + hd51|hd60|vusolo4k) BOXTYPE="armbox" BOXMODEL="$withval" ;; @@ -249,21 +241,7 @@ AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - vusolo4k) - if test "$BOXTYPE" = "armbox"; then - BOXMODEL="$withval" - else - AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) - fi - ;; - hd51) - if test "$BOXTYPE" = "armbox"; then - BOXMODEL="$withval" - else - AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) - fi - ;; - hd60) + hd51|hd60|vusolo4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else From fa6b0438c904b9b2ef18fbb21ff436d942727d46 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Wed, 21 Nov 2018 21:49:11 +0100 Subject: [PATCH 08/26] add support for wwio bre2ze4k Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9b9f459d468f75c40eafe5fb4318182224f59a81 Author: TangoCash Date: 2018-11-21 (Wed, 21 Nov 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- acinclude.m4 | 7 +++++-- libarmbox/hardware_caps.c | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index f332234..26bf1e1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -169,7 +169,7 @@ AC_ARG_WITH(boxmodel, AS_HELP_STRING([--with-boxmodel], [valid for generic: raspi]) AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101]) AS_HELP_STRING([], [valid for spark: spark, spark7162]) -AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), +AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k, bre2ze4k]), [case "${withval}" in ufs910|ufs912|ufs913|ufs922|atevio7500|fortis_hdbox|octagon1008|hs7110|hs7810a|hs7119|hs7819|dp7000|cuberevo|cuberevo_mini|cuberevo_mini2|cuberevo_250hd|cuberevo_2000hd|cuberevo_3000hd|ipbox9900|ipbox99|ipbox55|arivalink200|tf7700|hl101) if test "$BOXTYPE" = "duckbox"; then @@ -185,7 +185,7 @@ AS_HELP_STRING([], [valid for armbox: hd51, hd60, vusolo4k]), AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE]) fi ;; - hd51|hd60|vusolo4k) + hd51|hd60|vusolo4k|bre2ze4k) if test "$BOXTYPE" = "armbox"; then BOXMODEL="$withval" else @@ -245,6 +245,7 @@ AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101") AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51") AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60") AM_CONDITIONAL(BOXMODEL_VUSOLO4K, test "$BOXMODEL" = "vusolo4k") +AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k") AM_CONDITIONAL(BOXMODEL_RASPI, test "$BOXMODEL" = "raspi") @@ -323,6 +324,8 @@ elif test "$BOXMODEL" = "hd60"; then AC_DEFINE(BOXMODEL_HD60, 1, [hd60]) elif test "$BOXMODEL" = "vusolo4k"; then AC_DEFINE(BOXMODEL_VUSOLO4K, 1, [vusolo4k]) +elif test "$BOXMODEL" = "bre2ze4k"; then + AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k]) elif test "$BOXMODEL" = "raspi"; then AC_DEFINE(BOXMODEL_RASPI, 1, [raspberry pi]) fi diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 919499c..22911f5 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -77,6 +77,22 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD60"); strcpy(caps.boxarch, "HI3798M"); +#endif +#if BOXMODEL_BRE2ZE4K + initialized = 1; + caps.has_CI = 1; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_xres = 4; + caps.display_type = HW_DISPLAY_LED_NUM; + caps.display_can_deepstandby = 0; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 0; + caps.has_button_timer = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "WWIO"); + strcpy(caps.boxname, "BRE2ZE4K"); + strcpy(caps.boxarch, "BCM7251S"); #endif return ∩︀ } From da1a437ef77a700f52df4072831bcf26425ce1a3 Mon Sep 17 00:00:00 2001 From: GetAway Date: Sat, 1 Dec 2018 10:38:17 +0100 Subject: [PATCH 09/26] libarmbox: introduce has_button_vformat Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/3f0f80e0d0bf6adb90933edbb86c1b77eca397d0 Author: GetAway Date: 2018-12-01 (Sat, 01 Dec 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/hardware_caps.h | 1 + libarmbox/hardware_caps.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 3a553ca..44a11a9 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -40,6 +40,7 @@ typedef struct hw_caps int display_can_deepstandby; int display_has_statusline; int has_button_timer; + int has_button_vformat; char boxvendor[64]; char boxname[64]; char boxarch[64]; diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 22911f5..c5ee366 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -41,6 +41,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 1; caps.display_has_statusline = 1; caps.has_button_timer = 1; + caps.has_button_vformat = 0; caps.has_HDMI = 1; strcpy(caps.boxvendor, "VU"); strcpy(caps.boxname, "SOLO4K"); @@ -57,6 +58,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; caps.has_button_timer = 1; + caps.has_button_vformat = 0; caps.has_HDMI = 1; strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD51"); @@ -73,6 +75,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; caps.has_button_timer = 1; + caps.has_button_vformat = 0; caps.has_HDMI = 1; strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD60"); @@ -89,6 +92,7 @@ hw_caps_t *get_hwcaps(void) caps.display_can_set_brightness = 1; caps.display_has_statusline = 0; caps.has_button_timer = 1; + caps.has_button_vformat = 1; caps.has_HDMI = 1; strcpy(caps.boxvendor, "WWIO"); strcpy(caps.boxname, "BRE2ZE4K"); From 20fa589740c7a283ca9465b98eb3b56ed40541af Mon Sep 17 00:00:00 2001 From: TangoCash Date: Sun, 16 Dec 2018 15:13:37 +0100 Subject: [PATCH 10/26] update Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c38b70f43adbe1f70fcc5ee468c8bc0fe646126d Author: TangoCash Date: 2018-12-16 (Sun, 16 Dec 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/hardware_caps.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 3a553ca..c7e4643 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -28,6 +28,7 @@ typedef struct hw_caps int has_SCART; int has_SCART_input; int has_YUV_cinch; + int has_button_vformat; int can_shutdown; int can_cec; int can_ar_14_9; /* video drivers have 14:9 aspect ratio mode */ From a9cdfb8fe7e394531782878c03d779a9988c5c51 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Dec 2018 20:17:14 +0100 Subject: [PATCH 11/26] remove obsolete compatibility headers Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/68d8bda1e547c38c7cc27647fa716cb876eab004 Author: vanhofen Date: 2018-12-22 (Sat, 22 Dec 2018) Origin message was: ------------------ - remove obsolete compatibility headers ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 3 --- include/dmx_cs.h | 1 - include/init_cs.h | 2 -- include/video_cs.h | 1 - 4 files changed, 7 deletions(-) delete mode 100644 include/dmx_cs.h delete mode 100644 include/init_cs.h delete mode 100644 include/video_cs.h diff --git a/Makefile.am b/Makefile.am index c26789f..0f2f2d6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -72,16 +72,13 @@ pkginclude_HEADERS = \ include/cs_api.h \ include/ca_ci.h \ include/cs_types.h \ - include/dmx_cs.h \ include/dmx_hal.h \ include/glfb.h \ include/hardware_caps.h \ - include/init_cs.h \ include/init_td.h \ include/mmi.h \ include/playback.h \ include/playback_hal.h \ include/pwrmngr.h \ include/record_hal.h \ - include/video_cs.h \ include/video_hal.h diff --git a/include/dmx_cs.h b/include/dmx_cs.h deleted file mode 100644 index 7f86974..0000000 --- a/include/dmx_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "dmx_hal.h" diff --git a/include/init_cs.h b/include/init_cs.h deleted file mode 100644 index 609c3e1..0000000 --- a/include/init_cs.h +++ /dev/null @@ -1,2 +0,0 @@ -#warning using init_cs.h from libstb-hal -#include "init_td.h" diff --git a/include/video_cs.h b/include/video_cs.h deleted file mode 100644 index f1d48d4..0000000 --- a/include/video_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "video_hal.h" From 818e38734ef03b08b3aa3d63803fb0ee57b3b0af Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Dec 2018 20:17:14 +0100 Subject: [PATCH 12/26] unify handling of ca header Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c83f81fa5e07a279604f264e7948260e03a5476b Author: vanhofen 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 #include @@ -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 #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 #include "dvbci_mmi.h" -#include +#include eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot) { From f3dcd28bc87406a9ef4f15573afe679e18a27d82 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 22 Dec 2018 20:17:14 +0100 Subject: [PATCH 13/26] unify handling of playback header Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/91137035de3c5b127c3a752816aee41a09304f2d Author: vanhofen Date: 2018-12-22 (Sat, 22 Dec 2018) Origin message was: ------------------ - unify handling of playback header ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 1 - azbox/playback.cpp | 2 +- azbox/{playback.h => playback_lib.h} | 6 +++--- common/ca.cpp | 2 +- generic-pc/playback.cpp | 2 +- generic-pc/{playback.h => playback_lib.h} | 0 include/playback.h | 2 -- include/playback_hal.h | 6 +++--- raspi/playback.h | 1 - raspi/playback_lib.h | 1 + 10 files changed, 10 insertions(+), 13 deletions(-) rename azbox/{playback.h => playback_lib.h} (95%) rename generic-pc/{playback.h => playback_lib.h} (100%) delete mode 100644 include/playback.h delete mode 120000 raspi/playback.h create mode 120000 raspi/playback_lib.h diff --git a/Makefile.am b/Makefile.am index 3503a30..0c7769c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -76,7 +76,6 @@ pkginclude_HEADERS = \ include/hardware_caps.h \ include/init_td.h \ include/mmi.h \ - include/playback.h \ include/playback_hal.h \ include/pwrmngr.h \ include/record_hal.h \ diff --git a/azbox/playback.cpp b/azbox/playback.cpp index 1e656f3..c387c6f 100644 --- a/azbox/playback.cpp +++ b/azbox/playback.cpp @@ -50,7 +50,7 @@ #define IN_FILE "/tmp/rmfp.in2" #define OUT_FILE "/tmp/rmfp.out2" -#include "playback.h" +#include "playback_lib.h" extern "C"{ #include "e2mruainclude.h" diff --git a/azbox/playback.h b/azbox/playback_lib.h similarity index 95% rename from azbox/playback.h rename to azbox/playback_lib.h index c56c69e..6997acb 100644 --- a/azbox/playback.h +++ b/azbox/playback_lib.h @@ -1,5 +1,5 @@ -#ifndef __PLAYBACK_H -#define __PLAYBACK_H +#ifndef __PLAYBACK_LIB_H_ +#define __PLAYBACK_LIB_H_ #include #include @@ -59,4 +59,4 @@ class cPlayback void DMNotify(int Event, void *pTsBuf, void *Tag); #endif }; -#endif +#endif // __PLAYBACK_LIB_H_ diff --git a/common/ca.cpp b/common/ca.cpp index f6ebea2..17f37aa 100644 --- a/common/ca.cpp +++ b/common/ca.cpp @@ -1,6 +1,6 @@ #include -#include "ca.h" +#include "ca_hal.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_CA, this, args) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index 5e9c4ac..fe5a7e7 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -1,6 +1,6 @@ #include -#include "playback.h" +#include "playback_lib.h" static const char * FILENAME = "playback-dummy"; diff --git a/generic-pc/playback.h b/generic-pc/playback_lib.h similarity index 100% rename from generic-pc/playback.h rename to generic-pc/playback_lib.h diff --git a/include/playback.h b/include/playback.h deleted file mode 100644 index c62544b..0000000 --- a/include/playback.h +++ /dev/null @@ -1,2 +0,0 @@ -#include -#include "playback_hal.h" diff --git a/include/playback_hal.h b/include/playback_hal.h index 5891fd2..690f4ab 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -12,15 +12,15 @@ #include "../libarmbox/playback_libeplayer3.h" #endif #elif HAVE_AZBOX_HARDWARE -#include "../azbox/playback.h" +#include "../azbox/playback_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/playback.h" +#include "../raspi/playback_lib.h" #else #if ENABLE_GSTREAMER #include "../generic-pc/playback_gst.h" #else -#include "../generic-pc/playback.h" +#include "../generic-pc/playback_lib.h" #endif #endif #else diff --git a/raspi/playback.h b/raspi/playback.h deleted file mode 120000 index 1363d92..0000000 --- a/raspi/playback.h +++ /dev/null @@ -1 +0,0 @@ -../generic-pc/playback.h \ No newline at end of file diff --git a/raspi/playback_lib.h b/raspi/playback_lib.h new file mode 120000 index 0000000..5738cee --- /dev/null +++ b/raspi/playback_lib.h @@ -0,0 +1 @@ +../generic-pc/playback_lib.h \ No newline at end of file From 44123d7476377100a75cd4a6f3de45506bf61ad2 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 14/26] move azbox code to libazbox directory Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/bcc5c7ccdbe690ca98ca614fcfc2522d02661c47 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - move azbox code to libazbox directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 4 ++-- configure.ac | 10 +++++----- {azbox => libazbox}/Makefile.am | 0 {azbox => libazbox}/audio.cpp | 0 {azbox => libazbox}/audio_lib.h | 0 {azbox => libazbox}/dmx.cpp | 0 {azbox => libazbox}/e2mruainclude.h | 0 {azbox => libazbox}/hardware_caps.c | 0 {azbox => libazbox}/init.cpp | 0 {azbox => libazbox}/playback.cpp | 0 {azbox => libazbox}/playback_lib.h | 0 {azbox => libazbox}/record.cpp | 0 {azbox => libazbox}/record_lib.h | 0 {azbox => libazbox}/video.cpp | 0 {azbox => libazbox}/video_lib.h | 0 15 files changed, 7 insertions(+), 7 deletions(-) rename {azbox => libazbox}/Makefile.am (100%) rename {azbox => libazbox}/audio.cpp (100%) rename {azbox => libazbox}/audio_lib.h (100%) rename {azbox => libazbox}/dmx.cpp (100%) rename {azbox => libazbox}/e2mruainclude.h (100%) rename {azbox => libazbox}/hardware_caps.c (100%) rename {azbox => libazbox}/init.cpp (100%) rename {azbox => libazbox}/playback.cpp (100%) rename {azbox => libazbox}/playback_lib.h (100%) rename {azbox => libazbox}/record.cpp (100%) rename {azbox => libazbox}/record_lib.h (100%) rename {azbox => libazbox}/video.cpp (100%) rename {azbox => libazbox}/video_lib.h (100%) diff --git a/Makefile.am b/Makefile.am index 0c7769c..2a0c746 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,9 +19,9 @@ libstb_hal_la_LIBADD += \ libtriple/libtriple.la endif if BOXTYPE_AZBOX -SUBDIRS += azbox +SUBDIRS += libazbox libstb_hal_la_LIBADD += \ - azbox/libazbox.la + libazbox/libazbox.la endif if BOXTYPE_GENERIC if BOXMODEL_RASPI diff --git a/configure.ac b/configure.ac index e149c33..f541823 100644 --- a/configure.ac +++ b/configure.ac @@ -89,15 +89,15 @@ fi AC_OUTPUT([ Makefile common/Makefile -libeplayer3/Makefile -libeplayer3-arm/Makefile -azbox/Makefile generic-pc/Makefile +libarmbox/Makefile +libazbox/Makefile libduckbox/Makefile libdvbci/Makefile -libtriple/Makefile +libeplayer3/Makefile +libeplayer3-arm/Makefile libspark/Makefile -libarmbox/Makefile +libtriple/Makefile raspi/Makefile tools/Makefile ]) diff --git a/azbox/Makefile.am b/libazbox/Makefile.am similarity index 100% rename from azbox/Makefile.am rename to libazbox/Makefile.am diff --git a/azbox/audio.cpp b/libazbox/audio.cpp similarity index 100% rename from azbox/audio.cpp rename to libazbox/audio.cpp diff --git a/azbox/audio_lib.h b/libazbox/audio_lib.h similarity index 100% rename from azbox/audio_lib.h rename to libazbox/audio_lib.h diff --git a/azbox/dmx.cpp b/libazbox/dmx.cpp similarity index 100% rename from azbox/dmx.cpp rename to libazbox/dmx.cpp diff --git a/azbox/e2mruainclude.h b/libazbox/e2mruainclude.h similarity index 100% rename from azbox/e2mruainclude.h rename to libazbox/e2mruainclude.h diff --git a/azbox/hardware_caps.c b/libazbox/hardware_caps.c similarity index 100% rename from azbox/hardware_caps.c rename to libazbox/hardware_caps.c diff --git a/azbox/init.cpp b/libazbox/init.cpp similarity index 100% rename from azbox/init.cpp rename to libazbox/init.cpp diff --git a/azbox/playback.cpp b/libazbox/playback.cpp similarity index 100% rename from azbox/playback.cpp rename to libazbox/playback.cpp diff --git a/azbox/playback_lib.h b/libazbox/playback_lib.h similarity index 100% rename from azbox/playback_lib.h rename to libazbox/playback_lib.h diff --git a/azbox/record.cpp b/libazbox/record.cpp similarity index 100% rename from azbox/record.cpp rename to libazbox/record.cpp diff --git a/azbox/record_lib.h b/libazbox/record_lib.h similarity index 100% rename from azbox/record_lib.h rename to libazbox/record_lib.h diff --git a/azbox/video.cpp b/libazbox/video.cpp similarity index 100% rename from azbox/video.cpp rename to libazbox/video.cpp diff --git a/azbox/video_lib.h b/libazbox/video_lib.h similarity index 100% rename from azbox/video_lib.h rename to libazbox/video_lib.h From 735e8ccbdbef4c4292c9fe40cb49095203d6cd61 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 15/26] move raspi code to libraspi directory Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e55aab61fb1e392b56090eb12bcd4e6a5b3b3aaa Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - move raspi code to libraspi directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 4 ++-- configure.ac | 2 +- {raspi => libraspi}/Makefile.am | 0 {raspi => libraspi}/audio.cpp | 0 {raspi => libraspi}/audio_lib.h | 0 {raspi => libraspi}/dmx.cpp | 0 {raspi => libraspi}/dmx_cs.h | 0 {raspi => libraspi}/dmx_lib.h | 0 {raspi => libraspi}/glfb.cpp | 0 {raspi => libraspi}/glfb.h | 0 {raspi => libraspi}/hardware_caps.c | 0 {raspi => libraspi}/init.cpp | 0 {raspi => libraspi}/playback.cpp | 0 {raspi => libraspi}/playback_lib.h | 0 {raspi => libraspi}/record.cpp | 0 {raspi => libraspi}/record_lib.h | 0 {raspi => libraspi}/video.cpp | 0 {raspi => libraspi}/video_lib.h | 0 18 files changed, 3 insertions(+), 3 deletions(-) rename {raspi => libraspi}/Makefile.am (100%) rename {raspi => libraspi}/audio.cpp (100%) rename {raspi => libraspi}/audio_lib.h (100%) rename {raspi => libraspi}/dmx.cpp (100%) rename {raspi => libraspi}/dmx_cs.h (100%) rename {raspi => libraspi}/dmx_lib.h (100%) rename {raspi => libraspi}/glfb.cpp (100%) rename {raspi => libraspi}/glfb.h (100%) rename {raspi => libraspi}/hardware_caps.c (100%) rename {raspi => libraspi}/init.cpp (100%) rename {raspi => libraspi}/playback.cpp (100%) rename {raspi => libraspi}/playback_lib.h (100%) rename {raspi => libraspi}/record.cpp (100%) rename {raspi => libraspi}/record_lib.h (100%) rename {raspi => libraspi}/video.cpp (100%) rename {raspi => libraspi}/video_lib.h (100%) diff --git a/Makefile.am b/Makefile.am index 2a0c746..dd44a46 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,9 @@ libstb_hal_la_LIBADD += \ endif if BOXTYPE_GENERIC if BOXMODEL_RASPI -SUBDIRS += raspi +SUBDIRS += libraspi libstb_hal_la_LIBADD += \ - raspi/libraspi.la + libraspi/libraspi.la else SUBDIRS += generic-pc libstb_hal_la_LIBADD += \ diff --git a/configure.ac b/configure.ac index f541823..c66a156 100644 --- a/configure.ac +++ b/configure.ac @@ -96,9 +96,9 @@ libduckbox/Makefile libdvbci/Makefile libeplayer3/Makefile libeplayer3-arm/Makefile +libraspi/Makefile libspark/Makefile libtriple/Makefile -raspi/Makefile tools/Makefile ]) diff --git a/raspi/Makefile.am b/libraspi/Makefile.am similarity index 100% rename from raspi/Makefile.am rename to libraspi/Makefile.am diff --git a/raspi/audio.cpp b/libraspi/audio.cpp similarity index 100% rename from raspi/audio.cpp rename to libraspi/audio.cpp diff --git a/raspi/audio_lib.h b/libraspi/audio_lib.h similarity index 100% rename from raspi/audio_lib.h rename to libraspi/audio_lib.h diff --git a/raspi/dmx.cpp b/libraspi/dmx.cpp similarity index 100% rename from raspi/dmx.cpp rename to libraspi/dmx.cpp diff --git a/raspi/dmx_cs.h b/libraspi/dmx_cs.h similarity index 100% rename from raspi/dmx_cs.h rename to libraspi/dmx_cs.h diff --git a/raspi/dmx_lib.h b/libraspi/dmx_lib.h similarity index 100% rename from raspi/dmx_lib.h rename to libraspi/dmx_lib.h diff --git a/raspi/glfb.cpp b/libraspi/glfb.cpp similarity index 100% rename from raspi/glfb.cpp rename to libraspi/glfb.cpp diff --git a/raspi/glfb.h b/libraspi/glfb.h similarity index 100% rename from raspi/glfb.h rename to libraspi/glfb.h diff --git a/raspi/hardware_caps.c b/libraspi/hardware_caps.c similarity index 100% rename from raspi/hardware_caps.c rename to libraspi/hardware_caps.c diff --git a/raspi/init.cpp b/libraspi/init.cpp similarity index 100% rename from raspi/init.cpp rename to libraspi/init.cpp diff --git a/raspi/playback.cpp b/libraspi/playback.cpp similarity index 100% rename from raspi/playback.cpp rename to libraspi/playback.cpp diff --git a/raspi/playback_lib.h b/libraspi/playback_lib.h similarity index 100% rename from raspi/playback_lib.h rename to libraspi/playback_lib.h diff --git a/raspi/record.cpp b/libraspi/record.cpp similarity index 100% rename from raspi/record.cpp rename to libraspi/record.cpp diff --git a/raspi/record_lib.h b/libraspi/record_lib.h similarity index 100% rename from raspi/record_lib.h rename to libraspi/record_lib.h diff --git a/raspi/video.cpp b/libraspi/video.cpp similarity index 100% rename from raspi/video.cpp rename to libraspi/video.cpp diff --git a/raspi/video_lib.h b/libraspi/video_lib.h similarity index 100% rename from raspi/video_lib.h rename to libraspi/video_lib.h From 1cf0b7bbcad8918cb815251760f9d5deee92142b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 16/26] move generic-pc code to libgeneric-pc directory Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9c52b69d61e7b7601f8f734a1dc96bee0922beb4 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - move generic-pc code to libgeneric-pc directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 2 +- configure.ac | 2 +- {generic-pc => libgeneric-pc}/Makefile.am | 0 {generic-pc => libgeneric-pc}/audio.cpp | 0 {generic-pc => libgeneric-pc}/audio_lib.h | 0 {generic-pc => libgeneric-pc}/clutterfb.cpp | 0 {generic-pc => libgeneric-pc}/dmx.cpp | 0 {generic-pc => libgeneric-pc}/glfb.cpp | 0 {generic-pc => libgeneric-pc}/glfb_priv.h | 0 {generic-pc => libgeneric-pc}/hardware_caps.c | 0 {generic-pc => libgeneric-pc}/init.cpp | 0 {generic-pc => libgeneric-pc}/playback.cpp | 0 {generic-pc => libgeneric-pc}/playback_gst.h | 0 {generic-pc => libgeneric-pc}/playback_gst_01.cpp | 0 {generic-pc => libgeneric-pc}/playback_gst_10.cpp | 0 {generic-pc => libgeneric-pc}/playback_lib.h | 0 {generic-pc => libgeneric-pc}/record.cpp | 0 {generic-pc => libgeneric-pc}/record_lib.h | 0 {generic-pc => libgeneric-pc}/video.cpp | 0 {generic-pc => libgeneric-pc}/video_lib.h | 0 20 files changed, 2 insertions(+), 2 deletions(-) rename {generic-pc => libgeneric-pc}/Makefile.am (100%) rename {generic-pc => libgeneric-pc}/audio.cpp (100%) rename {generic-pc => libgeneric-pc}/audio_lib.h (100%) rename {generic-pc => libgeneric-pc}/clutterfb.cpp (100%) rename {generic-pc => libgeneric-pc}/dmx.cpp (100%) rename {generic-pc => libgeneric-pc}/glfb.cpp (100%) rename {generic-pc => libgeneric-pc}/glfb_priv.h (100%) rename {generic-pc => libgeneric-pc}/hardware_caps.c (100%) rename {generic-pc => libgeneric-pc}/init.cpp (100%) rename {generic-pc => libgeneric-pc}/playback.cpp (100%) rename {generic-pc => libgeneric-pc}/playback_gst.h (100%) rename {generic-pc => libgeneric-pc}/playback_gst_01.cpp (100%) rename {generic-pc => libgeneric-pc}/playback_gst_10.cpp (100%) rename {generic-pc => libgeneric-pc}/playback_lib.h (100%) rename {generic-pc => libgeneric-pc}/record.cpp (100%) rename {generic-pc => libgeneric-pc}/record_lib.h (100%) rename {generic-pc => libgeneric-pc}/video.cpp (100%) rename {generic-pc => libgeneric-pc}/video_lib.h (100%) diff --git a/Makefile.am b/Makefile.am index dd44a46..fd883e1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ SUBDIRS += libraspi libstb_hal_la_LIBADD += \ libraspi/libraspi.la else -SUBDIRS += generic-pc +SUBDIRS += libgeneric-pc libstb_hal_la_LIBADD += \ generic-pc/libgeneric.la endif diff --git a/configure.ac b/configure.ac index c66a156..60667e1 100644 --- a/configure.ac +++ b/configure.ac @@ -89,13 +89,13 @@ fi AC_OUTPUT([ Makefile common/Makefile -generic-pc/Makefile libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile libeplayer3/Makefile libeplayer3-arm/Makefile +libgeneric-pc/Makefile libraspi/Makefile libspark/Makefile libtriple/Makefile diff --git a/generic-pc/Makefile.am b/libgeneric-pc/Makefile.am similarity index 100% rename from generic-pc/Makefile.am rename to libgeneric-pc/Makefile.am diff --git a/generic-pc/audio.cpp b/libgeneric-pc/audio.cpp similarity index 100% rename from generic-pc/audio.cpp rename to libgeneric-pc/audio.cpp diff --git a/generic-pc/audio_lib.h b/libgeneric-pc/audio_lib.h similarity index 100% rename from generic-pc/audio_lib.h rename to libgeneric-pc/audio_lib.h diff --git a/generic-pc/clutterfb.cpp b/libgeneric-pc/clutterfb.cpp similarity index 100% rename from generic-pc/clutterfb.cpp rename to libgeneric-pc/clutterfb.cpp diff --git a/generic-pc/dmx.cpp b/libgeneric-pc/dmx.cpp similarity index 100% rename from generic-pc/dmx.cpp rename to libgeneric-pc/dmx.cpp diff --git a/generic-pc/glfb.cpp b/libgeneric-pc/glfb.cpp similarity index 100% rename from generic-pc/glfb.cpp rename to libgeneric-pc/glfb.cpp diff --git a/generic-pc/glfb_priv.h b/libgeneric-pc/glfb_priv.h similarity index 100% rename from generic-pc/glfb_priv.h rename to libgeneric-pc/glfb_priv.h diff --git a/generic-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c similarity index 100% rename from generic-pc/hardware_caps.c rename to libgeneric-pc/hardware_caps.c diff --git a/generic-pc/init.cpp b/libgeneric-pc/init.cpp similarity index 100% rename from generic-pc/init.cpp rename to libgeneric-pc/init.cpp diff --git a/generic-pc/playback.cpp b/libgeneric-pc/playback.cpp similarity index 100% rename from generic-pc/playback.cpp rename to libgeneric-pc/playback.cpp diff --git a/generic-pc/playback_gst.h b/libgeneric-pc/playback_gst.h similarity index 100% rename from generic-pc/playback_gst.h rename to libgeneric-pc/playback_gst.h diff --git a/generic-pc/playback_gst_01.cpp b/libgeneric-pc/playback_gst_01.cpp similarity index 100% rename from generic-pc/playback_gst_01.cpp rename to libgeneric-pc/playback_gst_01.cpp diff --git a/generic-pc/playback_gst_10.cpp b/libgeneric-pc/playback_gst_10.cpp similarity index 100% rename from generic-pc/playback_gst_10.cpp rename to libgeneric-pc/playback_gst_10.cpp diff --git a/generic-pc/playback_lib.h b/libgeneric-pc/playback_lib.h similarity index 100% rename from generic-pc/playback_lib.h rename to libgeneric-pc/playback_lib.h diff --git a/generic-pc/record.cpp b/libgeneric-pc/record.cpp similarity index 100% rename from generic-pc/record.cpp rename to libgeneric-pc/record.cpp diff --git a/generic-pc/record_lib.h b/libgeneric-pc/record_lib.h similarity index 100% rename from generic-pc/record_lib.h rename to libgeneric-pc/record_lib.h diff --git a/generic-pc/video.cpp b/libgeneric-pc/video.cpp similarity index 100% rename from generic-pc/video.cpp rename to libgeneric-pc/video.cpp diff --git a/generic-pc/video_lib.h b/libgeneric-pc/video_lib.h similarity index 100% rename from generic-pc/video_lib.h rename to libgeneric-pc/video_lib.h From dc6917f4458ee07f15c392d8f86c6f1d339f4ad4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 17/26] Makefile.am: put commented libtest lines together Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9f5b84c764e46eb86abff6efab207a23319d9e54 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - Makefile.am: put commented libtest lines together ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index fd883e1..e9edd85 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,11 @@ ACLOCAL_AMFLAGS = -I m4 lib_LTLIBRARIES = libstb-hal.la libstb_hal_la_SOURCES = SUBDIRS = common tools -#bin_PROGRAMS = libstb-hal-test libstb_hal_la_LIBADD = \ common/libcommon.la - +#bin_PROGRAMS = libstb-hal-test #libstb_hal_test_SOURCES = libtest.cpp #libstb_hal_test_LDADD = libstb-hal.la From 025afdf66c7d4e4a3fd64f83db9161fbced139b0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 18/26] move libeplayer3-sh4 code to libeplayer3-sh4 directory; ... rename library to libeplayer3_sh4.la Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/974a07b900fc5b46567561d2a838913c713f88db Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - move libeplayer3-sh4 code to libeplayer3-sh4 directory; ... rename library to libeplayer3_sh4.la ------------------ This commit was generated by Migit --- Makefile.am | 8 ++++---- configure.ac | 2 +- {libeplayer3 => libeplayer3-sh4}/Makefile.am | 6 +++--- {libeplayer3 => libeplayer3-sh4}/README | 0 {libeplayer3 => libeplayer3-sh4}/include/input.h | 0 {libeplayer3 => libeplayer3-sh4}/include/manager.h | 0 {libeplayer3 => libeplayer3-sh4}/include/misc.h | 0 {libeplayer3 => libeplayer3-sh4}/include/output.h | 0 {libeplayer3 => libeplayer3-sh4}/include/pes.h | 0 {libeplayer3 => libeplayer3-sh4}/include/player.h | 0 {libeplayer3 => libeplayer3-sh4}/include/writer.h | 0 {libeplayer3 => libeplayer3-sh4}/input.cpp | 0 {libeplayer3 => libeplayer3-sh4}/manager.cpp | 0 {libeplayer3 => libeplayer3-sh4}/output.cpp | 0 {libeplayer3 => libeplayer3-sh4}/player.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/aac.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/ac3.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/divx.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/dts.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/h263.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/h264.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/misc.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/mp3.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/mpeg2.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/pcm.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/pes.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/vc1.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/wmv.cpp | 0 {libeplayer3 => libeplayer3-sh4}/writer/writer.cpp | 0 29 files changed, 8 insertions(+), 8 deletions(-) rename {libeplayer3 => libeplayer3-sh4}/Makefile.am (84%) rename {libeplayer3 => libeplayer3-sh4}/README (100%) rename {libeplayer3 => libeplayer3-sh4}/include/input.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/manager.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/misc.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/output.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/pes.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/player.h (100%) rename {libeplayer3 => libeplayer3-sh4}/include/writer.h (100%) rename {libeplayer3 => libeplayer3-sh4}/input.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/manager.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/output.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/player.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/aac.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/ac3.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/divx.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/dts.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/h263.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/h264.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/misc.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/mp3.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/mpeg2.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/pcm.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/pes.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/vc1.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/wmv.cpp (100%) rename {libeplayer3 => libeplayer3-sh4}/writer/writer.cpp (100%) diff --git a/Makefile.am b/Makefile.am index e9edd85..c08f55e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,17 +35,17 @@ endif endif if BOXTYPE_SPARK #libstb_hal_test_LDADD += -lasound -SUBDIRS += libspark libeplayer3 +SUBDIRS += libspark libeplayer3-sh4 libstb_hal_la_LIBADD += \ libspark/libspark.la \ - libeplayer3/libeplayer3.la + libeplayer3-sh4/libeplayer3_sh4.la endif if BOXTYPE_DUCKBOX #libstb_hal_test_LDADD += -lasound -SUBDIRS += libduckbox libeplayer3 libdvbci +SUBDIRS += libduckbox libeplayer3-sh4 libdvbci libstb_hal_la_LIBADD += \ libduckbox/libduckbox.la \ - libeplayer3/libeplayer3.la \ + libeplayer3-sh4/libeplayer3_sh4.la \ libdvbci/libdvbci.la endif if BOXTYPE_ARMBOX diff --git a/configure.ac b/configure.ac index 60667e1..df30f91 100644 --- a/configure.ac +++ b/configure.ac @@ -93,8 +93,8 @@ libarmbox/Makefile libazbox/Makefile libduckbox/Makefile libdvbci/Makefile -libeplayer3/Makefile libeplayer3-arm/Makefile +libeplayer3-sh4/Makefile libgeneric-pc/Makefile libraspi/Makefile libspark/Makefile diff --git a/libeplayer3/Makefile.am b/libeplayer3-sh4/Makefile.am similarity index 84% rename from libeplayer3/Makefile.am rename to libeplayer3-sh4/Makefile.am index 814d106..d129566 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3-sh4/Makefile.am @@ -1,13 +1,13 @@ AUTOMAKE_OPTIONS = subdir-objects -noinst_LTLIBRARIES = libeplayer3.la +noinst_LTLIBRARIES = libeplayer3_sh4.la AM_CPPFLAGS = -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS AM_CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE AM_CPPFLAGS += -I$(srcdir)/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -libeplayer3_la_SOURCES = \ +libeplayer3_sh4_la_SOURCES = \ input.cpp output.cpp manager.cpp player.cpp \ writer/writer.cpp \ writer/pes.cpp \ @@ -18,6 +18,6 @@ libeplayer3_la_SOURCES = \ # writer/h264.cpp # writer/h263.cpp writer/vc1.cpp writer/pcm.cpp writer/aac.cpp -LIBEPLAYER3_LIBS = libeplayer3.la +LIBEPLAYER3_LIBS = libeplayer3_sh4.la # -lpthread -lavformat -lavcodec -lavutil -lswresample -lm diff --git a/libeplayer3/README b/libeplayer3-sh4/README similarity index 100% rename from libeplayer3/README rename to libeplayer3-sh4/README diff --git a/libeplayer3/include/input.h b/libeplayer3-sh4/include/input.h similarity index 100% rename from libeplayer3/include/input.h rename to libeplayer3-sh4/include/input.h diff --git a/libeplayer3/include/manager.h b/libeplayer3-sh4/include/manager.h similarity index 100% rename from libeplayer3/include/manager.h rename to libeplayer3-sh4/include/manager.h diff --git a/libeplayer3/include/misc.h b/libeplayer3-sh4/include/misc.h similarity index 100% rename from libeplayer3/include/misc.h rename to libeplayer3-sh4/include/misc.h diff --git a/libeplayer3/include/output.h b/libeplayer3-sh4/include/output.h similarity index 100% rename from libeplayer3/include/output.h rename to libeplayer3-sh4/include/output.h diff --git a/libeplayer3/include/pes.h b/libeplayer3-sh4/include/pes.h similarity index 100% rename from libeplayer3/include/pes.h rename to libeplayer3-sh4/include/pes.h diff --git a/libeplayer3/include/player.h b/libeplayer3-sh4/include/player.h similarity index 100% rename from libeplayer3/include/player.h rename to libeplayer3-sh4/include/player.h diff --git a/libeplayer3/include/writer.h b/libeplayer3-sh4/include/writer.h similarity index 100% rename from libeplayer3/include/writer.h rename to libeplayer3-sh4/include/writer.h diff --git a/libeplayer3/input.cpp b/libeplayer3-sh4/input.cpp similarity index 100% rename from libeplayer3/input.cpp rename to libeplayer3-sh4/input.cpp diff --git a/libeplayer3/manager.cpp b/libeplayer3-sh4/manager.cpp similarity index 100% rename from libeplayer3/manager.cpp rename to libeplayer3-sh4/manager.cpp diff --git a/libeplayer3/output.cpp b/libeplayer3-sh4/output.cpp similarity index 100% rename from libeplayer3/output.cpp rename to libeplayer3-sh4/output.cpp diff --git a/libeplayer3/player.cpp b/libeplayer3-sh4/player.cpp similarity index 100% rename from libeplayer3/player.cpp rename to libeplayer3-sh4/player.cpp diff --git a/libeplayer3/writer/aac.cpp b/libeplayer3-sh4/writer/aac.cpp similarity index 100% rename from libeplayer3/writer/aac.cpp rename to libeplayer3-sh4/writer/aac.cpp diff --git a/libeplayer3/writer/ac3.cpp b/libeplayer3-sh4/writer/ac3.cpp similarity index 100% rename from libeplayer3/writer/ac3.cpp rename to libeplayer3-sh4/writer/ac3.cpp diff --git a/libeplayer3/writer/divx.cpp b/libeplayer3-sh4/writer/divx.cpp similarity index 100% rename from libeplayer3/writer/divx.cpp rename to libeplayer3-sh4/writer/divx.cpp diff --git a/libeplayer3/writer/dts.cpp b/libeplayer3-sh4/writer/dts.cpp similarity index 100% rename from libeplayer3/writer/dts.cpp rename to libeplayer3-sh4/writer/dts.cpp diff --git a/libeplayer3/writer/h263.cpp b/libeplayer3-sh4/writer/h263.cpp similarity index 100% rename from libeplayer3/writer/h263.cpp rename to libeplayer3-sh4/writer/h263.cpp diff --git a/libeplayer3/writer/h264.cpp b/libeplayer3-sh4/writer/h264.cpp similarity index 100% rename from libeplayer3/writer/h264.cpp rename to libeplayer3-sh4/writer/h264.cpp diff --git a/libeplayer3/writer/misc.cpp b/libeplayer3-sh4/writer/misc.cpp similarity index 100% rename from libeplayer3/writer/misc.cpp rename to libeplayer3-sh4/writer/misc.cpp diff --git a/libeplayer3/writer/mp3.cpp b/libeplayer3-sh4/writer/mp3.cpp similarity index 100% rename from libeplayer3/writer/mp3.cpp rename to libeplayer3-sh4/writer/mp3.cpp diff --git a/libeplayer3/writer/mpeg2.cpp b/libeplayer3-sh4/writer/mpeg2.cpp similarity index 100% rename from libeplayer3/writer/mpeg2.cpp rename to libeplayer3-sh4/writer/mpeg2.cpp diff --git a/libeplayer3/writer/pcm.cpp b/libeplayer3-sh4/writer/pcm.cpp similarity index 100% rename from libeplayer3/writer/pcm.cpp rename to libeplayer3-sh4/writer/pcm.cpp diff --git a/libeplayer3/writer/pes.cpp b/libeplayer3-sh4/writer/pes.cpp similarity index 100% rename from libeplayer3/writer/pes.cpp rename to libeplayer3-sh4/writer/pes.cpp diff --git a/libeplayer3/writer/vc1.cpp b/libeplayer3-sh4/writer/vc1.cpp similarity index 100% rename from libeplayer3/writer/vc1.cpp rename to libeplayer3-sh4/writer/vc1.cpp diff --git a/libeplayer3/writer/wmv.cpp b/libeplayer3-sh4/writer/wmv.cpp similarity index 100% rename from libeplayer3/writer/wmv.cpp rename to libeplayer3-sh4/writer/wmv.cpp diff --git a/libeplayer3/writer/writer.cpp b/libeplayer3-sh4/writer/writer.cpp similarity index 100% rename from libeplayer3/writer/writer.cpp rename to libeplayer3-sh4/writer/writer.cpp From 99793f1362454126a30d995fc9e42853ae66eaea Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 19/26] align includes and Makefiles to directory changes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/52caa02ddce5b7c79675cec4c2bb1f568f147d5c Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - align includes and Makefiles to directory changes ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/audio_hal.h | 6 +++--- include/playback_hal.h | 8 ++++---- include/record_hal.h | 6 +++--- include/video_hal.h | 6 +++--- libduckbox/Makefile.am | 2 +- libspark/Makefile.am | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/audio_hal.h b/include/audio_hal.h index f45ea2d..6ea7a74 100644 --- a/include/audio_hal.h +++ b/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 diff --git a/include/playback_hal.h b/include/playback_hal.h index 690f4ab..e18cab2 100644 --- a/include/playback_hal.h +++ b/include/playback_hal.h @@ -12,15 +12,15 @@ #include "../libarmbox/playback_libeplayer3.h" #endif #elif HAVE_AZBOX_HARDWARE -#include "../azbox/playback_lib.h" +#include "../libazbox/playback_lib.h" #elif HAVE_GENERIC_HARDWARE #if BOXMODEL_RASPI -#include "../raspi/playback_lib.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_lib.h" +#include "../libgeneric-pc/playback_lib.h" #endif #endif #else diff --git a/include/record_hal.h b/include/record_hal.h index 40f50e6..a5b0fdf 100644 --- a/include/record_hal.h +++ b/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 diff --git a/include/video_hal.h b/include/video_hal.h index 0ea7d6c..8e30d4c 100644 --- a/include/video_hal.h +++ b/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 diff --git a/libduckbox/Makefile.am b/libduckbox/Makefile.am index 5b47cab..d636086 100644 --- a/libduckbox/Makefile.am +++ b/libduckbox/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libduckbox.la AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libeplayer3/include + -I$(top_srcdir)/libeplayer3-sh4/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing diff --git a/libspark/Makefile.am b/libspark/Makefile.am index 74f9837..50efca9 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libspark.la AM_CPPFLAGS = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/include \ - -I$(top_srcdir)/libeplayer3/include + -I$(top_srcdir)/libeplayer3-sh4/include AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = \ From a7d79f7b9f341ba9023fa52cd7f79368c65e4102 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 20/26] remove some more obsolete compatibility headers Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ff3d970af88724162360791f3016dfd2443bb097 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - remove some more obsolete compatibility headers ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libraspi/dmx.cpp | 2 +- libraspi/dmx_cs.h | 1 - libtriple/playback.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 libraspi/dmx_cs.h delete mode 100644 libtriple/playback.h diff --git a/libraspi/dmx.cpp b/libraspi/dmx.cpp index 0858a47..e09ecbc 100644 --- a/libraspi/dmx.cpp +++ b/libraspi/dmx.cpp @@ -32,7 +32,7 @@ #include #include #include -#include "dmx_hal.h" +#include "dmx_lib.h" #include "lt_debug.h" #include "video_lib.h" diff --git a/libraspi/dmx_cs.h b/libraspi/dmx_cs.h deleted file mode 100644 index 175d8cb..0000000 --- a/libraspi/dmx_cs.h +++ /dev/null @@ -1 +0,0 @@ -#include "dmx_lib.h" diff --git a/libtriple/playback.h b/libtriple/playback.h deleted file mode 100644 index 6e6b4c5..0000000 --- a/libtriple/playback.h +++ /dev/null @@ -1 +0,0 @@ -#include "playback_td.h" From cb0f746afecea4a6447bcf4d67da511f9d70a81a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 21/26] re-split ca.h/ca_ci.h for a better transparency Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b88cb3be6c9fb7ace01dd460999a1d5685cbdc6d Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - re-split ca.h/ca_ci.h for a better transparency ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 3 +- include/ca.h | 119 +++++++++++++++++++++++++++++++++++++++ include/ca_hal.h | 125 +---------------------------------------- libdvbci/dvbci_mmi.cpp | 2 +- 4 files changed, 124 insertions(+), 125 deletions(-) create mode 100644 include/ca.h diff --git a/Makefile.am b/Makefile.am index c08f55e..af6a81b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,9 +66,10 @@ endif pkginclude_HEADERS = \ include/audio_hal.h \ + include/ca.h \ + include/ca_ci.h \ include/ca_hal.h \ include/cs_api.h \ - include/ca_ci.h \ include/cs_types.h \ include/dmx_hal.h \ include/glfb.h \ diff --git a/include/ca.h b/include/ca.h new file mode 100644 index 0000000..d615f43 --- /dev/null +++ b/include/ca.h @@ -0,0 +1,119 @@ +#ifndef __ca__ +#define __ca__ + +#include +#include "cs_types.h" +#include +#include +typedef std::vector CaIdVector; +typedef std::vector::iterator CaIdVectorIterator; +typedef std::vector::const_iterator CaIdVectorConstIterator; + +enum CA_INIT_MASK { + CA_INIT_SC = 1, + CA_INIT_CI, + CA_INIT_BOTH +}; + +enum CA_SLOT_TYPE { + CA_SLOT_TYPE_SMARTCARD, + CA_SLOT_TYPE_CI, + CA_SLOT_TYPE_ALL +}; + +enum CA_MESSAGE_FLAGS { + CA_MESSAGE_EMPTY = (1 << 0), + CA_MESSAGE_HAS_PARAM1_DATA = (1 << 1), // Free after use! + CA_MESSAGE_HAS_PARAM1_INT = (1 << 2), + CA_MESSAGE_HAS_PARAM1_PTR = (1 << 3), + CA_MESSAGE_HAS_PARAM2_INT = (1 << 4), + CA_MESSAGE_HAS_PARAM2_PTR = (1 << 5), + CA_MESSAGE_HAS_PARAM2_DATA = (1 << 6), + CA_MESSAGE_HAS_PARAM3_DATA = (1 << 7), // Free after use! + CA_MESSAGE_HAS_PARAM3_INT = (1 << 8), + CA_MESSAGE_HAS_PARAM3_PTR = (1 << 9), + CA_MESSAGE_HAS_PARAM4_INT = (1 << 10), + CA_MESSAGE_HAS_PARAM4_PTR = (1 << 11), + CA_MESSAGE_HAS_PARAM4_DATA = (1 << 12), + CA_MESSAGE_HAS_PARAM5_INT = (1 << 13), + CA_MESSAGE_HAS_PARAM5_PTR = (1 << 14), + CA_MESSAGE_HAS_PARAM5_DATA = (1 << 15), + CA_MESSAGE_HAS_PARAM6_INT = (1 << 16), + CA_MESSAGE_HAS_PARAM6_PTR = (1 << 17), + CA_MESSAGE_HAS_PARAM6_DATA = (1 << 18), + CA_MESSAGE_HAS_PARAM1_LONG = (1 << 19), + CA_MESSAGE_HAS_PARAM2_LONG = (1 << 20), + CA_MESSAGE_HAS_PARAM3_LONG = (1 << 21), + CA_MESSAGE_HAS_PARAM4_LONG = (1 << 22) +}; + +enum CA_MESSAGE_MSGID { + CA_MESSAGE_MSG_INSERTED, + CA_MESSAGE_MSG_REMOVED, + CA_MESSAGE_MSG_INIT_OK, + CA_MESSAGE_MSG_INIT_FAILED, + CA_MESSAGE_MSG_MMI_MENU, + CA_MESSAGE_MSG_MMI_MENU_ENTER, + CA_MESSAGE_MSG_MMI_MENU_ANSWER, + CA_MESSAGE_MSG_MMI_LIST, + CA_MESSAGE_MSG_MMI_TEXT, + CA_MESSAGE_MSG_MMI_REQ_INPUT, + CA_MESSAGE_MSG_MMI_CLOSE, + CA_MESSAGE_MSG_INTERNAL, + CA_MESSAGE_MSG_PMT_ARRIVED, + CA_MESSAGE_MSG_CAPMT_ARRIVED, + CA_MESSAGE_MSG_CAT_ARRIVED, + CA_MESSAGE_MSG_ECM_ARRIVED, + CA_MESSAGE_MSG_EMM_ARRIVED, + CA_MESSAGE_MSG_CHANNEL_CHANGE, + CA_MESSAGE_MSG_GUI_READY, + CA_MESSAGE_MSG_EXIT +}; + +typedef std::set ca_map_t; +typedef ca_map_t::iterator ca_map_iterator_t; + +typedef struct CA_MESSAGE { + uint32_t MsgId; + enum CA_SLOT_TYPE SlotType; + int Slot; + uint32_t Flags; + union { + uint8_t *Data[4]; + uint32_t Param[4]; + void *Ptr[4]; + uint64_t ParamLong[4]; + } Msg; +} CA_MESSAGE; + +class cCA { +private: + cCA(void); +public: + uint32_t GetNumberCISlots(void); + uint32_t GetNumberSmartCardSlots(void); + static cCA *GetInstance(void); + bool SendPMT(int Unit, unsigned char *Data, int Len, CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL); +// bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/) { return true; }; + bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/, enum CA_SLOT_TYPE + /*SlotType*/, unsigned char /*scrambled = 0*/, ca_map_t /*camap = std::set()*/, int /*mode = 0*/, bool /*enabled = false*/) { return true; }; + bool SendMessage(const CA_MESSAGE *Msg); + void SetInitMask(enum CA_INIT_MASK InitMask); + int GetCAIDS(CaIdVector & /*Caids*/) { return 0; }; + bool Start(void); + void Stop(void); + void Ready(bool Set); + void ModuleReset(enum CA_SLOT_TYPE, uint32_t Slot); + bool ModulePresent(enum CA_SLOT_TYPE, uint32_t Slot); + void ModuleName(enum CA_SLOT_TYPE, uint32_t Slot, char *Name); + void MenuEnter(enum CA_SLOT_TYPE, uint32_t Slot); + void MenuAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint32_t choice); + void InputAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint8_t * Data, int Len); + void MenuClose(enum CA_SLOT_TYPE, uint32_t Slot); + void SetTSClock(u32 /*Speed*/) { return; }; + bool checkChannelID(u64 /*chanID*/) { return false; }; + void setCheckLiveSlot(int /*check*/) { return; }; + virtual ~cCA(); +}; + +#endif // __ca__ diff --git a/include/ca_hal.h b/include/ca_hal.h index 67796e3..09e964f 100644 --- a/include/ca_hal.h +++ b/include/ca_hal.h @@ -1,126 +1,5 @@ -/* - * dummy functions to implement ca_cs.h interface - */ #if HAVE_DUCKBOX_HARDWARE || HAVE_ARM_HARDWARE #include "ca_ci.h" #else -#ifndef __ca_hal__ -#define __ca_hal__ - -#include -#include "cs_types.h" -#include -#include -typedef std::vector CaIdVector; -typedef std::vector::iterator CaIdVectorIterator; -typedef std::vector::const_iterator CaIdVectorConstIterator; - -enum CA_INIT_MASK { - CA_INIT_SC = 1, - CA_INIT_CI, - CA_INIT_BOTH -}; - -enum CA_SLOT_TYPE { - CA_SLOT_TYPE_SMARTCARD, - CA_SLOT_TYPE_CI, - CA_SLOT_TYPE_ALL -}; - -enum CA_MESSAGE_FLAGS { - CA_MESSAGE_EMPTY = (1 << 0), - CA_MESSAGE_HAS_PARAM1_DATA = (1 << 1), // Free after use! - CA_MESSAGE_HAS_PARAM1_INT = (1 << 2), - CA_MESSAGE_HAS_PARAM1_PTR = (1 << 3), - CA_MESSAGE_HAS_PARAM2_INT = (1 << 4), - CA_MESSAGE_HAS_PARAM2_PTR = (1 << 5), - CA_MESSAGE_HAS_PARAM2_DATA = (1 << 6), - CA_MESSAGE_HAS_PARAM3_DATA = (1 << 7), // Free after use! - CA_MESSAGE_HAS_PARAM3_INT = (1 << 8), - CA_MESSAGE_HAS_PARAM3_PTR = (1 << 9), - CA_MESSAGE_HAS_PARAM4_INT = (1 << 10), - CA_MESSAGE_HAS_PARAM4_PTR = (1 << 11), - CA_MESSAGE_HAS_PARAM4_DATA = (1 << 12), - CA_MESSAGE_HAS_PARAM5_INT = (1 << 13), - CA_MESSAGE_HAS_PARAM5_PTR = (1 << 14), - CA_MESSAGE_HAS_PARAM5_DATA = (1 << 15), - CA_MESSAGE_HAS_PARAM6_INT = (1 << 16), - CA_MESSAGE_HAS_PARAM6_PTR = (1 << 17), - CA_MESSAGE_HAS_PARAM6_DATA = (1 << 18), - CA_MESSAGE_HAS_PARAM1_LONG = (1 << 19), - CA_MESSAGE_HAS_PARAM2_LONG = (1 << 20), - CA_MESSAGE_HAS_PARAM3_LONG = (1 << 21), - CA_MESSAGE_HAS_PARAM4_LONG = (1 << 22) -}; - -enum CA_MESSAGE_MSGID { - CA_MESSAGE_MSG_INSERTED, - CA_MESSAGE_MSG_REMOVED, - CA_MESSAGE_MSG_INIT_OK, - CA_MESSAGE_MSG_INIT_FAILED, - CA_MESSAGE_MSG_MMI_MENU, - CA_MESSAGE_MSG_MMI_MENU_ENTER, - CA_MESSAGE_MSG_MMI_MENU_ANSWER, - CA_MESSAGE_MSG_MMI_LIST, - CA_MESSAGE_MSG_MMI_TEXT, - CA_MESSAGE_MSG_MMI_REQ_INPUT, - CA_MESSAGE_MSG_MMI_CLOSE, - CA_MESSAGE_MSG_INTERNAL, - CA_MESSAGE_MSG_PMT_ARRIVED, - CA_MESSAGE_MSG_CAPMT_ARRIVED, - CA_MESSAGE_MSG_CAT_ARRIVED, - CA_MESSAGE_MSG_ECM_ARRIVED, - CA_MESSAGE_MSG_EMM_ARRIVED, - CA_MESSAGE_MSG_CHANNEL_CHANGE, - CA_MESSAGE_MSG_GUI_READY, - CA_MESSAGE_MSG_EXIT -}; - -typedef std::set ca_map_t; -typedef ca_map_t::iterator ca_map_iterator_t; - -typedef struct CA_MESSAGE { - uint32_t MsgId; - enum CA_SLOT_TYPE SlotType; - int Slot; - uint32_t Flags; - union { - uint8_t *Data[4]; - uint32_t Param[4]; - void *Ptr[4]; - uint64_t ParamLong[4]; - } Msg; -} CA_MESSAGE; - -class cCA { -private: - cCA(void); -public: - uint32_t GetNumberCISlots(void); - uint32_t GetNumberSmartCardSlots(void); - static cCA *GetInstance(void); - bool SendPMT(int Unit, unsigned char *Data, int Len, CA_SLOT_TYPE SlotType = CA_SLOT_TYPE_ALL); -// bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/) { return true; }; - bool SendCAPMT(u64 /*Source*/, u8 /*DemuxSource*/, u8 /*DemuxMask*/, const unsigned char * /*CAPMT*/, u32 /*CAPMTLen*/, const unsigned char * /*RawPMT*/, u32 /*RawPMTLen*/, enum CA_SLOT_TYPE - /*SlotType*/, unsigned char /*scrambled = 0*/, ca_map_t /*camap = std::set()*/, int /*mode = 0*/, bool /*enabled = false*/) { return true; }; - bool SendMessage(const CA_MESSAGE *Msg); - void SetInitMask(enum CA_INIT_MASK InitMask); - int GetCAIDS(CaIdVector & /*Caids*/) { return 0; }; - bool Start(void); - void Stop(void); - void Ready(bool Set); - void ModuleReset(enum CA_SLOT_TYPE, uint32_t Slot); - bool ModulePresent(enum CA_SLOT_TYPE, uint32_t Slot); - void ModuleName(enum CA_SLOT_TYPE, uint32_t Slot, char *Name); - void MenuEnter(enum CA_SLOT_TYPE, uint32_t Slot); - void MenuAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint32_t choice); - void InputAnswer(enum CA_SLOT_TYPE, uint32_t Slot, uint8_t * Data, int Len); - void MenuClose(enum CA_SLOT_TYPE, uint32_t Slot); - void SetTSClock(u32 /*Speed*/) { return; }; - bool checkChannelID(u64 /*chanID*/) { return false; }; - void setCheckLiveSlot(int /*check*/) { return; }; - virtual ~cCA(); -}; - -#endif // __ca_hal__ -#endif // HAVE_DUCKBOX_HARDWARE +#include "ca.h" +#endif diff --git a/libdvbci/dvbci_mmi.cpp b/libdvbci/dvbci_mmi.cpp index 2bd1928..5c87c09 100644 --- a/libdvbci/dvbci_mmi.cpp +++ b/libdvbci/dvbci_mmi.cpp @@ -5,7 +5,7 @@ #include #include "dvbci_mmi.h" -#include +#include eDVBCIMMISession::eDVBCIMMISession(eDVBCISlot *tslot) { From ca04aab7ff94ffe0f5c5ae3988cc07c49910ed62 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 22/26] fix one missing change Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/d5bbe298ac238a7a20d2d4322a5960944b7c4241 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - fix one missing change ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index af6a81b..cc4793a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,7 @@ libstb_hal_la_LIBADD += \ else SUBDIRS += libgeneric-pc libstb_hal_la_LIBADD += \ - generic-pc/libgeneric.la + libgeneric-pc/libgeneric.la endif endif if BOXTYPE_SPARK From f79b538ce90dc722a1d6786ebeae403f82ec1098 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 23:20:35 +0100 Subject: [PATCH 23/26] libraspi: fix links to libgeneric-pc directory Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/fb16af600b5f047872a4f7da0bce4c227f9a5900 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - libraspi: fix links to libgeneric-pc directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libraspi/playback.cpp | 2 +- libraspi/playback_lib.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraspi/playback.cpp b/libraspi/playback.cpp index d2e1498..1d16e59 120000 --- a/libraspi/playback.cpp +++ b/libraspi/playback.cpp @@ -1 +1 @@ -../generic-pc/playback.cpp \ No newline at end of file +../libgeneric-pc/playback.cpp \ No newline at end of file diff --git a/libraspi/playback_lib.h b/libraspi/playback_lib.h index 5738cee..d6dd7e5 120000 --- a/libraspi/playback_lib.h +++ b/libraspi/playback_lib.h @@ -1 +1 @@ -../generic-pc/playback_lib.h \ No newline at end of file +../libgeneric-pc/playback_lib.h \ No newline at end of file From 9303c5f2aa77e7038f41a915d2cf5cd464a32b28 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 23 Dec 2018 22:33:56 +0100 Subject: [PATCH 24/26] rename init_td.h => init.h Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/4390d8395ae21b469b618865591f0ad6f33dc505 Author: vanhofen Date: 2018-12-23 (Sun, 23 Dec 2018) Origin message was: ------------------ - rename init_td.h => init.h ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- Makefile.am | 2 +- include/cs_api.h | 2 +- include/init.h | 5 +++++ include/init_td.h | 5 ----- libarmbox/init.cpp | 2 +- libazbox/init.cpp | 2 +- libduckbox/init.cpp | 2 +- libgeneric-pc/init.cpp | 2 +- libraspi/init.cpp | 2 +- libspark/init.cpp | 2 +- libtest.cpp | 2 +- libtriple/init_td.cpp | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 include/init.h delete mode 100644 include/init_td.h diff --git a/Makefile.am b/Makefile.am index cc4793a..cd5fab2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,7 @@ pkginclude_HEADERS = \ include/dmx_hal.h \ include/glfb.h \ include/hardware_caps.h \ - include/init_td.h \ + include/init.h \ include/mmi.h \ include/playback_hal.h \ include/pwrmngr.h \ diff --git a/include/cs_api.h b/include/cs_api.h index 38ecf2c..05b0c9f 100644 --- a/include/cs_api.h +++ b/include/cs_api.h @@ -4,7 +4,7 @@ #ifndef __CS_API_H_ #define __CS_API_H_ -#include "init_td.h" +#include "init.h" #include typedef void (*cs_messenger) (unsigned int msg, unsigned int data); diff --git a/include/init.h b/include/init.h new file mode 100644 index 0000000..7ae0577 --- /dev/null +++ b/include/init.h @@ -0,0 +1,5 @@ +#ifndef __init__ +#define __init__ +void init_td_api(); +void shutdown_td_api(); +#endif // __init__ diff --git a/include/init_td.h b/include/init_td.h deleted file mode 100644 index d9a6f09..0000000 --- a/include/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/libarmbox/init.cpp b/libarmbox/init.cpp index f7374d1..682bf1c 100644 --- a/libarmbox/init.cpp +++ b/libarmbox/init.cpp @@ -8,7 +8,7 @@ #include #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include diff --git a/libazbox/init.cpp b/libazbox/init.cpp index 2029b4f..7c930f1 100644 --- a/libazbox/init.cpp +++ b/libazbox/init.cpp @@ -1,6 +1,6 @@ #include -#include "init_td.h" +#include "init.h" #include "lt_debug.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/libduckbox/init.cpp b/libduckbox/init.cpp index f429afe..3abc241 100644 --- a/libduckbox/init.cpp +++ b/libduckbox/init.cpp @@ -10,7 +10,7 @@ #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include "lt_debug.h" diff --git a/libgeneric-pc/init.cpp b/libgeneric-pc/init.cpp index fa2a01c..6a8d89e 100644 --- a/libgeneric-pc/init.cpp +++ b/libgeneric-pc/init.cpp @@ -2,7 +2,7 @@ #include #include -#include "init_td.h" +#include "init.h" #include "glfb.h" #include "lt_debug.h" diff --git a/libraspi/init.cpp b/libraspi/init.cpp index 47f6d9e..20809c6 100644 --- a/libraspi/init.cpp +++ b/libraspi/init.cpp @@ -34,7 +34,7 @@ #include #include -#include "init_td.h" +#include "init.h" #include "lt_debug.h" #include "glfb.h" #define lt_debug(args...) _lt_debug(TRIPLE_DEBUG_INIT, NULL, args) diff --git a/libspark/init.cpp b/libspark/init.cpp index cea952f..0c3e92a 100644 --- a/libspark/init.cpp +++ b/libspark/init.cpp @@ -13,7 +13,7 @@ #include -#include "init_td.h" +#include "init.h" #include "pwrmngr.h" #include "lt_debug.h" diff --git a/libtest.cpp b/libtest.cpp index b66024b..d8ecce4 100644 --- a/libtest.cpp +++ b/libtest.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #if HAVE_GENERIC_HARDWARE #include diff --git a/libtriple/init_td.cpp b/libtriple/init_td.cpp index 8015839..4500400 100644 --- a/libtriple/init_td.cpp +++ b/libtriple/init_td.cpp @@ -1,6 +1,6 @@ #include -#include "init_td.h" +#include "init.h" #include #include #include From 6f76e14dbebe6d2811d59607966010117aaaba46 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Tue, 25 Dec 2018 00:57:24 +0100 Subject: [PATCH 25/26] fix merge Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/3eed45f7b1d4595b4727729465db68e22605eae7 Author: Frankenstone 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/hardware_caps.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/hardware_caps.h b/include/hardware_caps.h index 44a11a9..3a553ca 100644 --- a/include/hardware_caps.h +++ b/include/hardware_caps.h @@ -40,7 +40,6 @@ typedef struct hw_caps int display_can_deepstandby; int display_has_statusline; int has_button_timer; - int has_button_vformat; char boxvendor[64]; char boxname[64]; char boxarch[64]; From 3dbb20bebfc7296f140d3682b9105a9283e4497c Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 25 Dec 2018 05:29:24 +0100 Subject: [PATCH 26/26] vusolo4k tuner fix Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ba118e1c90e3473224836387ca5065593c1f6c90 Author: BPanther Date: 2018-12-25 (Tue, 25 Dec 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/dmx.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index 400303f..1c7ea42 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -71,9 +71,17 @@ static const char *DMX_T[] = { /* this is the number of different cDemux() units, not the number of * /dev/dvb/.../demuxX devices! */ +#if BOXMODEL_VUSOLO4K +#define NUM_DEMUX 16 +#else #define NUM_DEMUX 4 +#endif /* the current source of each cDemux unit */ +#if BOXMODEL_VUSOLO4K +static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; +#else static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0 }; +#endif /* map the device numbers. */ #if BOXMODEL_VUSOLO4K