mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 18:43:41 +00:00
- Remove obsolete code
- Thanks to Amine svn path=/trunk/; revision=49340
This commit is contained in:
parent
788c89ca8b
commit
8de36e1611
2 changed files with 3 additions and 81 deletions
|
@ -39,10 +39,8 @@ public:
|
||||||
virtual ~CPortWaveCyclic(){}
|
virtual ~CPortWaveCyclic(){}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
BOOL m_bInitialized;
|
|
||||||
PDEVICE_OBJECT m_pDeviceObject;
|
PDEVICE_OBJECT m_pDeviceObject;
|
||||||
PMINIPORTWAVECYCLIC m_pMiniport;
|
PMINIPORTWAVECYCLIC m_pMiniport;
|
||||||
PRESOURCELIST m_pResourceList;
|
|
||||||
PPINCOUNT m_pPinCount;
|
PPINCOUNT m_pPinCount;
|
||||||
PPOWERNOTIFY m_pPowerNotify;
|
PPOWERNOTIFY m_pPowerNotify;
|
||||||
PPCFILTER_DESCRIPTOR m_pDescriptor;
|
PPCFILTER_DESCRIPTOR m_pDescriptor;
|
||||||
|
@ -202,12 +200,6 @@ CPortWaveCyclic::GetDeviceProperty(
|
||||||
{
|
{
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initiazed\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return IoGetDeviceProperty(m_pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength);
|
return IoGetDeviceProperty(m_pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -228,12 +220,6 @@ CPortWaveCyclic::Init(
|
||||||
DPRINT("IPortWaveCyclic_Init entered %p\n", this);
|
DPRINT("IPortWaveCyclic_Init entered %p\n", this);
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_Init called again\n");
|
|
||||||
return STATUS_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
Status = UnknownMiniport->QueryInterface(IID_IMiniportWaveCyclic, (PVOID*)&Miniport);
|
Status = UnknownMiniport->QueryInterface(IID_IMiniportWaveCyclic, (PVOID*)&Miniport);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
|
@ -244,22 +230,13 @@ CPortWaveCyclic::Init(
|
||||||
// Initialize port object
|
// Initialize port object
|
||||||
m_pMiniport = Miniport;
|
m_pMiniport = Miniport;
|
||||||
m_pDeviceObject = DeviceObject;
|
m_pDeviceObject = DeviceObject;
|
||||||
m_bInitialized = TRUE;
|
|
||||||
m_pResourceList = ResourceList;
|
|
||||||
|
|
||||||
|
|
||||||
if (ResourceList)
|
|
||||||
{
|
|
||||||
// increment reference on resource list
|
|
||||||
ResourceList->AddRef();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// initialize miniport
|
||||||
Status = Miniport->Init(UnknownAdapter, ResourceList, this);
|
Status = Miniport->Init(UnknownAdapter, ResourceList, this);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status);
|
DPRINT("IMiniportWaveCyclic_Init failed with %x\n", Status);
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
m_bInitialized = FALSE;
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -270,7 +247,6 @@ CPortWaveCyclic::Init(
|
||||||
{
|
{
|
||||||
DPRINT("failed to get description\n");
|
DPRINT("failed to get description\n");
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
m_bInitialized = FALSE;
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -294,7 +270,6 @@ CPortWaveCyclic::Init(
|
||||||
{
|
{
|
||||||
DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status);
|
DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status);
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
m_bInitialized = FALSE;
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -335,11 +310,6 @@ CPortWaveCyclic::NewRegistryKey(
|
||||||
{
|
{
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_fnNewRegistryKey called w/o initialized\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition);
|
return PcNewRegistryKey(OutRegistryKey, OuterUnknown, RegistryKeyType, DesiredAccess, m_pDeviceObject, (ISubdevice*)this, ObjectAttributes, CreateOptions, Disposition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -365,12 +335,6 @@ CPortWaveCyclic::NewMasterDmaChannel(
|
||||||
|
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_fnNewSlaveDmaChannel called w/o initialized\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
|
|
||||||
Status = PcDmaMasterDescription(ResourceList, (Dma32BitAddresses | Dma64BitAddresses), Dma32BitAddresses, 0, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, 0, &DeviceDescription);
|
Status = PcDmaMasterDescription(ResourceList, (Dma32BitAddresses | Dma64BitAddresses), Dma32BitAddresses, 0, Dma64BitAddresses, DmaWidth, DmaSpeed, MaximumLength, 0, &DeviceDescription);
|
||||||
if (NT_SUCCESS(Status))
|
if (NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
|
@ -397,12 +361,6 @@ CPortWaveCyclic::NewSlaveDmaChannel(
|
||||||
|
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWaveCyclic_fnNewSlaveDmaChannel called w/o initialized\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
|
|
||||||
// FIXME
|
// FIXME
|
||||||
// Check for F-Type DMA Support
|
// Check for F-Type DMA Support
|
||||||
//
|
//
|
||||||
|
|
|
@ -43,8 +43,6 @@ protected:
|
||||||
|
|
||||||
PMINIPORTWAVEPCI m_Miniport;
|
PMINIPORTWAVEPCI m_Miniport;
|
||||||
PDEVICE_OBJECT m_pDeviceObject;
|
PDEVICE_OBJECT m_pDeviceObject;
|
||||||
BOOL m_bInitialized;
|
|
||||||
PRESOURCELIST m_pResourceList;
|
|
||||||
PSERVICEGROUP m_ServiceGroup;
|
PSERVICEGROUP m_ServiceGroup;
|
||||||
PPINCOUNT m_pPinCount;
|
PPINCOUNT m_pPinCount;
|
||||||
PPOWERNOTIFY m_pPowerNotify;
|
PPOWERNOTIFY m_pPowerNotify;
|
||||||
|
@ -233,12 +231,6 @@ CPortWavePci::Init(
|
||||||
this, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList);
|
this, DeviceObject, Irp, UnknownMiniport, UnknownAdapter, ResourceList);
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWavePci_fnInit called again\n");
|
|
||||||
return STATUS_SUCCESS;
|
|
||||||
}
|
|
||||||
|
|
||||||
Status = UnknownMiniport->QueryInterface(IID_IMiniportWavePci, (PVOID*)&Miniport);
|
Status = UnknownMiniport->QueryInterface(IID_IMiniportWavePci, (PVOID*)&Miniport);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
|
@ -249,30 +241,20 @@ CPortWavePci::Init(
|
||||||
// Initialize port object
|
// Initialize port object
|
||||||
m_Miniport = Miniport;
|
m_Miniport = Miniport;
|
||||||
m_pDeviceObject = DeviceObject;
|
m_pDeviceObject = DeviceObject;
|
||||||
m_bInitialized = TRUE;
|
|
||||||
m_pResourceList = ResourceList;
|
|
||||||
InitializeListHead(&m_EventList);
|
InitializeListHead(&m_EventList);
|
||||||
KeInitializeSpinLock(&m_EventListLock);
|
KeInitializeSpinLock(&m_EventListLock);
|
||||||
|
|
||||||
// increment reference on miniport adapter
|
// increment reference on miniport adapter
|
||||||
Miniport->AddRef();
|
Miniport->AddRef();
|
||||||
|
|
||||||
|
|
||||||
if (ResourceList)
|
|
||||||
{
|
|
||||||
// increment reference on resource list
|
|
||||||
ResourceList->AddRef();
|
|
||||||
}
|
|
||||||
|
|
||||||
Status = Miniport->Init(UnknownAdapter, ResourceList, this, &ServiceGroup);
|
Status = Miniport->Init(UnknownAdapter, ResourceList, this, &ServiceGroup);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
DPRINT("IPortWavePci_fnInit failed with %x\n", Status);
|
DPRINT("IPortWavePci_fnInit failed with %x\n", Status);
|
||||||
m_bInitialized = FALSE;
|
|
||||||
// release reference on miniport adapter
|
// release reference on miniport adapter
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
// increment reference on resource list
|
|
||||||
ResourceList->Release();
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -282,7 +264,6 @@ CPortWavePci::Init(
|
||||||
{
|
{
|
||||||
DPRINT("failed to get description\n");
|
DPRINT("failed to get description\n");
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
m_bInitialized = FALSE;
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +288,6 @@ CPortWavePci::Init(
|
||||||
{
|
{
|
||||||
DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status);
|
DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status);
|
||||||
Miniport->Release();
|
Miniport->Release();
|
||||||
m_bInitialized = FALSE;
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -361,12 +341,6 @@ CPortWavePci::NewRegistryKey(
|
||||||
DPRINT("IPortWavePci_fnNewRegistryKey entered\n");
|
DPRINT("IPortWavePci_fnNewRegistryKey entered\n");
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWavePci_fnNewRegistryKey called w/o initiazed\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return PcNewRegistryKey(OutRegistryKey,
|
return PcNewRegistryKey(OutRegistryKey,
|
||||||
OuterUnknown,
|
OuterUnknown,
|
||||||
RegistryKeyType,
|
RegistryKeyType,
|
||||||
|
@ -389,12 +363,6 @@ CPortWavePci::GetDeviceProperty(
|
||||||
DPRINT("IPortWavePci_fnGetDeviceProperty entered\n");
|
DPRINT("IPortWavePci_fnGetDeviceProperty entered\n");
|
||||||
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL);
|
||||||
|
|
||||||
if (!m_bInitialized)
|
|
||||||
{
|
|
||||||
DPRINT("IPortWavePci_fnNewRegistryKey called w/o initiazed\n");
|
|
||||||
return STATUS_UNSUCCESSFUL;
|
|
||||||
}
|
|
||||||
|
|
||||||
return IoGetDeviceProperty(m_pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength);
|
return IoGetDeviceProperty(m_pDeviceObject, DeviceRegistryProperty, BufferLength, PropertyBuffer, ReturnLength);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -434,8 +402,6 @@ NTAPI
|
||||||
CPortWavePci::Notify(
|
CPortWavePci::Notify(
|
||||||
IN PSERVICEGROUP ServiceGroup)
|
IN PSERVICEGROUP ServiceGroup)
|
||||||
{
|
{
|
||||||
//IPortWavePciImpl * This = (IPortWavePciImpl*)iface;
|
|
||||||
|
|
||||||
//DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup);
|
//DPRINT("IPortWavePci_fnNotify entered %p, ServiceGroup %p\n", This, ServiceGroup);
|
||||||
|
|
||||||
if (ServiceGroup)
|
if (ServiceGroup)
|
||||||
|
@ -492,8 +458,6 @@ NTSTATUS
|
||||||
NTAPI
|
NTAPI
|
||||||
CPortWavePci::ReleaseChildren()
|
CPortWavePci::ReleaseChildren()
|
||||||
{
|
{
|
||||||
//IPortWavePciImpl * This = (IPortWavePciImpl*)CONTAINING_RECORD(iface, IPortWavePciImpl, lpVtblSubDevice);
|
|
||||||
|
|
||||||
UNIMPLEMENTED
|
UNIMPLEMENTED
|
||||||
return STATUS_UNSUCCESSFUL;
|
return STATUS_UNSUCCESSFUL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue