Skip to content

Commit 5ff0482

Browse files
CE1CECLCE1CECL
committed
More Changes
- Add & Update cywbtserialbus Sources - Update All `*.inx` files to `*.inf` - Update All `*.inf` files from worproject releases `.zip` - Update All `*.inf` files to Remove `DriverVer` - Add `uaspdisabler` & `dsdtpatch` Drivers to tree (`.inf`-only Drivers from `.zip` releases) - Make all `Configuration Condition` & `Platform Condition` be Release & ARM64 by Default - Remove ALL references to `Win32` & `x64` targets Signed-off-by: Christopher Lentocha <christopherericlentocha@gmail.com>
1 parent 5e06d98 commit 5ff0482

52 files changed

Lines changed: 8932 additions & 96 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎build/bcm2836/buildbcm2836.sln‎

Lines changed: 82 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDHostBRCME88C", "..\..\dri
6666
EndProject
6767
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpirshub3", "..\..\drivers\usb\bcm2711\rpirshub3\rpirshub3.vcxproj", "{DFE53385-0150-401F-91D2-66587EF1927A}"
6868
EndProject
69+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "rpi4hdmiwav", "rpi4hdmiwav", "{BC27DA96-9057-4233-8082-FCAA7AB30DF2}"
70+
EndProject
71+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpi4hdmiwav", "..\..\drivers\audio\rpi4hdmiwav\rpi4hdmiwav\rpi4hdmiwav.vcxproj", "{0697D874-5BE1-4884-A62A-4D5772045F04}"
72+
EndProject
73+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EndpointsCommon", "..\..\drivers\audio\rpi4hdmiwav\EndpointsCommon\EndpointsCommon.vcxproj", "{E58E819D-A822-49A7-A98D-B7A7A9B0728E}"
74+
EndProject
75+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rpi4hdmiwavbridge", "..\..\drivers\pwm\rpi4hdmiwavbridge\rpi4hdmiwavbridge.vcxproj", "{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}"
76+
EndProject
77+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cywbtserialbus", "..\..\drivers\bt\cywbtserialbus\vendor\cywbtserialbus.vcxproj", "{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}"
78+
EndProject
79+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dsdtpatch", "..\..\drivers\misc\dsdtpatch\dsdtpatch.vcxproj", "{3201E911-229F-4677-9528-7B2A083D5F6A}"
80+
EndProject
81+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uaspdisabler", "..\..\drivers\usb\bcm2711\uaspdisabler\uaspdisabler.vcxproj", "{7B764458-7562-4C53-B41A-F8456107501C}"
82+
EndProject
6983
Global
7084
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7185
Debug|ARM = Debug|ARM
@@ -228,10 +242,8 @@ Global
228242
{1F747444-9FD4-4B32-8450-96113506B2A7}.Release|ARM64.Build.0 = Release|ARM64
229243
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM.ActiveCfg = Debug|ARM
230244
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM.Build.0 = Debug|ARM
231-
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM.Deploy.0 = Debug|ARM
232245
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM64.ActiveCfg = Debug|ARM64
233246
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM64.Build.0 = Debug|ARM64
234-
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Debug|ARM64.Deploy.0 = Debug|ARM64
235247
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Release|ARM.ActiveCfg = Release|ARM
236248
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Release|ARM.Build.0 = Release|ARM
237249
{5C7944BC-EB3A-4866-B80E-E158CC3C2E20}.Release|ARM.Deploy.0 = Release|ARM
@@ -256,10 +268,8 @@ Global
256268
{A4EF48D0-496B-46C4-B9FF-3D5F4858F2FC}.Release|ARM64.Build.0 = Release|ARM64
257269
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM.ActiveCfg = Debug|ARM
258270
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM.Build.0 = Debug|ARM
259-
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM.Deploy.0 = Debug|ARM
260271
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM64.ActiveCfg = Debug|ARM64
261272
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM64.Build.0 = Debug|ARM64
262-
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Debug|ARM64.Deploy.0 = Debug|ARM64
263273
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Release|ARM.ActiveCfg = Release|ARM
264274
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Release|ARM.Build.0 = Release|ARM
265275
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Release|ARM.Deploy.0 = Release|ARM
@@ -268,23 +278,89 @@ Global
268278
{DC75D1FD-24D8-462B-8566-5E672802DDF3}.Release|ARM64.Deploy.0 = Release|ARM64
269279
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM.ActiveCfg = Debug|ARM
270280
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM.Build.0 = Debug|ARM
271-
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM.Deploy.0 = Debug|ARM
272281
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM64.ActiveCfg = Debug|ARM64
273282
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM64.Build.0 = Debug|ARM64
274-
{DFE53385-0150-401F-91D2-66587EF1927A}.Debug|ARM64.Deploy.0 = Debug|ARM64
275283
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM.ActiveCfg = Release|ARM
276284
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM.Build.0 = Release|ARM
277285
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM.Deploy.0 = Release|ARM
278286
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM64.ActiveCfg = Release|ARM64
279287
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM64.Build.0 = Release|ARM64
280288
{DFE53385-0150-401F-91D2-66587EF1927A}.Release|ARM64.Deploy.0 = Release|ARM64
289+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Debug|ARM.ActiveCfg = Debug|ARM
290+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Debug|ARM.Build.0 = Debug|ARM
291+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Debug|ARM64.ActiveCfg = Debug|ARM64
292+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Debug|ARM64.Build.0 = Debug|ARM64
293+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM.ActiveCfg = Release|ARM
294+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM.Build.0 = Release|ARM
295+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM.Deploy.0 = Release|ARM
296+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM64.ActiveCfg = Release|ARM64
297+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM64.Build.0 = Release|ARM64
298+
{0697D874-5BE1-4884-A62A-4D5772045F04}.Release|ARM64.Deploy.0 = Release|ARM64
299+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Debug|ARM.ActiveCfg = Debug|ARM
300+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Debug|ARM.Build.0 = Debug|ARM
301+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Debug|ARM64.ActiveCfg = Debug|ARM64
302+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Debug|ARM64.Build.0 = Debug|ARM64
303+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM.ActiveCfg = Release|ARM
304+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM.Build.0 = Release|ARM
305+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM.Deploy.0 = Release|ARM
306+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM64.ActiveCfg = Release|ARM64
307+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM64.Build.0 = Release|ARM64
308+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E}.Release|ARM64.Deploy.0 = Release|ARM64
309+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Debug|ARM.ActiveCfg = Debug|ARM
310+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Debug|ARM.Build.0 = Debug|ARM
311+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Debug|ARM64.ActiveCfg = Debug|ARM64
312+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Debug|ARM64.Build.0 = Debug|ARM64
313+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM.ActiveCfg = Release|ARM
314+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM.Build.0 = Release|ARM
315+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM.Deploy.0 = Release|ARM
316+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM64.ActiveCfg = Release|ARM64
317+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM64.Build.0 = Release|ARM64
318+
{2E48AFDC-ABB8-4B84-A7E2-EA8600D727CB}.Release|ARM64.Deploy.0 = Release|ARM64
319+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM.ActiveCfg = Debug|ARM
320+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM.Build.0 = Debug|ARM
321+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM.Deploy.0 = Debug|ARM
322+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM64.ActiveCfg = Debug|ARM64
323+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM64.Build.0 = Debug|ARM64
324+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Debug|ARM64.Deploy.0 = Debug|ARM64
325+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM.ActiveCfg = Release|ARM
326+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM.Build.0 = Release|ARM
327+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM.Deploy.0 = Release|ARM
328+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM64.ActiveCfg = Release|ARM64
329+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM64.Build.0 = Release|ARM64
330+
{F8EFDBF2-B339-413F-94F5-AEB55DCCBA01}.Release|ARM64.Deploy.0 = Release|ARM64
331+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM.ActiveCfg = Debug|ARM
332+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM.Build.0 = Debug|ARM
333+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM.Deploy.0 = Debug|ARM
334+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM64.ActiveCfg = Debug|ARM64
335+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM64.Build.0 = Debug|ARM64
336+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Debug|ARM64.Deploy.0 = Debug|ARM64
337+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM.ActiveCfg = Release|ARM
338+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM.Build.0 = Release|ARM
339+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM.Deploy.0 = Release|ARM
340+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM64.ActiveCfg = Release|ARM64
341+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM64.Build.0 = Release|ARM64
342+
{3201E911-229F-4677-9528-7B2A083D5F6A}.Release|ARM64.Deploy.0 = Release|ARM64
343+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM.ActiveCfg = Debug|ARM
344+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM.Build.0 = Debug|ARM
345+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM.Deploy.0 = Debug|ARM
346+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM64.ActiveCfg = Debug|ARM64
347+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM64.Build.0 = Debug|ARM64
348+
{7B764458-7562-4C53-B41A-F8456107501C}.Debug|ARM64.Deploy.0 = Debug|ARM64
349+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM.ActiveCfg = Release|ARM
350+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM.Build.0 = Release|ARM
351+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM.Deploy.0 = Release|ARM
352+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM64.ActiveCfg = Release|ARM64
353+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM64.Build.0 = Release|ARM64
354+
{7B764458-7562-4C53-B41A-F8456107501C}.Release|ARM64.Deploy.0 = Release|ARM64
281355
EndGlobalSection
282356
GlobalSection(SolutionProperties) = preSolution
283357
HideSolutionNode = FALSE
284358
EndGlobalSection
285359
GlobalSection(NestedProjects) = preSolution
286360
{3A038574-E9E7-4984-8EAA-DD1192C2498E} = {5E0F66BD-F46A-410B-A693-E5958463B53F}
287361
{1A0EEDCE-814F-4045-91BD-012E96D8F89F} = {5E0F66BD-F46A-410B-A693-E5958463B53F}
362+
{0697D874-5BE1-4884-A62A-4D5772045F04} = {BC27DA96-9057-4233-8082-FCAA7AB30DF2}
363+
{E58E819D-A822-49A7-A98D-B7A7A9B0728E} = {BC27DA96-9057-4233-8082-FCAA7AB30DF2}
288364
EndGlobalSection
289365
GlobalSection(ExtensibilityGlobals) = postSolution
290366
SolutionGuid = {2AF6BE5C-DEF7-4A6D-8A4E-770799EF5664}

‎drivers/RpiLanPropertyChange/bcm2836/RpiLanPropertyChange.inf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Signature = "$WINDOWS NT$"
66
Class = SYSTEM
77
ClassGuid = {4d36e97d-e325-11ce-bfc1-08002be10318}
88
Provider = %ProviderString%
9-
DriverVer = 04/27/2020,1.0.0.0000
9+
1010
CatalogFile = RpiLanPropertyChange.cat
1111

1212
[DestinationDirs]
@@ -52,4 +52,4 @@ REG_MULTI_SZ = 0x00010000
5252
REG_APPEND_MULTI_SZ = 0x00010008
5353
REG_EXPAND_SZ = 0x00020000
5454
REG_DWORD = 0x00010001
55-
REG_BINARY = 0x00000001
55+
REG_BINARY = 0x00000001

‎drivers/audio/bcm2836/EndpointsCommon/EndpointsCommon.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DriverType>KMDF</DriverType>
2525
<TARGETNAME>EndpointsCommon</TARGETNAME>
2626
<DriverTargetPlatform>Universal</DriverTargetPlatform>
27-
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
27+
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
2828
<Platform Condition="'$(Platform)' == ''">ARM64</Platform>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎drivers/audio/bcm2836/rpiwav.inf‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Signature="$Windows NT$"
33
Class=MEDIA
44
ClassGUID={4d36e96c-e325-11ce-bfc1-08002be10318}
5-
DriverVer = WILL_BE_FIXED_UP_BY_STAMPINF
5+
66
Provider=%ProviderString%
77
CatalogFile=rpiwav.cat
88
PnpLockdown=1
@@ -17,7 +17,7 @@ rpiwav.sys=222
1717
%MfgName%=MicrosoftDS,NT$ARCH$
1818

1919
[MicrosoftDS.NT$ARCH$]
20-
%RPIWAV_SA.DeviceDesc%=RPIWAV_SA, Root\rpiwav
20+
%RPIWAV_SA.DeviceDesc%=RPIWAV_SA, ACPI\RPI73EA
2121

2222
[DestinationDirs]
2323
RPIWAV_SA.CopyList=12 ; windows\system32\drivers
@@ -96,12 +96,6 @@ HKR,,DeviceType,0x10001,0x0000001D
9696
; SDDL_DEVOBJ_SYS_ALL_ADM_RWX_WORLD_RWX_RES_RWX
9797
HKR,,Security,,"D:P(A;;GA;;;SY)(A;;GRGWGX;;;BA)(A;;GRGWGX;;;WD)(A;;GRGWGX;;;RC)"
9898

99-
[DeviceInstall32]
100-
AddDevice = ROOT\rpiwav\0000,,rpiwav_RootDevice_Inst
101-
102-
[rpiwav_RootDevice_Inst]
103-
HardwareIds = ROOT\rpiwav
104-
10599
;======================================================
106100
; WDF
107101
;======================================================

‎drivers/audio/rpi4hdmiwav/EndpointsCommon/EndpointsCommon.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DriverType>KMDF</DriverType>
2525
<TARGETNAME>EndpointsCommon</TARGETNAME>
2626
<DriverTargetPlatform>Universal</DriverTargetPlatform>
27-
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
27+
<Configuration Condition="'$(Configuration)' == ''">Release</Configuration>
2828
<Platform Condition="'$(Platform)' == ''">ARM64</Platform>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

‎drivers/audio/rpi4hdmiwav/rpi4hdmiwav.inf‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Signature="$Windows NT$"
33
Class=MEDIA
44
ClassGUID={4d36e96c-e325-11ce-bfc1-08002be10318}
5-
DriverVer = WILL_BE_FIXED_UP_BY_STAMPINF
5+
66
Provider=%ProviderString%
77
CatalogFile=rpi4hdmiwav.cat
88
PnpLockdown=1
@@ -17,77 +17,77 @@ rpi4hdmiwav.sys=222
1717
%MfgName%=MicrosoftDS,NT$ARCH$
1818

1919
[MicrosoftDS.NT$ARCH$]
20-
%RPI4HDMIWAV_SA.DeviceDesc%=RPI4HDMIWAV_SA, ACPI\RPI73EC
20+
%RPIWAV_SA.DeviceDesc%=RPIWAV_SA, ACPI\RPI73EC
2121

2222
[DestinationDirs]
23-
RPI4HDMIWAV_SA.CopyList=12 ; windows\system32\drivers
23+
RPIWAV_SA.CopyList=12 ; windows\system32\drivers
2424

2525
;======================================================
26-
; RPI4HDMIWAV_SA
26+
; RPIWAV_SA
2727
;======================================================
28-
[RPI4HDMIWAV_SA.CopyList]
28+
[RPIWAV_SA.CopyList]
2929
rpi4hdmiwav.sys
3030

31-
[RPI4HDMIWAV_SA.AddReg]
31+
[RPIWAV_SA.AddReg]
3232
HKR,,AssociatedFilters,,"wdmaud"
3333
HKR,,Driver,,rpi4hdmiwav.sys
3434

3535
HKR,Drivers,SubClasses,,"wave"
3636

3737
HKR,Drivers\wave\wdmaud.drv,Driver,,wdmaud.drv
3838

39-
HKR,Drivers\wave\wdmaud.drv,Description,,%RPI4HDMIWAV_SA.DeviceDesc%
39+
HKR,Drivers\wave\wdmaud.drv,Description,,%RPIWAV_SA.DeviceDesc%
4040

4141
;======================================================
4242
; render interfaces: speaker (external: headphone)
4343
;======================================================
44-
[RPI4HDMIWAV.I.WaveSpeakerHeadphone]
45-
AddReg=RPI4HDMIWAV.I.WaveSpeakerHeadphone.AddReg
46-
[RPI4HDMIWAV.I.WaveSpeakerHeadphone.AddReg]
44+
[RPIWAV.I.WaveSpeakerHeadphone]
45+
AddReg=RPIWAV.I.WaveSpeakerHeadphone.AddReg
46+
[RPIWAV.I.WaveSpeakerHeadphone.AddReg]
4747
HKR,,CLSID,,%Proxy.CLSID%
48-
HKR,,FriendlyName,,%RPI4HDMIWAV.WaveSpeakerHeadphone.szPname%
48+
HKR,,FriendlyName,,%RPIWAV.WaveSpeakerHeadphone.szPname%
4949

50-
[RPI4HDMIWAV.I.TopologySpeakerHeadphone]
51-
AddReg=RPI4HDMIWAV.I.TopologySpeakerHeadphone.AddReg
52-
[RPI4HDMIWAV.I.TopologySpeakerHeadphone.AddReg]
50+
[RPIWAV.I.TopologySpeakerHeadphone]
51+
AddReg=RPIWAV.I.TopologySpeakerHeadphone.AddReg
52+
[RPIWAV.I.TopologySpeakerHeadphone.AddReg]
5353
HKR,,CLSID,,%Proxy.CLSID%
54-
HKR,,FriendlyName,,%RPI4HDMIWAV.TopologySpeakerHeadphone.szPname%
54+
HKR,,FriendlyName,,%RPIWAV.TopologySpeakerHeadphone.szPname%
5555
; The following lines opt-in to pull mode.
5656
HKR,EP\0,%PKEY_AudioEndpoint_Association%,,%KSNODETYPE_ANY%
5757
HKR,EP\0,%PKEY_AudioEndpoint_Supports_EventDriven_Mode%,0x00010001,0x1
5858

5959

6060
;======================================================
61-
; RPI4HDMIWAV_SA
61+
; RPIWAV_SA
6262
;======================================================
63-
[RPI4HDMIWAV_SA.NT]
63+
[RPIWAV_SA.NT]
6464
Include=ks.inf,wdmaudio.inf
6565
Needs=KS.Registration, WDMAUDIO.Registration
66-
CopyFiles=RPI4HDMIWAV_SA.CopyList
67-
AddReg=RPI4HDMIWAV_SA.AddReg
66+
CopyFiles=RPIWAV_SA.CopyList
67+
AddReg=RPIWAV_SA.AddReg
6868

69-
[RPI4HDMIWAV_SA.NT.Interfaces]
69+
[RPIWAV_SA.NT.Interfaces]
7070
;
7171
; Interfaces for speaker (external: headphone) render endpoint.
7272
;
73-
AddInterface=%KSCATEGORY_AUDIO%, %KSNAME_WaveSpeakerHeadphone%, RPI4HDMIWAV.I.WaveSpeakerHeadphone
74-
AddInterface=%KSCATEGORY_RENDER%, %KSNAME_WaveSpeakerHeadphone%, RPI4HDMIWAV.I.WaveSpeakerHeadphone
75-
AddInterface=%KSCATEGORY_REALTIME%, %KSNAME_WaveSpeakerHeadphone%, RPI4HDMIWAV.I.WaveSpeakerHeadphone
76-
AddInterface=%KSCATEGORY_AUDIO%, %KSNAME_TopologySpeakerHeadphone%, RPI4HDMIWAV.I.TopologySpeakerHeadphone
77-
AddInterface=%KSCATEGORY_TOPOLOGY%, %KSNAME_TopologySpeakerHeadphone%, RPI4HDMIWAV.I.TopologySpeakerHeadphone
73+
AddInterface=%KSCATEGORY_AUDIO%, %KSNAME_WaveSpeakerHeadphone%, RPIWAV.I.WaveSpeakerHeadphone
74+
AddInterface=%KSCATEGORY_RENDER%, %KSNAME_WaveSpeakerHeadphone%, RPIWAV.I.WaveSpeakerHeadphone
75+
AddInterface=%KSCATEGORY_REALTIME%, %KSNAME_WaveSpeakerHeadphone%, RPIWAV.I.WaveSpeakerHeadphone
76+
AddInterface=%KSCATEGORY_AUDIO%, %KSNAME_TopologySpeakerHeadphone%, RPIWAV.I.TopologySpeakerHeadphone
77+
AddInterface=%KSCATEGORY_TOPOLOGY%, %KSNAME_TopologySpeakerHeadphone%, RPIWAV.I.TopologySpeakerHeadphone
7878

7979

80-
[RPI4HDMIWAV_SA.NT.Services]
80+
[RPIWAV_SA.NT.Services]
8181
AddService=rpi4hdmiwav,0x00000002,rpi4hdmiwav_Service_Inst
8282

8383
[rpi4hdmiwav_Service_Inst]
84-
DisplayName=%RPI4HDMIWAV.SvcDesc%
84+
DisplayName=%RPIWAV.SvcDesc%
8585
ServiceType=1
8686
StartType=3
8787
ErrorControl=1
8888
ServiceBinary=%10%\system32\drivers\rpi4hdmiwav.sys
8989

90-
[RPI4HDMIWAV_SA.NT.HW]
90+
[RPIWAV_SA.NT.HW]
9191
AddReg = AUDIOHW.AddReg
9292

9393
[AUDIOHW.AddReg]
@@ -99,9 +99,9 @@ HKR,,Security,,"D:P(A;;GA;;;SY)(A;;GRGWGX;;;BA)(A;;GRGWGX;;;WD)(A;;GRGWGX;;;RC)"
9999
;======================================================
100100
; WDF
101101
;======================================================
102-
[RPI4HDMIWAV_SA.NT.Wdf]
103-
KmdfService = rpi4hdmiwav, RPI4HDMIWAV_SA_WdfSect
104-
[RPI4HDMIWAV_SA_WdfSect]
102+
[RPIWAV_SA.NT.Wdf]
103+
KmdfService = rpi4hdmiwav, RPIWAV_SA_WdfSect
104+
[RPIWAV_SA_WdfSect]
105105
KmdfLibraryVersion = $KMDFVERSION$
106106

107107
;======================================================
@@ -133,9 +133,9 @@ ProviderString="MS-IOT"
133133
MfgName="Microsoft"
134134
MsCopyRight="Copyright (c) Microsoft Corporation All Rights Reserved"
135135

136-
RPI4HDMIWAV_SA.DeviceDesc="Raspberry Pi Audio"
137-
RPI4HDMIWAV.SvcDesc="Raspberry Pi Audio Driver"
136+
RPIWAV_SA.DeviceDesc="Raspberry Pi 4 HDMI Audio"
137+
RPIWAV.SvcDesc="Raspberry Pi 4 HDMI Audio Driver"
138138

139139
;; friendly names
140-
RPI4HDMIWAV.WaveSpeakerHeadphone.szPname="Raspberry Pi Speaker Headphone"
141-
RPI4HDMIWAV.TopologySpeakerHeadphone.szPname="Raspberry Pi Speaker Headphone"
140+
RPIWAV.WaveSpeakerHeadphone.szPname="Raspberry Pi 4 HDMI Output"
141+
RPIWAV.TopologySpeakerHeadphone.szPname="Raspberry Pi 4 HDMI Output"

0 commit comments

Comments
 (0)