dtv_demod: modified dtv demod
authorJihong Sui <jihong.sui@amlogic.com>
Thu, 10 May 2018 11:18:01 +0000 (19:18 +0800)
committernengwen.chen <nengwen.chen@amlogic.com>
Mon, 14 May 2018 06:16:55 +0000 (14:16 +0800)
PD#165971: dtv_demod: modified dtv demod

1. change folder name(amldemod ->dtv_demod);
2. set status 0 when not support;

Change-Id: I96c23b0b333ee0967d5013ebc8915fdffa097433
Signed-off-by: Jihong Sui <jihong.sui@amlogic.com>
29 files changed:
MAINTAINERS
drivers/amlogic/media/Kconfig
drivers/amlogic/media/Makefile
drivers/amlogic/media/dtv_demod/Kconfig [moved from drivers/amlogic/media/amldemod/Kconfig with 100% similarity]
drivers/amlogic/media/dtv_demod/Makefile [moved from drivers/amlogic/media/amldemod/Makefile with 89% similarity]
drivers/amlogic/media/dtv_demod/aml_demod.c [moved from drivers/amlogic/media/amldemod/aml_demod.c with 99% similarity]
drivers/amlogic/media/dtv_demod/amlfrontend.c [moved from drivers/amlogic/media/amldemod/amlfrontend.c with 99% similarity]
drivers/amlogic/media/dtv_demod/atsc_func.c [moved from drivers/amlogic/media/amldemod/atsc_func.c with 99% similarity]
drivers/amlogic/media/dtv_demod/demod_func.c [moved from drivers/amlogic/media/amldemod/demod_func.c with 99% similarity]
drivers/amlogic/media/dtv_demod/dtmb_func.c [moved from drivers/amlogic/media/amldemod/dtmb_func.c with 99% similarity]
drivers/amlogic/media/dtv_demod/dvbc_func.c [moved from drivers/amlogic/media/amldemod/dvbc_func.c with 99% similarity]
drivers/amlogic/media/dtv_demod/dvbc_v2.c [moved from drivers/amlogic/media/amldemod/dvbc_v2.c with 99% similarity]
drivers/amlogic/media/dtv_demod/dvbc_v3.c [moved from drivers/amlogic/media/amldemod/dvbc_v3.c with 99% similarity]
drivers/amlogic/media/dtv_demod/dvbt_v2.c [moved from drivers/amlogic/media/amldemod/dvbt_v2.c with 99% similarity]
drivers/amlogic/media/dtv_demod/i2c_func.c [moved from drivers/amlogic/media/amldemod/i2c_func.c with 95% similarity]
drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h [moved from drivers/amlogic/media/amldemod/include/acf_filter_coefficient.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_che.h with 98% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_che_bit.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_front.h with 98% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_front_bit.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_sync.h with 97% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_sync_bit.h with 98% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_top.h with 98% similarity]
drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h [moved from drivers/amlogic/media/amldemod/include/addr_dtmb_top_bit.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/amlfrontend.h [moved from drivers/amlogic/media/amldemod/include/amlfrontend.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/atsc_func.h [moved from drivers/amlogic/media/amldemod/include/atsc_func.h with 96% similarity]
drivers/amlogic/media/dtv_demod/include/demod_func.h [moved from drivers/amlogic/media/amldemod/include/demod_func.h with 99% similarity]
drivers/amlogic/media/dtv_demod/include/depend.h [moved from drivers/amlogic/media/amldemod/include/depend.h with 96% similarity]
drivers/amlogic/media/dtv_demod/tuner_func.c [moved from drivers/amlogic/media/amldemod/tuner_func.c with 99% similarity]

index a818a8a..aade510 100644 (file)
@@ -14444,8 +14444,10 @@ F:     drivers/amlogic/media/vout/backlight/aml_ldim/iw7027_bl.h
 AMLOGIC DTV DEMOD DRIVER
 M:      Jihong Sui <jihong.sui@amlogic.com>
 F:      include/uapi/linux/dvb/aml_demod.h
-F:      drivers/amlogic/media/aml_demod/*
+F:      drivers/amlogic/media/amldemod/*
+
+AMLOGIC DTV DEMOD DRIVER
+M:      Jihong Sui <jihong.sui@amlogic.com>
+F:      drivers/amlogic/media/amldemod/*
+F:      drivers/amlogic/media/dtv_demod/*
 
-AMLOGIC DEBUG
-M: Jianxin Pan <jianxin.pan@amlogic.com>
-F:  drivers/amlogic/debug/
index 1c7758f..5071b50 100644 (file)
@@ -53,5 +53,5 @@ source "drivers/amlogic/media/vin/Kconfig"
 source "drivers/amlogic/media/video_processor/Kconfig"
 source "drivers/amlogic/media/enhancement/Kconfig"
 endif
-source "drivers/amlogic/media/amldemod/Kconfig"
+source "drivers/amlogic/media/dtv_demod/Kconfig"
 endmenu
index e22a933..9702f1b 100644 (file)
@@ -8,4 +8,4 @@ obj-$(CONFIG_AMLOGIC_MEDIA_DEINTERLACE) +=      deinterlace/
 obj-$(CONFIG_AMLOGIC_MEDIA_VIN)                +=      vin/
 obj-$(CONFIG_AMLOGIC_MEDIA_VIDEO_PROCESSOR)    +=      video_processor/
 obj-$(CONFIG_AMLOGIC_MEDIA_ENHANCEMENT) += enhancement/
-obj-$(CONFIG_AMLOGIC_DTV_DEMOD) += amldemod/
+obj-$(CONFIG_AMLOGIC_DTV_DEMOD) += dtv_demod/
similarity index 89%
rename from drivers/amlogic/media/amldemod/Makefile
rename to drivers/amlogic/media/dtv_demod/Makefile
index 272531f..4d75e20 100644 (file)
@@ -12,7 +12,7 @@ dtvdemod-objs += aml_demod.o
 
 ccflags-y += -I.
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
-ccflags-y += -Idrivers/amlogic/media/amldemod/include
+ccflags-y += -Idrivers/amlogic/media/dtv_demod/include
 #ccflags-y += -I./include
 #ccflags-y += -Idrivers/amlogic/dvb_tv/
 ccflags-y += -DDVB_CORE_ORI=1 -DDVB_49=1 -DDEBUG
similarity index 99%
rename from drivers/amlogic/media/amldemod/aml_demod.c
rename to drivers/amlogic/media/dtv_demod/aml_demod.c
index c9cf7f1..6f0e0e4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/aml_demod.c
+ * drivers/amlogic/media/dtv_demod/aml_demod.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/amlfrontend.c
rename to drivers/amlogic/media/dtv_demod/amlfrontend.c
index 238321b..3566abd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/amlfrontend.c
+ * drivers/amlogic/media/dtv_demod/amlfrontend.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1425,18 +1425,7 @@ static int gxtv_demod_atsc_read_status
        if (aml_demod_debug & DBG_ATSC) {
                if ((dbg_lst_status != s) || (last_lock != ilock)) {
                        /* check tuner */
-                       /*dvbfe = aml_get_fe();*//*get_si2177_tuner();*/
-                       /*if (dvbfe != NULL) {*/
-#if 0
-                               if (dvbfe->ops.tuner_ops.get_strength) {
-                                       strength =
-                               dvbfe->ops.tuner_ops.get_strength(dvbfe);
-                               }
-#else
-                               strength = tuner_get_ch_power2();
-#endif
-                       /*      strength -= 100;*/
-                       /*}*/
+                       strength = tuner_get_ch_power2();
 
                        PR_ATSC("s=%d(1 is lock),lock=%d\n", s, ilock);
                        PR_ATSC("[rsj_test]freq[%d] strength[%d]\n",
@@ -3847,10 +3836,12 @@ static int aml_dtvdm_tune(struct dvb_frontend *fe, bool re_tune,
 
        if (nmode == AM_FE_UNKNOWN_N) {
                *delay = HZ * 5;
+               *status = 0;
                return 0;
        }
        if (is_not_active(fe)) {
-               PR_DBG("tune :not active\n");
+               *status = 0;
+               PR_DBGL("tune :not active\n");
                return 0;
        }
 
similarity index 99%
rename from drivers/amlogic/media/amldemod/atsc_func.c
rename to drivers/amlogic/media/dtv_demod/atsc_func.c
index e2d4fef..e7d2762 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/atsc_func.c
+ * drivers/amlogic/media/dtv_demod/atsc_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/demod_func.c
rename to drivers/amlogic/media/dtv_demod/demod_func.c
index fe0acc6..0e6249f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/demod_func.c
+ * drivers/amlogic/media/dtv_demod/demod_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/dtmb_func.c
rename to drivers/amlogic/media/dtv_demod/dtmb_func.c
index efb0b7d..024f3b7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dtmb_func.c
+ * drivers/amlogic/media/dtv_demod/dtmb_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/dvbc_func.c
rename to drivers/amlogic/media/dtv_demod/dvbc_func.c
index 95fbda6..a31725f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_func.c
+ * drivers/amlogic/media/dtv_demod/dvbc_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/dvbc_v2.c
rename to drivers/amlogic/media/dtv_demod/dvbc_v2.c
index fb5cd74..60b2b7f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_v2.c
+ * drivers/amlogic/media/dtv_demod/dvbc_v2.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/dvbc_v3.c
rename to drivers/amlogic/media/dtv_demod/dvbc_v3.c
index 74a8316..67b1cd5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbc_v3.c
+ * drivers/amlogic/media/dtv_demod/dvbc_v3.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/dvbt_v2.c
rename to drivers/amlogic/media/dtv_demod/dvbt_v2.c
index bfb1f30..4e88be1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/dvbt_v2.c
+ * drivers/amlogic/media/dtv_demod/dvbt_v2.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 95%
rename from drivers/amlogic/media/amldemod/i2c_func.c
rename to drivers/amlogic/media/dtv_demod/i2c_func.c
index 2e7a491..6802084 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/i2c_func.c
+ * drivers/amlogic/media/dtv_demod/i2c_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/acf_filter_coefficient.h
+ * drivers/amlogic/media/dtv_demod/include/acf_filter_coefficient.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_che.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_che.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_che_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_che_bit.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_front.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_front.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_front_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_front_bit.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_sync.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_sync_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_sync_bit.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_top.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_top.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/addr_dtmb_top_bit.h
+ * drivers/amlogic/media/dtv_demod/include/addr_dtmb_top_bit.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/amlfrontend.h
+ * drivers/amlogic/media/dtv_demod/include/amlfrontend.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/atsc_func.h
+ * drivers/amlogic/media/dtv_demod/include/atsc_func.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/demod_func.h
+ * drivers/amlogic/media/dtv_demod/include/demod_func.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/include/depend.h
+ * drivers/amlogic/media/dtv_demod/include/depend.h
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *
similarity index 99%
rename from drivers/amlogic/media/amldemod/tuner_func.c
rename to drivers/amlogic/media/dtv_demod/tuner_func.c
index 893e17c..69a17ba 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * drivers/amlogic/media/amldemod/tuner_func.c
+ * drivers/amlogic/media/dtv_demod/tuner_func.c
  *
  * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
  *