summaryrefslogtreecommitdiff
authorXindong Xu <xindong.xu@amlogic.com>2018-01-26 09:16:36 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2018-01-29 05:32:18 (GMT)
commit023a25b2012e33a05ee748575252075299b073c6 (patch)
treed31a48d82c4afb9294a8cfa131c31230964bd4c8
parent90575c92c166dc1d71dc8456ceddc9cfc37f713b (diff)
downloadeinstein-023a25b2012e33a05ee748575252075299b073c6.zip
einstein-023a25b2012e33a05ee748575252075299b073c6.tar.gz
einstein-023a25b2012e33a05ee748575252075299b073c6.tar.bz2
einstein: add porting tvinput to HIDL architecture [4/6]
PD# 157786 add porting tvinput to HIDL architecture Change-Id: I0861ee4ea69bce9ad6e8c1cc08157dbf95555fd3
Diffstat
-rw-r--r--files/tv/tvconfig.conf2
-rw-r--r--init.amlogic.usb.rc4
-rw-r--r--manifest.xml18
-rw-r--r--upgrade/aml_sdc_burn.ini4
4 files changed, 21 insertions, 7 deletions
diff --git a/files/tv/tvconfig.conf b/files/tv/tvconfig.conf
index e5c3aca..20e6395 100644
--- a/files/tv/tvconfig.conf
+++ b/files/tv/tvconfig.conf
@@ -12,7 +12,7 @@ ssm.macaddr.startwork.en = 1
ssm.handle.hdmi.edid.en=1
ssm.rgbogo.file.path = /dev/block/cri_data
ssm.rgbogo.file.offset = 0
-ssm.hdmi_av.hotplug.detect.en = 0
+ssm.hdmi_av.hotplug.detect.en = 1
#audio config
audio.architecture.type = g9tv_external_dac_onboard
audio.resample.type = hw
diff --git a/init.amlogic.usb.rc b/init.amlogic.usb.rc
index dac38fb..4d78557 100644
--- a/init.amlogic.usb.rc
+++ b/init.amlogic.usb.rc
@@ -9,7 +9,7 @@ on boot
mkdir /config/usb_gadget/g1/strings/0x409 0770
write /config/usb_gadget/g1/strings/0x409/serialnumber ${ro.serialno}
write /config/usb_gadget/g1/strings/0x409/manufacturer amlogic
- write /config/usb_gadget/g1/strings/0x409/product txlx_t962e_r321
+ write /config/usb_gadget/g1/strings/0x409/product t962e_r321
mkdir /config/usb_gadget/g1/functions/ffs.adb
mkdir /config/usb_gadget/g1/functions/mtp.gs0
mkdir /config/usb_gadget/g1/configs/b.1 0770 shell shell
@@ -18,7 +18,7 @@ on boot
symlink /config/usb_gadget/g1/configs/b.1 /config/usb_gadget/g1/os_desc/b.1
mount functionfs adb /dev/usb-ffs/adb uid=2000,gid=2000
setprop sys.usb.configfs 1
- setprop sys.usb.controller "c9100000.dwc2_a"
+ setprop sys.usb.controller "ff400000.dwc2_a"
on property:sys.usb.config=none && property:sys.usb.configfs=1
setprop sys.usb.ffs.ready 0
diff --git a/manifest.xml b/manifest.xml
index 34d4b47..b56768f 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -161,6 +161,15 @@
</interface>
</hal>
<hal>
+ <name>android.hardware.tv.input</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>ITvInput</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
+ <hal>
<name>vendor.amlogic.hardware.systemcontrol</name>
<transport>hwbinder</transport>
<version>1.0</version>
@@ -187,6 +196,15 @@
<instance>default</instance>
</interface>
</hal>
+ <hal>
+ <name>vendor.amlogic.hardware.tvserver</name>
+ <transport>hwbinder</transport>
+ <version>1.0</version>
+ <interface>
+ <name>ITvServer</name>
+ <instance>default</instance>
+ </interface>
+ </hal>
<hal format="hidl">
<name>android.hardware.thermal</name>
<transport>hwbinder</transport>
diff --git a/upgrade/aml_sdc_burn.ini b/upgrade/aml_sdc_burn.ini
index abd7d5b..b36fda3 100644
--- a/upgrade/aml_sdc_burn.ini
+++ b/upgrade/aml_sdc_burn.ini
@@ -3,10 +3,6 @@
;This card burning script support both dos and unix file format, but don't edit in windows if not dos format
;Except comment, all must readable ASCII letters
;
-;Amlogic sdcard 烧录镜像脚本
-;本脚本支持dos和unix两种格式的方便,但是推荐保一直保存为dos格式的
-;如果是非dos格式的,请不在windows下使用记事本编辑,否则编辑后会变成不可解析
-;除注释行外的字符必须是可识别的ASCII
[common]
erase_bootloader = 1