From 331b140babe62318835a7923f00f11b09c454ebd Mon Sep 17 00:00:00 2001 From: Jacky Liu Date: Tue, 6 Feb 2024 19:47:18 +0800 Subject: [PATCH] Update i2c device paths Update i2c device paths with static bus numbers. Bug: 323447554 Test: Boot to home Change-Id: Id98eda794ef6c14e832dc3b40350f76adcb60ad8 --- powerstats/felix/service.cpp | 10 +--- ...rdware.vibrator-service.cs40l26-private.rc | 48 ++++++++++--------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/powerstats/felix/service.cpp b/powerstats/felix/service.cpp index dd10ef1..0194a54 100644 --- a/powerstats/felix/service.cpp +++ b/powerstats/felix/service.cpp @@ -156,15 +156,7 @@ void addGPU(std::shared_ptr p) { } std::string getNfcPath() { - struct stat buffer; - int size = 128; - char path[size]; - for (int i = 0; i < 10; i++) { - std::snprintf(path, size, - "/sys/devices/platform/10970000.hsi2c/i2c-%d/i2c-st21nfc/power_stats", i); - if (!stat(path, &buffer)) break; - } - return std::string(path); + return std::string("/sys/devices/platform/10970000.hsi2c/i2c-8/8-0008/power_stats"); } int main() { diff --git a/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc b/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc index 2799cdc..e45356e 100644 --- a/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc +++ b/vibrator/cs40l26/android.hardware.vibrator-service.cs40l26-private.rc @@ -1,5 +1,5 @@ on property:vendor.all.modules.ready=1 - wait /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_cal_time_ms + wait /sys/bus/i2c/devices/15-0043/calibration/redc_cal_time_ms mkdir /mnt/vendor/persist/haptics 0770 system system chmod 770 /mnt/vendor/persist/haptics @@ -9,26 +9,28 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics/cs40l26.cal chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/f0_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/q_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/calibration/redc_stored - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/vibe_state - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/num_waves - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_offset - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/owt_free_space - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/i2c-cs40l26a/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/i2c-cs40l26a-dual/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/15-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/15-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/15-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/15-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/15-0043/default/num_waves + chown system system /sys/bus/i2c/devices/15-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/15-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/15-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/15-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/15-0043/default/delay_before_stop_playback_us + + chown system system /sys/bus/i2c/devices/15-0042/calibration/f0_stored + chown system system /sys/bus/i2c/devices/15-0042/calibration/q_stored + chown system system /sys/bus/i2c/devices/15-0042/calibration/redc_stored + chown system system /sys/bus/i2c/devices/15-0042/default/vibe_state + chown system system /sys/bus/i2c/devices/15-0042/default/num_waves + chown system system /sys/bus/i2c/devices/15-0042/default/f0_offset + chown system system /sys/bus/i2c/devices/15-0042/default/owt_free_space + chown system system /sys/bus/i2c/devices/15-0042/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/15-0042/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/15-0042/default/delay_before_stop_playback_us + chown system system /dev/gpiochip44 enable vendor.vibrator.cs40l26 @@ -46,8 +48,8 @@ service vendor.vibrator.cs40l26 /vendor/bin/hw/android.hardware.vibrator-service setenv CALIBRATION_FILEPATH /mnt/vendor/persist/haptics/cs40l26.cal setenv CALIBRATION_FILEPATH_DUAL /mnt/vendor/persist/haptics/cs40l26_dual.cal - setenv HWAPI_PATH_PREFIX /sys/bus/i2c/devices/i2c-cs40l26a/ - setenv HWAPI_PATH_PREFIX_DUAL /sys/bus/i2c/devices/i2c-cs40l26a-dual/ + setenv HWAPI_PATH_PREFIX /sys/bus/i2c/devices/15-0043/ + setenv HWAPI_PATH_PREFIX_DUAL /sys/bus/i2c/devices/15-0042/ setenv HWAPI_DEBUG_PATHS " calibration/f0_stored calibration/redc_stored