From 44c09326b2ba78cffd6a21a15c5aef41f8298aa8 Mon Sep 17 00:00:00 2001 From: Ethan Chen Date: Sun, 19 Apr 2020 02:06:36 -0700 Subject: sdm660-common: Remove wigig components Change-Id: If730bffdf749f30ddf0dfeec8ce769848b19b17e --- rootdir/etc/init.qcom.rc | 39 --------------------------------------- rootdir/etc/ueventd.qcom.rc | 9 --------- 2 files changed, 48 deletions(-) diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 64ecb58..e08ee59 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -48,8 +48,6 @@ on early-init chown root system /dev/kmsg chmod 0620 /dev/kmsg - # Load WIGIG platform driver - exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules msm_11ad_proxy on init # Create cgroup mount point for memory @@ -147,9 +145,6 @@ on boot mkdir /mnt/vendor/persist/iar_db 0770 system system mkdir /mnt/vendor/spunvm 0770 system system - #Create WIGIG socket area - mkdir /dev/socket/wigig 0770 wifi wifi - setprop wifi.interface wlan0 setprop ro.telephony.call_ring.multiple false @@ -264,13 +259,9 @@ on post-fs-data mkdir /data/vendor/wifi/hostapd 0770 wifi wifi mkdir /data/vendor/wifi/hostapd/ctrl 0770 wifi wifi mkdir /data/vendor/wifi/wpa_supplicant 0770 wifi wifi - mkdir /data/vendor/wifi/wigig_hostapd 0770 wifi wifi mkdir /data/vendor/wifi/wpa 0770 wifi wifi mkdir /data/vendor/wifi/wpa/sockets 0770 wifi wifi - # Create the directories used by WiGig Sensing - mkdir /data/vendor/sensing 0770 system wifi - # Create the directories used by CnE subsystem mkdir /data/vendor/connectivity 0771 radio radio chown radio radio /data/vendor/connectivity @@ -577,21 +568,6 @@ service vendor.sensors.qti /vendor/bin/sensors.qti on property:sys.sysctl.tcp_adv_win_scale=* write /proc/sys/net/ipv4/tcp_adv_win_scale ${sys.sysctl.tcp_adv_win_scale} -service vendor.wigig_supplicant /vendor/bin/hw/wpa_supplicant \ - -iwigig0 -Dnl80211 -c/data/vendor/wifi/wigig_supplicant.conf \ - -m/data/vendor/wifi/wigig_p2p_supplicant.conf \ - -O/data/vendor/wifi/wigig_sockets -dd \ - -e/data/vendor/wifi/wigig_entropy.bin -g@android:wigig/wpa_wigig0 \ - -S wigigsvc - # we will start as root and wpa_supplicant will switch to user wifi - # after setting up the capabilities required for WEXT - # user wifi - # group wifi inet keystore - class main - socket wigig/wpa_wigig0 dgram 660 wifi wifi - disabled - oneshot - # Data Migration service vendor.move_wifi_data /system/bin/move_wifi_data.sh class main @@ -600,13 +576,6 @@ service vendor.move_wifi_data /system/bin/move_wifi_data.sh disabled oneshot -service vendor.sensingdaemon /vendor/bin/sensingdaemon - class hal - socket wigig/sensingdaemon stream 660 system wifi - user system - group wifi - disabled - service ptt_socket_app /system/vendor/bin/ptt_socket_app -d class main user wifi @@ -741,14 +710,6 @@ service hostapd_fst /vendor/bin/hw/hostapd -dd -g /data/vendor/wifi/hostapd/glob disabled oneshot -service vendor.wigig_hostapd /vendor/bin/hw/hostapd -dd -j wigighostapd /data/vendor/wifi/hostapd/wigig_hostapd.conf - class late_start - capabilities NET_ADMIN NET_RAW - user wifi - group wifi inet keystore - oneshot - disabled - service ims_regmanager /system/vendor/bin/exe-ims-regmanagerprocessnative class late_start group net_bt_admin inet radio wifi diff --git a/rootdir/etc/ueventd.qcom.rc b/rootdir/etc/ueventd.qcom.rc index 8677655..cf83812 100644 --- a/rootdir/etc/ueventd.qcom.rc +++ b/rootdir/etc/ueventd.qcom.rc @@ -289,15 +289,6 @@ firmware_directories /vendor/firmware_mnt/image/ /sys/devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/wlan0/queues/rx-* rps_cpus 0660 system system /sys/devices/soc/600000.qcom,pcie/pci0000:00/0000:00:00.0/0000:01:00.0/net/p2p0/queues/rx-* rps_cpus 0660 system system -# wigig -/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/fst_link_loss 0660 wifi wifi -/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/thermal_throttling 0660 system system -/sys/bus/pci/drivers/wil6210* 0000:01:00.0/wil6210/snr_thresh 0660 wifi wifi -/sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/queues/rx-0/rps_cpus 0660 system system -/sys/bus/pci/drivers/wil6210* 0000:01:00.0/net/wigig0/gro_flush_timeout 0660 system system -/sys/devices/virtual/net/bond0 queues/rx-0/rps_cpus 0660 system system -/dev/wigig_sensing 0660 system system - #nfc permissions /dev/nfc-nci 0660 nfc nfc /dev/nq-nci 0660 nfc nfc -- cgit v1.2.3