Fix DMA_OPERATIONS to use stdcall.

svn path=/trunk/; revision=12682

diff --git a/reactos/include/ddk/iotypes.h b/reactos/include/ddk/iotypes.h
index 80cfc3a..6a83dd1 100644 (file)
--- a/reactos/include/ddk/iotypes.h
+++ b/reactos/include/ddk/iotypes.h
@@ -1196,18 +1196,18 @@ typedef struct _SCATTER_GATHER_LIST {
   SCATTER_GATHER_ELEMENT Elements[1];
 } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST;
 
-typedef VOID (*PPUT_DMA_ADAPTER)(
+typedef VOID STDCALL (*PPUT_DMA_ADAPTER)(
   PDMA_ADAPTER DmaAdapter
   );
 
-typedef PVOID (*PALLOCATE_COMMON_BUFFER)(
+typedef PVOID STDCALL (*PALLOCATE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   OUT PPHYSICAL_ADDRESS LogicalAddress,
   IN BOOLEAN CacheEnabled
   );
 
-typedef VOID (*PFREE_COMMON_BUFFER)(
+typedef VOID STDCALL (*PFREE_COMMON_BUFFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
   IN PHYSICAL_ADDRESS LogicalAddress,
@@ -1215,7 +1215,7 @@ typedef VOID (*PFREE_COMMON_BUFFER)(
   IN BOOLEAN CacheEnabled
   );
 
-typedef NTSTATUS (*PALLOCATE_ADAPTER_CHANNEL)(
+typedef NTSTATUS STDCALL (*PALLOCATE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN ULONG NumberOfMapRegisters,
@@ -1223,7 +1223,7 @@ typedef NTSTATUS (*PALLOCATE_ADAPTER_CHANNEL)(
   IN PVOID Context
   );
 
-typedef BOOLEAN (*PFLUSH_ADAPTER_BUFFERS)(
+typedef BOOLEAN STDCALL (*PFLUSH_ADAPTER_BUFFERS)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -1232,17 +1232,17 @@ typedef BOOLEAN (*PFLUSH_ADAPTER_BUFFERS)(
   IN BOOLEAN WriteToDevice
   );
 
-typedef VOID (*PFREE_ADAPTER_CHANNEL)(
+typedef VOID STDCALL (*PFREE_ADAPTER_CHANNEL)(
   IN PDMA_ADAPTER DmaAdapter
   );
 
-typedef VOID (*PFREE_MAP_REGISTERS)(
+typedef VOID STDCALL (*PFREE_MAP_REGISTERS)(
   IN PDMA_ADAPTER DmaAdapter,
   PVOID MapRegisterBase,
   ULONG NumberOfMapRegisters
   );
 
-typedef PHYSICAL_ADDRESS (*PMAP_TRANSFER)(
+typedef PHYSICAL_ADDRESS STDCALL (*PMAP_TRANSFER)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
   IN PVOID MapRegisterBase,
@@ -1251,22 +1251,22 @@ typedef PHYSICAL_ADDRESS (*PMAP_TRANSFER)(
   IN BOOLEAN WriteToDevice
   );
 
-typedef ULONG (*PGET_DMA_ALIGNMENT)(
+typedef ULONG STDCALL (*PGET_DMA_ALIGNMENT)(
   IN PDMA_ADAPTER DmaAdapter
   );
 
-typedef ULONG (*PREAD_DMA_COUNTER)(
+typedef ULONG STDCALL (*PREAD_DMA_COUNTER)(
   IN PDMA_ADAPTER DmaAdapter
   );
 
-typedef VOID (*PDRIVER_LIST_CONTROL)(
+typedef VOID STDCALL (*PDRIVER_LIST_CONTROL)(
   IN struct _DEVICE_OBJECT *DeviceObject,
   IN struct _IRP *Irp,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN PVOID Context
   );
 
-typedef NTSTATUS (*PGET_SCATTER_GATHER_LIST)(
+typedef NTSTATUS STDCALL (*PGET_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
   IN PMDL Mdl,
@@ -1277,7 +1277,7 @@ typedef NTSTATUS (*PGET_SCATTER_GATHER_LIST)(
   IN BOOLEAN WriteToDevice
   );
 
-typedef VOID (*PPUT_SCATTER_GATHER_LIST)(
+typedef VOID STDCALL (*PPUT_SCATTER_GATHER_LIST)(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN BOOLEAN WriteToDevice

diff --git a/reactos/ntoskrnl/io/pnpdma.c b/reactos/ntoskrnl/io/pnpdma.c
index ef0d33f..77fff2c 100644 (file)
--- a/reactos/ntoskrnl/io/pnpdma.c
+++ b/reactos/ntoskrnl/io/pnpdma.c
@@ -1,4 +1,4 @@
-/* $Id: pnpdma.c,v 1.9 2004/10/23 17:32:51 navaraf Exp $
+/* $Id$
  *
  * COPYRIGHT:      See COPYING in the top level directory
  * PROJECT:        ReactOS kernel
@@ -31,6 +31,7 @@ typedef struct _DMA_ADAPTER_INTERNAL {
 /* FUNCTIONS *****************************************************************/
 
 VOID
+STDCALL
 IopPutDmaAdapter(
   PDMA_ADAPTER DmaAdapter)
 {
@@ -40,6 +41,7 @@ IopPutDmaAdapter(
 
 
 PVOID
+STDCALL
 IopAllocateCommonBuffer(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
@@ -54,6 +56,7 @@ IopAllocateCommonBuffer(
 
 
 VOID
+STDCALL
 IopFreeCommonBuffer(
   IN PDMA_ADAPTER DmaAdapter,
   IN ULONG Length,
@@ -69,6 +72,7 @@ IopFreeCommonBuffer(
 
 
 NTSTATUS
+STDCALL
 IopAllocateAdapterChannel(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
@@ -84,6 +88,7 @@ IopAllocateAdapterChannel(
 
 
 BOOLEAN
+STDCALL
 IopFlushAdapterBuffers(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
@@ -100,6 +105,7 @@ IopFlushAdapterBuffers(
 
 
 VOID
+STDCALL
 IopFreeAdapterChannel(
   IN PDMA_ADAPTER DmaAdapter)
 {
@@ -109,6 +115,7 @@ IopFreeAdapterChannel(
 
 
 VOID
+STDCALL
 IopFreeMapRegisters(
   IN PDMA_ADAPTER DmaAdapter,
   PVOID MapRegisterBase,
@@ -122,6 +129,7 @@ IopFreeMapRegisters(
 
 
 PHYSICAL_ADDRESS
+STDCALL
 IopMapTransfer(
   IN PDMA_ADAPTER DmaAdapter,
   IN PMDL Mdl,
@@ -138,6 +146,7 @@ IopMapTransfer(
 
 
 ULONG
+STDCALL
 IopGetDmaAlignment(
   IN PDMA_ADAPTER DmaAdapter)
 {
@@ -148,6 +157,7 @@ IopGetDmaAlignment(
 
 
 ULONG
+STDCALL
 IopReadDmaCounter(
   IN PDMA_ADAPTER DmaAdapter)
 {
@@ -157,6 +167,7 @@ IopReadDmaCounter(
 
 
 NTSTATUS
+STDCALL
 IopGetScatterGatherList(
   IN PDMA_ADAPTER DmaAdapter,
   IN PDEVICE_OBJECT DeviceObject,
@@ -174,15 +185,16 @@ IopGetScatterGatherList(
 
 
 VOID
+STDCALL
 IopPutScatterGatherList(
   IN PDMA_ADAPTER DmaAdapter,
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN BOOLEAN WriteToDevice)
 {
+  DPRINT("IopPutScatterGatherList\n");
   /* FIXME */
 }
 
-
 /*
  * @implemented
  */