HalAllocateCommonBuffer :

- Move it from winddk.h to wdm.h and make it an inline function
- NTHALAPI -> FORCEINLINE
- PADAPTER_OBJECT  AdapterObject -> PDMA_ADAPTER DmaAdapter

svn path=/branches/header-work/; revision=45895

diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 0f034e4..e8e3a77 100644 (file)
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -10393,6 +10393,26 @@ extern volatile KSYSTEM_TIME KeTickCount;
 extern BOOLEAN NTSYSAPI NLS_MB_CODE_PAGE_TAG;
 extern BOOLEAN NTSYSAPI NLS_MB_OEM_CODE_PAGE_TAG;
 
+#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)
+FORCEINLINE
+PVOID
+NTAPI
+HalAllocateCommonBuffer(
+  IN PADAPTER_OBJECT  AdapterObject,
+  IN ULONG  Length,
+  OUT PPHYSICAL_ADDRESS  LogicalAddress,
+  IN BOOLEAN  CacheEnabled)
+{
+  PALLOCATE_COMMON_BUFFER allocateCommonBuffer;
+  PVOID commonBuffer;
+
+  allocateCommonBuffer = *(DmaAdapter)->DmaOperations->AllocateCommonBuffer;
+  ASSERT( allocateCommonBuffer != NULL );
+  commonBuffer = allocateCommonBuffer( DmaAdapter, Length, LogicalAddress, CacheEnabled );
+  return commonBuffer;
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index ffe2c08..72b7074 100644 (file)
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -3758,15 +3758,6 @@ HalAllocateAdapterChannel(
   IN ULONG  NumberOfMapRegisters,
   IN PDRIVER_CONTROL  ExecutionRoutine);
 
-NTHALAPI
-PVOID
-NTAPI
-HalAllocateCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  OUT PPHYSICAL_ADDRESS  LogicalAddress,
-  IN BOOLEAN  CacheEnabled);
-
 NTHALAPI
 NTSTATUS
 NTAPI