[ros-diffs] [akhaldi] 45895: HalAllocateCommonBuffer : - Move it from winddk.h to wdm.h and make it an inline function - NTHALAPI -> FORCEINLINE - PADAPTER_OBJECT AdapterObject -> PDMA_ADAPTER DmaAdapter

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Fri Mar  5 21:57:21 2010
New Revision: 45895

URL: http://svn.reactos.org/svn/reactos?rev=45895&view=rev
Log:
HalAllocateCommonBuffer : 
- Move it from winddk.h to wdm.h and make it an inline function
- NTHALAPI -> FORCEINLINE
- PADAPTER_OBJECT  AdapterObject -> PDMA_ADAPTER DmaAdapter

Modified:
    branches/header-work/include/ddk/wdm.h
    branches/header-work/include/ddk/winddk.h

Modified: branches/header-work/include/ddk/wdm.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?rev=45895&r1=45894&r2=45895&view=diff
==============================================================================
--- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Fri Mar  5 21:57:21 2010
@@ -10393,6 +10393,26 @@
 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

Modified: branches/header-work/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.h?rev=45895&r1=45894&r2=45895&view=diff
==============================================================================
--- branches/header-work/include/ddk/winddk.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/winddk.h [iso-8859-1] Fri Mar  5 21:57:21 2010
@@ -3759,15 +3759,6 @@
   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
 HalAssignSlotResources(