[ros-diffs] [janderwald] 38912: - Fix IPortWaveCyclic interface

Author: janderwald
Date: Sun Jan 18 14:55:57 2009
New Revision: 38912

URL: http://svn.reactos.org/svn/reactos?rev=38912&view=rev
Log:
- Fix IPortWaveCyclic interface

Modified:
    trunk/reactos/include/ddk/portcls.h

Modified: trunk/reactos/include/ddk/portcls.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=…
==============================================================================
--- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Sun Jan 18 14:55:57 2009
@@ -1117,40 +1117,21 @@
 
 DECLARE_INTERFACE_(IPortWaveCyclic, IPort)
 {
-    STDMETHOD_(NTSTATUS, QueryInterface)(THIS_
-        REFIID InterfaceId,
-        PVOID* Interface
-        ) PURE;
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE;
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-
-    STDMETHOD_(NTSTATUS,Init)(THIS_
-        IN      PDEVICE_OBJECT  DeviceObject,
-        IN      PIRP            Irp,
-        IN      PUNKNOWN        UnknownMiniport,
-        IN      PUNKNOWN        UnknownAdapter      OPTIONAL,
-        IN      PRESOURCELIST   ResourceList 
-    )   PURE;
-    STDMETHOD_(NTSTATUS,GetDeviceProperty)(THIS_
-        IN      DEVICE_REGISTRY_PROPERTY    DeviceProperty,
-        IN      ULONG                       BufferLength,
-        OUT     PVOID                       PropertyBuffer,
-        OUT     PULONG                      ResultLength
-    )   PURE;
-    STDMETHOD_(NTSTATUS,NewRegistryKey)(THIS_
-        OUT     PREGISTRYKEY *      OutRegistryKey,
-        IN      PUNKNOWN            OuterUnknown,
-        IN      ULONG               RegistryKeyType,
-        IN      ACCESS_MASK         DesiredAccess,
-        IN      POBJECT_ATTRIBUTES  ObjectAttributes    OPTIONAL,
-        IN      ULONG               CreateOptions       OPTIONAL,
-        OUT     PULONG              Disposition         OPTIONAL 
-    )   PURE;
+    DEFINE_ABSTRACT_UNKNOWN()
+
+    DEFINE_ABSTRACT_PORT()
 
     STDMETHOD_(VOID, Notify)(THIS_
         IN  PSERVICEGROUP ServiceGroup) PURE;
 
+    STDMETHOD_(NTSTATUS, NewSlaveDmaChannel)(THIS_
+        OUT PDMACHANNELSLAVE* DmaChannel,
+        IN  PUNKNOWN OuterUnknown,
+        IN  PRESOURCELIST ResourceList OPTIONAL,
+        IN  ULONG DmaIndex,
+        IN  ULONG MaximumLength,
+        IN  BOOL DemandMode,
+        IN  DMA_SPEED DmaSpeed) PURE;
 
     STDMETHOD_(NTSTATUS, NewMasterDmaChannel)(THIS_
         OUT PDMACHANNEL* DmaChannel,
@@ -1161,16 +1142,6 @@
         IN  BOOL Dma64BitAddresses,
         IN  DMA_WIDTH DmaWidth,
         IN  DMA_SPEED DmaSpeed) PURE;
-
-    STDMETHOD_(NTSTATUS, NewSlaveDmaChannel)(THIS_
-        OUT PDMACHANNELSLAVE* DmaChannel,
-        IN  PUNKNOWN OuterUnknown,
-        IN  PRESOURCELIST ResourceList OPTIONAL,
-        IN  ULONG DmaIndex,
-        IN  ULONG MaximumLength,
-        IN  BOOL DemandMode,
-        IN  DMA_SPEED DmaSpeed) PURE;
-
 
 };