tvinput: add porting tvinput to HIDL architecture [3/6]

PD# 157786

add porting tvinput to HIDL architecture

Change-Id: I194f42bac67abb8cc1c1b02361f6125106adde86

23 files changed, 207 insertions, 38 deletions

diff --git a/core_amlogic.mk b/core_amlogic.mk
index 9cc1943..f601910 100644
--- a/core_amlogic.mk
+++ b/core_amlogic.mk
@@ -126,8 +126,11 @@ $(call inherit-product-if-exists, external/naver-fonts/fonts.mk)
 $(call inherit-product-if-exists, external/roboto-fonts/fonts.mk)
 $(call inherit-product-if-exists, frameworks/base/data/keyboards/keyboards.mk)
 $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk)
-$(call inherit-product, build/target/product/core_base.mk)
-
+ifneq ($(TARGET_BUILD_GOOGLE_ATV), true)
+  $(call inherit-product, build/target/product/core_base.mk)
+else
+  $(call inherit-product, device/amlogic/common/core_base_atv.mk)
+endif
 #default hardware composer version is 2.0
 TARGET_USES_HWC2 := true
 
@@ -166,6 +169,12 @@ PRODUCT_PACKAGES += \
     Music
 endif
 
+ifeq ($(TARGET_BUILD_LIVETV), true)
+PRODUCT_PACKAGES += LiveTv
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.software.picture_in_picture.xml:vendor/etc/permissions/android.software.picture_in_picture.xml
+endif
+
 PRODUCT_PACKAGES += \
     droidlogic \
     droidlogic-res \
@@ -434,8 +443,8 @@ PRODUCT_PACKAGES += \
 
 # DroidVold
 PRODUCT_PACKAGES += \
-    vendor.amlogic.hardware.droidvold@10 \
-    vendor.amlogic.hardware.droidvold@10_vendor \
+    vendor.amlogic.hardware.droidvold@1.0 \
+    vendor.amlogic.hardware.droidvold@1.0_vendor \
     vendor.amlogic.hardware.droidvold-V1.0-java
 
 ifeq ($(TARGET_BUILD_GOOGLE_ATV), true)
diff --git a/core_base_atv.mk b/core_base_atv.mk
new file mode 100644
index 0000000..e4e3a7b
--- a/dev/null
+++ b/core_base_atv.mk
@@ -0,0 +1,64 @@
+#
+# Copyright (C) 2013 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Note that components added here will be also shared in PDK. Components
+# that should not be in PDK should be added in lower level like core.mk.
+
+PRODUCT_PROPERTY_OVERRIDES := \
+    ro.config.notification_sound=OnTheHunt.ogg \
+    ro.config.alarm_alert=Alarm_Classic.ogg
+
+PRODUCT_PACKAGES += \
+    ContactsProvider \
+    DefaultContainerService \
+    TelephonyProvider \
+    UserDictionaryProvider \
+    atrace \
+    libandroidfw \
+    libaudiopreprocessing \
+    libaudioutils \
+    libfilterpack_imageproc \
+    libgabi++ \
+    libmdnssd \
+    libnfc_ndef \
+    libpowermanager \
+    libspeexresampler \
+    libstagefright_soft_aacdec \
+    libstagefright_soft_aacenc \
+    libstagefright_soft_amrdec \
+    libstagefright_soft_amrnbenc \
+    libstagefright_soft_amrwbenc \
+    libstagefright_soft_avcdec \
+    libstagefright_soft_avcenc \
+    libstagefright_soft_flacenc \
+    libstagefright_soft_g711dec \
+    libstagefright_soft_gsmdec \
+    libstagefright_soft_hevcdec \
+    libstagefright_soft_mp3dec \
+    libstagefright_soft_mpeg2dec \
+    libstagefright_soft_mpeg4dec \
+    libstagefright_soft_mpeg4enc \
+    libstagefright_soft_opusdec \
+    libstagefright_soft_rawdec \
+    libstagefright_soft_vorbisdec \
+    libstagefright_soft_vpxdec \
+    libstagefright_soft_vpxenc \
+    libvariablespeed \
+    libwebrtc_audio_preprocessing \
+    mdnsd \
+    requestsync \
+    wifi-service
+
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_minimal.mk)
diff --git a/init.amlogic.wifi_buildin.rc b/init.amlogic.wifi_buildin.rc
index df3c08f..1ae5218 100644
--- a/init.amlogic.wifi_buildin.rc
+++ b/init.amlogic.wifi_buildin.rc
@@ -1,3 +1,2 @@
 on boot
     insmod /vendor/lib/modules/dhd.ko firmware_path=/vendor/etc/wifi/buildin/ nvram_path=/vendor/etc/wifi/buildin/
-
diff --git a/init.amlogic.wifi_buildin_ap62x8.rc b/init.amlogic.wifi_buildin_ap62x8.rc
index 20686bf..e7e279e 100644
--- a/init.amlogic.wifi_buildin_ap62x8.rc
+++ b/init.amlogic.wifi_buildin_ap62x8.rc
@@ -1,4 +1,3 @@
 on boot
     start bcmdl
     insmod /vendor/lib/modules/bcmdhd.ko firmware_path=/vendor/etc/wifi/buildin/ nvram_path=/vendor/etc/wifi/buildin/
-
diff --git a/patch/Readme.txt b/patch/Readme.txt
deleted file mode 100644
index 87ce809..0000000
--- a/patch/Readme.txt
+++ b/dev/null
@@ -1,12 +0,0 @@
-patch的路径位于device/amlogic/common/patch

-patch命名方式如下：

-以bootable/recovery为例:

-生成patch:

-cd bootable/recovery

-git format-patch -2

-得到两个patch:   0001-PD-140761-fix-bug-when-upgrade-from-6.0-openlinux-to.patch   (这个提交在前，需要先打)

-                           0002-PD-141165-support-upgrade-with-partition-num-changed.patch

-然后把这两个patch重命名后放到device/amlogic/common/patch目录

-mv 0001-PD-140761-fix-bug-when-upgrade-from-6.0-openlinux-to.patch ../../device/amlogic/common/patch/bootable#recovery#0001.patch

-mv 0002-PD-141165-support-upgrade-with-partition-num-changed.patch ../../device/amlogic/common/patch/bootable#recovery#0002.patch

-git仓库相对于项目根目录的路径必须包含在patch的名字中
\ No newline at end of file
diff --git a/products/tv/init.amlogic.rc b/products/tv/init.amlogic.rc
index 4cb003a..785a352 100644
--- a/products/tv/init.amlogic.rc
+++ b/products/tv/init.amlogic.rc
@@ -96,7 +96,8 @@ on boot
     chmod 0660 /proc/bluetooth/sleep/lpm
     # change back to bluetooth from system
     chown bluetooth bluetooth /data/misc/bluetooth
-
+    insmod /vendor/lib/modules/btusb.ko
+    mknod btusb0 c 180 194
     write /sys/block/mmcblk0/queue/read_ahead_kb 2048
     write /sys/block/mmcblk1/queue/read_ahead_kb 2048
 
diff --git a/products/tv/product_tv.mk b/products/tv/product_tv.mk
index 9615c4f..9a40354 100644
--- a/products/tv/product_tv.mk
+++ b/products/tv/product_tv.mk
@@ -5,6 +5,7 @@ $(call inherit-product, device/amlogic/common/core_amlogic.mk)
 PRODUCT_PACKAGES += \
     android.hardware.tv.input@1.0-impl \
     android.hardware.tv.input@1.0-service \
+    vendor.amlogic.hardware.tvserver@1.0_vendor \
     tv_input.amlogic
 
 # TV
@@ -15,11 +16,13 @@ PRODUCT_PACKAGES += \
     libtv_jni \
     tvserver \
     libtvplay \
+    libvendorfont \
     libTVaudio \
     libntsc_decode \
     libtinyxml \
     libzvbi \
     droidlogic-tv \
+    droidlogic.tv.software.core.xml \
     TvProvider \
     DroidLogicTvInput \
     DroidLogicTvSource \
@@ -125,7 +128,7 @@ PRODUCT_COPY_FILES += \
 
 # TV EQ
 PRODUCT_COPY_FILES += \
-    $(BOARD_AML_VENDOR_PATH)/external/libaudioeffect/EQ/lib/libhpeq.so:$(TARGET_COPY_OUT_VENDOR)lib/soundfx/libhpeq.so \
+    $(BOARD_AML_VENDOR_PATH)/external/libaudioeffect/EQ/lib/libhpeq.so:$(TARGET_COPY_OUT_VENDOR)/lib/soundfx/libhpeq.so \
     $(BOARD_AML_VENDOR_PATH)/external/libaudioeffect/EQ/lib64/libhpeq.so:$(TARGET_COPY_OUT_VENDOR)/lib64/soundfx/libhpeq.so
 
 # default wallpaper for mbox to fix bug 106225
diff --git a/sepolicy/device.te b/sepolicy/device.te
index fff2c52..226f74c 100644
--- a/sepolicy/device.te
+++ b/sepolicy/device.te
@@ -11,6 +11,8 @@ type picture_device, dev_type;
 type hdcptx_device, dev_type;
 type hdcprx_device, dev_type;
 
+type dvb_video_device, dev_type;
+type mediactl_video_device, dev_type;
 type avin_device, dev_type;
 type hdmirx0_device, dev_type;
 type amvideo_device, dev_type;
@@ -31,3 +33,4 @@ type ge2d_device, dev_type;
 type amvecm_device, dev_type;
 
 type hidraw_device, dev_type;
+type vbi_device, dev_type;
diff --git a/sepolicy/file.te b/sepolicy/file.te
index ed24f76..ed477f5 100644
--- a/sepolicy/file.te
+++ b/sepolicy/file.te
@@ -40,4 +40,9 @@ type ntfs, sdcard_type, fs_type, mlstrustedobject;
 type exfat, sdcard_type, fs_type, mlstrustedobject;
 
 type optee_file, file_type, data_file_type;
-
+type sysfs_cec, fs_type, sysfs_type;
+type sysfs_display_mode, fs_type, sysfs_type;
+type sysfs_lcd, fs_type, sysfs_type;
+type sysfs_rdma, fs_type, sysfs_type;
+type sysfs_am_vecm, fs_type, sysfs_type;
+type sysfs_di, fs_type, sysfs_type;
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index b8db7db..73d1c80 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -101,8 +101,28 @@
 /sys/devices/virtual/amhdmitx/amhdmitx0/aud_output_chs          u:object_r:sysfs_aud_output_chs:s0
 /sys/class/mpgpu/mpgpucmd                                       u:object_r:sysfs_mpgpu_cmd:s0
 /sys/power/early_suspend_trigger                                u:object_r:sysfs_power_trigger:s0
+
+/sys/module/rdma/parameters/enable                              u:object_r:sysfs_rdma:s0
+/sys/module/di/parameters(/.*)?                                 u:object_r:sysfs_di:s0
+/sys/module/am_vecm/parameters(/.*)?                            u:object_r:sysfs_am_vecm:s0
+/sys/module/amvideo/parameters(/.*)?                            u:object_r:sysfs_video:s0
+/sys/module/tvin_afe/parameters/force_nostd                     u:object_r:sysfs_video:s0
+/sys/module/tvin_hdmirx/parameters(/.*)?                        u:object_r:sysfs_cec:s0
+/sys/class/hdmirx/hdmirx0/edid                                  u:object_r:sysfs_cec:s0
+/sys/class/amhdmitx/amhdmitx0/edid_info                         u:object_r:sysfs_cec:s0
+/sys/class/cec/port_seq                                         u:object_r:sysfs_cec:s0
+/sys/class/display/mode                                         u:object_r:sysfs_display_mode:s0
+/sys/class/lcd/enable                                           u:object_r:sysfs_lcd:s0
+/sys/class/video/video_scaler_path_sel                          u:object_r:sysfs_video:s0
+
+
+/sys/class/amvecm(/.*)?                                         u:object_r:sysfs_video:s0
+/sys/class/video(/.*)?                                          u:object_r:sysfs_video:s0
+/dev/vbi[0-3]                                                   u:object_r:vbi_device:s0
+
 /sys/class/mpgpu/scale_mode                                     u:object_r:sysfs_mpgpu_scale:s0
 /sys/module/di/parameters/bypass_all                            u:object_r:sysfs_mpgpu_scale:s0
+
 /param(/.*)?                  u:object_r:param_tv_file:s0
 /tee(/.*)?                    u:object_r:tee_data_file:s0
 
@@ -125,7 +145,7 @@
 /vendor/bin/tee-supplicant    u:object_r:tee_exec:s0
 /vendor/bin/tee_preload_fw    u:object_r:firmload_exec:s0
 
-#/vendor/bin/tvserver         u:object_r:tvserver_exec:s0
+/vendor/bin/tvserver          u:object_r:tvserver_exec:s0
 #/vendor/bin/wlan_fwloader    u:object_r:wlan_fwloader_exec:s0
 /vendor/xbin/bcmdl   	      u:object_r:bcmdl_exec:s0
 
diff --git a/sepolicy/hal_audio_default.te b/sepolicy/hal_audio_default.te
index e7e0eaf..959679c 100644
--- a/sepolicy/hal_audio_default.te
+++ b/sepolicy/hal_audio_default.te
@@ -13,3 +13,4 @@ allow hal_audio_default init:unix_stream_socket { connectto };
 allow hal_audio_default bluetooth_prop:property_service { set };
 allow hal_audio_default bluetooth_prop:file { read getattr open };
 
+allow hal_audio_default sysfs_aud_output_chs:file { read write open };
diff --git a/sepolicy/hal_graphics_composer_default.te b/sepolicy/hal_graphics_composer_default.te
index 6604a2e..bb0afdb 100644
--- a/sepolicy/hal_graphics_composer_default.te
+++ b/sepolicy/hal_graphics_composer_default.te
@@ -11,3 +11,7 @@ allow hal_graphics_composer_default video_device:chr_file rw_file_perms;
 allow hal_graphics_composer_default graphics_device:chr_file {open read write ioctl};
 allow hal_graphics_composer_default sysfs_video:file rw_file_perms;
 allow hal_graphics_composer_default sysfs:file rw_file_perms;
+
+get_prop(tvserver, tv_prop)
+allow hal_graphics_composer_default sysfs_video:dir { search write };
+allow hal_graphics_composer_default sysfs_display_mode:file { read write open getattr };
diff --git a/sepolicy/hal_tv_input_default.te b/sepolicy/hal_tv_input_default.te
new file mode 100644
index 0000000..c18456b
--- a/dev/null
+++ b/sepolicy/hal_tv_input_default.te
@@ -0,0 +1,6 @@
+allow hal_tv_input_default tvserver_hwservice:hwservice_manager { find };
+allow hal_tv_input_default tvserver:binder { call transfer };
+
+#allow hal_tv_input_default binder_device:chr_file { ioctl };
+#allow hal_tv_input_default hal_allocator_default:fd { use };
+#allow hal_tv_input_default hal_allocator_default:binder { call transfer };
diff --git a/sepolicy/hwservice.te b/sepolicy/hwservice.te
index 7f6168c..778886d 100644
--- a/sepolicy/hwservice.te
+++ b/sepolicy/hwservice.te
@@ -1,3 +1,4 @@
 type systemcontrol_hwservice, hwservice_manager_type;
 type hdmicecd_hwservice, hwservice_manager_type;
 type droidvold_hwservice, hwservice_manager_type;
+type tvserver_hwservice, hwservice_manager_type;
diff --git a/sepolicy/hwservice_contexts b/sepolicy/hwservice_contexts
index fb676c2..bc4c37a 100644
--- a/sepolicy/hwservice_contexts
+++ b/sepolicy/hwservice_contexts
@@ -1,3 +1,5 @@
 vendor.amlogic.hardware.systemcontrol::ISystemControl              u:object_r:systemcontrol_hwservice:s0
 vendor.amlogic.hardware.hdmicec::IDroidHdmiCEC                     u:object_r:hdmicecd_hwservice:s0
-vendor.amlogic.hardware.droidvold::IDroidVold                     u:object_r:droidvold_hwservice:s0
+vendor.amlogic.hardware.droidvold::IDroidVold                      u:object_r:droidvold_hwservice:s0
+vendor.amlogic.hardware.tvserver::ITvServer                        u:object_r:tvserver_hwservice:s0
+
diff --git a/sepolicy/hwservicemanager.te b/sepolicy/hwservicemanager.te
index 7e9542b..697b434 100644
--- a/sepolicy/hwservicemanager.te
+++ b/sepolicy/hwservicemanager.te
@@ -12,3 +12,8 @@ allow hwservicemanager droidvold:binder { call transfer };
 allow hwservicemanager droidvold:dir { search };
 allow hwservicemanager droidvold:file { read open };
 allow hwservicemanager droidvold:process { getattr };
+
+allow hwservicemanager tvserver:binder { call transfer };
+allow hwservicemanager tvserver:dir { search };
+allow hwservicemanager tvserver:file { read open };
+allow hwservicemanager tvserver:process { getattr };
diff --git a/sepolicy/mediacodec.te b/sepolicy/mediacodec.te
index 068c21d..fc8d66e 100644
--- a/sepolicy/mediacodec.te
+++ b/sepolicy/mediacodec.te
@@ -15,4 +15,6 @@ allow mediacodec sysfs_video:file rw_file_perms;
 
 allow mediacodec system_file:dir { read open };
 allow mediacodec system_server:fifo_file { write append };
+allow mediacodec { sysfs_am_vecm }:dir { search };
+allow mediacodec sysfs_am_vecm:file { read write open getattr };
 
diff --git a/sepolicy/system_app.te b/sepolicy/system_app.te
index fa5c9a8..17e7f4e 100644
--- a/sepolicy/system_app.te
+++ b/sepolicy/system_app.te
@@ -76,12 +76,16 @@ allow system_app ntfs:file create_file_perms;
 allow system_app mnt_media_rw_file:dir r_dir_perms;
 allow system_app { systemcontrol_hwservice hdmicecd_hwservice }:hwservice_manager { find };
 
-allow system_app { system_control hdmicecd }:binder { call transfer };
+allow system_app { system_control hdmicecd tvserver }:binder { call transfer };
 
-allow system_app droidvold_hwservice:hwservice_manager { find };
+allow system_app { droidvold_hwservice tvserver_hwservice }:hwservice_manager { find };
 allow system_app droidvold:binder { call transfer };
 
 allow system_app droidmount_service:service_manager { add };
 
 allow system_app fuseblk:dir create_dir_perms;
 allow system_app fuseblk:file create_file_perms;
+
+get_prop(system_app, tv_prop)
+allow system_app vbi_device:chr_file { read write open ioctl };
+
diff --git a/sepolicy/system_control.te b/sepolicy/system_control.te
index 7aa57f1..ef530e8 100644
--- a/sepolicy/system_control.te
+++ b/sepolicy/system_control.te
@@ -76,6 +76,8 @@ allow system_control block_device:dir r_dir_perms;
 
 allow system_control sysfs_audio_cap:file {open getattr read};
 allow system_control sysfs_video:file rw_file_perms;
+allow system_control { sysfs_video sysfs_cec sysfs_am_vecm }:dir { search };
+
 allow system_control app_data_file:file rw_file_perms;
 #allow system_control system_control_service:service_manager add;
 #allow system_control permission_service:service_manager find;
@@ -98,9 +100,18 @@ allow system_control param_tv_file:file { create open read write setattr getattr
 allow system_control sysfs_digital_codec:file { read write };
 #allow system_control system_file:file execute_no_trans;
 
-allow system_control env_device:blk_file { getattr read open write };
+allow system_control { env_device cri_block_device }:blk_file { getattr read open write };
 allow system_control self:capability sys_nice;
 
 allow system_control system_app:binder { call };
 allow system_control droidvold_hwservice:hwservice_manager { find };
-allow system_control droidvold:binder { call };
\ No newline at end of file
+allow system_control droidvold:binder { call };
+
+allow system_control { video_device amvecm_device }:chr_file  { read write open ioctl getattr };
+
+allow system_control param_tv_file:dir { write search add_name create };
+allow system_control param_tv_file:file { create read write open getattr };
+
+allow system_control vendor_configs_file:file { ioctl lock };
+allow system_control { sysfs_display_mode sysfs_am_vecm }:file { read write open getattr };
+
diff --git a/sepolicy/tvserver.te b/sepolicy/tvserver.te
new file mode 100644
index 0000000..94ce62c
--- a/dev/null
+++ b/sepolicy/tvserver.te
@@ -0,0 +1,48 @@
+type tvserver, domain;
+type tvserver_exec, exec_type, vendor_file_type, file_type;
+
+init_daemon_domain(tvserver)
+
+allow tvserver vndbinder_device:chr_file { read write open ioctl };
+allow tvserver vndservicemanager:binder { call transfer };
+
+allow tvserver hwservicemanager:binder { call transfer };
+allow tvserver { tvserver_hwservice  hidl_base_hwservice }:hwservice_manager { add };
+
+allow tvserver hwservicemanager_prop:file { open read getattr };
+
+allow tvserver { hal_tv_input_default system_app }:binder { call transfer };
+
+
+allow tvserver { video_device dvb_video_device amvideo_device mediactl_video_device }:chr_file  { read write open ioctl getattr };
+allow tvserver { hdmirx0_device avin_device }:chr_file  { read write open ioctl getattr };
+
+allow tvserver audio_device:dir { search };
+allow tvserver audio_device:chr_file { read write open ioctl };
+
+get_prop(tvserver, media_prop)
+get_prop(tvserver, tv_prop)
+set_prop(tvserver, tv_prop)
+set_prop(tvserver, tv_config_prop)
+allow tvserver tv_prop:file { read open getattr };
+
+allow tvserver proc:file { read write open ioctl getattr };
+
+allow tvserver param_tv_file:dir  { search read write open add_name remove_name rmdir };
+allow tvserver param_tv_file:file { create open read write setattr getattr lock unlink ioctl };
+allow param_tv_file labeledfs:filesystem { associate };
+
+allow tvserver { vendor_shell_exec vendor_toolbox_exec vendor_file }:file execute_no_trans;
+
+allow tvserver { system_control }:binder { call transfer };
+
+#allow tvserver hal_allocator_default:fd { use };
+allow tvserver { sysfs_cec sysfs_video sysfs_audio sysfs_lcd sysfs_rdma sysfs_di sysfs_am_vecm }:file { read write open getattr };
+
+allow tvserver sysfs_display_mode:file { read open getattr };
+
+allow tvserver system_file:dir { open };
+allow tvserver { sysfs_video sysfs_cec sysfs_di sysfs_am_vecm }:dir { search write add_name };
+
+allow tvserver systemcontrol_hwservice:hwservice_manager { find };
+
diff --git a/wifi.mk b/wifi.mk
index b1a8497..e468b81 100644
--- a/wifi.mk
+++ b/wifi.mk
@@ -66,7 +66,6 @@ PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6335/nvram.txt:$(TA
 PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6212/fw_bcm43438a0.bin:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/fw_bcm43438a0.bin
 PRODUCT_COPY_FILES += hardware/amlogic/wifi/bcm_ampak/config/6212/nvram.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/buildin/nvram_ap6212.txt
 endif
-
 ################################################################################## bcm4354
 ifeq ($(WIFI_MODULE),bcm4354)
 WIFI_DRIVER := bcm4354
@@ -113,13 +112,11 @@ endif
 ################################################################################## bcm4356
 ifeq ($(WIFI_MODULE),bcm4356)
 WIFI_DRIVER := bcm4356
-
 ifneq ($(WIFI_BUILD_IN), true)
 WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
 WIFI_DRIVER_MODULE_NAME := dhd
 WIFI_DRIVER_MODULE_ARG  := "firmware_path=/vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin nvram_path=/vendor/etc/wifi/4356/nvram_ap6356.txt"
 endif
-
 WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/4356/fw_bcm4356a2_ag.bin
 WIFI_DRIVER_FW_PATH_AP  := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/4356/fw_bcm4356a2_ag_p2p.bin
@@ -714,13 +711,11 @@ endif
 ################################################################################## AP6335
 ifeq ($(WIFI_MODULE),AP6335)
 WIFI_DRIVER := AP6335
-
 ifneq ($(WIFI_BUILD_IN), true)
 WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
 WIFI_DRIVER_MODULE_NAME := dhd
 WIFI_DRIVER_MODULE_ARG  := "firmware_path=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin nvram_path=/vendor/etc/wifi/6335/nvram.txt"
 endif
-
 WIFI_DRIVER_FW_PATH_STA :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag.bin
 WIFI_DRIVER_FW_PATH_AP  :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_P2P :=/vendor/etc/wifi/6335/fw_bcm4339a0_ag_p2p.bin
@@ -896,13 +891,11 @@ endif
 ################################################################################## AP6255
 ifeq ($(WIFI_MODULE),AP6255)
 WIFI_DRIVER := AP6255
-
 ifneq ($(WIFI_BUILD_IN), true)
 WIFI_DRIVER_MODULE_PATH := /vendor/lib/modules/dhd.ko
 WIFI_DRIVER_MODULE_NAME := dhd
 WIFI_DRIVER_MODULE_ARG  := "firmware_path=/vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin nvram_path=/vendor/etc/wifi/6255/nvram.txt"
 endif
-
 WIFI_DRIVER_FW_PATH_STA := /vendor/etc/wifi/6255/fw_bcm43455c0_ag.bin
 WIFI_DRIVER_FW_PATH_AP  := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_apsta.bin
 WIFI_DRIVER_FW_PATH_P2P := /vendor/etc/wifi/6255/fw_bcm43455c0_ag_p2p.bin
diff --git a/wifi_driver.mk b/wifi_driver.mk
index 9d791d6..a4d608b 100644
--- a/wifi_driver.mk
+++ b/wifi_driver.mk
@@ -65,9 +65,9 @@ bcm43458:
 	$(bcmwifi-modules)
 define bcmd-usb-wifi-modules
 	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.201.88.27.x ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/amlogic/ampere/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
 	cp $(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.201.88.27.x/bcmdhd.ko $(TARGET_OUT)/
-	cp $(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
+	cp $(shell pwd)/vendor/amlogic/ampere/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
 	#cp $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ/net/wireless/cfg80211.ko $(TARGET_OUT)/
 endef
 AP6269:
@@ -197,7 +197,7 @@ multiwifi:
 #	#cp $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ/net/wireless/cfg80211.ko $(TARGET_OUT)/
 	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.363.110.17.x ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
 	cp $(shell pwd)/hardware/wifi/broadcom/drivers/ap6xxx/bcmdhd-usb.1.363.110.17.x/bcmdhd.ko $(TARGET_OUT)/
-#	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
-#	cp $(shell pwd)/vendor/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
+	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ M=$(shell pwd)/vendor/amlogic/ampere/broadcom/btusb/btusb_1_6_29_1/ ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
+	cp $(shell pwd)/vendor/amlogic/ampere/broadcom/btusb/btusb_1_6_29_1/btusb.ko $(TARGET_OUT)/
 	$(MAKE) -C $(shell pwd)/$(PRODUCT_OUT)/obj/KERNEL_OBJ TopDIR=$(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU M=$(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(CROSS_COMPILE) modules
 	cp $(shell pwd)/hardware/wifi/realtek/drivers/8822bu/rtl8822BU/8822bu.ko $(TARGET_OUT)/
diff --git a/wifi_modules.mk b/wifi_modules.mk
index d47c5e8..249a6c9 100644
--- a/wifi_modules.mk
+++ b/wifi_modules.mk
@@ -1,5 +1,6 @@
 DEFAULT_WIFI_KERNEL_MODULES := \
         $(PRODUCT_OUT)/obj/lib_vendor/dhd.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/bcmdhd.ko \
+	$(PRODUCT_OUT)/obj/lib_vendor/btusb.ko \
 	$(PRODUCT_OUT)/obj/lib_vendor/8822bu.ko \
         $(PRODUCT_OUT)/obj/lib_vendor/8189es.ko