80 replies to this topic

[Erik Slagter]

The enigma2 bbappend is modified with two new patches (why they would want to patch their own source code is beyond me, but ok), but neither of them are included in that commit. 

I see the patches, no problem.

 

But it's all about adding a new delsys DVBS2X, which is not really recquired and also not supported by DVB4Linux. The tuners will work anyway because of the blindscan-auto-FEC.

 

It's exactly like Athoik says, if they have implemented the PLS/multistream api, we're fine.

 

So I am very interested to know if someone actually does have one of the "new" tuners and can test this.

Edited by Erik Slagter, 22 June 2018 - 11:11.

[Rob van der Does]

In 'About' the S2x-tuner should be announced as "45308X" (= FBC  DVB-S2x). 

Since mid-May the receivers delivered by VU+ are having this tuner embedded, but be aware for old stock from resellers.

[willy01]

Here screens from my Uno 4K SE

Attached Files

•  2.jpg   109.71KB   9 downloads
•  1.jpg   139.38KB   10 downloads

[Rob van der Does]

Well, that's clearly the new S2x-compatible FBC-tuner.

[Erik Slagter]

But I don't see multistream capability, without that they're useless to me.

[Rob van der Does]

But I don't see multistream capability, without that they're useless to me.

But it does in VTi, so something must be missing/wrong in PLi.

[littlesat]

Yep VTi the closed source image based on VUs manufacturers image... Hopefully VU did implement it in the default way we already have for the other boxes....

And when the manufacturers image still doesn't have it (I do not see a relevant commit made recently here http://code.vuplus.c...php?action=repo) then it is embeded in VTi's secret license voilanting code

Edited by littlesat, 22 June 2018 - 15:25.

[willy01]

where do you see it in vti ?

[littlesat]

It might a commit on VUs code from 28-Feb-2018.... I have no idea if they made it other boxes compatible....

 

When it is compatible we need a way to enable it... When it is not compatible we need to communicate this to VU...

 

author hschang <chang@dev3> 2018-02-28 07:04:44 (GMT)
committer hschang <chang@dev3> 2018-02-28 07:04:44 (GMT)
commit e79f10463a103a1e9e27e74d084082053d140fb3 (patch)
tree b9daa5a045d92c9c5b23bb18c4c7cc3901b2f9d6
parent 14e4460c8f8ca6f413e657847b4ed977a970935f (diff)
Support DVB-S2X for uno4k, ultimo4k, uno4kse.
Diffstat
-rw-r--r-- meta-bsp/recipes-kernel/linux-libc-headers/files/linux_3_1x_dvbs2x.patch 81 
-rw-r--r-- meta-bsp/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb 6 
-rw-r--r-- meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc 1 
-rw-r--r-- meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28/linux_3_1x_dvbs2x.patch 81 
-rw-r--r-- meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb 2 
-rw-r--r-- meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend 2 
-rw-r--r-- meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb 2 
7 files changed, 170 insertions, 5 deletions
diff --git a/meta-bsp/recipes-kernel/linux-libc-headers/files/linux_3_1x_dvbs2x.patch b/meta-bsp/recipes-kernel/linux-libc-headers/files/linux_3_1x_dvbs2x.patch
new file mode 100644
index 0000000..0933dc6
--- /dev/null
+++ b/meta-bsp/recipes-kernel/linux-libc-headers/files/linux_3_1x_dvbs2x.patch
@@ -0,0 +1,81 @@
+diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
+index 1f925e8..57ed889 100644
+--- a/drivers/media/dvb-core/dvb_frontend.c
++++ b/drivers/media/dvb-core/dvb_frontend.c
+@@ -170,6 +170,7 @@ static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system)
+  return DVBV3_QAM;
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  case SYS_ISDBS:
+  case SYS_DSS:
+@@ -893,6 +894,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  case SYS_DVBC_ANNEX_A:
+  case SYS_DVBC_ANNEX_C:
+@@ -959,6 +961,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  c->modulation = QPSK;   /* implied for DVB-S in legacy API */
+  c->rolloff = ROLLOFF_35;/* implied for DVB-S */
+@@ -2102,6 +2105,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_ISDBS:
+  case SYS_TURBO:
+  case SYS_DVBC_ANNEX_A:
+diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
+index c56d77c..5aebaa9 100644
+--- a/include/uapi/linux/dvb/frontend.h
++++ b/include/uapi/linux/dvb/frontend.h
+@@ -165,6 +165,24 @@ typedef enum fe_code_rate {
+  FEC_3_5,
+  FEC_9_10,
+  FEC_2_5,
++ FEC_13_45=13,
++ FEC_9_20=14,
++ FEC_11_20=15,
++ FEC_23_36=16,
++ FEC_25_36=17,
++ FEC_13_18=18,
++ FEC_26_45=19,
++ FEC_28_45=20,
++ FEC_7_9=21,
++ FEC_77_90=22,
++ FEC_32_45=23,
++ FEC_11_15=24,
++ FEC_1_2_L=25,
++ FEC_8_15_L=26,
++ FEC_3_5_L=27,
++ FEC_2_3_L=28,
++ FEC_5_9_L=29,
++ FEC_26_45_L=30
+ } fe_code_rate_t;
+ 
+ 
+@@ -183,6 +201,7 @@ typedef enum fe_modulation {
+  APSK_32,
+  DQPSK,
+  QAM_4_NR,
++ APSK_8,
+ } fe_modulation_t;
+ 
+ typedef enum fe_transmit_mode {
+@@ -410,6 +429,7 @@ typedef enum fe_delivery_system {
+  SYS_DVBT2,
+  SYS_TURBO,
+  SYS_DVBC_ANNEX_C,
++ SYS_DVBS2X = 21,
+ } fe_delivery_system_t;
+ 
+ /* backward compatibility */
diff --git a/meta-bsp/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb b/meta-bsp/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb
index 62755c8..813bf8b 100644
--- a/meta-bsp/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb
+++ b/meta-bsp/recipes-kernel/linux-libc-headers/linux-libc-headers_3.19.bb
@@ -1,9 +1,13 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
 
-PR .= "-bsp2"
+PR .= "-bsp3"
 
 require linux-libc-headers.inc
 
+SRC_URI += " \
+ file://linux_3_1x_dvbs2x.patch \
+"
+
 SRC_URI_append_vuultimo4k = " \
  file://linux_3.19_dmx_source_dvr.patch \
 "
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
index 147559e..cd15209 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28.inc
@@ -20,6 +20,7 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.14-1.8.tar.bz2
  file://linux_rpmb_not_alloc.patch \
  file://rt2800usb_fix_warn_tx_status_timeout_to_dbg.patch \
  file://usb_core_hub_msleep.patch \
+ file://linux_3_1x_dvbs2x.patch \
  "
 
 SRC_URI += "${@base_contains("VUPLUS_FEATURES", "dvbproxy", "file://linux_dvb_adapter.patch;patch=1;pnum=1", "", d)}"
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28/linux_3_1x_dvbs2x.patch b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28/linux_3_1x_dvbs2x.patch
new file mode 100644
index 0000000..0933dc6
--- /dev/null
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-3.14.28/linux_3_1x_dvbs2x.patch
@@ -0,0 +1,81 @@
+diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
+index 1f925e8..57ed889 100644
+--- a/drivers/media/dvb-core/dvb_frontend.c
++++ b/drivers/media/dvb-core/dvb_frontend.c
+@@ -170,6 +170,7 @@ static enum dvbv3_emulation_type dvbv3_type(u32 delivery_system)
+  return DVBV3_QAM;
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  case SYS_ISDBS:
+  case SYS_DSS:
+@@ -893,6 +894,7 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  case SYS_DVBC_ANNEX_A:
+  case SYS_DVBC_ANNEX_C:
+@@ -959,6 +961,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_TURBO:
+  c->modulation = QPSK;   /* implied for DVB-S in legacy API */
+  c->rolloff = ROLLOFF_35;/* implied for DVB-S */
+@@ -2102,6 +2105,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
+  switch (c->delivery_system) {
+  case SYS_DVBS:
+  case SYS_DVBS2:
++ case SYS_DVBS2X:
+  case SYS_ISDBS:
+  case SYS_TURBO:
+  case SYS_DVBC_ANNEX_A:
+diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
+index c56d77c..5aebaa9 100644
+--- a/include/uapi/linux/dvb/frontend.h
++++ b/include/uapi/linux/dvb/frontend.h
+@@ -165,6 +165,24 @@ typedef enum fe_code_rate {
+  FEC_3_5,
+  FEC_9_10,
+  FEC_2_5,
++ FEC_13_45=13,
++ FEC_9_20=14,
++ FEC_11_20=15,
++ FEC_23_36=16,
++ FEC_25_36=17,
++ FEC_13_18=18,
++ FEC_26_45=19,
++ FEC_28_45=20,
++ FEC_7_9=21,
++ FEC_77_90=22,
++ FEC_32_45=23,
++ FEC_11_15=24,
++ FEC_1_2_L=25,
++ FEC_8_15_L=26,
++ FEC_3_5_L=27,
++ FEC_2_3_L=28,
++ FEC_5_9_L=29,
++ FEC_26_45_L=30
+ } fe_code_rate_t;
+ 
+ 
+@@ -183,6 +201,7 @@ typedef enum fe_modulation {
+  APSK_32,
+  DQPSK,
+  QAM_4_NR,
++ APSK_8,
+ } fe_modulation_t;
+ 
+ typedef enum fe_transmit_mode {
+@@ -410,6 +429,7 @@ typedef enum fe_delivery_system {
+  SYS_DVBT2,
+  SYS_TURBO,
+  SYS_DVBC_ANNEX_C,
++ SYS_DVBS2X = 21,
+ } fe_delivery_system_t;
+ 
+ /* backward compatibility */
diff --git a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
index c67c3c0..f03970f 100644
--- a/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
+++ b/meta-bsp/recipes-kernel/linux/linux-vuplus-vuultimo4k_3.14.28.bb
@@ -2,7 +2,7 @@ require linux-vuplus-3.14.28.inc
 
 COMPATIBLE_MACHINE = "^(vuultimo4k)$"
 
-PR = "${INC_PR}.10"
+PR = "${INC_PR}.11"
 
 SRC_URI = "http://archive.vuplus.com/download/kernel/stblinux-3.14-1.12.tar.bz2 \
     file://${KERNEL_CONFIG} \
diff --git a/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend b/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
index da39894..393826a 100644
--- a/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
+++ b/meta-bsp/recipes-vuplus/enigma2/enigma2.bbappend
@@ -54,8 +54,6 @@ SRC_URI_append_vuuno4kse = " \
 SRC_URI_append_vuzero4k = " \
  file://vu_hd_1080p_default.patch \
  file://enigma2_vuplus_uianimation_speed.patch \
- file://enigma2_vuplus_dvbs2x.patch \
- file://enigma2_vuplus_mis_pls.patch \
  file://enigma2_vuplus_zero4k_blindscan.patch \
 "
 
diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 4df7f86..f7b15d2 100644
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -233,7 +233,7 @@ DEPENDS += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libgles libvugle
 RDEPENDS_${PN}_append_vuplus += "${@base_contains("VUPLUS_FEATURES", "uianimation", "libvugles2" , "", d)}"
 
 PN = "enigma2"
-PR = "r175"
+PR = "r176"

Edited by littlesat, 22 June 2018 - 15:37.

[littlesat]

But it looks like they are patching the kernel + enigma2 with separate patch files, which looks a bit strange...

Edited by littlesat, 22 June 2018 - 15:40.

[athoik]

Just for testing return true here: https://github.com/O...Manager.py#L589

[willy01]

set to "false"

[athoik]

set to "false"

No return True!

[willy01]

can´t understand it, what should i change in the py

[athoik]

Change return multistream to return True.

Edited by athoik, 22 June 2018 - 16:23.

[willy01]

sorry, but you mean?

		if not multistream and "TBS" in self.description:
			multistream = True
		return True

[athoik]

Yes, that's right.

[willy01]

nothing is change in the Info

Attached Files

•  1.jpg   139.38KB   5 downloads

[littlesat]

The info will not change... the s2x features will be enabled.... If this works we need a 'small' work-a-round or better VU needs to add something so E2 knows it is a capable tuner...

[willy01]

can´t test it, only 19,2 here