Merge "haptics: update hapitcs sink and slot setting" into udc-dev

This commit is contained in:
TreeHugger Robot 2023-02-28 16:55:22 +00:00 committed by Android (Google) Code Review
commit 4d1376b0ad
3 changed files with 4 additions and 4 deletions

View file

@ -42,7 +42,7 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Source" value="PCM"/> <ctl name="Haptics Streaming Source" value="ASP Rx"/>
<ctl name="HAPTIC_RX Format" value="S32_LE"/> <ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>

View file

@ -39,8 +39,8 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Source" value="PCM"/> <ctl name="Haptics Streaming Source" value="ASP Rx"/>
<ctl name="HR Haptics Source" value="PCM"/> <ctl name="HR Haptics Streaming Source" value="ASP Rx"/>
<ctl name="HAPTIC_RX Format" value="S32_LE"/> <ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>

View file

@ -42,7 +42,7 @@
<ctl name="TDM_0_TX Sample Rate" value="SR_48K" /> <ctl name="TDM_0_TX Sample Rate" value="SR_48K" />
<!-- Haptic setting --> <!-- Haptic setting -->
<ctl name="Haptics Source" value="PCM"/> <ctl name="Haptics Streaming Source" value="ASP Rx"/>
<ctl name="HAPTIC_RX Format" value="S32_LE"/> <ctl name="HAPTIC_RX Format" value="S32_LE"/>
<ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/> <ctl name="HAPTIC_RX SlotFmt" value="S32_LE"/>
<ctl name="HAPTIC_RX Chan" value="Four"/> <ctl name="HAPTIC_RX Chan" value="Four"/>