vanhofen
6 years ago
23 changed files with 8598 additions and 36 deletions
File diff suppressed because it is too large
File diff suppressed because it is too large
@ -0,0 +1,13 @@ |
|||||
|
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
|
||||
|
index b4fb650..1073007 100644
|
||||
|
--- a/include/uapi/linux/dvb/dmx.h
|
||||
|
+++ b/include/uapi/linux/dvb/dmx.h
|
||||
|
@@ -127,7 +127,7 @@ typedef enum {
|
||||
|
DMX_SOURCE_FRONT1, |
||||
|
DMX_SOURCE_FRONT2, |
||||
|
DMX_SOURCE_FRONT3, |
||||
|
- DMX_SOURCE_DVR0 = 16,
|
||||
|
+ DMX_SOURCE_DVR0 = 32,
|
||||
|
DMX_SOURCE_DVR1, |
||||
|
DMX_SOURCE_DVR2, |
||||
|
DMX_SOURCE_DVR3 |
||||
@ -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 */ |
||||
@ -0,0 +1,13 @@ |
|||||
|
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
|
||||
|
index b4fb650..1073007 100644
|
||||
|
--- a/include/uapi/linux/dvb/dmx.h
|
||||
|
+++ b/include/uapi/linux/dvb/dmx.h
|
||||
|
@@ -127,7 +127,7 @@ typedef enum {
|
||||
|
DMX_SOURCE_FRONT1, |
||||
|
DMX_SOURCE_FRONT2, |
||||
|
DMX_SOURCE_FRONT3, |
||||
|
- DMX_SOURCE_DVR0 = 16,
|
||||
|
+ DMX_SOURCE_DVR0 = 32,
|
||||
|
DMX_SOURCE_DVR1, |
||||
|
DMX_SOURCE_DVR2, |
||||
|
DMX_SOURCE_DVR3 |
||||
@ -0,0 +1,44 @@ |
|||||
|
#!/bin/sh |
||||
|
|
||||
|
if [ -e /sys/class/net/sys0 ]; then |
||||
|
ifconfig sys0 up |
||||
|
fi |
||||
|
|
||||
|
case "$1" in |
||||
|
start) |
||||
|
# first boot? |
||||
|
[ -f /etc/dropbear/dropbear_rsa_host_key ] |
||||
|
echo -n "Starting vuplus-platform-util" |
||||
|
if [ ! -e /dev/brcm0 ]; then |
||||
|
DRV_PATH=/lib/modules/`uname -r`/extra |
||||
|
insmod $DRV_PATH/procmk.ko |
||||
|
insmod $DRV_PATH/bcm_event.ko |
||||
|
insmod $DRV_PATH/dvb_base.ko |
||||
|
|
||||
|
start-stop-daemon --start --quiet --exec /usr/bin/dvb_server -- & |
||||
|
|
||||
|
mknod -m a=rw /dev/brcm0 c 30 0 |
||||
|
|
||||
|
start-stop-daemon --start --quiet --exec /usr/bin/init_client $DRV_PATH/dvb-bcm7252s.ko $DRV_PATH/brcmfb.ko -- & |
||||
|
fi |
||||
|
|
||||
|
while [ ! -c /dev/fb0 ]; do |
||||
|
usleep 100000 |
||||
|
done |
||||
|
|
||||
|
if [ -e /usr/bin/initfb ]; then |
||||
|
/usr/bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) |
||||
|
fi |
||||
|
|
||||
|
echo "." |
||||
|
;; |
||||
|
stop) |
||||
|
;; |
||||
|
restart) |
||||
|
;; |
||||
|
*) |
||||
|
echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" |
||||
|
exit 1 |
||||
|
esac |
||||
|
|
||||
|
exit 0 |
||||
@ -0,0 +1,44 @@ |
|||||
|
#!/bin/sh |
||||
|
|
||||
|
if [ -e /sys/class/net/sys0 ]; then |
||||
|
ifconfig sys0 up |
||||
|
fi |
||||
|
|
||||
|
case "$1" in |
||||
|
start) |
||||
|
# first boot? |
||||
|
[ -f /etc/dropbear/dropbear_rsa_host_key ] |
||||
|
echo -n "Starting vuplus-platform-util" |
||||
|
if [ ! -e /dev/brcm0 ]; then |
||||
|
DRV_PATH=/lib/modules/`uname -r`/extra |
||||
|
insmod $DRV_PATH/procmk.ko |
||||
|
insmod $DRV_PATH/bcm_event.ko |
||||
|
insmod $DRV_PATH/dvb_base.ko |
||||
|
|
||||
|
start-stop-daemon --start --quiet --exec /usr/bin/dvb_server -- & |
||||
|
|
||||
|
mknod -m a=rw /dev/brcm0 c 30 0 |
||||
|
|
||||
|
start-stop-daemon --start --quiet --exec /usr/bin/init_client $DRV_PATH/dvb-bcm7252sse.ko $DRV_PATH/brcmfb.ko -- & |
||||
|
fi |
||||
|
|
||||
|
while [ ! -c /dev/fb0 ]; do |
||||
|
usleep 100000 |
||||
|
done |
||||
|
|
||||
|
if [ -e /usr/bin/initfb ]; then |
||||
|
/usr/bin/initfb $(sed -n 's/osd_resolution=//p' /var/tuxbox/config/neutrino.conf) |
||||
|
fi |
||||
|
|
||||
|
echo "." |
||||
|
;; |
||||
|
stop) |
||||
|
;; |
||||
|
restart) |
||||
|
;; |
||||
|
*) |
||||
|
echo "Usage: /etc/init.d/vuplus-platform-util {start|stop|restart}" |
||||
|
exit 1 |
||||
|
esac |
||||
|
|
||||
|
exit 0 |
||||
Loading…
Reference in new issue