[ros-diffs] [akhaldi] 45896: HalFreeCommonBuffer and HalReadDmaCounter : - Move them from winddk.h to wdm.h and make them inline functions - NTHALAPI -> FORCEINLINE - PADAPTER_OBJECT AdapterObject -> PDMA_ADAPTER DmaAdapter

[akhaldi at svn.reactos.org]

Author: akhaldi
Date: Fri Mar  5 22:03:42 2010
New Revision: 45896

URL: http://svn.reactos.org/svn/reactos?rev=45896&view=rev
Log:
HalFreeCommonBuffer and HalReadDmaCounter : 
- Move them from winddk.h to wdm.h and make them inline functions
- 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=45896&r1=45895&r2=45896&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 22:03:42 2010
@@ -10411,6 +10411,39 @@
   commonBuffer = allocateCommonBuffer( DmaAdapter, Length, LogicalAddress, CacheEnabled );
   return commonBuffer;
 }
+
+FORCEINLINE
+VOID
+NTAPI
+HalFreeCommonBuffer(
+  IN PDMA_ADAPTER DmaAdapter,
+  IN ULONG  Length,
+  IN PHYSICAL_ADDRESS  LogicalAddress,
+  IN PVOID  VirtualAddress,
+  IN BOOLEAN  CacheEnabled)
+{
+  PFREE_COMMON_BUFFER freeCommonBuffer;
+
+  freeCommonBuffer = *(DmaAdapter)->DmaOperations->FreeCommonBuffer;
+  ASSERT( freeCommonBuffer != NULL );
+  freeCommonBuffer( DmaAdapter, Length, LogicalAddress, VirtualAddress, CacheEnabled );
+}
+
+FORCEINLINE
+ULONG
+NTAPI
+HalReadDmaCounter(
+  IN PDMA_ADAPTER DmaAdapter)
+{
+  PREAD_DMA_COUNTER readDmaCounter;
+  ULONG counter;
+
+  readDmaCounter = *(DmaAdapter)->DmaOperations->ReadDmaCounter;
+  ASSERT( readDmaCounter != NULL );
+  counter = readDmaCounter( DmaAdapter );
+  return counter;
+}
+
 #endif
 
 #ifdef __cplusplus

Modified: branches/header-work/include/ddk/winddk.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/winddk.h?rev=45896&r1=45895&r2=45896&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 22:03:42 2010
@@ -3772,16 +3772,6 @@
   IN OUT PCM_RESOURCE_LIST  *AllocatedResources);
 
 NTHALAPI
-VOID
-NTAPI
-HalFreeCommonBuffer(
-  IN PADAPTER_OBJECT  AdapterObject,
-  IN ULONG  Length,
-  IN PHYSICAL_ADDRESS  LogicalAddress,
-  IN PVOID  VirtualAddress,
-  IN BOOLEAN  CacheEnabled);
-
-NTHALAPI
 PADAPTER_OBJECT
 NTAPI
 HalGetAdapter(
@@ -3825,12 +3815,6 @@
   IN ULONG  BusInterruptVector,
   OUT PKIRQL  Irql,
   OUT PKAFFINITY  Affinity);
-
-NTHALAPI
-ULONG
-NTAPI
-HalReadDmaCounter(
-  IN PADAPTER_OBJECT  AdapterObject);
 
 NTHALAPI
 ULONG