- Revert to pre-38722 to unbreak build

svn path=/trunk/; revision=38728

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/adapter.c b/reactos/drivers/wdm/audio/backpln/portcls/adapter.c
index e53a56e..e0b1686 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/adapter.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/adapter.c
@@ -168,8 +168,7 @@ PcAddAdapterDevice(
     RtlZeroMemory(portcls_ext, sizeof(PCExtension));
     portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject;
     portcls_ext->StartDevice = StartDevice;
-    InitializeListHead(&portcls_ext->SubDeviceList);
-    InitializeListHead(&portcls_ext->PhysicalConnectionList);
+       InitializeListHead(&portcls_ext->SubDeviceList);
 
     status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL);
     if (!NT_SUCCESS(status))

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c
index 45edf1c..49ca49d 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c
@@ -187,15 +187,7 @@ IPortTopology_fnNewRegistryKey(
         DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n");
         return STATUS_UNSUCCESSFUL;
     }
-    return PcNewRegistryKey(OutRegistryKey, 
-                            OuterUnknown,
-                            RegistryKeyType,
-                            DesiredAccess,
-                            This->pDeviceObject,
-                            NULL,//FIXME
-                            ObjectAttributes,
-                            CreateOptions,
-                            Disposition);
+    return STATUS_UNSUCCESSFUL;
 }
 
 static IPortTopologyVtbl vt_IPortTopology =

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c
index 1ad3a4e..5ad694a 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c
@@ -247,23 +247,7 @@ IPortWavePci_fnNewRegistryKey(
     IN ULONG  CreateOptions  OPTIONAL,
     OUT PULONG  Disposition  OPTIONAL)
 {
-    IPortWavePciImpl * This = (IPortWavePciImpl*)iface;
-
-    if (!This->bInitialized)
-    {
-        DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n");
-        return STATUS_UNSUCCESSFUL;
-    }
-
-    return PcNewRegistryKey(OutRegistryKey, 
-                            OuterUnknown,
-                            RegistryKeyType,
-                            DesiredAccess,
-                            This->pDeviceObject,
-                            NULL,//FIXME
-                            ObjectAttributes,
-                            CreateOptions,
-                            Disposition);
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
index 184a0c5..c5ffa08 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
+++ b/reactos/drivers/wdm/audio/backpln/portcls/portcls.rbuild
@@ -11,7 +11,6 @@
        <library>rtl</library>
        <library>hal</library>
        <file>api.c</file>
-       <file>connection.c</file>
        <file>dll.c</file>
        <file>dma_slave.c</file>
        <file>drm_port.c</file>

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/power.c b/reactos/drivers/wdm/audio/backpln/portcls/power.c
index 9c13389..3f0a406 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/power.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/power.c
@@ -36,50 +36,3 @@ PcRegisterAdapterPowerManagement(
     DeviceExt->AdapterPowerManagement = pPower;
     return STATUS_SUCCESS;
 }
-
-
-static
-VOID
-NTAPI
-PwrCompletionCallback(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN UCHAR MinorFunction,
-    IN POWER_STATE PowerState,
-    IN PVOID Context,
-    IN PIO_STATUS_BLOCK IoStatus)
-{
-    KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE);
-}
-
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-PcRequestNewPowerState(
-    IN  PDEVICE_OBJECT DeviceObject,
-    IN  DEVICE_POWER_STATE RequestedNewState)
-{
-    KEVENT Event;
-    NTSTATUS Status;
-    POWER_STATE PowerState;
-    PCExtension* DeviceExt;
-
-    if (!DeviceObject || !RequestedNewState)
-        return STATUS_INVALID_PARAMETER;
-
-    DeviceExt = (PCExtension*)DeviceObject->DeviceExtension;
-    KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
-
-    PowerState.DeviceState = RequestedNewState;
-    PowerState.SystemState = PowerSystemUnspecified;
-
-    Status = PoRequestPowerIrp(DeviceExt->PhysicalDeviceObject, IRP_MN_SET_POWER, PowerState, PwrCompletionCallback, (PVOID)&Event, NULL);
-    if (NT_SUCCESS(Status))
-    {
-        KeWaitForSingleObject((PVOID)&Event, Executive, KernelMode, FALSE, NULL);
-    }
-
-
-    return Status;
-}
-

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/private.h b/reactos/drivers/wdm/audio/backpln/portcls/private.h
index 17afe30..0787438 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/private.h
+++ b/reactos/drivers/wdm/audio/backpln/portcls/private.h
@@ -15,7 +15,6 @@
 #include <dmusicks.h>
 
 #include "interfaces.h"
-#include <ks.h>
 
 #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
 #define TAG_PORTCLASS TAG('P', 'C', 'L', 'S')
@@ -87,17 +86,6 @@ typedef struct
     KSOBJECT_HEADER ObjectHeader;
 }SUBDEVICE_ENTRY;
 
-typedef struct
-{
-    LIST_ENTRY Entry;
-    ISubdevice * FromSubDevice;
-    LPWSTR FromUnicodeString;
-    ULONG FromPin;
-    ISubdevice * ToSubDevice;
-    LPWSTR ToUnicodeString;
-    ULONG ToPin;
-}PHYSICAL_CONNECTION;
-
 
 typedef struct
 {
@@ -108,7 +96,6 @@ typedef struct
 
     IResourceList* resources;
     LIST_ENTRY SubDeviceList;
-    LIST_ENTRY PhysicalConnectionList;
 
 } PCExtension;
 

diff --git a/reactos/drivers/wdm/audio/backpln/portcls/stubs.c b/reactos/drivers/wdm/audio/backpln/portcls/stubs.c
index 63e0a2e..480a9d6 100644 (file)
--- a/reactos/drivers/wdm/audio/backpln/portcls/stubs.c
+++ b/reactos/drivers/wdm/audio/backpln/portcls/stubs.c
@@ -12,6 +12,29 @@
 #include "private.h"
 #include <portcls.h>
 
+/*
+    Factory Stubs
+*/
+
+
+
+/* ===============================================================
+    Power Management
+*/
+
+/*
+ * @unimplemented
+ */
+NTSTATUS NTAPI
+PcRequestNewPowerState(
+    IN  PDEVICE_OBJECT pDeviceObject,
+    IN  DEVICE_POWER_STATE RequestedNewState)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+
 /* ===============================================================
     Properties
 */
@@ -28,3 +51,60 @@ PcCompletePendingPropertyRequest(
     return STATUS_UNSUCCESSFUL;
 }
 
+/* ===============================================================
+    Physical Connections
+*/
+
+/*
+ * @unimplemented
+ */
+NTSTATUS NTAPI
+PcRegisterPhysicalConnection(
+    IN  PDEVICE_OBJECT DeviceObject,
+    IN  PUNKNOWN FromUnknown,
+    IN  ULONG FromPin,
+    IN  PUNKNOWN ToUnknown,
+    IN  ULONG ToPin)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS NTAPI
+PcRegisterPhysicalConnectionFromExternal(
+    IN  PDEVICE_OBJECT DeviceObject,
+    IN  PUNICODE_STRING FromString,
+    IN  ULONG FromPin,
+    IN  PUNKNOWN ToUnknown,
+    IN  ULONG ToPin)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+/*
+ * @unimplemented
+ */
+NTSTATUS NTAPI
+PcRegisterPhysicalConnectionToExternal(
+    IN  PDEVICE_OBJECT DeviceObject,
+    IN  PUNKNOWN FromUnknown,
+    IN  ULONG FromPin,
+    IN  PUNICODE_STRING ToString,
+    IN  ULONG ToPin)
+{
+    UNIMPLEMENTED;
+    return STATUS_UNSUCCESSFUL;
+}
+
+
+/* ===============================================================
+    Misc
+*/
+
+/*
+ * @unimplemented
+ */