Skip to content

Commit 0b05c6c

Browse files
haochuan1982haochuan1982
committed
virtio ko
1 parent 2051f86 commit 0b05c6c

6 files changed

Lines changed: 66 additions & 63 deletions

‎groups/audio/audio_base_aaos/default/policy/audio_policy_configuration.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!-- Primary Audio HAL -->
5151
<module name="primary" halVersion="3.0">
5252
<xi:include href="audio_policy_configuration_attached_devices.xml"/>
53-
<defaultOutputDevice>bus0_media_CARD_0_DEV_1</defaultOutputDevice>
53+
<defaultOutputDevice>bus0_media_CARD_2_DEV_1</defaultOutputDevice>
5454
<xi:include href="audio_policy_configuration_mixports.xml"/>
5555
<xi:include href="audio_policy_configuration_devices.xml"/>
5656
<xi:include href="audio_policy_configuration_routes.xml"/>
@@ -65,6 +65,9 @@
6565
<!-- Remote Submix Audio HAL -->
6666
<xi:include href="r_submix_audio_policy_configuration.xml"/>
6767

68+
<!-- Bluetooth Audio HAL -->
69+
<xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/>
70+
6871
</modules>
6972
<!-- End of Modules section -->
7073

‎groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,33 +16,33 @@
1616
<attachedDevices>
1717

1818
<!-- Audio Zone 0 -->
19-
<item>bus0_media_CARD_0_DEV_1</item>
20-
<item>bus1_navigation_CARD_0_DEV_5</item>
21-
<item>bus2_call_CARD_0_DEV_6</item>
22-
<item>bus3_alarm_CARD_0_DEV_7</item>
19+
<item>bus0_media_CARD_2_DEV_1</item>
20+
<item>bus1_navigation_CARD_2_DEV_5</item>
21+
<item>bus2_call_CARD_2_DEV_6</item>
22+
<item>bus3_alarm_CARD_2_DEV_7</item>
2323

2424
<item>bottom</item>
2525
<!-- back mic pcm6-->
2626
<item>back</item>
2727
<item>Echo-Reference Mic</item>
2828
<!-- voice assistant pcm 5-->
29-
<item>i_bus1_CARD_0_DEV_5</item>
29+
<item>i_bus1_CARD_2_DEV_5</item>
3030

3131
<!-- Audio Zone 1 -->
32-
<item>bus100_CARD_0_DEV_2</item>
32+
<item>bus100_CARD_2_DEV_2</item>
3333
<!-- In Call-->
34-
<item>bus101_CARD_0_DEV_8</item>
34+
<item>bus101_CARD_2_DEV_8</item>
3535

36-
<item>i_bus100_CARD_0_DEV_2</item>
36+
<item>i_bus100_CARD_2_DEV_2</item>
3737

3838
<!-- Audio Zone 2-->
39-
<item>bus200_CARD_0_DEV_3</item>
39+
<item>bus200_CARD_2_DEV_3</item>
4040

41-
<item>i_bus200_CARD_0_DEV_3</item>
41+
<item>i_bus200_CARD_2_DEV_3</item>
4242

4343
<!-- Audio Zone 3-->
44-
<item>bus300_CARD_0_DEV_4</item>
44+
<item>bus300_CARD_2_DEV_4</item>
4545

46-
<item>i_bus300_CARD_0_DEV_4</item>
46+
<item>i_bus300_CARD_2_DEV_4</item>
4747

4848
</attachedDevices>

‎groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
-->
1616
<devicePorts>
1717
<!-- Audio zone 0 -->
18-
<devicePort tagName="bus0_media_CARD_0_DEV_1" role="sink" type="AUDIO_DEVICE_OUT_BUS"
19-
address="bus0_media_CARD_0_DEV_1">
18+
<devicePort tagName="bus0_media_CARD_2_DEV_1" role="sink" type="AUDIO_DEVICE_OUT_BUS"
19+
address="bus0_media_CARD_2_DEV_1">
2020
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
2121
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
2222
<gains>
@@ -25,8 +25,8 @@
2525
defaultValueMB="0" stepValueMB="100"/>
2626
</gains>
2727
</devicePort>
28-
<devicePort tagName="bus1_navigation_CARD_0_DEV_5" role="sink" type="AUDIO_DEVICE_OUT_BUS"
29-
address="bus1_navigation_CARD_0_DEV_5">
28+
<devicePort tagName="bus1_navigation_CARD_2_DEV_5" role="sink" type="AUDIO_DEVICE_OUT_BUS"
29+
address="bus1_navigation_CARD_2_DEV_5">
3030
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
3131
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
3232
<gains>
@@ -35,8 +35,8 @@
3535
defaultValueMB="0" stepValueMB="100"/>
3636
</gains>
3737
</devicePort>
38-
<devicePort tagName="bus2_call_CARD_0_DEV_6" role="sink" type="AUDIO_DEVICE_OUT_BUS"
39-
address="bus2_call_CARD_0_DEV_6">
38+
<devicePort tagName="bus2_call_CARD_2_DEV_6" role="sink" type="AUDIO_DEVICE_OUT_BUS"
39+
address="bus2_call_CARD_2_DEV_6">
4040
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
4141
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
4242
<gains>
@@ -45,8 +45,8 @@
4545
defaultValueMB="0" stepValueMB="100"/>
4646
</gains>
4747
</devicePort>
48-
<devicePort tagName="bus3_alarm_CARD_0_DEV_7" role="sink" type="AUDIO_DEVICE_OUT_BUS"
49-
address="bus3_alarm_CARD_0_DEV_7">
48+
<devicePort tagName="bus3_alarm_CARD_2_DEV_7" role="sink" type="AUDIO_DEVICE_OUT_BUS"
49+
address="bus3_alarm_CARD_2_DEV_7">
5050
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
5151
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
5252
<gains>
@@ -74,8 +74,8 @@
7474
samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
7575
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_IN_FRONT_BACK"/>
7676
</devicePort>
77-
<devicePort tagName="i_bus1_CARD_0_DEV_5" type="AUDIO_DEVICE_IN_BUS"
78-
role="source" address="i_bus1_CARD_0_DEV_5">
77+
<devicePort tagName="i_bus1_CARD_2_DEV_5" type="AUDIO_DEVICE_IN_BUS"
78+
role="source" address="i_bus1_CARD_2_DEV_5">
7979
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
8080
samplingRates="48000"
8181
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
@@ -87,8 +87,8 @@
8787
</devicePort>
8888

8989
<!-- Audio zone 1 -->
90-
<devicePort tagName="bus100_CARD_0_DEV_2" role="sink" type="AUDIO_DEVICE_OUT_BUS"
91-
address="bus100_CARD_0_DEV_2">
90+
<devicePort tagName="bus100_CARD_2_DEV_2" role="sink" type="AUDIO_DEVICE_OUT_BUS"
91+
address="bus100_CARD_2_DEV_2">
9292
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
9393
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
9494
<gains>
@@ -97,8 +97,8 @@
9797
defaultValueMB="0" stepValueMB="100"/>
9898
</gains>
9999
</devicePort>
100-
<devicePort tagName="bus101_CARD_0_DEV_8" role="sink" type="AUDIO_DEVICE_OUT_BUS"
101-
address="bus101_CARD_0_DEV_8">
100+
<devicePort tagName="bus101_CARD_2_DEV_8" role="sink" type="AUDIO_DEVICE_OUT_BUS"
101+
address="bus101_CARD_2_DEV_8">
102102
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
103103
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
104104
<gains>
@@ -108,8 +108,8 @@
108108
</gains>
109109
</devicePort>
110110

111-
<devicePort tagName="i_bus100_CARD_0_DEV_2" type="AUDIO_DEVICE_IN_BUS"
112-
role="source" address="i_bus100_CARD_0_DEV_2">
111+
<devicePort tagName="i_bus100_CARD_2_DEV_2" type="AUDIO_DEVICE_IN_BUS"
112+
role="source" address="i_bus100_CARD_2_DEV_2">
113113
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
114114
samplingRates="48000"
115115
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
@@ -121,8 +121,8 @@
121121
</devicePort>
122122

123123
<!-- Audio zone 2 -->
124-
<devicePort tagName="bus200_CARD_0_DEV_3" role="sink" type="AUDIO_DEVICE_OUT_BUS"
125-
address="bus200_CARD_0_DEV_3">
124+
<devicePort tagName="bus200_CARD_2_DEV_3" role="sink" type="AUDIO_DEVICE_OUT_BUS"
125+
address="bus200_CARD_2_DEV_3">
126126
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
127127
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
128128
<gains>
@@ -132,8 +132,8 @@
132132
</gains>
133133
</devicePort>
134134

135-
<devicePort tagName="i_bus200_CARD_0_DEV_3" type="AUDIO_DEVICE_IN_BUS"
136-
role="source" address="i_bus200_CARD_0_DEV_3">
135+
<devicePort tagName="i_bus200_CARD_2_DEV_3" type="AUDIO_DEVICE_IN_BUS"
136+
role="source" address="i_bus200_CARD_2_DEV_3">
137137
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
138138
samplingRates="48000"
139139
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
@@ -145,8 +145,8 @@
145145
</devicePort>
146146

147147
<!-- Audio zone 3-->
148-
<devicePort tagName="bus300_CARD_0_DEV_4" role="sink" type="AUDIO_DEVICE_OUT_BUS"
149-
address="bus300_CARD_0_DEV_4">
148+
<devicePort tagName="bus300_CARD_2_DEV_4" role="sink" type="AUDIO_DEVICE_OUT_BUS"
149+
address="bus300_CARD_2_DEV_4">
150150
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
151151
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
152152
<gains>
@@ -156,8 +156,8 @@
156156
</gains>
157157
</devicePort>
158158

159-
<devicePort tagName="i_bus300_CARD_0_DEV_4" type="AUDIO_DEVICE_IN_BUS"
160-
role="source" address="i_bus300_CARD_0_DEV_4">
159+
<devicePort tagName="i_bus300_CARD_2_DEV_4" type="AUDIO_DEVICE_IN_BUS"
160+
role="source" address="i_bus300_CARD_2_DEV_4">
161161
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
162162
samplingRates="48000"
163163
channelMasks="AUDIO_CHANNEL_IN_STEREO"/>

‎groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
</mixPort>
8383

8484
<!-- Audio Zone 2-->
85-
<mixPort name="mixport_bus200_CARD_0_DEV_3" role="source">
85+
<mixPort name="mixport_bus200_CARD_2_DEV_3" role="source">
8686
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
8787
samplingRates="48000"
8888
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

‎groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@
1616
<routes>
1717

1818
<!-- Audio Zone 0-->
19-
<route type="mix" sink="bus0_media_CARD_0_DEV_1" sources="mixport_bus0_media_out"/>
20-
<route type="mix" sink="bus1_navigation_CARD_0_DEV_5" sources="mixport_bus1_navigation_out"/>
21-
<route type="mix" sink="bus2_call_CARD_0_DEV_6" sources="mixport_bus2_call_out"/>
22-
<route type="mix" sink="bus3_alarm_CARD_0_DEV_7" sources="mixport_bus3_alarm_out"/>
19+
<route type="mix" sink="bus0_media_CARD_2_DEV_1" sources="mixport_bus0_media_out"/>
20+
<route type="mix" sink="bus1_navigation_CARD_2_DEV_5" sources="mixport_bus1_navigation_out"/>
21+
<route type="mix" sink="bus2_call_CARD_2_DEV_6" sources="mixport_bus2_call_out"/>
22+
<route type="mix" sink="bus3_alarm_CARD_2_DEV_7" sources="mixport_bus3_alarm_out"/>
2323

2424
<route type="mix" sink="primary input" sources="bottom"/>
2525
<route type="mix" sink="Built-In Back Mic" sources="back"/>
2626
<route type="mix" sink="Echo-Reference" sources="Echo-Reference Mic"/>
27-
<route type="mix" sink="mixport_input_bus1_zone_0" sources="i_bus1_CARD_0_DEV_5"/>
27+
<route type="mix" sink="mixport_input_bus1_zone_0" sources="i_bus1_CARD_2_DEV_5"/>
2828

2929
<!-- Audio Zone 1-->
30-
<route type="mix" sink="bus100_CARD_0_DEV_2" sources="mixport_bus100_audio_zone_1"/>
31-
<route type="mix" sink="bus101_CARD_0_DEV_8" sources="mixport_bus101_audio_zone_1"/>
32-
<route type="mix" sink="mixport_input_bus100_zone_1" sources="i_bus100_CARD_0_DEV_2"/>
30+
<route type="mix" sink="bus100_CARD_2_DEV_2" sources="mixport_bus100_audio_zone_1"/>
31+
<route type="mix" sink="bus101_CARD_2_DEV_8" sources="mixport_bus101_audio_zone_1"/>
32+
<route type="mix" sink="mixport_input_bus100_zone_1" sources="i_bus100_CARD_2_DEV_2"/>
3333

3434
<!-- Audio Zone 2-->
35-
<route type="mix" sink="bus200_CARD_0_DEV_3" sources="mixport_bus200_CARD_0_DEV_3"/>
36-
<route type="mix" sink="mixport_input_bus200_zone_2" sources="i_bus200_CARD_0_DEV_3"/>
35+
<route type="mix" sink="bus200_CARD_2_DEV_3" sources="mixport_bus200_CARD_2_DEV_3"/>
36+
<route type="mix" sink="mixport_input_bus200_zone_2" sources="i_bus200_CARD_2_DEV_3"/>
3737

3838
<!-- Audio Zone 3-->
39-
<route type="mix" sink="bus300_CARD_0_DEV_4" sources="mixport_bus101_audio_zone_1"/>
40-
<route type="mix" sink="mixport_input_bus300_zone_3" sources="i_bus300_CARD_0_DEV_4"/>
39+
<route type="mix" sink="bus300_CARD_2_DEV_4" sources="mixport_bus101_audio_zone_1"/>
40+
<route type="mix" sink="mixport_input_bus300_zone_3" sources="i_bus300_CARD_2_DEV_4"/>
4141

4242
</routes>

‎groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,26 @@
2828
<zoneConfig name="primary zone config" isDefault="true">
2929
<volumeGroups>
3030
<group>
31-
<device address="bus0_media_CARD_0_DEV_1">
31+
<device address="bus0_media_CARD_2_DEV_1">
3232
<context context="music"/>
3333
<context context="announcement"/>
3434
<context context="notification"/>
3535
</device>
3636
</group>
3737
<group>
38-
<device address="bus1_navigation_CARD_0_DEV_5">
38+
<device address="bus1_navigation_CARD_2_DEV_5">
3939
<context context="navigation"/>
4040
<context context="voice_command"/>
4141
</device>
4242
</group>
4343
<group>
44-
<device address="bus2_call_CARD_0_DEV_6">
44+
<device address="bus2_call_CARD_2_DEV_6">
4545
<context context="call_ring"/>
4646
<context context="call"/>
4747
</device>
4848
</group>
4949
<group>
50-
<device address="bus3_alarm_CARD_0_DEV_7">
50+
<device address="bus3_alarm_CARD_2_DEV_7">
5151
<context context="alarm"/>
5252
<context context="system_sound"/>
5353
<context context="emergency"/>
@@ -61,15 +61,15 @@
6161
<inputDevices>
6262
<inputDevice address="bottom"/>
6363
<inputDevice address="back"/>
64-
<inputDevice address="i_bus1_CARD_0_DEV_5"/>
64+
<inputDevice address="i_bus1_CARD_2_DEV_5"/>
6565
</inputDevices>
6666
</zone>
6767
<zone name="front passenger zone 1" audioZoneId="1" occupantZoneId="1">
6868
<zoneConfigs>
6969
<zoneConfig name="front passenger zone 1 config 0" isDefault="true">
7070
<volumeGroups>
7171
<group>
72-
<device address="bus100_CARD_0_DEV_2">
72+
<device address="bus100_CARD_2_DEV_2">
7373
<context context="music"/>
7474
<context context="navigation"/>
7575
<context context="voice_command"/>
@@ -83,7 +83,7 @@
8383
</device>
8484
</group>
8585
<group>
86-
<device address="bus101_CARD_0_DEV_8">
86+
<device address="bus101_CARD_2_DEV_8">
8787
<context context="call_ring"/>
8888
<context context="call"/>
8989
</device>
@@ -95,7 +95,7 @@
9595
<group>
9696
<!-- Due to a shortage of devices and devices in different zoneconfigs
9797
is exclusive, temporarily use the same device as config 0 in call. -->
98-
<device address="bus101_CARD_0_DEV_8">
98+
<device address="bus101_CARD_2_DEV_8">
9999
<context context="music"/>
100100
<context context="navigation"/>
101101
<context context="voice_command"/>
@@ -114,15 +114,15 @@
114114
</zoneConfig>
115115
</zoneConfigs>
116116
<inputDevices>
117-
<inputDevice address="i_bus100_CARD_0_DEV_2"/>
117+
<inputDevice address="i_bus100_CARD_2_DEV_2"/>
118118
</inputDevices>
119119
</zone>
120120
<zone name="front passenger zone 2" audioZoneId="2" occupantZoneId="2">
121121
<zoneConfigs>
122122
<zoneConfig name="front passenger zone 2 config 0" isDefault="true">
123123
<volumeGroups>
124124
<group>
125-
<device address="bus200_CARD_0_DEV_3">
125+
<device address="bus200_CARD_2_DEV_3">
126126
<context context="music"/>
127127
<context context="navigation"/>
128128
<context context="voice_command"/>
@@ -141,15 +141,15 @@
141141
</zoneConfig>
142142
</zoneConfigs>
143143
<inputDevices>
144-
<inputDevice address="i_bus200_CARD_0_DEV_3"/>
144+
<inputDevice address="i_bus200_CARD_2_DEV_3"/>
145145
</inputDevices>
146146
</zone>
147147
<zone name="front passenger zone 3" audioZoneId="3" occupantZoneId="3">
148148
<zoneConfigs>
149149
<zoneConfig name="front passenger zone 3 config 0" isDefault="true">
150150
<volumeGroups>
151151
<group>
152-
<device address="bus300_CARD_0_DEV_4">
152+
<device address="bus300_CARD_2_DEV_4">
153153
<context context="music"/>
154154
<context context="navigation"/>
155155
<context context="voice_command"/>
@@ -168,7 +168,7 @@
168168
</zoneConfig>
169169
</zoneConfigs>
170170
<inputDevices>
171-
<inputDevice address="i_bus300_CARD_0_DEV_4"/>
171+
<inputDevice address="i_bus300_CARD_2_DEV_4"/>
172172
</inputDevices>
173173
</zone>
174174
</zones>

0 commit comments

Comments
 (0)