mirror of
https://github.com/reactos/reactos.git
synced 2025-04-26 08:30:21 +00:00
- Revert to pre-38722 to unbreak build
svn path=/trunk/; revision=38728
This commit is contained in:
parent
cf776e38c2
commit
ca7c2576bb
7 changed files with 83 additions and 89 deletions
|
@ -169,7 +169,6 @@ PcAddAdapterDevice(
|
||||||
portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject;
|
portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject;
|
||||||
portcls_ext->StartDevice = StartDevice;
|
portcls_ext->StartDevice = StartDevice;
|
||||||
InitializeListHead(&portcls_ext->SubDeviceList);
|
InitializeListHead(&portcls_ext->SubDeviceList);
|
||||||
InitializeListHead(&portcls_ext->PhysicalConnectionList);
|
|
||||||
|
|
||||||
status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL);
|
status = KsAllocateDeviceHeader(&portcls_ext->KsDeviceHeader, 0, NULL);
|
||||||
if (!NT_SUCCESS(status))
|
if (!NT_SUCCESS(status))
|
||||||
|
|
|
@ -187,15 +187,7 @@ IPortTopology_fnNewRegistryKey(
|
||||||
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n");
|
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n");
|
||||||
return STATUS_UNSUCCESSFUL;
|
return STATUS_UNSUCCESSFUL;
|
||||||
}
|
}
|
||||||
return PcNewRegistryKey(OutRegistryKey,
|
return STATUS_UNSUCCESSFUL;
|
||||||
OuterUnknown,
|
|
||||||
RegistryKeyType,
|
|
||||||
DesiredAccess,
|
|
||||||
This->pDeviceObject,
|
|
||||||
NULL,//FIXME
|
|
||||||
ObjectAttributes,
|
|
||||||
CreateOptions,
|
|
||||||
Disposition);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static IPortTopologyVtbl vt_IPortTopology =
|
static IPortTopologyVtbl vt_IPortTopology =
|
||||||
|
|
|
@ -247,23 +247,7 @@ IPortWavePci_fnNewRegistryKey(
|
||||||
IN ULONG CreateOptions OPTIONAL,
|
IN ULONG CreateOptions OPTIONAL,
|
||||||
OUT PULONG Disposition OPTIONAL)
|
OUT PULONG Disposition OPTIONAL)
|
||||||
{
|
{
|
||||||
IPortWavePciImpl * This = (IPortWavePciImpl*)iface;
|
|
||||||
|
|
||||||
if (!This->bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
return STATUS_UNSUCCESSFUL;
|
||||||
}
|
|
||||||
|
|
||||||
return PcNewRegistryKey(OutRegistryKey,
|
|
||||||
OuterUnknown,
|
|
||||||
RegistryKeyType,
|
|
||||||
DesiredAccess,
|
|
||||||
This->pDeviceObject,
|
|
||||||
NULL,//FIXME
|
|
||||||
ObjectAttributes,
|
|
||||||
CreateOptions,
|
|
||||||
Disposition);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NTSTATUS
|
NTSTATUS
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
<library>rtl</library>
|
<library>rtl</library>
|
||||||
<library>hal</library>
|
<library>hal</library>
|
||||||
<file>api.c</file>
|
<file>api.c</file>
|
||||||
<file>connection.c</file>
|
|
||||||
<file>dll.c</file>
|
<file>dll.c</file>
|
||||||
<file>dma_slave.c</file>
|
<file>dma_slave.c</file>
|
||||||
<file>drm_port.c</file>
|
<file>drm_port.c</file>
|
||||||
|
|
|
@ -36,50 +36,3 @@ PcRegisterAdapterPowerManagement(
|
||||||
DeviceExt->AdapterPowerManagement = pPower;
|
DeviceExt->AdapterPowerManagement = pPower;
|
||||||
return STATUS_SUCCESS;
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include <dmusicks.h>
|
#include <dmusicks.h>
|
||||||
|
|
||||||
#include "interfaces.h"
|
#include "interfaces.h"
|
||||||
#include <ks.h>
|
|
||||||
|
|
||||||
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
|
#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
|
||||||
#define TAG_PORTCLASS TAG('P', 'C', 'L', 'S')
|
#define TAG_PORTCLASS TAG('P', 'C', 'L', 'S')
|
||||||
|
@ -87,17 +86,6 @@ typedef struct
|
||||||
KSOBJECT_HEADER ObjectHeader;
|
KSOBJECT_HEADER ObjectHeader;
|
||||||
}SUBDEVICE_ENTRY;
|
}SUBDEVICE_ENTRY;
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
LIST_ENTRY Entry;
|
|
||||||
ISubdevice * FromSubDevice;
|
|
||||||
LPWSTR FromUnicodeString;
|
|
||||||
ULONG FromPin;
|
|
||||||
ISubdevice * ToSubDevice;
|
|
||||||
LPWSTR ToUnicodeString;
|
|
||||||
ULONG ToPin;
|
|
||||||
}PHYSICAL_CONNECTION;
|
|
||||||
|
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
|
@ -108,7 +96,6 @@ typedef struct
|
||||||
|
|
||||||
IResourceList* resources;
|
IResourceList* resources;
|
||||||
LIST_ENTRY SubDeviceList;
|
LIST_ENTRY SubDeviceList;
|
||||||
LIST_ENTRY PhysicalConnectionList;
|
|
||||||
|
|
||||||
} PCExtension;
|
} PCExtension;
|
||||||
|
|
||||||
|
|
|
@ -12,6 +12,29 @@
|
||||||
#include "private.h"
|
#include "private.h"
|
||||||
#include <portcls.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
|
Properties
|
||||||
*/
|
*/
|
||||||
|
@ -28,3 +51,60 @@ PcCompletePendingPropertyRequest(
|
||||||
return STATUS_UNSUCCESSFUL;
|
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
|
||||||
|
*/
|
||||||
|
|
Loading…
Reference in a new issue