- Move more stuff to wdm.h

- Add NTAPI back to some Io* definitions
- Remove some redundant Io* definitions

svn path=/branches/header-work/; revision=45894
This commit is contained in:
Amine Khaldi 2010-03-05 20:40:37 +00:00
parent f7910da58e
commit b7de91f3bf
2 changed files with 9 additions and 53 deletions

View file

@ -7431,6 +7431,7 @@ IoAllocateAdapterChannel(
FORCEINLINE
BOOLEAN
NTAPI
IoFlushAdapterBuffers(
IN PDMA_ADAPTER DmaAdapter,
IN PMDL Mdl,
@ -7452,6 +7453,7 @@ IoFlushAdapterBuffers(
FORCEINLINE
VOID
NTAPI
IoFreeAdapterChannel(
IN PDMA_ADAPTER DmaAdapter)
{
@ -7463,6 +7465,7 @@ IoFreeAdapterChannel(
FORCEINLINE
VOID
NTAPI
IoFreeMapRegisters(
IN PDMA_ADAPTER DmaAdapter,
IN PVOID MapRegisterBase,
@ -7476,6 +7479,7 @@ IoFreeMapRegisters(
FORCEINLINE
PHYSICAL_ADDRESS
NTAPI
IoMapTransfer(
IN PDMA_ADAPTER DmaAdapter,
IN PMDL Mdl,
@ -8839,6 +8843,10 @@ typedef struct _WORK_QUEUE_ITEM {
* Executive Functions *
******************************************************************************/
#define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend)
#define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend)
#define ExInterlockedExchangeUlong(Target, Value, Lock) Exfi386InterlockedExchangeUlong(Target, Value)
#define ExInitializeSListHead InitializeSListHead
#if defined(_X86_)

View file

@ -3671,54 +3671,6 @@ DbgPrompt(
/** Stuff from winnt4.h */
#ifndef DMA_MACROS_DEFINED
#if (NTDDI_VERSION >= NTDDI_WIN2K)
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
BOOLEAN
NTAPI
IoFlushAdapterBuffers(
IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl,
IN PVOID MapRegisterBase,
IN PVOID CurrentVa,
IN ULONG Length,
IN BOOLEAN WriteToDevice);
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
VOID
NTAPI
IoFreeAdapterChannel(
IN PADAPTER_OBJECT AdapterObject);
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
VOID
NTAPI
IoFreeMapRegisters(
IN PADAPTER_OBJECT AdapterObject,
IN PVOID MapRegisterBase,
IN ULONG NumberOfMapRegisters);
//DECLSPEC_DEPRECATED_DDK
NTHALAPI
PHYSICAL_ADDRESS
NTAPI
IoMapTransfer(
IN PADAPTER_OBJECT AdapterObject,
IN PMDL Mdl,
IN PVOID MapRegisterBase,
IN PVOID CurrentVa,
IN OUT PULONG Length,
IN BOOLEAN WriteToDevice);
#endif // (NTDDI_VERSION >= NTDDI_WIN2K)
#endif // !defined(DMA_MACROS_DEFINED)
NTKERNELAPI
NTSTATUS
NTAPI
@ -4055,12 +4007,8 @@ Exfi386InterlockedExchangeUlong(
IN PULONG Target,
IN ULONG Value);
#define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend)
#define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend)
#define ExInterlockedExchangeUlong(Target, Value, Lock) Exfi386InterlockedExchangeUlong(Target, Value)
#endif /* _X86_ */
#ifdef _M_ARM
//
// NT-ARM is not documented