mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 22:47:51 +00:00
Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv
This commit is contained in:
commit
f63803169f
@ -1,31 +0,0 @@
|
||||
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
|
||||
index 315809d..54dff7c 100644
|
||||
--- a/drivers/media/dvb-frontends/m88ds3103.c
|
||||
+++ b/drivers/media/dvb-frontends/m88ds3103.c
|
||||
@@ -1244,6 +1244,8 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
||||
dprintk("symbol rate = %d\n", c->symbol_rate);
|
||||
dprintk("delivery system = %d\n", c->delivery_system);
|
||||
|
||||
+ state->delivery_system = c->delivery_system;
|
||||
+
|
||||
realFreq = c->frequency;
|
||||
lpf_offset_KHz = 0;
|
||||
if(c->symbol_rate < 5000000){
|
||||
@@ -1501,7 +1503,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
||||
}
|
||||
msleep(20);
|
||||
}
|
||||
-
|
||||
+/*
|
||||
if((status & FE_HAS_LOCK) == 0){
|
||||
state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS;
|
||||
m88ds3103_demod_connect(fe, offset_khz);
|
||||
@@ -1514,7 +1516,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
||||
msleep(20);
|
||||
}
|
||||
}
|
||||
-
|
||||
+*/
|
||||
if (status & FE_HAS_LOCK){
|
||||
if(state->config->ci_mode == 2)
|
||||
m88ds3103_set_clock_ratio(state);
|
@ -27,7 +27,7 @@ if [ "$(id -u)" != "0" ]; then
|
||||
clear
|
||||
echo "#########################################################"
|
||||
echo "# please execute with 'sudo' or -DANGEROUS!!!- as root #"
|
||||
echo "# example: sudo ./create_livestick <drive> #"
|
||||
echo "# example: sudo ./create_livestick <drive> #"
|
||||
echo "#########################################################"
|
||||
exit 1
|
||||
fi
|
||||
@ -36,7 +36,7 @@ if [ -z "$1" ]; then
|
||||
clear
|
||||
echo "#########################################################"
|
||||
echo "# please execute with your drive as option #"
|
||||
echo "# example: sudo ./create_livestick /dev/sdb #"
|
||||
echo "# example: sudo ./create_livestick /dev/sdb #"
|
||||
echo "#########################################################"
|
||||
exit 1
|
||||
fi
|
||||
@ -71,7 +71,7 @@ echo "#########################################################"
|
||||
echo "# #"
|
||||
echo "# OpenELEC missing tool - Installation will quit #"
|
||||
echo "# #"
|
||||
echo "# We can't find the required tool \"syslinux\" #"
|
||||
echo "# We can't find the required tool \"syslinux\" #"
|
||||
echo "# on your system. #"
|
||||
echo "# Please install it via your package manager. #"
|
||||
echo "# #"
|
||||
@ -87,11 +87,11 @@ echo "#########################################################"
|
||||
echo "# #"
|
||||
echo "# OpenELEC missing tool - Installation will quit #"
|
||||
echo "# #"
|
||||
echo "# We can't find the required tool \"mcopy\" #"
|
||||
echo "# We can't find the required tool \"mcopy\" #"
|
||||
echo "# on your system. #"
|
||||
echo "# Please install it via your package manager. #"
|
||||
echo "# NOTE: Some distributions call this package #"
|
||||
echo "# \"mtools\". #"
|
||||
echo "# \"mtools\". #"
|
||||
echo "# #"
|
||||
echo "#########################################################"
|
||||
exit 1
|
||||
@ -105,7 +105,7 @@ echo "#########################################################"
|
||||
echo "# #"
|
||||
echo "# OpenELEC missing tool - Installation will quit #"
|
||||
echo "# #"
|
||||
echo "# We can't find the required tool \"parted\" #"
|
||||
echo "# We can't find the required tool \"parted\" #"
|
||||
echo "# on your system. #"
|
||||
echo "# Please install it via your package manager. #"
|
||||
echo "# #"
|
||||
@ -121,7 +121,7 @@ echo "#########################################################"
|
||||
echo "# #"
|
||||
echo "# OpenELEC.tv missing tool - Installation will quit #"
|
||||
echo "# #"
|
||||
echo "# We can't find the required tool \"mkfs.vfat\" #"
|
||||
echo "# We can't find the required tool \"mkfs.vfat\" #"
|
||||
echo "# on your system. #"
|
||||
echo "# Please install it via your package manager. #"
|
||||
echo "# #"
|
||||
|
Loading…
x
Reference in New Issue
Block a user