summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzlockard <[email protected]>2023-10-31 14:53:48 -0700
committerGitHub <[email protected]>2023-10-31 14:53:48 -0700
commit3ad25d938bc0319447992218a1809814119188df (patch)
treec6d6277fcec6af0172bca7a8a72d2fc732330c4c
parent3b5421931e80bc8c0b83ff899a04aca54b42162d (diff)
INF changes to support latest WDK (#1046)
Co-authored-by: Zac Lockard <[email protected]>
-rw-r--r--general/echo/umdf2/driver/AutoSync/echo.vcxproj4
-rw-r--r--general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters22
-rw-r--r--general/echo/umdf2/driver/AutoSync/echoum.inxbin4980 -> 4596 bytes
-rw-r--r--gpio/samples/simdevice/umdf/simdeviceumdf.inxbin3680 -> 3444 bytes
-rw-r--r--gpio/samples/simgpio/simgpio.inxbin3684 -> 3714 bytes
-rw-r--r--gpio/samples/simgpio_i2c/simgpio_i2c.inxbin3756 -> 3786 bytes
-rw-r--r--sd/miniport/sdhc/sdhc.inxbin7830 -> 7856 bytes
-rw-r--r--serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj2
-rw-r--r--serial/VirtualSerial2/ComPort/virtualserial2um.inxbin4440 -> 6316 bytes
-rw-r--r--usb/umdf2_fx2/driver/osrusbfx2um.inxbin6562 -> 6012 bytes
-rw-r--r--usb/umdf2_fx2/umdf2_fx2.sln30
11 files changed, 41 insertions, 17 deletions
diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
index cff9cdc4..fc32074b 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj
@@ -38,7 +38,7 @@
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>True</UseDebugLibraries>
- <DriverTargetPlatform>Universal</DriverTargetPlatform>
+ <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
<DriverType>UMDF</DriverType>
<PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -81,6 +81,8 @@
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>echo</TargetName>
+ <InfVerif_AdditionalOptions>
+ </InfVerif_AdditionalOptions>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>echo</TargetName>
diff --git a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
index e7ee9b9d..10c243cc 100644
--- a/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
+++ b/general/echo/umdf2/driver/AutoSync/echo.vcxproj.Filters
@@ -29,4 +29,26 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="*.h;*.hpp;*.hxx;*.hm;*.inl;*.xsd">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <Inf Include="*.inx">
+ <Filter>Driver Files</Filter>
+ </Inf>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/general/echo/umdf2/driver/AutoSync/echoum.inx b/general/echo/umdf2/driver/AutoSync/echoum.inx
index 3734b873..00320858 100644
--- a/general/echo/umdf2/driver/AutoSync/echoum.inx
+++ b/general/echo/umdf2/driver/AutoSync/echoum.inx
Binary files differ
diff --git a/gpio/samples/simdevice/umdf/simdeviceumdf.inx b/gpio/samples/simdevice/umdf/simdeviceumdf.inx
index ef471b77..587cd604 100644
--- a/gpio/samples/simdevice/umdf/simdeviceumdf.inx
+++ b/gpio/samples/simdevice/umdf/simdeviceumdf.inx
Binary files differ
diff --git a/gpio/samples/simgpio/simgpio.inx b/gpio/samples/simgpio/simgpio.inx
index a2b3478b..fd8a4c18 100644
--- a/gpio/samples/simgpio/simgpio.inx
+++ b/gpio/samples/simgpio/simgpio.inx
Binary files differ
diff --git a/gpio/samples/simgpio_i2c/simgpio_i2c.inx b/gpio/samples/simgpio_i2c/simgpio_i2c.inx
index 67c9ee56..7706cfbf 100644
--- a/gpio/samples/simgpio_i2c/simgpio_i2c.inx
+++ b/gpio/samples/simgpio_i2c/simgpio_i2c.inx
Binary files differ
diff --git a/sd/miniport/sdhc/sdhc.inx b/sd/miniport/sdhc/sdhc.inx
index 07ffa21c..50026a87 100644
--- a/sd/miniport/sdhc/sdhc.inx
+++ b/sd/miniport/sdhc/sdhc.inx
Binary files differ
diff --git a/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
index 35c9a0e5..f2fec3f2 100644
--- a/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
+++ b/serial/VirtualSerial2/ComPort/VirtualSerial2um.vcxproj
@@ -38,7 +38,7 @@
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetVersion>Windows10</TargetVersion>
<UseDebugLibraries>True</UseDebugLibraries>
- <DriverTargetPlatform>Universal</DriverTargetPlatform>
+ <DriverTargetPlatform>Windows Driver</DriverTargetPlatform>
<DriverType>UMDF</DriverType>
<PlatformToolset>WindowsUserModeDriver10.0</PlatformToolset>
<ConfigurationType>DynamicLibrary</ConfigurationType>
diff --git a/serial/VirtualSerial2/ComPort/virtualserial2um.inx b/serial/VirtualSerial2/ComPort/virtualserial2um.inx
index 1194ae6a..6679d7ab 100644
--- a/serial/VirtualSerial2/ComPort/virtualserial2um.inx
+++ b/serial/VirtualSerial2/ComPort/virtualserial2um.inx
Binary files differ
diff --git a/usb/umdf2_fx2/driver/osrusbfx2um.inx b/usb/umdf2_fx2/driver/osrusbfx2um.inx
index 4d22fdbe..737295b0 100644
--- a/usb/umdf2_fx2/driver/osrusbfx2um.inx
+++ b/usb/umdf2_fx2/driver/osrusbfx2um.inx
Binary files differ
diff --git a/usb/umdf2_fx2/umdf2_fx2.sln b/usb/umdf2_fx2/umdf2_fx2.sln
index c878c062..b31996d2 100644
--- a/usb/umdf2_fx2/umdf2_fx2.sln
+++ b/usb/umdf2_fx2/umdf2_fx2.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
MinimumVisualStudioVersion = 12.0
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Driver", "Driver", "{3B268182-F450-4AB8-B350-A2CF6495F756}"
EndProject
@@ -9,38 +9,38 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exe", "Exe", "{52ABC41E-9AA
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2um", "driver\osrusbfx2um.vcxproj", "{5B711254-3F53-4E1D-A1AD-CC81E34588B7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "exe\osrusbfx2.vcxproj", "{9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osrusbfx2", "exe\osrusbfx2.vcxproj", "{6EED5CDD-5526-40DC-97F9-582857E10187}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
- Release|Win32 = Release|Win32
Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Debug|Win32.ActiveCfg = Debug|Win32
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Debug|Win32.Build.0 = Debug|Win32
- {5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|Win32.ActiveCfg = Release|Win32
- {5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|Win32.Build.0 = Release|Win32
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Debug|x64.ActiveCfg = Debug|x64
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Debug|x64.Build.0 = Debug|x64
+ {5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|Win32.ActiveCfg = Release|Win32
+ {5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|Win32.Build.0 = Release|Win32
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|x64.ActiveCfg = Release|x64
{5B711254-3F53-4E1D-A1AD-CC81E34588B7}.Release|x64.Build.0 = Release|x64
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Debug|Win32.ActiveCfg = Debug|Win32
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Debug|Win32.Build.0 = Debug|Win32
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Release|Win32.ActiveCfg = Release|Win32
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Release|Win32.Build.0 = Release|Win32
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Debug|x64.ActiveCfg = Debug|x64
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Debug|x64.Build.0 = Debug|x64
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Release|x64.ActiveCfg = Release|x64
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F}.Release|x64.Build.0 = Release|x64
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Debug|Win32.ActiveCfg = Debug|Win32
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Debug|Win32.Build.0 = Debug|Win32
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Debug|x64.ActiveCfg = Debug|x64
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Debug|x64.Build.0 = Debug|x64
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Release|Win32.ActiveCfg = Release|Win32
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Release|Win32.Build.0 = Release|Win32
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Release|x64.ActiveCfg = Release|x64
+ {6EED5CDD-5526-40DC-97F9-582857E10187}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{5B711254-3F53-4E1D-A1AD-CC81E34588B7} = {3B268182-F450-4AB8-B350-A2CF6495F756}
- {9DA0D0CB-D2F6-4E86-BAE8-9A7500820F5F} = {52ABC41E-9AAA-4DA8-8986-F6298E32C8A3}
+ {6EED5CDD-5526-40DC-97F9-582857E10187} = {52ABC41E-9AAA-4DA8-8986-F6298E32C8A3}
EndGlobalSection
EndGlobal