diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 53219eb..dde0741 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -29,6 +29,10 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk $(call soong_config_set,lyric,tuning_product,cloudripper) $(call soong_config_set,google3a_config,target_device,cloudripper) +DEVICE_PACKAGE_OVERLAYS += device/google/tangorpro/tangorpro/overlay +PRODUCT_SOONG_NAMESPACES += device/google/tangorpro +PRODUCT_PACKAGES += WifiOverlayT6pro + # Init files PRODUCT_COPY_FILES += \ device/google/tangorpro/conf/init.tangorpro.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.tangorpro.rc @@ -145,7 +149,3 @@ endif # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ ro.gms.dck.eligible_wcc=2 - -# WIFI COEX -PRODUCT_COPY_FILES += \ - device/google/tangorpro/wifi/coex_table.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/coex_table.xml diff --git a/init.insmod.tangorpro.cfg b/init.insmod.tangorpro.cfg index 502973a..a075efe 100644 --- a/init.insmod.tangorpro.cfg +++ b/init.insmod.tangorpro.cfg @@ -6,6 +6,7 @@ # Load device specific kernel modules # Modules here will be loaded *after* all common modules +modprobe|synadhd.ko modprobe|snd-soc-cs35l41-spi.ko modprobe|ftm5.ko modprobe|sec_touch.ko diff --git a/rro_overlays/WifiOverlay/Android.bp b/rro_overlays/WifiOverlay/Android.bp new file mode 100644 index 0000000..f160968 --- /dev/null +++ b/rro_overlays/WifiOverlay/Android.bp @@ -0,0 +1,18 @@ +package { + // See: http://go/android-license-faq + // A large-scale-change added 'default_applicable_licenses' to import + // all of the 'license_kinds' from "//device/google/tangorpro:device_google_tangorpro_license"" + // to get the below license kinds: + // SPDX-license-identifier-Apache-2.0 + default_applicable_licenses: [ + "//device/google/tangorpro:device_google_tangorpro_license", + ], +} + +runtime_resource_overlay { + name: "WifiOverlayT6pro", + theme: "WifiOverlayT6pro", + certificate: "platform", + sdk_version: "current", + product_specific: true +} diff --git a/rro_overlays/WifiOverlay/AndroidManifest.xml b/rro_overlays/WifiOverlay/AndroidManifest.xml new file mode 100644 index 0000000..152a3ee --- /dev/null +++ b/rro_overlays/WifiOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/rro_overlays/WifiOverlay/OWNERS b/rro_overlays/WifiOverlay/OWNERS new file mode 100644 index 0000000..8b6c5a7 --- /dev/null +++ b/rro_overlays/WifiOverlay/OWNERS @@ -0,0 +1,4 @@ +# People who can approve changes for submission +kumachang@google.com +wangroger@google.com +hsuvictor@google.com diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml new file mode 100644 index 0000000..d5818e4 --- /dev/null +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -0,0 +1,117 @@ + + + + + + true + + + true + + + true + + + -77 + -80 + + -80 + -83 + + + false + + + true + + + 524288,2097152,8388608,262144,524288,4194304 + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + Pixel + + + 32 + + + + 1 + 2 + 3 + 8 + + + + 3000 + + + 10 + + + true + + + true + + + true + + + false + + + true + + + true + + + true + + + true + diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index 325f210..ad3e590 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -23,4 +23,4 @@ BOARD_KERNEL_CMDLINE += swiotlb=noforce include device/google/gs201/BoardConfig-common.mk -include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk include device/google/tangorpro-sepolicy/tangorpro-sepolicy.mk -include device/google/gs201/wifi/qcom/BoardConfig-wifi.mk \ No newline at end of file +include device/google/tangorpro/wifi/BoardConfig-wifi.mk diff --git a/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml new file mode 100644 index 0000000..ee95c9b --- /dev/null +++ b/tangorpro/overlay/frameworks/base/core/res/res/values/config.xml @@ -0,0 +1,23 @@ + + + + + + false + diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk new file mode 100644 index 0000000..587f245 --- /dev/null +++ b/wifi/BoardConfig-wifi.mk @@ -0,0 +1,30 @@ +# +# Copyright (C) 2021 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. +# + +BOARD_WLAN_DEVICE := synadhd +BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) +WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_WPA_SUPPLICANT_DRIVER := NL80211 +BOARD_HOSTAPD_DRIVER := NL80211 +# Wifi interface combination - {1 STA + 1 P2P} or {1 STA + 1 NAN} or {1 AP} +WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN}, 1}}, {{{AP}, 1}} +WIFI_FEATURE_WIFI_EXT_HAL := true +WIFI_FEATURE_IMU_DETECTION := true +# Avoid Wifi reset on MAC Address change +WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true +WIFI_FEATURE_HOSTAPD_11AX := true + diff --git a/wifi/coex_table.xml b/wifi/coex_table.xml deleted file mode 100644 index 36066d6..0000000 --- a/wifi/coex_table.xml +++ /dev/null @@ -1,367 +0,0 @@ - - - LTE - 1 - - - 3 - 10 - - - - - - NR - 1 - - - 3 - 10 - - - - - - LTE - 2 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - NR - 2 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - LTE - 3 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - NR - 3 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - LTE - 4 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - LTE - 5 - - - 3 - 10 - - - - - - NR - 5 - - - 3 - 10 - - - - - - LTE - 7 - - - 50 - 50 - - - 2 - -1 - 10 - - - - - - NR - 7 - - - 50 - 50 - - - 2 - -1 - 10 - - - - - - LTE - 18 - - - 3 - 10 - - - - - - NR - 18 - - - 3 - 10 - - - - - - LTE - 19 - - - 3 - 10 - - - - - - LTE - 25 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - NR - 25 - - - 3 - 10 - - - -2 - 1 - 10 - - - - - - LTE - 26 - - - 3 - 10 - - - - - - NR - 26 - - - 3 - 10 - - - - - - LTE - 27 - - - 3 - 10 - - - - - - LTE - 38 - - - 3 - 10 - - - - - - NR - 38 - - - 3 - 10 - - - - - - LTE - 39 - - - 3 - 10 - - - - - - NR - 39 - - - 3 - 10 - - - - - - LTE - 40 - - - 50 - 50 - - - 11 - - - - - - NR - 40 - - - 50 - 50 - - - 11 - - - - - - LTE - 41 - - - 50 - 50 - - - 2 - 10 - - - - - - NR - 41 - - - 50 - 50 - - - 2 - 10 - - - - - - NR - 79 - - - all - - - -