bcmauxspi: Add ARM64 Support

ms-iot · Jul 14, 2020 · e731b58 · e731b58
1 parent a365ed5
commit e731b58
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/drivers/spi/bcmauxspi/bcmauxspi.cpp b/drivers/spi/bcmauxspi/bcmauxspi.cpp
@@ -868,7 +868,7 @@ VOID AUXSPI_DEVICE::EvtSpbIoOther (
 
         if (writeDescriptor.TransferLength != readDescriptor.TransferLength) {
             AUXSPI_LOG_ERROR(
-                "Write buffer length must be equal to read buffer length for full-duplex transfer. (readDescriptor.TransferLength = %d, writeDescriptor.TransferLength = %d)",
+                "Write buffer length must be equal to read buffer length for full-duplex transfer. (readDescriptor.TransferLength = %lld, writeDescriptor.TransferLength = %lld)",
                 readDescriptor.TransferLength,
                 writeDescriptor.TransferLength);
             SpbRequestComplete(SpbRequest, STATUS_INVALID_PARAMETER);

diff --git a/drivers/spi/bcmauxspi/bcmauxspi.h b/drivers/spi/bcmauxspi/bcmauxspi.h
@@ -385,9 +385,9 @@ class AUXSPI_DEVICE {
     {
         UNREFERENCED_PARAMETER(BufferPtr);
         UNREFERENCED_PARAMETER(Length);
-        NT_ASSERT((reinterpret_cast<ULONG>(BufferPtr) &
+        NT_ASSERT((reinterpret_cast<UINT_PTR>(BufferPtr) &
                 FILE_LONG_ALIGNMENT) == 0);
-        NT_ASSERT((Length % sizeof(ULONG)) == 0);
+        NT_ASSERT((Length % sizeof(UINT_PTR)) == 0);
     }
 
     volatile BCM_AUXSPI_REGISTERS* registersPtr;

diff --git a/drivers/spi/bcmauxspi/bcmauxspi.inf b/drivers/spi/bcmauxspi/bcmauxspi.inf
diff --git a/drivers/spi/bcmauxspi/bcmauxspi.vcxproj b/drivers/spi/bcmauxspi/bcmauxspi.vcxproj
@@ -9,6 +9,14 @@
       <Configuration>Release</Configuration>
       <Platform>ARM</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="PropertySheets">
     <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
@@ -37,6 +45,14 @@
     <TargetVersion>Windows10</TargetVersion>
     <UseDebugLibraries>False</UseDebugLibraries>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>True</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+    <TargetVersion>Windows10</TargetVersion>
+    <UseDebugLibraries>False</UseDebugLibraries>
+  </PropertyGroup>
   <!-- Needed by any VcxProj -->
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -49,6 +65,14 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
     <Import Project="$(SolutionDir)\..\bsp.props" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" />
+    <Import Project="$(SolutionDir)\..\bsp.props" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
     <RunCodeAnalysis>false</RunCodeAnalysis>
@@ -58,6 +82,14 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <RunCodeAnalysis>false</RunCodeAnalysis>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <!-- The WrappedTaskItems label is used by the conversion tool to identify the location where items 
         associated with wrapped tasks will reside.-->
   <ItemGroup Label="WrappedTaskItems">
@@ -74,6 +106,7 @@
       <EnablePREfast>false</EnablePREfast>
       <WppEnabled>true</WppEnabled>
       <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <WarningVersion>18</WarningVersion>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -85,6 +118,24 @@
       <WarningVersion>18</WarningVersion>
     </ClCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <EnablePREfast>false</EnablePREfast>
+      <WppEnabled>true</WppEnabled>
+      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <WarningVersion>18</WarningVersion>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <EnablePREfast>false</EnablePREfast>
+      <WppRecorderEnabled>true</WppRecorderEnabled>
+      <WppEnabled>true</WppEnabled>
+      <WppScanConfigurationData>trace.h</WppScanConfigurationData>
+      <WarningVersion>18</WarningVersion>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <!-- We only add items (e.g. form ClSourceFiles) that do not already exist (e.g in the ClCompile list), this avoids duplication -->
     <ClCompile Include="@(ClSourceFiles)" Exclude="@(ClCompile)">