Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[cgutman] 46776: [TXTSETUP.SIF] - Add PnP information for isapnp [REACTOS.DFF] - Remove isapnp

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Apr 8 04:18:27 2010 New Revision: 46776 URL: http://svn.reactos.org/svn/reactos?rev=46776&view=rev Log: [TXTSETUP.SIF] - Add PnP information for isapnp [REACTOS.DFF] - Remove isapnp Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/boot/bootdata/txtsetup.sif Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Apr 8 04:18:27 2010 @@ -489,8 +489,6 @@ drivers\battery\battc\battc.sys 2 -drivers\bus\isapnp\isapnp.sys 2 - drivers\bus\acpi\cmbatt\cmbatt.sys 2 drivers\bus\acpi\compbatt\compbatt.sys 2 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Apr 8 04:18:27 2010 @@ -22,6 +22,7 @@ cdfs.sys=,,,,,,x,,,,,,4 cdrom.sys=,,,,,,x,,,,,,4 class2.sys=,,,,,,x,,,,,,4 +isapnp.sys=,,,,,,,,,,,,4 kdcom.dll=,,,,,,,,,,,,2 disk.sys=,,,,,,x,,,,,,4 floppy.sys=,,,,,,x,,,,,,4 @@ -36,13 +37,16 @@ ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] +*PNP0A00 = isapnp +*PNP0A03 = pci *PNP0C08 = acpi -*PNP0A03 = pci +PCI\CC_0601 = isapnp PCI\CC_0604 = pci [BootBusExtenders.Load] acpi = acpi.sys pci = pci.sys +isapnp = isapnp.sys [Cabinets] Cabinet=reactos.cab

14 years, 8 months

[cgutman] 46775: [ISAPNP] - Fix a typo

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Apr 8 01:03:59 2010 New Revision: 46775 URL: http://svn.reactos.org/svn/reactos?rev=46775&view=rev Log: [ISAPNP] - Fix a typo Modified: trunk/reactos/drivers/bus/isapnp/hardware.c Modified: trunk/reactos/drivers/bus/isapnp/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/hardwar… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/hardware.c [iso-8859-1] Thu Apr 8 01:03:59 2010 @@ -352,7 +352,7 @@ HwDelay(); Data = ((Data << 8) | ReadData(ReadDataPort)); HwDelay(); - Data >>= 1; + Byte >>= 1; if (Data != 0xFFFF) {

14 years, 8 months

[janderwald] 46774: [KS] - Implement IKsDevice::GetAdapterObject, IKsDevice::ArbitrateAdapterChannel - Store device interface guid in the symbolic link list entry, which is used by KsFilterFactoryUpdateCacheData - Implement KsFilterFactoryUpdateCacheData, which is used to dynamically propagate format / medium changes to directshow components - Move stream pointer preparation to an own function, which is called by KsPinGetLeadingEdgeStreamPointer / KsStreamPointerClone / KsStreamPointerAdvanceOff

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Apr 7 23:45:25 2010 New Revision: 46774 URL: http://svn.reactos.org/svn/reactos?rev=46774&view=rev Log: [KS] - Implement IKsDevice::GetAdapterObject, IKsDevice::ArbitrateAdapterChannel - Store device interface guid in the symbolic link list entry, which is used by KsFilterFactoryUpdateCacheData - Implement KsFilterFactoryUpdateCacheData, which is used to dynamically propagate format / medium changes to directshow components - Move stream pointer preparation to an own function, which is called by KsPinGetLeadingEdgeStreamPointer / KsStreamPointerClone / KsStreamPointerAdvanceOffsets - Fix locating correct offset in KsStreamPointerScheduleTimeout, KsStreamPointerCancelTimeout, KsStreamPointerGetNextClone - Further BDA support is on hold until ReactOS supports s/g in hal Modified: trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/deviceinterface.c trunk/reactos/drivers/ksfilter/ks/filterfactory.c trunk/reactos/drivers/ksfilter/ks/ksiface.h trunk/reactos/drivers/ksfilter/ks/kstypes.h trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/priv.h Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -112,14 +112,15 @@ NTAPI IKsDevice_fnGetAdapterObject( IN IKsDevice * iface, - IN PADAPTER_OBJECT Object, + IN PADAPTER_OBJECT * Object, IN PULONG Unknown1, IN PULONG Unknown2) { - //PKSIDEVICE_HEADER This = (PKSIDEVICE_HEADER)CONTAINING_RECORD(iface, KSIDEVICE_HEADER, lpVtblIKsDevice); - - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSIDEVICE_HEADER This = (PKSIDEVICE_HEADER)CONTAINING_RECORD(iface, KSIDEVICE_HEADER, lpVtblIKsDevice); + + *Object = This->AdapterObject; + + return STATUS_SUCCESS; } @@ -169,15 +170,24 @@ NTAPI IKsDevice_fnArbitrateAdapterChannel( IN IKsDevice * iface, - IN ULONG ControlCode, - IN IO_ALLOCATION_ACTION Action, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, IN PVOID Context) { - //PKSIDEVICE_HEADER This = (PKSIDEVICE_HEADER)CONTAINING_RECORD(iface, KSIDEVICE_HEADER, lpVtblIKsDevice); - - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; - + PKSIDEVICE_HEADER This = (PKSIDEVICE_HEADER)CONTAINING_RECORD(iface, KSIDEVICE_HEADER, lpVtblIKsDevice); + NTSTATUS Status; + + DPRINT("IKsDevice_fnArbitrateAdapterChannel NumberOfMapRegisters %lu ExecutionRoutine %p Context %p Irql %lu\n", NumberOfMapRegisters, ExecutionRoutine, Context, KeGetCurrentIrql()); + + /* sanity check */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(This->AdapterObject); + + /* allocate adapter channel */ + Status = IoAllocateAdapterChannel(This->AdapterObject, This->KsDevice.FunctionalDeviceObject, NumberOfMapRegisters, ExecutionRoutine, Context); + + /* done */ + return Status; } NTSTATUS @@ -518,7 +528,6 @@ Status = KspForwardIrpSynchronous(DeviceObject, Irp); DPRINT1("IRP_MN_QUERY_INTERFACE Next Device: Status %x\n", Status); - Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -687,6 +696,23 @@ DPRINT("DeviceHeader %p\n", DeviceExtension->DeviceHeader); + if (Descriptor && Descriptor->Dispatch) + { + DPRINT("Descriptor Add %p\n", Descriptor->Dispatch->Add); + DPRINT("Descriptor Start %p\n", Descriptor->Dispatch->Start); + DPRINT("Descriptor PostStart %p\n", Descriptor->Dispatch->PostStart); + DPRINT("Descriptor QueryStop %p\n", Descriptor->Dispatch->QueryStop); + DPRINT("Descriptor CancelStop %p\n", Descriptor->Dispatch->CancelStop); + DPRINT("Descriptor Stop %p\n", Descriptor->Dispatch->Stop); + DPRINT("Descriptor QueryRemove %p\n", Descriptor->Dispatch->QueryRemove); + DPRINT("Descriptor CancelRemove %p\n", Descriptor->Dispatch->CancelRemove); + DPRINT("Descriptor Remove %p\n", Descriptor->Dispatch->Remove); + DPRINT("Descriptor QueryCapabilities %p\n", Descriptor->Dispatch->QueryCapabilities); + DPRINT("Descriptor SurpriseRemoval %p\n", Descriptor->Dispatch->SurpriseRemoval); + DPRINT("Descriptor QueryPower %p\n", Descriptor->Dispatch->QueryPower); + DPRINT("Descriptor SetPower %p\n", Descriptor->Dispatch->SetPower); + DPRINT("Descriptor QueryInterface %p\n", Descriptor->Dispatch->QueryInterface); + } /* check for success */ if (!NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/ksfilter/ks/deviceinterface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/deviceinterface.c [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -90,6 +90,10 @@ /* return result */ return Status; } + + /* copy device class */ + RtlMoveMemory(&SymEntry->DeviceInterfaceClass, &Categories[Index], sizeof(CLSID)); + /* insert symbolic link entry */ InsertTailList(SymbolicLinkList, &SymEntry->Entry); } Modified: trunk/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -469,19 +469,261 @@ return KsAllocateObjectCreateItem((KSDEVICE_HEADER)Factory->DeviceHeader, &CreateItem, TRUE, IKsFilterFactory_ItemFreeCb); } +ULONG +KspCacheAddData( + PKSPCACHE_DESCRIPTOR Descriptor, + LPCVOID Data, + ULONG Length) +{ + ULONG Index; + + for(Index = 0; Index < Descriptor->DataOffset; Index++) + { + if (RtlCompareMemory(Descriptor->DataCache, Data, Length) == Length) + { + if (Index + Length > Descriptor->DataOffset) + { + /* adjust used space */ + Descriptor->DataOffset = Index + Length; + /* return absolute offset */ + return Descriptor->DataLength + Index; + } + } + } + + /* sanity check */ + ASSERT(Descriptor->DataOffset + Length < Descriptor->DataLength); + + /* copy to data blob */ + RtlMoveMemory((Descriptor->DataCache + Descriptor->DataOffset), Data, Length); + + /* backup offset */ + Index = Descriptor->DataOffset; + + /* adjust used space */ + Descriptor->DataOffset += Length; + + /* return absolute offset */ + return Descriptor->DataLength + Index; +} + /* @implemented */ KSDDKAPI NTSTATUS NTAPI -KsFilterFactoryUpdateCacheData ( +KsFilterFactoryUpdateCacheData( IN PKSFILTERFACTORY FilterFactory, IN const KSFILTER_DESCRIPTOR* FilterDescriptor OPTIONAL) { - UNIMPLEMENTED + KSPCACHE_DESCRIPTOR Descriptor; + PKSPCACHE_FILTER_HEADER FilterHeader; + UNICODE_STRING FilterData = RTL_CONSTANT_STRING(L"FilterData"); + PKSPCACHE_PIN_HEADER PinHeader; + ULONG Index, SubIndex; + PLIST_ENTRY Entry; + PSYMBOLIC_LINK_ENTRY SymEntry; + BOOLEAN Found; + HKEY hKey; + NTSTATUS Status = STATUS_SUCCESS; + + IKsFilterFactoryImpl * Factory = (IKsFilterFactoryImpl*)CONTAINING_RECORD(FilterFactory, IKsFilterFactoryImpl, FilterFactory); + DPRINT("KsFilterFactoryUpdateCacheData %p\n", FilterDescriptor); - return STATUS_SUCCESS; + if (!FilterDescriptor) + FilterDescriptor = Factory->FilterFactory.FilterDescriptor; + + ASSERT(FilterDescriptor); + + /* initialize cache descriptor */ + RtlZeroMemory(&Descriptor, sizeof(KSPCACHE_DESCRIPTOR)); + + /* calculate filter data size */ + Descriptor.FilterLength = sizeof(KSPCACHE_FILTER_HEADER); + + /* FIXME support variable size pin descriptors */ + ASSERT(FilterDescriptor->PinDescriptorSize == sizeof(KSPIN_DESCRIPTOR_EX)); + + for(Index = 0; Index < FilterDescriptor->PinDescriptorsCount; Index++) + { + /* add filter descriptor */ + Descriptor.FilterLength += sizeof(KSPCACHE_PIN_HEADER); + + if (FilterDescriptor->PinDescriptors[Index].PinDescriptor.Category) + { + /* add extra ULONG for offset to category */ + Descriptor.FilterLength += sizeof(ULONG); + + /* add size for clsid */ + Descriptor.DataLength += sizeof(CLSID); + } + + /* add space for formats */ + Descriptor.FilterLength += FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRangesCount * sizeof(KSPCACHE_DATARANGE); + + /* add space for MajorFormat / MinorFormat */ + Descriptor.DataLength += FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRangesCount * sizeof(CLSID) * 2; + + /* add space for mediums */ + Descriptor.FilterLength += FilterDescriptor->PinDescriptors[Index].PinDescriptor.MediumsCount * sizeof(ULONG); + + /* add space for the data */ + Descriptor.DataLength += FilterDescriptor->PinDescriptors[Index].PinDescriptor.MediumsCount * sizeof(KSPCACHE_MEDIUM); + } + + /* now allocate the space */ + Descriptor.FilterData = (PUCHAR)AllocateItem(NonPagedPool, Descriptor.DataLength + Descriptor.FilterLength); + if (!Descriptor.FilterData) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* initialize data cache */ + Descriptor.DataCache = (PUCHAR)((ULONG_PTR)Descriptor.FilterData + Descriptor.FilterLength); + + /* setup filter header */ + FilterHeader = (PKSPCACHE_FILTER_HEADER)Descriptor.FilterData; + + FilterHeader->dwVersion = 2; + FilterHeader->dwMerit = MERIT_DO_NOT_USE; + FilterHeader->dwUnused = 0; + FilterHeader->dwPins = FilterDescriptor->PinDescriptorsCount; + + Descriptor.FilterOffset = sizeof(KSPCACHE_FILTER_HEADER); + + /* write pin headers */ + for(Index = 0; Index < FilterDescriptor->PinDescriptorsCount; Index++) + { + /* get offset to pin */ + PinHeader = (PKSPCACHE_PIN_HEADER)((ULONG_PTR)Descriptor.FilterData + Descriptor.FilterOffset); + + /* write pin header */ + PinHeader->Signature = 0x33697030 + Index; + PinHeader->Flags = 0; + PinHeader->Instances = FilterDescriptor->PinDescriptors[Index].InstancesPossible; + if (PinHeader->Instances > 1) + PinHeader->Flags |= REG_PINFLAG_B_MANY; + + + PinHeader->MediaTypes = FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRangesCount; + PinHeader->Mediums = FilterDescriptor->PinDescriptors[Index].PinDescriptor.MediumsCount; + PinHeader->Category = (FilterDescriptor->PinDescriptors[Index].PinDescriptor.Category ? TRUE : FALSE); + + Descriptor.FilterOffset += sizeof(KSPCACHE_PIN_HEADER); + + if (PinHeader->Category) + { + /* get category offset */ + PULONG Category = (PULONG)(PinHeader + 1); + + /* write category offset */ + *Category = KspCacheAddData(&Descriptor, FilterDescriptor->PinDescriptors[Index].PinDescriptor.Category, sizeof(CLSID)); + + /* adjust offset */ + Descriptor.FilterOffset += sizeof(ULONG); + } + + /* add dataranges */ + for(SubIndex = 0; SubIndex < FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRangesCount; SubIndex++) + { + /* get datarange offset */ + PKSPCACHE_DATARANGE DataRange = (PKSPCACHE_DATARANGE)((ULONG_PTR)Descriptor.FilterData + Descriptor.FilterOffset); + + /* initialize data range */ + DataRange->Signature = 0x33797430 + SubIndex; + DataRange->dwUnused = 0; + DataRange->OffsetMajor = KspCacheAddData(&Descriptor, &FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRanges[SubIndex]->MajorFormat, sizeof(CLSID)); + DataRange->OffsetMinor = KspCacheAddData(&Descriptor, &FilterDescriptor->PinDescriptors[Index].PinDescriptor.DataRanges[SubIndex]->SubFormat, sizeof(CLSID)); + + /* adjust offset */ + Descriptor.FilterOffset += sizeof(KSPCACHE_DATARANGE); + } + + /* add mediums */ + for(SubIndex = 0; SubIndex < FilterDescriptor->PinDescriptors[Index].PinDescriptor.MediumsCount; SubIndex++) + { + KSPCACHE_MEDIUM Medium; + PULONG MediumOffset; + + /* get pin medium offset */ + MediumOffset = (PULONG)((ULONG_PTR)Descriptor.FilterData + Descriptor.FilterOffset); + + /* copy medium guid */ + RtlMoveMemory(&Medium.Medium, &FilterDescriptor->PinDescriptors[Index].PinDescriptor.Mediums[SubIndex].Set, sizeof(GUID)); + Medium.dw1 = FilterDescriptor->PinDescriptors[Index].PinDescriptor.Mediums[SubIndex].Id; /* FIXME verify */ + Medium.dw2 = 0; + + *MediumOffset = KspCacheAddData(&Descriptor, &Medium, sizeof(KSPCACHE_MEDIUM)); + + /* adjust offset */ + Descriptor.FilterOffset += sizeof(ULONG); + } + } + + /* sanity checks */ + ASSERT(Descriptor.FilterOffset == Descriptor.FilterLength); + ASSERT(Descriptor.DataOffset <= Descriptor.DataLength); + + + /* now go through all entries and update 'FilterData' key */ + for(Index = 0; Index < FilterDescriptor->CategoriesCount; Index++) + { + /* get first entry */ + Entry = Factory->SymbolicLinkList.Flink; + + /* set status to not found */ + Found = FALSE; + /* loop list until the the current category is found */ + while(Entry != &Factory->SymbolicLinkList) + { + /* fetch symbolic link entry */ + SymEntry = (PSYMBOLIC_LINK_ENTRY)CONTAINING_RECORD(Entry, SYMBOLIC_LINK_ENTRY, Entry); + + if (IsEqualGUIDAligned(&SymEntry->DeviceInterfaceClass, &FilterDescriptor->Categories[Index])) + { + /* found category */ + Found = TRUE; + break; + } + + /* move to next entry */ + Entry = Entry->Flink; + } + + if (!Found) + { + /* filter category is not present */ + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* now open device interface */ + Status = IoOpenDeviceInterfaceRegistryKey(&SymEntry->SymbolicLink, KEY_WRITE, &hKey); + if (!NT_SUCCESS(Status)) + { + /* failed to open interface key */ + break; + } + + /* update filterdata key */ + Status = ZwSetValueKey(hKey, &FilterData, 0, REG_BINARY, Descriptor.FilterData, Descriptor.FilterLength + Descriptor.DataOffset); + + /* close filterdata key */ + ZwClose(hKey); + + if (!NT_SUCCESS(Status)) + { + /* failed to set key value */ + break; + } + } + /* free filter data */ + FreeItem(Descriptor.FilterData); + + /* done */ + return Status; } Modified: trunk/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ksifac… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ksiface.h [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -282,7 +282,7 @@ STDMETHOD_(NTSTATUS,ReleaseDevice)(THIS) PURE; STDMETHOD_(NTSTATUS, GetAdapterObject)(THIS_ - IN PADAPTER_OBJECT Object, + IN PADAPTER_OBJECT * Object, IN PULONG Unknown1, IN PULONG Unknown2) PURE; @@ -300,8 +300,8 @@ IN KSSTATE NewState)PURE; STDMETHOD_(NTSTATUS, ArbitrateAdapterChannel)(THIS_ - IN ULONG ControlCode, - IN IO_ALLOCATION_ACTION Action, + IN ULONG NumberOfMapRegisters, + IN PDRIVER_CONTROL ExecutionRoutine, IN PVOID Context)PURE; STDMETHOD_(NTSTATUS, CheckIoCapability)(THIS_ Modified: trunk/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/kstype… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -108,6 +108,8 @@ LIST_ENTRY PowerDispatchList; LIST_ENTRY ObjectBags; + PADAPTER_OBJECT AdapterObject; + }KSIDEVICE_HEADER, *PKSIDEVICE_HEADER; typedef struct @@ -120,6 +122,7 @@ { LIST_ENTRY Entry; UNICODE_STRING SymbolicLink; + CLSID DeviceInterfaceClass; }SYMBOLIC_LINK_ENTRY, *PSYMBOLIC_LINK_ENTRY; typedef struct @@ -157,3 +160,51 @@ WCHAR BusIdentifier[1]; }BUS_ENUM_DEVICE_EXTENSION, *PBUS_ENUM_DEVICE_EXTENSION; + +typedef struct +{ + PUCHAR FilterData; + ULONG FilterLength; + ULONG FilterOffset; + + PUCHAR DataCache; + ULONG DataLength; + ULONG DataOffset; + +}KSPCACHE_DESCRIPTOR, *PKSPCACHE_DESCRIPTOR; + +typedef struct +{ + DWORD dwVersion; + DWORD dwMerit; + DWORD dwPins; + DWORD dwUnused; +}KSPCACHE_FILTER_HEADER, *PKSPCACHE_FILTER_HEADER; + +typedef struct +{ + ULONG Signature; + ULONG Flags; + ULONG Instances; + ULONG MediaTypes; + ULONG Mediums; + DWORD Category; +}KSPCACHE_PIN_HEADER, *PKSPCACHE_PIN_HEADER; + + +typedef struct +{ + ULONG Signature; + ULONG dwUnused; + ULONG OffsetMajor; + ULONG OffsetMinor; +}KSPCACHE_DATARANGE, *PKSPCACHE_DATARANGE; + + +typedef struct +{ + CLSID Medium; + ULONG dw1; + ULONG dw2; +}KSPCACHE_MEDIUM; + Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -17,6 +17,9 @@ KDPC TimerDpc; struct _KSISTREAM_POINTER *Next; PKSPIN Pin; + PVOID Data; + ULONG Offset; + ULONG Length; KSSTREAM_POINTER StreamPointer; }KSISTREAM_POINTER, *PKSISTREAM_POINTER; @@ -40,10 +43,11 @@ LIST_ENTRY IrpList; KSPIN_LOCK IrpListLock; + volatile LONG IrpCount; PKSISTREAM_POINTER ClonedStreamPointer; - PKSISTREAM_POINTER LeadingEdgeStreamPointer; - PKSISTREAM_POINTER TrailingStreamPointer; + KSISTREAM_POINTER LeadingEdgeStreamPointer; + KSISTREAM_POINTER TrailingStreamPointer; PFNKSPINPOWER Sleep; PFNKSPINPOWER Wake; @@ -58,9 +62,11 @@ PKSWORKER PinWorker; WORK_QUEUE_ITEM PinWorkQueueItem; - IRP * Irp; KEVENT FrameComplete; - + ULONG FrameSize; + ULONG NumFrames; + PDMA_ADAPTER Dma; + ULONG MapRegisters; }IKsPinImpl; @@ -1202,6 +1208,84 @@ return FALSE; } +NTSTATUS +IKsPin_PrepareStreamHeader( + IN IKsPinImpl * This, + IN PKSISTREAM_POINTER StreamPointer) +{ + PKSSTREAM_HEADER Header; + ULONG Length; + + /* grab new irp */ + StreamPointer->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); + if (!StreamPointer->Irp) + { + /* run out of mappings */ + DPRINT("OutOfMappings\n"); + return STATUS_DEVICE_NOT_READY; + } + + InterlockedDecrement(&This->IrpCount); + + /* get stream header */ + if (StreamPointer->Irp->RequestorMode == UserMode) + Header = (PKSSTREAM_HEADER)StreamPointer->Irp->AssociatedIrp.SystemBuffer; + else + Header = (PKSSTREAM_HEADER)StreamPointer->Irp->UserBuffer; + + /* initialize stream pointer */ + StreamPointer->Callback = NULL; + StreamPointer->Length = max(Header->DataUsed, Header->FrameExtent); + StreamPointer->Next = NULL; + StreamPointer->Offset = 0; + StreamPointer->Pin = &This->Pin; + StreamPointer->Data = Header->Data; + + StreamPointer->StreamPointer.Context = NULL; + StreamPointer->StreamPointer.Pin = &This->Pin; + StreamPointer->StreamPointer.StreamHeader = Header; + + if (This->Pin.Descriptor->PinDescriptor.DataFlow == KSPIN_DATAFLOW_IN) + StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetIn; + else + StreamPointer->StreamPointer.Offset = &StreamPointer->StreamPointer.OffsetOut; + + StreamPointer->StreamPointer.Offset->Alignment = 0; + StreamPointer->StreamPointer.Offset->Count = 0; + StreamPointer->StreamPointer.Offset->Data = NULL; + StreamPointer->StreamPointer.Offset->Remaining = 0; + + ASSERT(StreamPointer->StreamPointer.Offset->Remaining == 0); + + //StreamPointer->Offset += StreamPointer->StreamPointer.Offset->Count; + + ASSERT(StreamPointer->Length > StreamPointer->Offset); + ASSERT(StreamPointer->StreamPointer.StreamHeader); + ASSERT(This->FrameSize); + + /* calculate length */ + /* TODO split into frames */ + Length = StreamPointer->Length; + + /* FIXME */ + ASSERT(Length); + + StreamPointer->StreamPointer.Offset->Alignment = 0; + StreamPointer->StreamPointer.Context = NULL; + StreamPointer->StreamPointer.Pin = &This->Pin; + StreamPointer->StreamPointer.Offset->Count = Length; + StreamPointer->StreamPointer.Offset->Remaining = Length; + StreamPointer->StreamPointer.Offset->Data = (PVOID)((ULONG_PTR)StreamPointer->Data + StreamPointer->Offset); + StreamPointer->StreamPointer.StreamHeader->FrameExtent = Length; + if (StreamPointer->StreamPointer.StreamHeader->DataUsed) + StreamPointer->StreamPointer.StreamHeader->DataUsed = Length; + + StreamPointer->StreamPointer.StreamHeader->Data = StreamPointer->StreamPointer.Offset->Data; + + return STATUS_SUCCESS; +} + + /* @unimplemented */ @@ -1213,32 +1297,30 @@ IN KSSTREAM_POINTER_STATE State) { IKsPinImpl * This; + NTSTATUS Status; This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); - DPRINT("KsPinGetLeadingEdgeStreamPointer Pin %p State %x Count %lu Remaining %lu\n", Pin, State, - This->LeadingEdgeStreamPointer->StreamPointer.Offset->Count, - This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining); + DPRINT("KsPinGetLeadingEdgeStreamPointer Pin %p State %x Count %lu Remaining %lu\n", Pin, State, + This->LeadingEdgeStreamPointer.Length, + This->LeadingEdgeStreamPointer.Offset); /* sanity check */ - ASSERT(This->LeadingEdgeStreamPointer); ASSERT(State == KSSTREAM_POINTER_STATE_LOCKED); if (State == KSSTREAM_POINTER_STATE_LOCKED) { - /* do we have an irp packet */ - if (!This->Irp) + if (!This->LeadingEdgeStreamPointer.Irp || This->LeadingEdgeStreamPointer.StreamPointer.Offset->Remaining == 0) { - /* run out of packets */ - return NULL; + Status = IKsPin_PrepareStreamHeader(This, &This->LeadingEdgeStreamPointer); + if (!NT_SUCCESS(Status)) + return NULL; } - if (!This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining) - return NULL; - } - DPRINT("LeadingEdge %p\n", &This->LeadingEdgeStreamPointer->StreamPointer); - This->LeadingEdgeStreamPointer->Pin = &This->Pin; - return &This->LeadingEdgeStreamPointer->StreamPointer; + DPRINT("KsPinGetLeadingEdgeStreamPointer NewOffset %lu TotalLength %lu\n", This->LeadingEdgeStreamPointer.Offset, This->LeadingEdgeStreamPointer.Length); + } + + return &This->LeadingEdgeStreamPointer.StreamPointer; } /* @@ -1293,7 +1375,7 @@ IN BOOLEAN Eject) { UNIMPLEMENTED - DPRINT("KsStreamPointerUnlock Eject %lu\n", Eject); + DPRINT("KsStreamPointerUnlock StreamPointer %pEject %lu\n", StreamPointer, Eject); DbgBreakPoint(); } @@ -1328,7 +1410,7 @@ PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); DPRINT("KsStreamPointerDelete %p\n", Pointer); - +DbgBreakPoint(); This = (IKsPinImpl*)CONTAINING_RECORD(Pointer->StreamPointer.Pin, IKsPinImpl, Pin); /* point to first stream pointer */ @@ -1378,6 +1460,7 @@ PKSISTREAM_POINTER CurFrame; PKSISTREAM_POINTER NewFrame; ULONG RefCount; + NTSTATUS Status; ULONG Size; DPRINT("KsStreamPointerClone StreamPointer %p CancelCallback %p ContextSize %p CloneStreamPointer %p\n", StreamPointer, CancelCallback, ContextSize, CloneStreamPointer); @@ -1404,11 +1487,30 @@ /* copy stream pointer */ RtlMoveMemory(NewFrame, CurFrame, sizeof(KSISTREAM_POINTER)); + /* locate pin */ + This = (IKsPinImpl*)CONTAINING_RECORD(CurFrame->Pin, IKsPinImpl, Pin); + + /* prepare stream header in case required */ + if (CurFrame->StreamPointer.Offset->Remaining == 0) + { + Status = IKsPin_PrepareStreamHeader(This, NewFrame); + if (!NT_SUCCESS(Status)) + { + FreeItem(NewFrame); + return STATUS_DEVICE_NOT_READY; + } + } + if (ContextSize) NewFrame->StreamPointer.Context = (NewFrame + 1); - /* locate pin */ - This = (IKsPinImpl*)CONTAINING_RECORD(CurFrame->Pin, IKsPinImpl, Pin); + + if (This->Pin.Descriptor->PinDescriptor.DataFlow == KSPIN_DATAFLOW_IN) + NewFrame->StreamPointer.Offset = &NewFrame->StreamPointer.OffsetIn; + else + NewFrame->StreamPointer.Offset = &NewFrame->StreamPointer.OffsetOut; + + NewFrame->StreamPointer.Pin = &This->Pin; @@ -1419,6 +1521,8 @@ /* store result */ *CloneStreamPointer = &NewFrame->StreamPointer; + + DPRINT("KsStreamPointerClone CloneStreamPointer %p\n", *CloneStreamPointer); return STATUS_SUCCESS; } @@ -1437,52 +1541,46 @@ { PKSISTREAM_POINTER CurFrame; IKsPinImpl * This; - - DPRINT("KsStreamPointerAdvanceOffsets InUsed %lu OutUsed %lu Eject %lu\n", InUsed, OutUsed, Eject); + NTSTATUS Status; + + DPRINT("KsStreamPointerAdvanceOffsets StreamPointer %p InUsed %lu OutUsed %lu Eject %lu\n", StreamPointer, InUsed, OutUsed, Eject); /* get stream pointer */ CurFrame = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); - CurFrame->StreamPointer.OffsetIn.Remaining -= InUsed; - CurFrame->StreamPointer.OffsetOut.Remaining -= OutUsed; - CurFrame->StreamPointer.OffsetIn.Count -= InUsed; - CurFrame->StreamPointer.OffsetOut.Count -= OutUsed; - CurFrame->StreamPointer.OffsetIn.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetIn.Data + InUsed); - CurFrame->StreamPointer.OffsetOut.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetOut.Data + OutUsed); - - if (!CurFrame->StreamPointer.OffsetIn.Remaining) - CurFrame->StreamPointer.OffsetIn.Data = NULL; - - if (!CurFrame->StreamPointer.OffsetOut.Remaining) - CurFrame->StreamPointer.OffsetOut.Data = NULL; - /* locate pin */ This = (IKsPinImpl*)CONTAINING_RECORD(CurFrame->Pin, IKsPinImpl, Pin); + /* TODO */ + ASSERT(InUsed == 0); + ASSERT(Eject == 0); + ASSERT(OutUsed); + + DPRINT("KsStreamPointerAdvanceOffsets Offset %lu Length %lu NewOffset %lu Remaining %lu LeadingEdge %p DataUsed %lu\n", CurFrame->Offset, CurFrame->Length, CurFrame->Offset + OutUsed, +CurFrame->StreamPointer.OffsetOut.Remaining, &This->LeadingEdgeStreamPointer.StreamPointer, CurFrame->StreamPointer.StreamHeader->DataUsed); +DbgBreakPoint(); + if (This->Pin.Descriptor->PinDescriptor.DataFlow == KSPIN_DATAFLOW_IN) { - if (CurFrame->StreamPointer.OffsetIn.Remaining == 0) + ASSERT(CurFrame->StreamPointer.OffsetIn.Remaining >= InUsed); + CurFrame->StreamPointer.OffsetIn.Remaining -= InUsed; + CurFrame->StreamPointer.OffsetIn.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetIn.Data + InUsed); + } + else + { + if (!CurFrame->StreamPointer.OffsetOut.Remaining) { - /* get next mapping */ - This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); - if (!This->Irp) + Status = IKsPin_PrepareStreamHeader(This, CurFrame); + if (!NT_SUCCESS(Status)) + { return STATUS_DEVICE_NOT_READY; - - /* FIXME handle me */ - ASSERT(0); + } } - } - else - { - if (CurFrame->StreamPointer.OffsetOut.Remaining == 0) + else { - /* get next mapping */ - This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); - if (!This->Irp) - return STATUS_DEVICE_NOT_READY; - - /* FIXME handle me */ - ASSERT(0); + ASSERT(CurFrame->StreamPointer.OffsetOut.Remaining >= OutUsed); + CurFrame->StreamPointer.OffsetOut.Remaining -= OutUsed; + CurFrame->StreamPointer.OffsetOut.Data = (PVOID)((ULONG_PTR)CurFrame->StreamPointer.OffsetOut.Data + OutUsed); } } @@ -1499,6 +1597,7 @@ IN PKSSTREAM_POINTER StreamPointer) { UNIMPLEMENTED + DbgBreakPoint(); return STATUS_NOT_IMPLEMENTED; } @@ -1542,7 +1641,10 @@ IN ULONGLONG Interval) { LARGE_INTEGER DueTime; - PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + PKSISTREAM_POINTER Pointer; + + /* get stream pointer */ + Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); /* setup timer callback */ Pointer->Callback = Callback; @@ -1564,7 +1666,10 @@ KsStreamPointerCancelTimeout( IN PKSSTREAM_POINTER StreamPointer) { - PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + PKSISTREAM_POINTER Pointer; + + /* get stream pointer */ + Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); KeCancelTimer(&Pointer->Timer); @@ -1582,7 +1687,7 @@ IKsPinImpl * This; DPRINT("KsPinGetFirstCloneStreamPointer %p\n", Pin); - DbgBreakPoint(); +DbgBreakPoint(); This = (IKsPinImpl*)CONTAINING_RECORD(Pin, IKsPinImpl, Pin); /* return first cloned stream pointer */ return &This->ClonedStreamPointer->StreamPointer; @@ -1597,10 +1702,14 @@ KsStreamPointerGetNextClone( IN PKSSTREAM_POINTER StreamPointer) { - PKSISTREAM_POINTER Pointer = (PKSISTREAM_POINTER)StreamPointer; + PKSISTREAM_POINTER Pointer; DPRINT("KsStreamPointerGetNextClone\n"); - DbgBreakPoint(); +DbgBreakPoint(); + /* get stream pointer */ + Pointer = (PKSISTREAM_POINTER)CONTAINING_RECORD(StreamPointer, KSISTREAM_POINTER, StreamPointer); + + /* is there a another cloned stream pointer */ if (!Pointer->Next) return NULL; @@ -1614,11 +1723,7 @@ IKsPin_PinCentricWorker( IN PVOID Parameter) { - PIO_STACK_LOCATION IoStack; - PKSSTREAM_HEADER Header; - ULONG NumHeaders; NTSTATUS Status; - PIRP Irp; IKsPinImpl * This = (IKsPinImpl*)Parameter; DPRINT("IKsPin_PinCentricWorker\n"); @@ -1630,76 +1735,21 @@ ASSERT(This->Pin.Descriptor->Dispatch->Process); ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); ASSERT(!(This->Pin.Descriptor->Flags & KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING)); - ASSERT(This->LeadingEdgeStreamPointer); + ASSERT(!(This->Pin.Descriptor->Flags & KSPIN_FLAG_GENERATE_MAPPINGS)); do { - /* do we have an irp packet */ - if (!This->Irp) - { - /* fetch new irp packet */ - This->Irp = KsRemoveIrpFromCancelableQueue(&This->IrpList, &This->IrpListLock, KsListEntryHead, KsAcquireAndRemoveOnlySingleItem); - - if (!This->Irp) - { - /* reached last packet */ - break; - } - } - - /* get current irp stack location */ - IoStack = IoGetCurrentIrpStackLocation(This->Irp); - - if (This->Irp->RequestorMode == UserMode) - This->LeadingEdgeStreamPointer->StreamPointer.StreamHeader = Header = (PKSSTREAM_HEADER)This->Irp->AssociatedIrp.SystemBuffer; - else - This->LeadingEdgeStreamPointer->StreamPointer.StreamHeader = Header = (PKSSTREAM_HEADER)This->Irp->UserBuffer; - - /* calculate num headers */ - NumHeaders = IoStack->Parameters.DeviceIoControl.OutputBufferLength / Header->Size; - - /* assume headers of same length */ - ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength % Header->Size == 0); - - /* FIXME support multiple stream headers */ - ASSERT(NumHeaders == 1); - - if (This->Irp->RequestorMode == UserMode) - { - /* prepare header */ - Header->Data = MmGetSystemAddressForMdlSafe(This->Irp->MdlAddress, NormalPagePriority); - } - - /* set up stream pointer */ - This->LeadingEdgeStreamPointer->Irp = Irp = This->Irp; - This->LeadingEdgeStreamPointer->StreamPointer.Context = NULL; - This->LeadingEdgeStreamPointer->StreamPointer.Pin = &This->Pin; - This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Count = max(Header->DataUsed, Header->FrameExtent); - This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Data = Header->Data; - This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Count = max(Header->DataUsed, Header->FrameExtent); - This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut.Remaining = max(Header->DataUsed, Header->FrameExtent); - This->LeadingEdgeStreamPointer->Pin = &This->Pin; - DPRINT("IKsPin_PinCentricWorker calling Pin Process Routine\n"); - Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); - DPRINT("IKsPin_PinCentricWorker Status %lx, Count %lu Remaining %lu\n", Status, - This->LeadingEdgeStreamPointer->StreamPointer.Offset->Count, - This->LeadingEdgeStreamPointer->StreamPointer.Offset->Remaining); - - ASSERT(Status != STATUS_PENDING); - - // HACK complete irp - Irp->IoStatus.Information = max(Header->DataUsed, Header->FrameExtent); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - KsDecrementCountedWorker(This->PinWorker); - - + Status = This->Pin.Descriptor->Dispatch->Process(&This->Pin); + DPRINT("IKsPin_PinCentricWorker Status %lx, Offset %lu Length %lu\n", Status, + This->LeadingEdgeStreamPointer.Offset, + This->LeadingEdgeStreamPointer.Length); break; - }while(TRUE); -} + }while(This->IrpCount); +} + NTSTATUS NTAPI @@ -1709,6 +1759,8 @@ IKsPinImpl * This) { PKSPROCESSPIN_INDEXENTRY ProcessPinIndex; + PKSSTREAM_HEADER Header; + ULONG NumHeaders; PKSFILTER Filter; PIO_STACK_LOCATION IoStack; NTSTATUS Status = STATUS_SUCCESS; @@ -1721,6 +1773,7 @@ /* get current stack location */ IoStack = IoGetCurrentIrpStackLocation(Irp); + /* probe stream pointer */ if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_WRITE_STREAM) Status = KsProbeStreamIrp(Irp, KSSTREAM_WRITE | KSPROBE_ALLOCATEMDL | KSPROBE_PROBEANDLOCK | KSPROBE_SYSTEMADDRESS, This->Pin.StreamHeaderSize); else @@ -1735,6 +1788,46 @@ return Status; } + if (Irp->RequestorMode == UserMode) + Header = (PKSSTREAM_HEADER)Irp->AssociatedIrp.SystemBuffer; + else + Header = (PKSSTREAM_HEADER)Irp->UserBuffer; + + if (!Header) + { + DPRINT("NoHeader Canceling Irp %p\n", Irp); + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + /* calculate num headers */ + NumHeaders = IoStack->Parameters.DeviceIoControl.OutputBufferLength / Header->Size; + + /* assume headers of same length */ + ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength % Header->Size == 0); + + /* FIXME support multiple stream headers */ + ASSERT(NumHeaders == 1); + + if (Irp->RequestorMode == UserMode) + { + /* prepare header */ + ASSERT(Irp->MdlAddress); + Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + + if (!Header->Data) + { + DPRINT("NoHeader->Data Canceling Irp %p\n", Irp); + Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } + + } + + + if (This->Pin.Descriptor->Dispatch->Process) { /* it is a pin centric avstream */ @@ -1748,6 +1841,10 @@ /* sanity checks */ ASSERT(!(This->Pin.Descriptor->Flags & KSPIN_FLAG_DISPATCH_LEVEL_PROCESSING)); ASSERT(This->PinWorker); + + InterlockedIncrement(&This->IrpCount); + + DPRINT("IKsPin_DispatchKsStream IrpCount %lu\n", This->IrpCount); /* start the processing loop */ KsIncrementCountedWorker(This->PinWorker); @@ -1781,7 +1878,6 @@ /* add irp to cancelable queue */ KsAddIrpToCancelableQueue(&This->IrpList, &This->IrpListLock, Irp, KsListEntryTail, NULL /* FIXME */); - Status = Filter->Descriptor->Dispatch->Process(Filter, ProcessPinIndex); @@ -2110,6 +2206,9 @@ NTSTATUS Status; PKSDATAFORMAT DataFormat; PKSBASIC_HEADER BasicHeader; + ULONG Index; + ULONG FrameSize = 0; + ULONG NumFrames = 0; /* sanity checks */ ASSERT(Descriptor->Dispatch); @@ -2118,6 +2217,52 @@ //Output Pin: KSPIN_FLAG_PROCESS_IN_RUN_STATE_ONLY //Input Pin: KSPIN_FLAG_FIXED_FORMAT|KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT|KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING + + + if (Descriptor->AllocatorFraming) + { + DPRINT("KspCreatePin Dataflow %lu\n", Descriptor->PinDescriptor.DataFlow); + DPRINT("KspCreatePin CountItems %lu\n", Descriptor->AllocatorFraming->CountItems); + DPRINT("KspCreatePin PinFlags %lx\n", Descriptor->AllocatorFraming->PinFlags); + DPRINT("KspCreatePin OutputCompression RatioNumerator %lu RatioDenominator %lu RatioConstantMargin %lu\n", Descriptor->AllocatorFraming->OutputCompression.RatioNumerator, + Descriptor->AllocatorFraming->OutputCompression.RatioDenominator, Descriptor->AllocatorFraming->OutputCompression.RatioConstantMargin); + DPRINT("KspCreatePin PinWeight %lx\n", Descriptor->AllocatorFraming->PinWeight); + + for(Index = 0; Index < Descriptor->AllocatorFraming->CountItems; Index++) + { + DPRINT("KspCreatePin Index %lu MemoryFlags %lx\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].MemoryFlags); + DPRINT("KspCreatePin Index %lu BusFlags %lx\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].BusFlags); + DPRINT("KspCreatePin Index %lu Flags %lx\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].Flags); + DPRINT("KspCreatePin Index %lu Frames %lu\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].Frames); + DPRINT("KspCreatePin Index %lu FileAlignment %lx\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].FileAlignment); + DPRINT("KspCreatePin Index %lu MemoryTypeWeight %lx\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].MemoryTypeWeight); + DPRINT("KspCreatePin Index %lu PhysicalRange MinFrameSize %lu MaxFrameSize %lu Stepping %lu\n", Index, Descriptor->AllocatorFraming->FramingItem[Index].PhysicalRange.MinFrameSize, + Descriptor->AllocatorFraming->FramingItem[Index].PhysicalRange.MaxFrameSize, + Descriptor->AllocatorFraming->FramingItem[Index].PhysicalRange.Stepping); + + DPRINT("KspCreatePin Index %lu FramingRange MinFrameSize %lu MaxFrameSize %lu Stepping %lu InPlaceWeight %lu NotInPlaceWeight %lu\n", + Index, + Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.Range.MinFrameSize, + Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.Range.MaxFrameSize, + Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.Range.Stepping, + Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.InPlaceWeight, + Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.NotInPlaceWeight); + + FrameSize = Descriptor->AllocatorFraming->FramingItem[Index].FramingRange.Range.MaxFrameSize; + NumFrames = Descriptor->AllocatorFraming->FramingItem[Index].Frames; + } + } + + if (!FrameSize) + { + /* default to 50 * 188 (MPEG2 TS packet size) */ + FrameSize = 9400; + } + + if (!NumFrames) + { + NumFrames = 8; + } /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -2158,12 +2303,13 @@ This->BasicHeader.ControlMutex = BasicHeader->ControlMutex; ASSERT(This->BasicHeader.ControlMutex); - InitializeListHead(&This->BasicHeader.EventList); KeInitializeSpinLock(&This->BasicHeader.EventListLock); /* initialize pin */ This->lpVtbl = &vt_IKsPin; + This->FrameSize = FrameSize; + This->NumFrames = NumFrames; This->lpVtblReferenceClock = &vt_ReferenceClock; This->ref = 1; This->FileObject = IoStack->FileObject; @@ -2171,7 +2317,6 @@ KeInitializeMutex(&This->ProcessingMutex, 0); InitializeListHead(&This->IrpList); KeInitializeSpinLock(&This->IrpListLock); - /* allocate object bag */ This->Pin.Bag = AllocateItem(NonPagedPool, sizeof(KSIOBJECT_BAG)); @@ -2270,7 +2415,7 @@ This->ProcessPin.Flags = 0; This->ProcessPin.InPlaceCounterpart = NULL; This->ProcessPin.Pin = &This->Pin; - This->ProcessPin.StreamPointer = (PKSSTREAM_POINTER)This->LeadingEdgeStreamPointer; + This->ProcessPin.StreamPointer = (PKSSTREAM_POINTER)&This->LeadingEdgeStreamPointer.StreamPointer; This->ProcessPin.Terminate = FALSE; Status = Filter->lpVtbl->AddProcessPin(Filter, &This->ProcessPin); @@ -2291,18 +2436,6 @@ { /* pin centric processing filter */ - /* allocate leading stream pointer */ - Status = _KsEdit(This->Pin.Bag, (PVOID*)&This->LeadingEdgeStreamPointer, sizeof(KSISTREAM_POINTER), sizeof(KSISTREAM_POINTER), 0); - - /* FIXME cleanup */ - ASSERT(Status == STATUS_SUCCESS); - - /* FIXME cleanup */ - ASSERT(Status == STATUS_SUCCESS); - - /* setup stream pointer offset */ - This->LeadingEdgeStreamPointer->StreamPointer.Offset = &This->LeadingEdgeStreamPointer->StreamPointer.OffsetOut; - /* initialize work item */ ExInitializeWorkItem(&This->PinWorkQueueItem, IKsPin_PinCentricWorker, (PVOID)This); @@ -2319,6 +2452,12 @@ return Status; } + if (This->Pin.Descriptor->PinDescriptor.DataFlow == KSPIN_DATAFLOW_IN) + This->LeadingEdgeStreamPointer.StreamPointer.Offset = &This->LeadingEdgeStreamPointer.StreamPointer.OffsetIn; + else + This->LeadingEdgeStreamPointer.StreamPointer.Offset = &This->LeadingEdgeStreamPointer.StreamPointer.OffsetOut; + + KeInitializeEvent(&This->FrameComplete, NotificationEvent, FALSE); } Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Wed Apr 7 23:45:25 2010 @@ -4,7 +4,8 @@ #include <ntifs.h> #include <ntddk.h> -#define NDEBUG +//#define NDEBUG +#define YDEBUG #include <debug.h> #include <portcls.h> #include <ks.h> @@ -16,8 +17,11 @@ #include "kstypes.h" #include "ksiface.h" +#include "ksmedia.h" #define TAG_DEVICE_HEADER 'KSDH' +#define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ +#define MERIT_DO_NOT_USE 0x200000 /* dshow.h */ #define DEFINE_KSPROPERTY_PINPROPOSEDATAFORMAT(PinSet,\ PropGeneral, PropInstances, PropIntersection)\

14 years, 8 months

[fireball] 46773: - Temporarily comment out freeing the message queue at thread termination. Fixes "hangs" after exiting any application.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 7 23:23:51 2010 New Revision: 46773 URL: http://svn.reactos.org/svn/reactos?rev=46773&view=rev Log: - Temporarily comment out freeing the message queue at thread termination. Fixes "hangs" after exiting any application. Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/main/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/main/init.c [iso-8859-1] Wed Apr 7 23:23:51 2010 @@ -161,7 +161,7 @@ UserEnterExclusive(); //cleanup_clipboard_thread(); destroy_thread_windows(Win32Thread); - free_msg_queue(Win32Thread); + //free_msg_queue(Win32Thread); // FIXME! close_thread_desktop(Win32Thread); UserLeave();

14 years, 8 months

[fireball] 46772: - Code cleanup: remove unnecessary PTHREADINFO/PPROCESSINFO casts, reduce diff to the original code, make the code smaller by querying the current thread info only once per function.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 7 23:17:42 2010 New Revision: 46772 URL: http://svn.reactos.org/svn/reactos?rev=46772&view=rev Log: - Code cleanup: remove unnecessary PTHREADINFO/PPROCESSINFO casts, reduce diff to the original code, make the code smaller by querying the current thread info only once per function. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/handle.c [iso-8859-1] Wed Apr 7 23:17:42 2010 @@ -536,7 +536,7 @@ if (ops && obj->ops != ops) set_error( STATUS_OBJECT_TYPE_MISMATCH ); else - handle = alloc_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process() , obj, access, attr ); + handle = alloc_handle( PsGetCurrentProcessWin32Process() , obj, access, attr ); release_object( obj ); } else @@ -554,14 +554,14 @@ /* close a handle */ DECL_HANDLER(close_handle) { - unsigned int err = close_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle ); + unsigned int err = close_handle( PsGetCurrentProcessWin32Process(), req->handle ); set_error( err ); } /* set a handle information */ DECL_HANDLER(set_handle_info) { - reply->old_flags = set_handle_flags( (PPROCESSINFO)PsGetCurrentProcessWin32Process() , req->handle, req->mask, req->flags ); + reply->old_flags = set_handle_flags( PsGetCurrentProcessWin32Process() , req->handle, req->mask, req->flags ); } /* duplicate a handle */ @@ -597,9 +597,9 @@ struct object *obj; WCHAR *name; - if (!(obj = get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, 0, NULL ))) return; - - reply->access = get_handle_access( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle ); + if (!(obj = get_handle_obj( PsGetCurrentProcessWin32Process(), req->handle, 0, NULL ))) return; + + reply->access = get_handle_access( PsGetCurrentProcessWin32Process(), req->handle ); reply->ref_count = obj->refcount; if ((name = get_object_full_name( obj, &reply->total ))) set_reply_data_ptr( (void*)req, name, min( reply->total, get_reply_max_size((void*)req) )); @@ -627,7 +627,7 @@ if (req->security_info & DACL_SECURITY_INFORMATION) access |= WRITE_DAC; - if (!(obj = get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, access, NULL ))) return; + if (!(obj = get_handle_obj( PsGetCurrentProcessWin32Process(), req->handle, access, NULL ))) return; obj->ops->set_sd( obj, sd, req->security_info ); release_object( obj ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/hook.c [iso-8859-1] Wed Apr 7 23:17:42 2010 @@ -451,7 +451,6 @@ { ObReferenceObjectByPointer(current->peThread, 0, NULL, KernelMode); hook->owner = current; - //hook->process = process ? (struct process *)grab_object( process ) : NULL; if (process) ObReferenceObjectByPointer(process->peProcess, 0, NULL, KernelMode); hook->process = process; Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Wed Apr 7 23:17:42 2010 @@ -1674,7 +1674,7 @@ /* if skip wait is set, do what would have been done in the subsequent wait */ if (req->skip_wait) { - msg_queue_satisfied( &queue->obj, (PTHREADINFO)PsGetCurrentThreadWin32Thread() ); + msg_queue_satisfied( &queue->obj, PsGetCurrentThreadWin32Thread() ); } else { @@ -2087,7 +2087,7 @@ } else { - thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); + thread = PsGetCurrentThreadWin32Thread(); ObReferenceObjectByPointer(thread->peThread, 0, NULL, KernelMode); } Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/window.c [iso-8859-1] Wed Apr 7 23:17:42 2010 @@ -408,7 +408,7 @@ if (!(desktop = get_thread_desktop( current, DESKTOP_CREATEWINDOW ))) return NULL; - if (!(class = grab_class( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), atom, instance, &extra_bytes ))) + if (!(class = grab_class( current->process, atom, instance, &extra_bytes ))) { release_object( desktop ); return NULL; @@ -1778,7 +1778,7 @@ if (win) { if (!is_desktop_window(win)) destroy_window( win ); - else if (win->thread == (PTHREADINFO)PsGetCurrentThreadWin32Thread()) detach_window_thread( win ); + else if (win->thread == PsGetCurrentThreadWin32Thread()) detach_window_thread( win ); else set_error( STATUS_ACCESS_DENIED ); } } @@ -1787,7 +1787,7 @@ /* retrieve the desktop window for the current thread */ DECL_HANDLER(get_desktop_window) { - struct desktop *desktop = get_thread_desktop( (PTHREADINFO)PsGetCurrentThreadWin32Thread(), 0 ); + struct desktop *desktop = get_thread_desktop( PsGetCurrentThreadWin32Thread(), 0 ); if (!desktop) return; @@ -1865,7 +1865,7 @@ struct window *win = get_window( req->handle ); if (!win) return; - if (req->flags && is_desktop_window(win) && win->thread != (PTHREADINFO)PsGetCurrentThreadWin32Thread()) + if (req->flags && is_desktop_window(win) && win->thread != PsGetCurrentThreadWin32Thread()) { set_error( STATUS_ACCESS_DENIED ); return; @@ -1941,21 +1941,20 @@ struct unicode_str cls_name; atom_t atom = req->atom; struct desktop *desktop = NULL; - PTHREADINFO current_thread = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); - PPROCESSINFO current_process = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); get_req_unicode_str( (void*)req, &cls_name ); if (cls_name.len && !(atom = find_global_atom( NULL, &cls_name ))) return; if (req->desktop) { - if (!(desktop = get_desktop_obj( current_process, req->desktop, DESKTOP_ENUMERATE ))) return; + if (!(desktop = get_desktop_obj( current->process, req->desktop, DESKTOP_ENUMERATE ))) return; parent = desktop->top_window; } else { if (req->parent && !(parent = get_window( req->parent ))) return; - if (!parent && !(desktop = get_thread_desktop( current_thread, 0 ))) return; + if (!parent && !(desktop = get_thread_desktop( current, 0 ))) return; } if (parent) Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Wed Apr 7 23:17:42 2010 @@ -532,7 +532,7 @@ get_req_unicode_str( (void*)req, &name ); if ((winstation = create_winstation( &name, req->attributes, req->flags ))) { - reply->handle = alloc_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), winstation, req->access, req->attributes ); + reply->handle = alloc_handle( PsGetCurrentProcessWin32Process(), winstation, req->access, req->attributes ); release_object( winstation ); } } @@ -555,11 +555,12 @@ DECL_HANDLER(close_winstation) { struct winstation *winstation; - - if ((winstation = (struct winstation *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); + + if ((winstation = (struct winstation *)get_handle_obj( current->process, req->handle, 0, &winstation_ops ))) { - if (close_handle( PsGetCurrentProcessWin32Process(), req->handle )) set_error( STATUS_ACCESS_DENIED ); + if (close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); release_object( winstation ); } } @@ -576,12 +577,13 @@ DECL_HANDLER(set_process_winstation) { struct winstation *winstation; - - if ((winstation = (struct winstation *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); + + if ((winstation = (struct winstation *)get_handle_obj( current->process, req->handle, 0, &winstation_ops ))) { /* FIXME: should we close the old one? */ - ((PPROCESSINFO)PsGetCurrentProcessWin32Process())->winstation = req->handle; + current->process->winstation = req->handle; release_object( winstation ); } } @@ -592,15 +594,15 @@ struct desktop *desktop; struct winstation *winstation; struct unicode_str name; - PPROCESSINFO current = (PPROCESSINFO)PsGetCurrentProcessWin32Process(); + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); reply->handle = 0; get_req_unicode_str( (void*)req, &name ); - if ((winstation = get_process_winstation( current, WINSTA_CREATEDESKTOP ))) + if ((winstation = get_process_winstation( current->process, WINSTA_CREATEDESKTOP ))) { if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation ))) { - reply->handle = alloc_handle( current, desktop, req->access, req->attributes ); + reply->handle = alloc_handle( current->process, desktop, req->access, req->attributes ); release_object( desktop ); } release_object( winstation ); @@ -612,14 +614,15 @@ { struct winstation *winstation; struct unicode_str name; + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); get_req_unicode_str( (void*)req, &name ); /* FIXME: check access rights */ if (!req->winsta) - winstation = get_process_winstation( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), 0 ); + winstation = get_process_winstation( current->process, 0 ); else - winstation = (struct winstation *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->winsta, 0, &winstation_ops ); + winstation = (struct winstation *)get_handle_obj( current->process, req->winsta, 0, &winstation_ops ); if (winstation) { @@ -641,12 +644,13 @@ DECL_HANDLER(close_desktop) { struct desktop *desktop; + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); /* make sure it is a desktop handle */ - if ((desktop = (struct desktop *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, + if ((desktop = (struct desktop *)get_handle_obj( current->process, req->handle, 0, &desktop_ops ))) { - if (close_handle( PsGetCurrentProcessWin32Process(), req->handle )) set_error( STATUS_DEVICE_BUSY ); + if (close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); release_object( desktop ); } } @@ -678,7 +682,7 @@ { struct desktop *old_desktop, *new_desktop; struct winstation *winstation; - PTHREADINFO current = (PTHREADINFO)PsGetCurrentThreadWin32Thread(); + PTHREADINFO current = PsGetCurrentThreadWin32Thread(); if (!(winstation = get_process_winstation( current->process, 0 /* FIXME: access rights? */ ))) return; @@ -723,7 +727,7 @@ { struct object *obj; - if (!(obj = get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->handle, 0, NULL ))) return; + if (!(obj = get_handle_obj( PsGetCurrentProcessWin32Process(), req->handle, 0, NULL ))) return; if (obj->ops == &desktop_ops) { @@ -777,7 +781,7 @@ struct desktop *desktop; unsigned int index = 0; - if (!(winstation = (struct winstation *)get_handle_obj( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), req->winstation, + if (!(winstation = (struct winstation *)get_handle_obj( PsGetCurrentProcessWin32Process(), req->winstation, WINSTA_ENUMDESKTOPS, &winstation_ops ))) return;

14 years, 8 months

[cgutman] 46771: [RAMDISK] - Remove another unnecessary hack

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 7 23:04:41 2010 New Revision: 46771 URL: http://svn.reactos.org/svn/reactos?rev=46771&view=rev Log: [RAMDISK] - Remove another unnecessary hack Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Wed Apr 7 23:04:41 2010 @@ -2422,18 +2422,7 @@ 0, &PhysicalDeviceObject); if (NT_SUCCESS(Status)) - { - // - // ReactOS Fix - // The ReactOS Plug and Play Manager is broken and does not create - // the required keys when reporting a detected device. - // We hack around this ourselves. - // - RtlCreateUnicodeString(&((PEXTENDED_DEVOBJ_EXTENSION) - PhysicalDeviceObject->DeviceObjectExtension) - ->DeviceNode->InstancePath, - L"Root\\UNKNOWN\\0000"); - + { // // Create the device object //

14 years, 8 months

[cgutman] 46770: [HAL] - Remove an unnecessary hack now that PnP manager doesn't suck (as much ; ))

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 7 22:37:13 2010 New Revision: 46770 URL: http://svn.reactos.org/svn/reactos?rev=46770&view=rev Log: [HAL] - Remove an unnecessary hack now that PnP manager doesn't suck (as much ;)) Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Wed Apr 7 22:37:13 2010 @@ -848,9 +848,6 @@ /* Now add us */ if (NT_SUCCESS(Status)) Status = HalpAddDevice(DriverObject, TargetDevice); - - /* Force re-enumeration??? */ - IoInvalidateDeviceRelations(TargetDevice, 0); /* Return to kernel */ return Status;

14 years, 8 months

[cgutman] 46769: [INF] - Reenable isapnp

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 7 22:20:22 2010 New Revision: 46769 URL: http://svn.reactos.org/svn/reactos?rev=46769&view=rev Log: [INF] - Reenable isapnp Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== Binary files - no diff available.

14 years, 8 months

[cgutman] 46768: [ISAPNP] - Rewrite the ISAPnP driver based off EtherBoot source - TODO: Resource stuff

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 7 22:19:29 2010 New Revision: 46768 URL: http://svn.reactos.org/svn/reactos?rev=46768&view=rev Log: [ISAPNP] - Rewrite the ISAPnP driver based off EtherBoot source - TODO: Resource stuff Added: trunk/reactos/drivers/bus/isapnp/fdo.c (with props) trunk/reactos/drivers/bus/isapnp/hardware.c (with props) trunk/reactos/drivers/bus/isapnp/isapnphw.h (with props) trunk/reactos/drivers/bus/isapnp/pdo.c (with props) Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c trunk/reactos/drivers/bus/isapnp/isapnp.h trunk/reactos/drivers/bus/isapnp/isapnp.rbuild Added: trunk/reactos/drivers/bus/isapnp/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/fdo.c (added) +++ trunk/reactos/drivers/bus/isapnp/fdo.c [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,0 +1,141 @@ +/* + * PROJECT: ReactOS ISA PnP Bus driver + * FILE: fdo.c + * PURPOSE: FDO-specific code + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ +#include <isapnp.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +IsaFdoStartDevice( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + NTSTATUS Status; + KIRQL OldIrql; + + KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); + + Status = IsaHwDetectReadDataPort(FdoExt); + if (!NT_SUCCESS(Status)) + { + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + return Status; + } + + FdoExt->Common.State = dsStarted; + + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaFdoQueryDeviceRelations( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + NTSTATUS Status; + PLIST_ENTRY CurrentEntry; + PISAPNP_LOGICAL_DEVICE IsaDevice; + PDEVICE_RELATIONS DeviceRelations; + KIRQL OldIrql; + ULONG i = 0; + + if (IrpSp->Parameters.QueryDeviceRelations.Type != BusRelations) + return Irp->IoStatus.Status; + + KeAcquireSpinLock(&FdoExt->Lock, &OldIrql); + + Status = IsaHwFillDeviceList(FdoExt); + if (!NT_SUCCESS(Status)) + { + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + return Status; + } + + DeviceRelations = ExAllocatePool(NonPagedPool, + sizeof(DEVICE_RELATIONS) + sizeof(DEVICE_OBJECT) * (FdoExt->DeviceCount - 1)); + if (!DeviceRelations) + { + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + return STATUS_INSUFFICIENT_RESOURCES; + } + + CurrentEntry = FdoExt->DeviceListHead.Flink; + while (CurrentEntry != &FdoExt->DeviceListHead) + { + IsaDevice = CONTAINING_RECORD(CurrentEntry, ISAPNP_LOGICAL_DEVICE, ListEntry); + + DeviceRelations->Objects[i++] = IsaDevice->Common.Self; + + ObReferenceObject(IsaDevice->Common.Self); + + CurrentEntry = CurrentEntry->Flink; + } + + DeviceRelations->Count = FdoExt->DeviceCount; + + KeReleaseSpinLock(&FdoExt->Lock, OldIrql); + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaFdoPnp( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + NTSTATUS Status = Irp->IoStatus.Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = IsaForwardIrpSynchronous(FdoExt, Irp); + + if (NT_SUCCESS(Status)) + Status = IsaFdoStartDevice(FdoExt, Irp, IrpSp); + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_STOP_DEVICE: + FdoExt->Common.State = dsStopped; + + Status = STATUS_SUCCESS; + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + Status = IsaFdoQueryDeviceRelations(FdoExt, Irp, IrpSp); + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + break; + + default: + DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); + break; + } + + IoSkipCurrentIrpStackLocation(Irp); + + return IoCallDriver(FdoExt->Ldo, Irp); +} Propchange: trunk/reactos/drivers/bus/isapnp/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/isapnp/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/hardwar… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/hardware.c (added) +++ trunk/reactos/drivers/bus/isapnp/hardware.c [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,0 +1,579 @@ +/* + * PROJECT: ReactOS ISA PnP Bus driver + * FILE: hardware.c + * PURPOSE: Hardware support code + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ +#include <isapnp.h> +#include <isapnphw.h> + +#define NDEBUG +#include <debug.h> + +static +inline +VOID +WriteAddress(USHORT Address) +{ + WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS, Address); +} + +static +inline +VOID +WriteData(USHORT Data) +{ + WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_DATA, Data); +} + +static +inline +UCHAR +ReadData(PUCHAR ReadDataPort) +{ + return READ_PORT_UCHAR(ReadDataPort); +} + +static +inline +VOID +WriteByte(USHORT Address, USHORT Value) +{ + WriteAddress(Address); + WriteData(Value); +} + +static +inline +UCHAR +ReadByte(PUCHAR ReadDataPort, USHORT Address) +{ + WriteAddress(Address); + return ReadData(ReadDataPort); +} + +static +inline +USHORT +ReadWord(PUCHAR ReadDataPort, USHORT Address) +{ + return ((ReadByte(ReadDataPort, Address) << 8) | + (ReadByte(ReadDataPort, Address + 1))); +} + +static +inline +VOID +SetReadDataPort(PUCHAR ReadDataPort) +{ + WriteByte(ISAPNP_READPORT, ((ULONG_PTR)ReadDataPort >> 2)); +} + +static +inline +VOID +EnterIsolationState(VOID) +{ + WriteAddress(ISAPNP_SERIALISOLATION); +} + +static +inline +VOID +WaitForKey(VOID) +{ + WriteByte(ISAPNP_CONFIGCONTROL, ISAPNP_CONFIG_WAIT_FOR_KEY); +} + +static +inline +VOID +ResetCsn(VOID) +{ + WriteByte(ISAPNP_CONFIGCONTROL, ISAPNP_CONFIG_RESET_CSN); +} + +static +inline +VOID +Wake(USHORT Csn) +{ + WriteByte(ISAPNP_WAKE, Csn); +} + +static +inline +USHORT +ReadResourceData(PUCHAR ReadDataPort) +{ + return ReadByte(ReadDataPort, ISAPNP_RESOURCEDATA); +} + +static +inline +USHORT +ReadStatus(PUCHAR ReadDataPort) +{ + return ReadByte(ReadDataPort, ISAPNP_STATUS); +} + +static +inline +VOID +WriteCsn(USHORT Csn) +{ + WriteByte(ISAPNP_CARDSELECTNUMBER, Csn); +} + +static +inline +VOID +WriteLogicalDeviceNumber(USHORT LogDev) +{ + WriteByte(ISAPNP_LOGICALDEVICENUMBER, LogDev); +} + +static +inline +VOID +ActivateDevice(USHORT LogDev) +{ + WriteLogicalDeviceNumber(LogDev); + WriteByte(ISAPNP_ACTIVATE, 1); +} + +static +inline +VOID +DeactivateDevice(USHORT LogDev) +{ + WriteLogicalDeviceNumber(LogDev); + WriteByte(ISAPNP_ACTIVATE, 0); +} + +static +inline +USHORT +ReadIoBase(PUCHAR ReadDataPort, USHORT Index) +{ + return ReadWord(ReadDataPort, ISAPNP_IOBASE(Index)); +} + +static +inline +USHORT +ReadIrqNo(PUCHAR ReadDataPort, USHORT Index) +{ + return ReadByte(ReadDataPort, ISAPNP_IRQNO(Index)); +} + +static +inline +VOID +HwDelay(VOID) +{ + KeStallExecutionProcessor(1000); +} + +static +inline +USHORT +NextLFSR(USHORT Lfsr, USHORT InputBit) +{ + ULONG NextLfsr = Lfsr >> 1; + + NextLfsr |= (((Lfsr ^ NextLfsr) ^ InputBit)) << 7; + + return NextLfsr; +} + +static +VOID +SendKey(VOID) +{ + USHORT i, Lfsr; + + HwDelay(); + WriteAddress(0x00); + WriteAddress(0x00); + + Lfsr = ISAPNP_LFSR_SEED; + for (i = 0; i < 32; i++) + { + WriteAddress(Lfsr); + Lfsr = NextLFSR(Lfsr, 0); + } +} + +static +USHORT +PeekByte(PUCHAR ReadDataPort) +{ + USHORT i; + + for (i = 0; i < 20; i++) + { + if (ReadStatus(ReadDataPort) & 0x01) + return ReadResourceData(ReadDataPort); + + HwDelay(); + } + + return 0xFF; +} + +static +VOID +Peek(PUCHAR ReadDataPort, PVOID Buffer, ULONG Length) +{ + USHORT i, byte; + + for (i = 0; i < Length; i++) + { + byte = PeekByte(ReadDataPort); + if (Buffer) + *((PUCHAR)Buffer + i) = byte; + } +} + +static +USHORT +IsaPnpChecksum(PISAPNP_IDENTIFIER Identifier) +{ + USHORT i,j, Lfsr, Byte; + + Lfsr = ISAPNP_LFSR_SEED; + for (i = 0; i < 8; i++) + { + Byte = *(((PUCHAR)Identifier) + i); + for (j = 0; j < 8; j++) + { + Lfsr = NextLFSR(Lfsr, Byte); + Byte >>= 1; + } + } + + return Lfsr; +} + +static +BOOLEAN +FindTag(PUCHAR ReadDataPort, USHORT WantedTag, PVOID Buffer, ULONG Length) +{ + USHORT Tag, TagLen; + + do + { + Tag = PeekByte(ReadDataPort); + if (ISAPNP_IS_SMALL_TAG(Tag)) + { + TagLen = ISAPNP_SMALL_TAG_LEN(Tag); + Tag = ISAPNP_SMALL_TAG_NAME(Tag); + } + else + { + TagLen = PeekByte(ReadDataPort) + (PeekByte(ReadDataPort) << 8); + Tag = ISAPNP_LARGE_TAG_NAME(Tag); + } + + if (Tag == WantedTag) + { + if (Length > TagLen) + Length = TagLen; + + Peek(ReadDataPort, Buffer, Length); + + return TRUE; + } + else + { + Peek(ReadDataPort, NULL, Length); + } + } while (Tag != ISAPNP_TAG_END); + + return FALSE; +} + +static +BOOLEAN +FindLogDevId(PUCHAR ReadDataPort, USHORT LogDev, PISAPNP_LOGDEVID LogDeviceId) +{ + USHORT i; + + for (i = 0; i <= LogDev; i++) + { + if (!FindTag(ReadDataPort, ISAPNP_TAG_LOGDEVID, LogDeviceId, sizeof(*LogDeviceId))) + return FALSE; + } + + return TRUE; +} + +static +INT +TryIsolate(PUCHAR ReadDataPort) +{ + ISAPNP_IDENTIFIER Identifier; + USHORT i, j; + BOOLEAN Seen55aa, SeenLife; + INT Csn = 0; + USHORT Byte, Data; + + DPRINT("Setting read data port: 0x%x\n", ReadDataPort); + + WaitForKey(); + SendKey(); + + ResetCsn(); + HwDelay(); + HwDelay(); + + WaitForKey(); + SendKey(); + Wake(0x00); + + SetReadDataPort(ReadDataPort); + HwDelay(); + + while (TRUE) + { + EnterIsolationState(); + HwDelay(); + + RtlZeroMemory(&Identifier, sizeof(Identifier)); + + Seen55aa = SeenLife = FALSE; + for (i = 0; i < 9; i++) + { + Byte = 0; + for (j = 0; j < 8; j++) + { + Data = ReadData(ReadDataPort); + HwDelay(); + Data = ((Data << 8) | ReadData(ReadDataPort)); + HwDelay(); + Data >>= 1; + + if (Data != 0xFFFF) + { + SeenLife = TRUE; + if (Data == 0x55AA) + { + Byte |= 0x80; + Seen55aa = TRUE; + } + } + } + *(((PUCHAR)&Identifier) + i) = Byte; + } + + if (!Seen55aa) + { + if (Csn) + { + DPRINT("Found no more cards\n"); + } + else + { + if (SeenLife) + { + DPRINT("Saw life but no cards, trying new read port\n"); + Csn = -1; + } + else + { + DPRINT("Saw no sign of life, abandoning isolation\n"); + } + } + break; + } + + if (Identifier.Checksum != IsaPnpChecksum(&Identifier)) + { + DPRINT("Bad checksum, trying next read data port\n"); + Csn = -1; + break; + } + + Csn++; + + WriteCsn(Csn); + HwDelay(); + + Wake(0x00); + HwDelay(); + } + + WaitForKey(); + + if (Csn > 0) + { + DPRINT("Found %d cards at read port 0x%x\n", Csn, ReadDataPort); + } + + return Csn; +} + +static +PUCHAR +Isolate(VOID) +{ + PUCHAR ReadPort; + + for (ReadPort = (PUCHAR)ISAPNP_READ_PORT_START; + (ULONG_PTR)ReadPort <= ISAPNP_READ_PORT_MAX; + ReadPort += ISAPNP_READ_PORT_STEP) + { + /* Avoid the NE2000 probe space */ + if ((ULONG_PTR)ReadPort >= 0x280 && + (ULONG_PTR)ReadPort <= 0x380) + continue; + + if (TryIsolate(ReadPort) > 0) + return ReadPort; + } + + return 0; +} + +VOID +DeviceActivation(PISAPNP_LOGICAL_DEVICE IsaDevice, + BOOLEAN Activate) +{ + WaitForKey(); + SendKey(); + Wake(IsaDevice->CSN); + + if (Activate) + ActivateDevice(IsaDevice->LDN); + else + DeactivateDevice(IsaDevice->LDN); + + HwDelay(); + + WaitForKey(); +} + +NTSTATUS +ProbeIsaPnpBus(PISAPNP_FDO_EXTENSION FdoExt) +{ + PISAPNP_LOGICAL_DEVICE LogDevice; + ISAPNP_IDENTIFIER Identifier; + ISAPNP_LOGDEVID LogDevId; + USHORT Csn; + USHORT LogDev; + PDEVICE_OBJECT Pdo; + NTSTATUS Status; + + ASSERT(FdoExt->ReadDataPort); + + for (Csn = 1; Csn <= 0xFF; Csn++) + { + for (LogDev = 0; LogDev <= 0xFF; LogDev++) + { + Status = IoCreateDevice(FdoExt->Common.Self->DriverObject, + sizeof(ISAPNP_LOGICAL_DEVICE), + NULL, + FILE_DEVICE_CONTROLLER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Pdo); + if (!NT_SUCCESS(Status)) + return Status; + + Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; + + LogDevice = Pdo->DeviceExtension; + + RtlZeroMemory(LogDevice, sizeof(ISAPNP_LOGICAL_DEVICE)); + + LogDevice->Common.Self = Pdo; + LogDevice->Common.IsFdo = FALSE; + LogDevice->Common.State = dsStopped; + + LogDevice->CSN = Csn; + LogDevice->LDN = LogDev; + + WaitForKey(); + SendKey(); + Wake(Csn); + + Peek(FdoExt->ReadDataPort, &Identifier, sizeof(Identifier)); + + if (Identifier.VendorId & 0x80) + { + IoDeleteDevice(LogDevice->Common.Self); + return STATUS_SUCCESS; + } + + if (!FindLogDevId(FdoExt->ReadDataPort, LogDev, &LogDevId)) + break; + + WriteLogicalDeviceNumber(LogDev); + + LogDevice->VendorId = LogDevId.VendorId; + LogDevice->ProdId = LogDevId.ProdId; + LogDevice->IoAddr = ReadIoBase(FdoExt->ReadDataPort, 0); + LogDevice->IrqNo = ReadIrqNo(FdoExt->ReadDataPort, 0); + + DPRINT1("Detected ISA PnP device - VID: 0x%x PID: 0x%x IoBase: 0x%x IRQ:0x%x\n", + LogDevice->VendorId, LogDevice->ProdId, LogDevice->IoAddr, LogDevice->IrqNo); + + WaitForKey(); + + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + + InsertTailList(&FdoExt->DeviceListHead, &LogDevice->ListEntry); + FdoExt->DeviceCount++; + } + } + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaHwDetectReadDataPort( + IN PISAPNP_FDO_EXTENSION FdoExt) +{ + FdoExt->ReadDataPort = Isolate(); + if (!FdoExt->ReadDataPort) + { + DPRINT1("No read data port found\n"); + return STATUS_UNSUCCESSFUL; + } + + DPRINT1("Detected read data port at 0x%x\n", FdoExt->ReadDataPort); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaHwActivateDevice( + IN PISAPNP_LOGICAL_DEVICE LogicalDevice) +{ + DeviceActivation(LogicalDevice, + TRUE); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaHwDeactivateDevice( + IN PISAPNP_LOGICAL_DEVICE LogicalDevice) +{ + DeviceActivation(LogicalDevice, + FALSE); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaHwFillDeviceList( + IN PISAPNP_FDO_EXTENSION FdoExt) +{ + return ProbeIsaPnpBus(FdoExt); +} Propchange: trunk/reactos/drivers/bus/isapnp/hardware.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/bus/isapnp/isapnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.c [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,1729 +1,183 @@ -/* $Id$ - * +/* * PROJECT: ReactOS ISA PnP Bus driver * FILE: isapnp.c * PURPOSE: Driver entry - * PROGRAMMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) - * NOTE: Parts adapted from linux ISA PnP driver - * UPDATE HISTORY: - * 01-05-2001 CSH Created + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) */ #include <isapnp.h> -#ifndef NDEBUG #define NDEBUG -#endif #include <debug.h> - -#ifdef ALLOC_PRAGMA - -// Make the initialization routines discardable, so that they -// don't waste space - -#pragma alloc_text(init, DriverEntry) - - -#endif /* ALLOC_PRAGMA */ - - -PUCHAR IsaPnPReadPort; - - -#define UCHAR2USHORT(v0, v1) \ - ((v1 << 8) | v0) - -#define UCHAR2ULONG(v0, v1, v2, v3) \ - ((UCHAR2USHORT(v2, v3) << 16) | UCHAR2USHORT(v0, v1)) - - -#ifndef NDEBUG - -struct -{ - PCH Name; -} SmallTags[] = { - {"Unknown Small Tag"}, - {"ISAPNP_SRIN_VERSION"}, - {"ISAPNP_SRIN_LDEVICE_ID"}, - {"ISAPNP_SRIN_CDEVICE_ID"}, - {"ISAPNP_SRIN_IRQ_FORMAT"}, - {"ISAPNP_SRIN_DMA_FORMAT"}, - {"ISAPNP_SRIN_START_DFUNCTION"}, - {"ISAPNP_SRIN_END_DFUNCTION"}, - {"ISAPNP_SRIN_IO_DESCRIPTOR"}, - {"ISAPNP_SRIN_FL_IO_DESCRIPOTOR"}, - {"Reserved Small Tag"}, - {"Reserved Small Tag"}, - {"Reserved Small Tag"}, - {"Reserved Small Tag"}, - {"ISAPNP_SRIN_VENDOR_DEFINED"}, - {"ISAPNP_SRIN_END_TAG"} -}; - -struct -{ - PCH Name; -} LargeTags[] = { - {"Unknown Large Tag"}, - {"ISAPNP_LRIN_MEMORY_RANGE"}, - {"ISAPNP_LRIN_ID_STRING_ANSI"}, - {"ISAPNP_LRIN_ID_STRING_UNICODE"}, - {"ISAPNP_LRIN_VENDOR_DEFINED"}, - {"ISAPNP_LRIN_MEMORY_RANGE32"}, - {"ISAPNP_LRIN_FL_MEMORY_RANGE32"} -}; - -PCSZ TagName(ULONG Tag, BOOLEAN Small) -{ - if (Small && (Tag <= ISAPNP_SRIN_END_TAG)) { - return SmallTags[Tag].Name; - } else if (Tag <= ISAPNP_LRIN_FL_MEMORY_RANGE32){ - return LargeTags[Tag].Name; - } - - return NULL; -} - -#endif - -static __inline VOID WriteData(UCHAR Value) -{ - WRITE_PORT_UCHAR((PUCHAR)ISAPNP_WRITE_PORT, Value); -} - -static __inline VOID WriteAddress(UCHAR Value) -{ - WRITE_PORT_UCHAR((PUCHAR)ISAPNP_ADDRESS_PORT, Value); - KeStallExecutionProcessor(20); -} - -static __inline UCHAR ReadData(VOID) -{ - return READ_PORT_UCHAR(IsaPnPReadPort); -} - -static UCHAR ReadUchar(UCHAR Index) -{ - WriteAddress(Index); - return ReadData(); -} - -#if 0 -static USHORT ReadUshort(UCHAR Index) -{ - USHORT Value; - - Value = ReadUchar(Index); - Value = (Value << 8) + ReadUchar(Index + 1); - return Value; -} - -static ULONG ReadUlong(UCHAR Index) -{ - ULONG Value; - - Value = ReadUchar(Index); - Value = (Value << 8) + ReadUchar(Index + 1); - Value = (Value << 8) + ReadUchar(Index + 2); - Value = (Value << 8) + ReadUchar(Index + 3); - return Value; -} -#endif - -static VOID WriteUchar(UCHAR Index, UCHAR Value) -{ - WriteAddress(Index); - WriteData(Value); -} - -#if 0 -static VOID WriteUshort(UCHAR Index, USHORT Value) -{ - WriteUchar(Index, Value >> 8); - WriteUchar(Index + 1, Value); -} - -static VOID WriteUlong(UCHAR Index, ULONG Value) -{ - WriteUchar(Index, Value >> 24); - WriteUchar(Index + 1, Value >> 16); - WriteUchar(Index + 2, Value >> 8); - WriteUchar(Index + 3, Value); -} -#endif - -static __inline VOID SetReadDataPort(ULONG_PTR Port) -{ - IsaPnPReadPort = (PUCHAR)Port; - WriteUchar(0x00, (UCHAR) (Port >> 2)); - KeStallExecutionProcessor(100); -} - -static VOID SendKey(VOID) -{ - ULONG i; - UCHAR msb; - UCHAR code; - - /* FIXME: Is there something better? */ - KeStallExecutionProcessor(1000); - WriteAddress(0x00); - WriteAddress(0x00); - - code = 0x6a; - WriteAddress(code); - for (i = 1; i < 32; i++) { - msb = ((code & 0x01) ^ ((code & 0x02) >> 1)) << 7; - code = (code >> 1) | msb; - WriteAddress(code); - } -} - -/* Place all PnP cards in wait-for-key state */ -static VOID SendWait(VOID) -{ - WriteUchar(0x02, 0x02); -} - -static VOID SendWake(UCHAR csn) -{ - WriteUchar(ISAPNP_CARD_WAKECSN, csn); -} - -#if 0 -static VOID SelectLogicalDevice(UCHAR LogicalDevice) -{ - WriteUchar(ISAPNP_CARD_LOG_DEVICE_NUM, LogicalDevice); -} - -static VOID ActivateLogicalDevice(UCHAR LogicalDevice) -{ - SelectLogicalDevice(LogicalDevice); - WriteUchar(ISAPNP_CONTROL_ACTIVATE, 0x1); - KeStallExecutionProcessor(250); -} - -static VOID DeactivateLogicalDevice(UCHAR LogicalDevice) -{ - SelectLogicalDevice(LogicalDevice); - WriteUchar(ISAPNP_CONTROL_ACTIVATE, 0x0); - KeStallExecutionProcessor(500); -} -#endif - -#define READ_DATA_PORT_STEP 32 /* Minimum is 4 */ - -static ULONG_PTR FindNextReadPort(VOID) -{ - ULONG_PTR Port; - - - - Port = (ULONG_PTR)IsaPnPReadPort; - - while (TRUE) { - - Port += READ_DATA_PORT_STEP; - - - - if (Port > ISAPNP_MAX_READ_PORT) - - { - - return 0; - - } - - - - /* - - * We cannot use NE2000 probe spaces for - - * ISAPnP or we will lock up machines - - */ - - if ((Port < 0x280) || (Port > 0x380)) - - { - - return Port; - - } - - } - -} - -static BOOLEAN IsolateReadDataPortSelect(VOID) -{ - ULONG_PTR Port; - - SendWait(); - SendKey(); - - /* Control: reset CSN and conditionally everything else too */ - WriteUchar(0x02, 0x05); - KeStallExecutionProcessor(2000); - - SendWait(); - SendKey(); - SendWake(0x00); - - Port = FindNextReadPort(); - if (Port == 0) { - SendWait(); - return FALSE; - } - - SetReadDataPort(Port); - KeStallExecutionProcessor(1000); - WriteAddress(0x01); - KeStallExecutionProcessor(1000); - return TRUE; -} - -/* - * Isolate (assign uniqued CSN) to all ISA PnP devices - */ -static ULONG IsolatePnPCards(VOID) -{ - UCHAR checksum = 0x6a; - UCHAR chksum = 0x00; - UCHAR bit = 0x00; - ULONG data; - ULONG csn = 0; - ULONG i; - ULONG iteration = 1; - - DPRINT("Called\n"); - - IsaPnPReadPort = (PUCHAR)(ISAPNP_MIN_READ_PORT - READ_DATA_PORT_STEP); - if (!IsolateReadDataPortSelect()) { - DPRINT("Could not set read data port\n"); - return 0; - } - - while (TRUE) { - for (i = 1; i <= 64; i++) { - data = ReadData() << 8; - KeStallExecutionProcessor(250); - data = data | ReadData(); - KeStallExecutionProcessor(250); - if (data == 0x55aa) - bit = 0x01; - checksum = ((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7) | (checksum >> 1); - bit = 0x00; - } - for (i = 65; i <= 72; i++) { - data = ReadData() << 8; - KeStallExecutionProcessor(250); - data = data | ReadData(); - KeStallExecutionProcessor(250); - if (data == 0x55aa) - chksum |= (1 << (i - 65)); - } - if ((checksum != 0x00) && (checksum == chksum)) { - csn++; - - WriteUchar(0x06, (UCHAR) csn); - KeStallExecutionProcessor(250); - iteration++; - SendWake(0x00); - SetReadDataPort((ULONG_PTR)IsaPnPReadPort); - KeStallExecutionProcessor(1000); - WriteAddress(0x01); - KeStallExecutionProcessor(1000); - goto next; - } - if (iteration == 1) { - if (!IsolateReadDataPortSelect()) { - DPRINT("Could not set read data port\n"); - return 0; - } - } else if (iteration > 1) { - break; - } -next: - checksum = 0x6a; - chksum = 0x00; - bit = 0x00; - } - SendWait(); - return csn; -} - - -static VOID Peek(PUCHAR Data, ULONG Count) -{ - ULONG i, j; - UCHAR d = 0; - - for (i = 1; i <= Count; i++) { - for (j = 0; j < 20; j++) { - d = ReadUchar(0x05); - if (d & 0x1) - break; - KeStallExecutionProcessor(100); - } - if (!(d & 0x1)) { - if (Data != NULL) - *Data++ = 0xff; - continue; - } - d = ReadUchar(0x04); /* PRESDI */ - if (Data != NULL) - *Data++ = d; - } -} - - -/* - * Skip specified number of bytes from stream - */ -static VOID Skip(ULONG Count) -{ - Peek(NULL, Count); -} - - -/* - * Read one tag from stream - */ -static BOOLEAN ReadTag(PUCHAR Type, - PUSHORT Size, - PBOOLEAN Small) -{ - UCHAR tag, tmp[2]; - - Peek(&tag, 1); - if (tag == 0) { - /* Invalid tag */ - DPRINT("Invalid tag with value 0\n"); -#ifndef NDEBUG - for (;;); -#endif - return FALSE; - } - - if (tag & ISAPNP_RESOURCE_ITEM_TYPE) { - /* Large resource item */ - *Type = (tag & 0x7f); - Peek(tmp, 2); - *Size = UCHAR2USHORT(tmp[0], tmp[1]); - *Small = FALSE; -#ifndef NDEBUG - if (*Type > ISAPNP_LRIN_FL_MEMORY_RANGE32) { - DPRINT("Invalid large tag with value 0x%X\n", *Type); - for (;;); - } -#endif - } else { - /* Small resource item */ - *Type = (tag >> 3) & 0x0f; - *Size = tag & 0x07; - *Small = TRUE; -#ifndef NDEBUG - if (*Type > ISAPNP_SRIN_END_TAG) { - DPRINT("Invalid small tag with value 0x%X\n", *Type); - for (;;); - } -#endif - } -#if 0 - DPRINT("Tag = 0x%X, Type = 0x%X, Size = %d (%s)\n", - tag, *Type, *Size, TagName(*Type, *Small)); -#endif - /* Probably invalid data */ - if ((*Type == 0xff) && (*Size == 0xffff)) { - DPRINT("Invalid data (Type 0x%X Size 0x%X)\n", *Type, *Size); - for (;;); - return FALSE; - } - - return TRUE; -} - - -/* - * Parse ANSI name for ISA PnP logical device - */ -static NTSTATUS ParseAnsiName(PUNICODE_STRING Name, PUSHORT Size) -{ - ANSI_STRING AnsiString; - UCHAR Buffer[256]; - USHORT size1; - - size1 = (*Size >= sizeof(Buffer)) ? (sizeof(Buffer) - 1) : *Size; - - Peek(Buffer, size1); - Buffer[size1] = '\0'; - *Size -= size1; - - /* Clean whitespace from end of string */ - while ((size1 > 0) && (Buffer[--size1] == ' ')) - Buffer[size1] = '\0'; - - DPRINT("ANSI name: %s\n", Buffer); - - RtlInitAnsiString(&AnsiString, (PCSZ)&Buffer); - return RtlAnsiStringToUnicodeString(Name, &AnsiString, TRUE); -} - - -/* - * Add a resource list to the - * resource lists of a logical device - */ -static NTSTATUS AddResourceList( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Priority, - PISAPNP_CONFIGURATION_LIST *NewList) -{ - PISAPNP_CONFIGURATION_LIST List; - - DPRINT("Adding resource list for logical device %d on card %d (Priority %d)\n", - LogicalDevice->Number, - LogicalDevice->Card->CardId, - Priority); - - List = (PISAPNP_CONFIGURATION_LIST) - ExAllocatePoolWithTag(PagedPool, sizeof(ISAPNP_CONFIGURATION_LIST), TAG_ISAPNP); - if (!List) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(List, sizeof(ISAPNP_CONFIGURATION_LIST)); - - List->Priority = Priority; - - InitializeListHead(&List->ListHead); - - InsertTailList(&LogicalDevice->Configuration, &List->ListEntry); - - *NewList = List; - - return STATUS_SUCCESS; -} - - -/* - * Add a resource entry to the - * resource list of a logical device - */ -static NTSTATUS AddResourceDescriptor( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Priority, - ULONG Option, - PISAPNP_DESCRIPTOR *Descriptor) -{ - PLIST_ENTRY CurrentEntry; - PISAPNP_CONFIGURATION_LIST List; - PISAPNP_DESCRIPTOR d; +static +NTSTATUS +NTAPI +ForwardIrpCompletion( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + if (Irp->PendingReturned) + KeSetEvent((PKEVENT)Context, IO_NO_INCREMENT, FALSE); + + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +NTAPI +IsaForwardIrpSynchronous( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp) +{ + KEVENT Event; NTSTATUS Status; - DPRINT("Adding resource descriptor for logical device %d on card %d (%d of %d)\n", - LogicalDevice->Number, - LogicalDevice->Card->CardId, - LogicalDevice->CurrentDescriptorCount, - LogicalDevice->DescriptorCount); - - d = (PISAPNP_DESCRIPTOR) - ExAllocatePoolWithTag(PagedPool, sizeof(ISAPNP_DESCRIPTOR), TAG_ISAPNP); - if (!d) - return STATUS_NO_MEMORY; - - RtlZeroMemory(d, sizeof(ISAPNP_DESCRIPTOR)); - - d->Descriptor.Option = (UCHAR) Option; - - *Descriptor = d; - - CurrentEntry = LogicalDevice->Configuration.Flink; - while (CurrentEntry != &LogicalDevice->Configuration) { - List = CONTAINING_RECORD( - CurrentEntry, ISAPNP_CONFIGURATION_LIST, ListEntry); - - if (List->Priority == Priority) { - - LogicalDevice->ConfigurationSize += sizeof(IO_RESOURCE_DESCRIPTOR); - InsertTailList(&List->ListHead, &d->ListEntry); - LogicalDevice->CurrentDescriptorCount++; - if (LogicalDevice->DescriptorCount < - LogicalDevice->CurrentDescriptorCount) { - LogicalDevice->DescriptorCount = - LogicalDevice->CurrentDescriptorCount; - } - - return STATUS_SUCCESS; - } - CurrentEntry = CurrentEntry->Flink; - } - - Status = AddResourceList(LogicalDevice, Priority, &List); - if (NT_SUCCESS(Status)) { - LogicalDevice->ConfigurationSize += sizeof(IO_RESOURCE_LIST); - LogicalDevice->CurrentDescriptorCount = 0; - InsertTailList(&List->ListHead, &d->ListEntry); + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + + IoSetCompletionRoutine(Irp, ForwardIrpCompletion, &Event, TRUE, TRUE, TRUE); + + Status = IoCallDriver(FdoExt->Ldo, Irp); + if (Status == STATUS_PENDING) + { + Status = KeWaitForSingleObject(&Event, Suspended, KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = Irp->IoStatus.Status; } return Status; } -/* - * Add IRQ resource to resources list - */ -static NTSTATUS AddIrqResource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[3]; - ULONG irq, i, last = 0; - BOOLEAN found; - NTSTATUS Status; - - Peek(tmp, Size); - - irq = UCHAR2USHORT(tmp[0], tmp[0]); - - DPRINT("IRQ bitmask: 0x%X\n", irq); - - found = FALSE; - for (i = 0; i < 16; i++) { - if (!found && (irq & (1 << i))) { - last = i; - found = TRUE; - } - - if ((found && !(irq & (1 << i))) || (irq & (1 << i) && (i == 15))) { - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypeInterrupt; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Interrupt.MinimumVector = last; - - if ((irq & (1 << i)) && (i == 15)) - Descriptor->Descriptor.u.Interrupt.MaximumVector = i; - else - Descriptor->Descriptor.u.Interrupt.MaximumVector = i - 1; - - DPRINT("Found IRQ range %d - %d for logical device %d on card %d\n", - Descriptor->Descriptor.u.Interrupt.MinimumVector, - Descriptor->Descriptor.u.Interrupt.MaximumVector, - LogicalDevice->Number, - LogicalDevice->Card->CardId); - - found = FALSE; - } - } - - return STATUS_SUCCESS; -} - -/* - * Add DMA resource to resources list - */ -static NTSTATUS AddDmaResource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[2]; - ULONG dma, flags, i, last = 0; - BOOLEAN found; - NTSTATUS Status; - - Peek(tmp, Size); - - dma = tmp[0]; - flags = tmp[1]; - - DPRINT("DMA bitmask: 0x%X\n", dma); - - found = FALSE; - for (i = 0; i < 8; i++) { - if (!found && (dma & (1 << i))) { - last = i; - found = TRUE; - } - - if ((found && !(dma & (1 << i))) || (dma & (1 << i) && (i == 15))) { - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypeDma; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Dma.MinimumChannel = last; - - if ((dma & (1 << i)) && (i == 15)) - Descriptor->Descriptor.u.Dma.MaximumChannel = i; - else - Descriptor->Descriptor.u.Dma.MaximumChannel = i - 1; - - /* FIXME: Parse flags */ - - DPRINT("Found DMA range %d - %d for logical device %d on card %d\n", - Descriptor->Descriptor.u.Dma.MinimumChannel, - Descriptor->Descriptor.u.Dma.MaximumChannel, - LogicalDevice->Number, - LogicalDevice->Card->CardId); - - found = FALSE; - } - } - - return STATUS_SUCCESS; -} - -/* - * Add port resource to resources list - */ -static NTSTATUS AddIOPortResource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ -#if 0 - DPRINT("I/O port: size 0x%X\n", Size); - Skip(Size); -#else - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[7]; - NTSTATUS Status; - - Peek(tmp, Size); - - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypePort; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Port.Length = tmp[6]; - /* FIXME: Parse flags */ - Descriptor->Descriptor.u.Port.Alignment = 0; - Descriptor->Descriptor.u.Port.MinimumAddress.QuadPart = UCHAR2USHORT(tmp[1], tmp[2]); - Descriptor->Descriptor.u.Port.MaximumAddress.QuadPart = UCHAR2USHORT(tmp[4], tmp[4]); - - DPRINT("Found I/O port range 0x%X - 0x%X for logical device %d on card %d\n", - Descriptor->Descriptor.u.Port.MinimumAddress, - Descriptor->Descriptor.u.Port.MaximumAddress, - LogicalDevice->Number, - LogicalDevice->Card->CardId); -#endif - return STATUS_SUCCESS; -} - -/* - * Add fixed port resource to resources list - */ -static NTSTATUS AddFixedIOPortResource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ -#if 0 - DPRINT("Fixed I/O port: size 0x%X\n", Size); - Skip(Size); -#else - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[3]; - NTSTATUS Status; - - Peek(tmp, Size); - - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypePort; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Port.Length = tmp[2]; - Descriptor->Descriptor.u.Port.Alignment = 0; - Descriptor->Descriptor.u.Port.MinimumAddress.QuadPart = UCHAR2USHORT(tmp[0], tmp[1]); - Descriptor->Descriptor.u.Port.MaximumAddress.QuadPart = UCHAR2USHORT(tmp[0], tmp[1]); - - DPRINT("Found fixed I/O port range 0x%X - 0x%X for logical device %d on card %d\n", - Descriptor->Descriptor.u.Port.MinimumAddress, - Descriptor->Descriptor.u.Port.MaximumAddress, - LogicalDevice->Number, - LogicalDevice->Card->CardId); -#endif - return STATUS_SUCCESS; -} - -/* - * Add memory resource to resources list - */ -static NTSTATUS AddMemoryResource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ -#if 0 - DPRINT("Memory range: size 0x%X\n", Size); - Skip(Size); -#else - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[9]; - NTSTATUS Status; - - Peek(tmp, Size); - - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypeMemory; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Memory.Length = UCHAR2USHORT(tmp[7], tmp[8]) << 8; - Descriptor->Descriptor.u.Memory.Alignment = UCHAR2USHORT(tmp[5], tmp[6]); - Descriptor->Descriptor.u.Memory.MinimumAddress.QuadPart = UCHAR2USHORT(tmp[1], tmp[2]) << 8; - Descriptor->Descriptor.u.Memory.MaximumAddress.QuadPart = UCHAR2USHORT(tmp[3], tmp[4]) << 8; - - DPRINT("Found memory range 0x%X - 0x%X for logical device %d on card %d\n", - Descriptor->Descriptor.u.Memory.MinimumAddress, - Descriptor->Descriptor.u.Memory.MaximumAddress, - LogicalDevice->Number, - LogicalDevice->Card->CardId); -#endif - return STATUS_SUCCESS; -} - -/* - * Add 32-bit memory resource to resources list - */ -static NTSTATUS AddMemory32Resource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ -#if 0 - DPRINT("Memory32 range: size 0x%X\n", Size); - Skip(Size); -#else - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[17]; - NTSTATUS Status; - - Peek(tmp, Size); - - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypeMemory; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Memory.Length = - UCHAR2ULONG(tmp[13], tmp[14], tmp[15], tmp[16]); - Descriptor->Descriptor.u.Memory.Alignment = - UCHAR2ULONG(tmp[9], tmp[10], tmp[11], tmp[12]); - Descriptor->Descriptor.u.Memory.MinimumAddress.QuadPart = - UCHAR2ULONG(tmp[1], tmp[2], tmp[3], tmp[4]); - Descriptor->Descriptor.u.Memory.MaximumAddress.QuadPart = - UCHAR2ULONG(tmp[5], tmp[6], tmp[7], tmp[8]); - - DPRINT("Found memory32 range 0x%X - 0x%X for logical device %d on card %d\n", - Descriptor->Descriptor.u.Memory.MinimumAddress, - Descriptor->Descriptor.u.Memory.MaximumAddress, - LogicalDevice->Number, - LogicalDevice->Card->CardId); -#endif - return STATUS_SUCCESS; -} - -/* - * Add 32-bit fixed memory resource to resources list - */ -static NTSTATUS AddFixedMemory32Resource( - PISAPNP_LOGICAL_DEVICE LogicalDevice, - ULONG Size, - ULONG Priority, - ULONG Option) -{ -#if 0 - DPRINT("Memory32 range: size 0x%X\n", Size); - Skip(Size); -#else - PISAPNP_DESCRIPTOR Descriptor; - UCHAR tmp[17]; - NTSTATUS Status; - - Peek(tmp, Size); - - Status = AddResourceDescriptor(LogicalDevice, - Priority, Option, &Descriptor); - if (!NT_SUCCESS(Status)) - return Status; - Descriptor->Descriptor.Type = CmResourceTypeMemory; - Descriptor->Descriptor.ShareDisposition = CmResourceShareDeviceExclusive; - Descriptor->Descriptor.u.Memory.Length = - UCHAR2ULONG(tmp[9], tmp[10], tmp[11], tmp[12]); - Descriptor->Descriptor.u.Memory.Alignment = - UCHAR2ULONG(tmp[5], tmp[6], tmp[7], tmp[8]); - Descriptor->Descriptor.u.Memory.MinimumAddress.QuadPart = - UCHAR2ULONG(tmp[1], tmp[2], tmp[3], tmp[4]); - Descriptor->Descriptor.u.Memory.MaximumAddress.QuadPart = - UCHAR2ULONG(tmp[1], tmp[2], tmp[3], tmp[4]); - - DPRINT("Found fixed memory32 range 0x%X - 0x%X for logical device %d on card %d\n", - Descriptor->Descriptor.u.Memory.MinimumAddress, - Descriptor->Descriptor.u.Memory.MaximumAddress, - LogicalDevice->Number, - LogicalDevice->Card->CardId); -#endif - return STATUS_SUCCESS; -} - - -/* - * Parse logical device tag - */ -static PISAPNP_LOGICAL_DEVICE ParseLogicalDevice( - PISAPNP_DEVICE_EXTENSION DeviceExtension, - PISAPNP_CARD Card, - ULONG Size, - USHORT Number) -{ - UCHAR tmp[6]; - PISAPNP_LOGICAL_DEVICE LogicalDevice; - - DPRINT("Card %d Number %d\n", Card->CardId, Number); - - Peek(tmp, Size); - - LogicalDevice = (PISAPNP_LOGICAL_DEVICE)ExAllocatePoolWithTag( - PagedPool, sizeof(ISAPNP_LOGICAL_DEVICE), TAG_ISAPNP); - if (!LogicalDevice) - return NULL; - - RtlZeroMemory(LogicalDevice, sizeof(ISAPNP_LOGICAL_DEVICE)); - - LogicalDevice->Number = Number; - LogicalDevice->VendorId = UCHAR2USHORT(tmp[0], tmp[1]); - LogicalDevice->DeviceId = UCHAR2USHORT(tmp[2], tmp[3]); - LogicalDevice->Regs = tmp[4]; - LogicalDevice->Card = Card; - if (Size > 5) - LogicalDevice->Regs |= tmp[5] << 8; - - InitializeListHead(&LogicalDevice->Configuration); - - ExInterlockedInsertTailList(&Card->LogicalDevices, - &LogicalDevice->CardListEntry, - &Card->LogicalDevicesLock); - - ExInterlockedInsertTailList(&DeviceExtension->DeviceListHead, - &LogicalDevice->DeviceListEntry, - &DeviceExtension->GlobalListLock); - - DeviceExtension->DeviceListCount++; - - return LogicalDevice; -} - - -/* - * Parse resource map for logical device - */ -static BOOLEAN CreateLogicalDevice(PISAPNP_DEVICE_EXTENSION DeviceExtension, - PISAPNP_CARD Card, USHORT Size) -{ - ULONG number = 0, skip = 0, compat = 0; - UCHAR type, tmp[17]; - PISAPNP_LOGICAL_DEVICE LogicalDevice; - BOOLEAN Small; - ULONG Priority = 0; - ULONG Option = IO_RESOURCE_REQUIRED; - - DPRINT("Card %d Size %d\n", Card->CardId, Size); - - LogicalDevice = ParseLogicalDevice(DeviceExtension, Card, Size, (USHORT) number++); - if (!LogicalDevice) - return FALSE; - - while (TRUE) { - if (!ReadTag(&type, &Size, &Small)) - return FALSE; - - if (skip && !(Small && ((type == ISAPNP_SRIN_LDEVICE_ID) - || (type == ISAPNP_SRIN_END_TAG)))) - goto skip; - - if (Small) { - switch (type) { - case ISAPNP_SRIN_LDEVICE_ID: - if ((Size >= 5) && (Size <= 6)) { - LogicalDevice = ParseLogicalDevice( - DeviceExtension, Card, Size, (USHORT)number++); - if (!LogicalDevice) - return FALSE; - Size = 0; - skip = 0; - } else { - skip = 1; - } - Priority = 0; - Option = IO_RESOURCE_REQUIRED; - compat = 0; - break; - - case ISAPNP_SRIN_CDEVICE_ID: - if ((Size == 4) && (compat < MAX_COMPATIBLE_ID)) { - Peek(tmp, 4); - LogicalDevice->CVendorId[compat] = UCHAR2USHORT(tmp[0], tmp[1]); - LogicalDevice->CDeviceId[compat] = UCHAR2USHORT(tmp[2], tmp[3]); - compat++; - Size = 0; - } - break; - - case ISAPNP_SRIN_IRQ_FORMAT: - if ((Size < 2) || (Size > 3)) - goto skip; - AddIrqResource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_SRIN_DMA_FORMAT: - if (Size != 2) - goto skip; - AddDmaResource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_SRIN_START_DFUNCTION: - if (Size > 1) - goto skip; - - if (Size > 0) { - Peek(tmp, Size); - Priority = tmp[0]; - Size = 0; - /* FIXME: Maybe use IO_RESOURCE_PREFERRED for some */ - Option = IO_RESOURCE_ALTERNATIVE; - } else { - Priority = 0; - Option = IO_RESOURCE_ALTERNATIVE; - } - - DPRINT(" Start priority %d \n", Priority); - - LogicalDevice->CurrentDescriptorCount = 0; - - break; - - case ISAPNP_SRIN_END_DFUNCTION: - - DPRINT(" End priority %d \n", Priority); - - if (Size != 0) - goto skip; - Priority = 0; - Option = IO_RESOURCE_REQUIRED; - LogicalDevice->CurrentDescriptorCount = 0; - break; - - case ISAPNP_SRIN_IO_DESCRIPTOR: - if (Size != 7) - goto skip; - AddIOPortResource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_SRIN_FL_IO_DESCRIPOTOR: - if (Size != 3) - goto skip; - AddFixedIOPortResource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_SRIN_VENDOR_DEFINED: - break; - - case ISAPNP_SRIN_END_TAG: - if (Size > 0) - Skip(Size); - return FALSE; - - default: - DPRINT("Ignoring small tag of type 0x%X for logical device %d on card %d\n", - type, LogicalDevice->Number, Card->CardId); - } - } else { - switch (type) { - case ISAPNP_LRIN_MEMORY_RANGE: - if (Size != 9) - goto skip; - AddMemoryResource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_LRIN_ID_STRING_ANSI: - ParseAnsiName(&LogicalDevice->Name, &Size); - break; - - case ISAPNP_LRIN_ID_STRING_UNICODE: - break; - - case ISAPNP_LRIN_VENDOR_DEFINED: - break; - - case ISAPNP_LRIN_MEMORY_RANGE32: - if (Size != 17) - goto skip; - AddMemory32Resource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - case ISAPNP_LRIN_FL_MEMORY_RANGE32: - if (Size != 17) - goto skip; - AddFixedMemory32Resource(LogicalDevice, Size, Priority, Option); - Size = 0; - break; - - default: - DPRINT("Ignoring large tag of type 0x%X for logical device %d on card %d\n", - type, LogicalDevice->Number, Card->CardId); - } - } -skip: - if (Size > 0) - Skip(Size); - } - - return TRUE; -} - - -/* - * Parse resource map for ISA PnP card - */ -static BOOLEAN ParseResourceMap(PISAPNP_DEVICE_EXTENSION DeviceExtension, - PISAPNP_CARD Card) -{ - UCHAR type, tmp[17]; - USHORT size; - BOOLEAN Small; - - DPRINT("Card %d\n", Card->CardId); - - while (TRUE) { - if (!ReadTag(&type, &size, &Small)) - return FALSE; - - if (Small) { - switch (type) { - case ISAPNP_SRIN_VERSION: - if (size != 2) - goto skip; - Peek(tmp, 2); - Card->PNPVersion = tmp[0]; - Card->ProductVersion = tmp[1]; - size = 0; - break; - - case ISAPNP_SRIN_LDEVICE_ID: - if ((size >= 5) && (size <= 6)) { - if (!CreateLogicalDevice(DeviceExtension, Card, size)) - return FALSE; - size = 0; - } - break; - - case ISAPNP_SRIN_CDEVICE_ID: - /* FIXME: Parse compatible IDs */ - break; - - case ISAPNP_SRIN_END_TAG: - if (size > 0) - Skip(size); - return TRUE; - - default: - DPRINT("Ignoring small tag Type 0x%X for Card %d\n", type, Card->CardId); - } - } else { - switch (type) { - case ISAPNP_LRIN_ID_STRING_ANSI: - ParseAnsiName(&Card->Name, &size); - break; - - default: - DPRINT("Ignoring large tag Type 0x%X for Card %d\n", - type, Card->CardId); - } - } -skip: - if (size > 0) - Skip(size); - } - - return TRUE; -} - - -/* - * Compute ISA PnP checksum for first eight bytes - */ -static UCHAR Checksum(PUCHAR data) -{ - ULONG i, j; - UCHAR checksum = 0x6a, bit, b; - - for (i = 0; i < 8; i++) { - b = data[i]; - for (j = 0; j < 8; j++) { - bit = 0; - if (b & (1 << j)) - bit = 1; - checksum = ((((checksum ^ (checksum >> 1)) & - 0x01) ^ bit) << 7) | (checksum >> 1); - } - } - return checksum; -} - - -/* - * Build a resource list for a logical ISA PnP device - */ -static NTSTATUS BuildResourceList(PISAPNP_LOGICAL_DEVICE LogicalDevice, - PIO_RESOURCE_LIST DestinationList, - ULONG Priority) -{ - PLIST_ENTRY CurrentEntry, Entry; - PISAPNP_CONFIGURATION_LIST List; - PISAPNP_DESCRIPTOR Descriptor; - ULONG i; - - if (IsListEmpty(&LogicalDevice->Configuration)) - return STATUS_NOT_FOUND; - - CurrentEntry = LogicalDevice->Configuration.Flink; - while (CurrentEntry != &LogicalDevice->Configuration) { - List = CONTAINING_RECORD( - CurrentEntry, ISAPNP_CONFIGURATION_LIST, ListEntry); - - if (List->Priority == Priority) { - - DPRINT("Logical device %d DestinationList %p\n", - LogicalDevice->Number, - DestinationList); - - DestinationList->Version = 1; - DestinationList->Revision = 1; - DestinationList->Count = LogicalDevice->DescriptorCount; - - i = 0; - Entry = List->ListHead.Flink; - while (Entry != &List->ListHead) { - Descriptor = CONTAINING_RECORD( - Entry, ISAPNP_DESCRIPTOR, ListEntry); - - DPRINT("Logical device %d Destination %p(%d)\n", - LogicalDevice->Number, - &DestinationList->Descriptors[i], - i); - - RtlCopyMemory(&DestinationList->Descriptors[i], - &Descriptor->Descriptor, - sizeof(IO_RESOURCE_DESCRIPTOR)); - - i++; - - Entry = Entry->Flink; - } - - RemoveEntryList(&List->ListEntry); - - ExFreePool(List); - - return STATUS_SUCCESS; - } - - CurrentEntry = CurrentEntry->Flink; - } - - return STATUS_UNSUCCESSFUL; -} - - -/* - * Build resource lists for a logical ISA PnP device - */ -static NTSTATUS BuildResourceLists(PISAPNP_LOGICAL_DEVICE LogicalDevice) -{ - ULONG ListSize; - ULONG Priority; - ULONG SingleListSize; - PIO_RESOURCE_LIST p; - NTSTATUS Status; - - ListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) - - sizeof(IO_RESOURCE_LIST) - + LogicalDevice->ConfigurationSize; - - DPRINT("Logical device %d ListSize 0x%X ConfigurationSize 0x%X DescriptorCount %d\n", - LogicalDevice->Number, ListSize, - LogicalDevice->ConfigurationSize, - LogicalDevice->DescriptorCount); - - LogicalDevice->ResourceLists = - (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePoolWithTag( - PagedPool, ListSize, TAG_ISAPNP); - if (!LogicalDevice->ResourceLists) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(LogicalDevice->ResourceLists, ListSize); - - SingleListSize = sizeof(IO_RESOURCE_LIST) + - (LogicalDevice->DescriptorCount - 1) * - sizeof(IO_RESOURCE_DESCRIPTOR); - - DPRINT("SingleListSize %d\n", SingleListSize); - - Priority = 0; - p = &LogicalDevice->ResourceLists->List[0]; - do { - Status = BuildResourceList(LogicalDevice, p, Priority); - if (NT_SUCCESS(Status)) { - p = (PIO_RESOURCE_LIST)((ULONG_PTR)p + SingleListSize); - Priority++; - } - } while (Status != STATUS_NOT_FOUND); - - LogicalDevice->ResourceLists->ListSize = ListSize; - LogicalDevice->ResourceLists->AlternativeLists = Priority + 1; - - return STATUS_SUCCESS; -} - - -/* - * Build resource lists for a ISA PnP card - */ -static NTSTATUS BuildResourceListsForCard(PISAPNP_CARD Card) -{ - PISAPNP_LOGICAL_DEVICE LogicalDevice; - PLIST_ENTRY CurrentEntry; - NTSTATUS Status; - - CurrentEntry = Card->LogicalDevices.Flink; - while (CurrentEntry != &Card->LogicalDevices) { - LogicalDevice = CONTAINING_RECORD( - CurrentEntry, ISAPNP_LOGICAL_DEVICE, CardListEntry); - Status = BuildResourceLists(LogicalDevice); - if (!NT_SUCCESS(Status)) - return Status; - CurrentEntry = CurrentEntry->Flink; - } - - return STATUS_SUCCESS; -} - - -/* - * Build resource lists for all present ISA PnP cards - */ -static NTSTATUS BuildResourceListsForAll( - PISAPNP_DEVICE_EXTENSION DeviceExtension) -{ - PLIST_ENTRY CurrentEntry; - PISAPNP_CARD Card; - NTSTATUS Status; - - CurrentEntry = DeviceExtension->CardListHead.Flink; - while (CurrentEntry != &DeviceExtension->CardListHead) { - Card = CONTAINING_RECORD( - CurrentEntry, ISAPNP_CARD, ListEntry); - Status = BuildResourceListsForCard(Card); - if (!NT_SUCCESS(Status)) - return Status; - CurrentEntry = CurrentEntry->Flink; - } - - return STATUS_SUCCESS; -} - - -/* - * Build device list for all present ISA PnP cards - */ -static NTSTATUS BuildDeviceList(PISAPNP_DEVICE_EXTENSION DeviceExtension) -{ - ULONG csn; - UCHAR header[9], checksum; - PISAPNP_CARD Card; - - DPRINT("Called\n"); - - SendWait(); - SendKey(); - for (csn = 1; csn <= 10; csn++) { - SendWake((UCHAR)csn); - Peek(header, 9); - checksum = Checksum(header); - - if (checksum == 0x00 || checksum != header[8]) /* Invalid CSN */ - continue; - - DPRINT("VENDOR: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", - header[0], header[1], header[2], header[3], - header[4], header[5], header[6], header[7], header[8]); - - Card = (PISAPNP_CARD)ExAllocatePoolWithTag( - PagedPool, sizeof(ISAPNP_CARD), TAG_ISAPNP); - if (!Card) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlZeroMemory(Card, sizeof(ISAPNP_CARD)); - - Card->CardId = (USHORT) csn; - Card->VendorId = (header[1] << 8) | header[0]; - Card->DeviceId = (header[3] << 8) | header[2]; - Card->Serial = (header[7] << 24) | (header[6] << 16) | (header[5] << 8) | header[4]; - - InitializeListHead(&Card->LogicalDevices); - KeInitializeSpinLock(&Card->LogicalDevicesLock); - - ParseResourceMap(DeviceExtension, Card); - - ExInterlockedInsertTailList(&DeviceExtension->CardListHead, - &Card->ListEntry, - &DeviceExtension->GlobalListLock); - } - - return STATUS_SUCCESS; -} - - -static NTSTATUS -ISAPNPQueryBusRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PISAPNP_DEVICE_EXTENSION DeviceExtension; - PISAPNP_LOGICAL_DEVICE LogicalDevice; - PDEVICE_RELATIONS Relations; - PLIST_ENTRY CurrentEntry; - NTSTATUS Status = STATUS_SUCCESS; - ULONG Size; - ULONG i; - - DPRINT("Called\n"); - - DeviceExtension = (PISAPNP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (Irp->IoStatus.Information) { - /* FIXME: Another bus driver has already created a DEVICE_RELATIONS - structure so we must merge this structure with our own */ - } - - Size = sizeof(DEVICE_RELATIONS) + sizeof(Relations->Objects) * - (DeviceExtension->DeviceListCount - 1); - Relations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, Size, TAG_ISAPNP); - if (!Relations) - return STATUS_INSUFFICIENT_RESOURCES; - - Relations->Count = DeviceExtension->DeviceListCount; - - i = 0; - CurrentEntry = DeviceExtension->DeviceListHead.Flink; - while (CurrentEntry != &DeviceExtension->DeviceListHead) { - LogicalDevice = CONTAINING_RECORD( - CurrentEntry, ISAPNP_LOGICAL_DEVICE, DeviceListEntry); - - if (!LogicalDevice->Pdo) { - /* Create a physical device object for the - device as it does not already have one */ - Status = IoCreateDevice(DeviceObject->DriverObject, 0, - NULL, FILE_DEVICE_CONTROLLER, 0, FALSE, &LogicalDevice->Pdo); - if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%X\n", Status); - ExFreePool(Relations); - return Status; - } - - LogicalDevice->Pdo->Flags |= DO_BUS_ENUMERATED_DEVICE; - } - - /* Reference the physical device object. The PnP manager - will dereference it again when it is no longer needed */ - ObReferenceObject(LogicalDevice->Pdo); - - Relations->Objects[i] = LogicalDevice->Pdo; - - i++; - - CurrentEntry = CurrentEntry->Flink; - } - - Irp->IoStatus.Information = (ULONG_PTR)Relations; - - return Status; -} - - -static NTSTATUS -ISAPNPQueryDeviceRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PISAPNP_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - - DPRINT("Called\n"); - - DeviceExtension = (PISAPNP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->State == dsStopped) - return STATUS_UNSUCCESSFUL; - - switch (IrpSp->Parameters.QueryDeviceRelations.Type) { - case BusRelations: - Status = ISAPNPQueryBusRelations(DeviceObject, Irp, IrpSp); - break; - - default: - Status = STATUS_NOT_IMPLEMENTED; - } - - return Status; -} - - -static NTSTATUS -ISAPNPStartDevice( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PISAPNP_DEVICE_EXTENSION DeviceExtension; - NTSTATUS Status; - ULONG NumCards; - - DPRINT("Called\n"); - - DeviceExtension = (PISAPNP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->State == dsStarted) - return STATUS_SUCCESS; - - NumCards = IsolatePnPCards(); - - DPRINT("Number of ISA PnP cards found: %d\n", NumCards); - - Status = BuildDeviceList(DeviceExtension); - if (!NT_SUCCESS(Status)) { - DPRINT("BuildDeviceList() failed with status 0x%X\n", Status); - return Status; - } - - Status = BuildResourceListsForAll(DeviceExtension); - if (!NT_SUCCESS(Status)) { - DPRINT("BuildResourceListsForAll() failed with status 0x%X\n", Status); - return Status; - } - - DeviceExtension->State = dsStarted; - - return STATUS_SUCCESS; -} - - -static NTSTATUS -ISAPNPStopDevice( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - PIO_STACK_LOCATION IrpSp) -{ - PISAPNP_DEVICE_EXTENSION DeviceExtension; - - DPRINT("Called\n"); - - DeviceExtension = (PISAPNP_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (DeviceExtension->State != dsStopped) { - /* FIXME: Stop device */ - DeviceExtension->State = dsStopped; - } - - return STATUS_SUCCESS; -} - - -static DRIVER_DISPATCH ISAPNPDispatchOpenClose; -static NTSTATUS -NTAPI -ISAPNPDispatchOpenClose( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - DPRINT("Called\n"); - +static +NTSTATUS +NTAPI +IsaCreateClose( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; + + DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } -static DRIVER_DISPATCH ISAPNPDispatchReadWrite; -static NTSTATUS -NTAPI -ISAPNPDispatchReadWrite( - IN PDEVICE_OBJECT PhysicalDeviceObject, - IN PIRP Irp) -{ - DPRINT("Called\n"); - - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; +static +NTSTATUS +NTAPI +IsaIoctl( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + default: + DPRINT1("Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + break; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +static +NTSTATUS +NTAPI +IsaReadWrite( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); + + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; -} - -static DRIVER_DISPATCH ISAPNPDispatchDeviceControl; -static NTSTATUS -NTAPI -ISAPNPDispatchDeviceControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - - DPRINT("Called\n"); - - Irp->IoStatus.Information = 0; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { - default: - DPRINT("Unknown IOCTL 0x%X\n", IrpSp->MinorFunction); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - if (Status != STATUS_PENDING) { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - DPRINT("Leaving. Status 0x%X\n", Status); - - return Status; -} - -static DRIVER_DISPATCH ISAPNPControl; -static NTSTATUS -NTAPI -ISAPNPControl( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - - DPRINT("Called\n"); - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - switch (IrpSp->MinorFunction) { - case IRP_MN_QUERY_DEVICE_RELATIONS: - Status = ISAPNPQueryDeviceRelations(DeviceObject, Irp, IrpSp); - break; - - case IRP_MN_START_DEVICE: - Status = ISAPNPStartDevice(DeviceObject, Irp, IrpSp); - break; - - case IRP_MN_STOP_DEVICE: - Status = ISAPNPStopDevice(DeviceObject, Irp, IrpSp); - break; - - case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: - /* Nothing to do here */ - DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); - Status = Irp->IoStatus.Status; - break; - - default: - DPRINT("Unknown IOCTL 0x%X\n", IrpSp->MinorFunction); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - if (Status != STATUS_PENDING) { - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - DPRINT("Leaving. Status 0x%X\n", Status); - - return Status; -} - - -static NTSTATUS -NTAPI -ISAPNPAddDevice( + return STATUS_NOT_SUPPORTED; +} + +static +NTSTATUS +NTAPI +IsaAddDevice( IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject) { - PISAPNP_DEVICE_EXTENSION DeviceExtension; PDEVICE_OBJECT Fdo; + PISAPNP_FDO_EXTENSION FdoExt; NTSTATUS Status; - DPRINT("Called\n"); - - Status = IoCreateDevice(DriverObject, sizeof(ISAPNP_DEVICE_EXTENSION), - NULL, FILE_DEVICE_BUS_EXTENDER, FILE_DEVICE_SECURE_OPEN, TRUE, &Fdo); - if (!NT_SUCCESS(Status)) { - DPRINT("IoCreateDevice() failed with status 0x%X\n", Status); - return Status; - } - - DeviceExtension = (PISAPNP_DEVICE_EXTENSION)Fdo->DeviceExtension; - - DeviceExtension->Pdo = PhysicalDeviceObject; - - DeviceExtension->Ldo = - IoAttachDeviceToDeviceStack(Fdo, PhysicalDeviceObject); - - InitializeListHead(&DeviceExtension->CardListHead); - InitializeListHead(&DeviceExtension->DeviceListHead); - DeviceExtension->DeviceListCount = 0; - KeInitializeSpinLock(&DeviceExtension->GlobalListLock); - - DeviceExtension->State = dsStopped; + DPRINT("%s(%p, %p)\n", __FUNCTION__, DriverObject, PhysicalDeviceObject); + + Status = IoCreateDevice(DriverObject, + sizeof(*FdoExt), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + TRUE, + &Fdo); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create FDO (0x%x)\n", Status); + return Status; + } + + FdoExt = Fdo->DeviceExtension; + RtlZeroMemory(FdoExt, sizeof(*FdoExt)); + + FdoExt->Common.Self = Fdo; + FdoExt->Common.IsFdo = TRUE; + FdoExt->Common.State = dsStopped; + FdoExt->Pdo = PhysicalDeviceObject; + FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, + PhysicalDeviceObject); + + InitializeListHead(&FdoExt->DeviceListHead); + KeInitializeSpinLock(&FdoExt->Lock); Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - DPRINT("Done AddDevice\n"); - return STATUS_SUCCESS; } +static +NTSTATUS +NTAPI +IsaPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PISAPNP_COMMON_EXTENSION DevExt = DeviceObject->DeviceExtension; + + DPRINT("%s(%p, %p)\n", __FUNCTION__, DeviceObject, Irp); + + if (DevExt->IsFdo) + { + return IsaFdoPnp((PISAPNP_FDO_EXTENSION)DevExt, + Irp, + IrpSp); + } + else + { + return IsaPdoPnp((PISAPNP_LOGICAL_DEVICE)DevExt, + Irp, + IrpSp); + } +} NTSTATUS NTAPI @@ -1731,15 +185,15 @@ IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) { - DbgPrint("ISA Plug and Play Bus Driver\n"); - - DriverObject->MajorFunction[IRP_MJ_CREATE] = ISAPNPDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = ISAPNPDispatchOpenClose; - DriverObject->MajorFunction[IRP_MJ_READ] = ISAPNPDispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_WRITE] = ISAPNPDispatchReadWrite; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = ISAPNPDispatchDeviceControl; - DriverObject->MajorFunction[IRP_MJ_PNP] = ISAPNPControl; - DriverObject->DriverExtension->AddDevice = ISAPNPAddDevice; + DPRINT("%s(%p, %wZ)\n", __FUNCTION__, DriverObject, RegistryPath); + + DriverObject->MajorFunction[IRP_MJ_CREATE] = IsaCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = IsaCreateClose; + DriverObject->MajorFunction[IRP_MJ_READ] = IsaReadWrite; + DriverObject->MajorFunction[IRP_MJ_WRITE] = IsaReadWrite; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = IsaIoctl; + DriverObject->MajorFunction[IRP_MJ_PNP] = IsaPnp; + DriverObject->DriverExtension->AddDevice = IsaAddDevice; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/bus/isapnp/isapnp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.h [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,6 +1,6 @@ #pragma once -#include <ntddk.h> +#include <wdm.h> #ifdef __cplusplus extern "C" { @@ -8,331 +8,88 @@ #define TAG_ISAPNP 'PNPI' -#define IO_RESOURCE_REQUIRED 0x00 //ROS Extension - -#define ISAPNP_ADDRESS_PORT 0x0279 // ADDRESS (W) -#define ISAPNP_WRITE_PORT 0x0A79 // WRITE_DATA (W) -#define ISAPNP_MIN_READ_PORT 0x0203 // READ_DATA (R) -#define ISAPNP_MAX_READ_PORT 0x03FF // READ_DATA (R) - -// Card control registers -#define ISAPNP_CARD_READ_DATA_PORT 0x00 // Set READ_DATA port -#define ISAPNP_CARD_ISOLATION 0x01 // Isolation -#define ISAPNP_CARD_CONFIG_COTROL 0x02 // Configuration control -#define ISAPNP_CARD_WAKECSN 0x03 // Wake[CSN] -#define ISAPNP_CARD_RESOUCE_DATA 0x04 // Resource data port -#define ISAPNP_CARD_STATUS 0x05 // Status port -#define ISAPNP_CARD_CSN 0x06 // Card Select Number port -#define ISAPNP_CARD_LOG_DEVICE_NUM 0x07 // Logical Device Number -#define ISAPNP_CARD_RESERVED 0x08 // Card level reserved -#define ISAPNP_CARD_VENDOR_DEFINED 0x20 // Vendor defined - -// Logical device control registers -#define ISAPNP_CONTROL_ACTIVATE 0x30 // Activate logical device -#define ISAPNP_CONTROL_IO_RANGE_CHECK 0x31 // I/O range conflict check -#define ISAPNP_CONTROL_LDC_RESERVED 0x32 // Logical Device Control reserved -#define ISAPNP_CONTROL_LDCV_RESERVED 0x38 // Logical Device Control Vendor reserved - -// Logical device configuration registers -#define ISAPNP_CONFIG_MEMORY_BASE2 0x00 // Memory base address bits 23-16 -#define ISAPNP_CONFIG_MEMORY_BASE1 0x01 // Memory base address bits 15-8 -#define ISAPNP_CONFIG_MEMORY_CONTROL 0x02 // Memory control -#define ISAPNP_CONFIG_MEMORY_LIMIT2 0x03 // Memory limit bits 23-16 -#define ISAPNP_CONFIG_MEMORY_LIMIT1 0x04 // Memory limit bits 15-8 - -#define ISAPNP_CONFIG_MEMORY_DESC0 0x40 // Memory descriptor 0 -#define ISAPNP_CONFIG_MEMORY_DESC1 0x48 // Memory descriptor 1 -#define ISAPNP_CONFIG_MEMORY_DESC2 0x50 // Memory descriptor 2 -#define ISAPNP_CONFIG_MEMORY_DESC3 0x58 // Memory descriptor 3 - -#define ISAPNP_CONFIG_MEMORY32_BASE3 0x00 // 32-bit memory base address bits 31-24 -#define ISAPNP_CONFIG_MEMORY32_BASE2 0x01 // 32-bit memory base address bits 23-16 -#define ISAPNP_CONFIG_MEMORY32_BASE1 0x01 // 32-bit memory base address bits 15-8 -#define ISAPNP_CONFIG_MEMORY32_CONTROL 0x02 // 32-bit memory control -#define ISAPNP_CONFIG_MEMORY32_LIMIT3 0x03 // 32-bit memory limit bits 31-24 -#define ISAPNP_CONFIG_MEMORY32_LIMIT2 0x04 // 32-bit memory limit bits 23-16 -#define ISAPNP_CONFIG_MEMORY32_LIMIT1 0x05 // 32-bit memory limit bits 15-8 - -#define ISAPNP_CONFIG_MEMORY32_DESC0 0x76 // 32-bit memory descriptor 0 -#define ISAPNP_CONFIG_MEMORY32_DESC1 0x80 // 32-bit memory descriptor 1 -#define ISAPNP_CONFIG_MEMORY32_DESC2 0x90 // 32-bit memory descriptor 2 -#define ISAPNP_CONFIG_MEMORY32_DESC3 0xA0 // 32-bit memory descriptor 3 - -#define ISAPNP_CONFIG_IO_BASE1 0x00 // I/O port base address bits 15-8 -#define ISAPNP_CONFIG_IO_BASE0 0x01 // I/O port base address bits 7-0 - -#define ISAPNP_CONFIG_IO_DESC0 0x60 // I/O port descriptor 0 -#define ISAPNP_CONFIG_IO_DESC1 0x62 // I/O port descriptor 1 -#define ISAPNP_CONFIG_IO_DESC2 0x64 // I/O port descriptor 2 -#define ISAPNP_CONFIG_IO_DESC3 0x66 // I/O port descriptor 3 -#define ISAPNP_CONFIG_IO_DESC4 0x68 // I/O port descriptor 4 -#define ISAPNP_CONFIG_IO_DESC5 0x6A // I/O port descriptor 5 -#define ISAPNP_CONFIG_IO_DESC6 0x6C // I/O port descriptor 6 -#define ISAPNP_CONFIG_IO_DESC7 0x6E // I/O port descriptor 7 - -#define ISAPNP_CONFIG_IRQ_LEVEL0 0x70 // Interupt level for descriptor 0 -#define ISAPNP_CONFIG_IRQ_TYPE0 0x71 // Type level for descriptor 0 -#define ISAPNP_CONFIG_IRQ_LEVEL1 0x72 // Interupt level for descriptor 1 -#define ISAPNP_CONFIG_IRQ_TYPE1 0x73 // Type level for descriptor 1 - -#define ISAPNP_CONFIG_DMA_CHANNEL0 0x74 // DMA channel for descriptor 0 -#define ISAPNP_CONFIG_DMA_CHANNEL1 0x75 // DMA channel for descriptor 1 - - -typedef struct _PNPISA_SERIAL_ID -{ - UCHAR VendorId[4]; // Vendor Identifier - UCHAR SerialId[4]; // Serial number - UCHAR Checksum; // Checksum -} PNPISA_SERIAL_ID, *PPNPISA_SERIAL_ID; - - -#define ISAPNP_RES_PRIORITY_PREFERRED 0 -#define ISAPNP_RES_PRIORITY_ACCEPTABLE 1 -#define ISAPNP_RES_PRIORITY_FUNCTIONAL 2 -#define ISAPNP_RES_PRIORITY_INVALID 65535 - - -#define ISAPNP_RESOURCE_ITEM_TYPE 0x80 // 0 = small, 1 = large - -// Small Resource Item Names (SRINs) -#define ISAPNP_SRIN_VERSION 0x1 // PnP version number -#define ISAPNP_SRIN_LDEVICE_ID 0x2 // Logical device id -#define ISAPNP_SRIN_CDEVICE_ID 0x3 // Compatible device id -#define ISAPNP_SRIN_IRQ_FORMAT 0x4 // IRQ format -#define ISAPNP_SRIN_DMA_FORMAT 0x5 // DMA format -#define ISAPNP_SRIN_START_DFUNCTION 0x6 // Start dependant function -#define ISAPNP_SRIN_END_DFUNCTION 0x7 // End dependant function -#define ISAPNP_SRIN_IO_DESCRIPTOR 0x8 // I/O port descriptor -#define ISAPNP_SRIN_FL_IO_DESCRIPOTOR 0x9 // Fixed location I/O port descriptor -#define ISAPNP_SRIN_VENDOR_DEFINED 0xE // Vendor defined -#define ISAPNP_SRIN_END_TAG 0xF // End tag - -typedef struct _ISAPNP_SRI_VERSION -{ - UCHAR Header; - UCHAR Version; // Packed BCD format version number - UCHAR VendorVersion; // Vendor specific version number -} ISAPNP_SRI_VERSION, *PISAPNP_SRI_VERSION; - -typedef struct _ISAPNP_SRI_LDEVICE_ID -{ - UCHAR Header; - USHORT DeviceId; // Logical device id - USHORT VendorId; // Manufacturer id - UCHAR Flags; // Flags -} ISAPNP_SRI_LDEVICE_ID, *PISAPNP_SRI_LDEVICE_ID; - -typedef struct _ISAPNP_SRI_CDEVICE_ID -{ - UCHAR Header; - USHORT DeviceId; // Logical device id - USHORT VendorId; // Manufacturer id -} ISAPNP_SRI_CDEVICE_ID, *PISAPNP_SRI_CDEVICE_ID; - -typedef struct _ISAPNP_SRI_IRQ_FORMAT -{ - UCHAR Header; - USHORT Mask; // IRQ mask (bit 0 = irq 0, etc.) - UCHAR Information; // IRQ information -} ISAPNP_SRI_IRQ_FORMAT, *PISAPNP_SRI_IRQ_FORMAT; - -typedef struct _ISAPNP_SRI_DMA_FORMAT -{ - UCHAR Header; - USHORT Mask; // DMA channel mask (bit 0 = channel 0, etc.) - UCHAR Information; // DMA information -} ISAPNP_SRI_DMA_FORMAT, *PISAPNP_SRI_DMA_FORMAT; - -typedef struct _ISAPNP_SRI_START_DFUNCTION -{ - UCHAR Header; -} ISAPNP_SRI_START_DFUNCTION, *PISAPNP_SRI_START_DFUNCTION; - -typedef struct _ISAPNP_SRI_END_DFUNCTION -{ - UCHAR Header; -} ISAPNP_SRI_END_DFUNCTION, *PISAPNP_SRI_END_DFUNCTION; - -typedef struct _ISAPNP_SRI_IO_DESCRIPTOR -{ - UCHAR Header; - UCHAR Information; // Information - USHORT RangeMinBase; // Minimum base address - USHORT RangeMaxBase; // Maximum base address - UCHAR Alignment; // Base alignment - UCHAR RangeLength; // Length of range -} ISAPNP_SRI_IO_DESCRIPTOR, *PISAPNP_SRI_IO_DESCRIPTOR; - -typedef struct _ISAPNP_SRI_FL_IO_DESCRIPTOR -{ - UCHAR Header; - USHORT RangeBase; // Range base address - UCHAR RangeLength; // Length of range -} ISAPNP_SRI_FL_IO_DESCRIPTOR, *PISAPNP_SRI_FL_IO_DESCRIPTOR; - -typedef struct _PISAPNP_SRI_VENDOR_DEFINED -{ - UCHAR Header; - UCHAR Reserved[0]; // Vendor defined -} ISAPNP_SRI_VENDOR_DEFINED, *PISAPNP_SRI_VENDOR_DEFINED; - -typedef struct _ISAPNP_SRI_END_TAG -{ - UCHAR Header; - UCHAR Checksum; // Checksum -} ISAPNP_SRI_END_TAG, *PISAPNP_SRI_END_TAG; - - -typedef struct _ISAPNP_LRI -{ - UCHAR Header; - USHORT Length; // Length of data items -} ISAPNP_LRI, *PISAPNP_LRI; - -// Large Resource Item Names (LRINs) -#define ISAPNP_LRIN_MEMORY_RANGE 0x1 // Memory range descriptor -#define ISAPNP_LRIN_ID_STRING_ANSI 0x2 // Identifier string (ANSI) -#define ISAPNP_LRIN_ID_STRING_UNICODE 0x3 // Identifier string (UNICODE) -#define ISAPNP_LRIN_VENDOR_DEFINED 0x4 // Vendor defined -#define ISAPNP_LRIN_MEMORY_RANGE32 0x5 // 32-bit memory range descriptor -#define ISAPNP_LRIN_FL_MEMORY_RANGE32 0x6 // 32-bit fixed location memory range descriptor - -typedef struct _ISAPNP_LRI_MEMORY_RANGE -{ - UCHAR Header; - USHORT Length; // Length of data items - UCHAR Information; // Information - USHORT RangeMinBase; // Minimum base address - USHORT RangeMaxBase; // Maximum base address - USHORT Alignment; // Base alignment - USHORT RangeLength; // Length of range -} ISAPNP_LRI_MEMORY_RANGE, *PISAPNP_LRI_MEMORY_RANGE; - -typedef struct _ISAPNP_LRI_ID_STRING_ANSI -{ - UCHAR Header; - USHORT Length; // Length of data items - UCHAR String[0]; // Identifier string -} ISAPNP_LRI_ID_STRING_ANSI, *PISAPNP_LRI_ID_STRING_ANSI; - -typedef struct _ISAPNP_LRI_ID_STRING_UNICODE -{ - UCHAR Header; - USHORT Length; // Length of data items - USHORT CountryId; // Country identifier - USHORT String[0]; // Identifier string -} ISAPNP_LRI_ID_STRING_UNICODE, *PISAPNP_LRI_ID_STRING_UNICODE; - -typedef struct _PISAPNP_LRI_VENDOR_DEFINED -{ - UCHAR Header; - USHORT Length; // Length of data items - UCHAR Reserved[0]; // Vendor defined -} ISAPNP_LRI_VENDOR_DEFINED, *PISAPNP_LRI_VENDOR_DEFINED; - -typedef struct _ISAPNP_LRI_MEMORY_RANGE32 -{ - UCHAR Header; - USHORT Length; // Length of data items - UCHAR Information; // Information - ULONG RangeMinBase; // Minimum base address - ULONG RangeMaxBase; // Maximum base address - ULONG Alignment; // Base alignment - ULONG RangeLength; // Length of range -} ISAPNP_LRI_MEMORY_RANGE32, *PISAPNP_LRI_MEMORY_RANGE32; - -typedef struct _ISAPNP_LRI_FL_MEMORY_RANGE32 -{ - UCHAR Header; - USHORT Length; // Length of data items - UCHAR Information; // Information - ULONG RangeMinBase; // Minimum base address - ULONG RangeMaxBase; // Maximum base address - ULONG RangeLength; // Length of range -} ISAPNP_LRI_FL_MEMORY_RANGE32, *PISAPNP_LRI_FL_MEMORY_RANGE32; - -typedef struct _ISAPNP_CARD -{ - LIST_ENTRY ListEntry; - USHORT CardId; - USHORT VendorId; - USHORT DeviceId; - ULONG Serial; - UCHAR PNPVersion; - UCHAR ProductVersion; - UNICODE_STRING Name; - LIST_ENTRY LogicalDevices; - KSPIN_LOCK LogicalDevicesLock; -} ISAPNP_CARD, *PISAPNP_CARD; - - -typedef struct _ISAPNP_DESCRIPTOR -{ - LIST_ENTRY ListEntry; - IO_RESOURCE_DESCRIPTOR Descriptor; -} ISAPNP_DESCRIPTOR, *PISAPNP_DESCRIPTOR; - -typedef struct _ISAPNP_CONFIGURATION_LIST -{ - LIST_ENTRY ListEntry; - ULONG Priority; - LIST_ENTRY ListHead; -} ISAPNP_CONFIGURATION_LIST, *PISAPNP_CONFIGURATION_LIST; - - -#define MAX_COMPATIBLE_ID 32 - -typedef struct _ISAPNP_LOGICAL_DEVICE -{ - LIST_ENTRY CardListEntry; - LIST_ENTRY DeviceListEntry; - USHORT Number; - USHORT VendorId; - USHORT DeviceId; - USHORT CVendorId[MAX_COMPATIBLE_ID]; - USHORT CDeviceId[MAX_COMPATIBLE_ID]; - USHORT Regs; - PISAPNP_CARD Card; - UNICODE_STRING Name; - PDEVICE_OBJECT Pdo; - PIO_RESOURCE_REQUIREMENTS_LIST ResourceLists; - LIST_ENTRY Configuration; - ULONG ConfigurationSize; - ULONG DescriptorCount; - ULONG CurrentDescriptorCount; -} ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; - - typedef enum { dsStopped, dsStarted } ISAPNP_DEVICE_STATE; -typedef struct _ISAPNP_DEVICE_EXTENSION -{ - // Physical Device Object +typedef struct _ISAPNP_COMMON_EXTENSION { + PDEVICE_OBJECT Self; + BOOLEAN IsFdo; + ISAPNP_DEVICE_STATE State; +} ISAPNP_COMMON_EXTENSION, *PISAPNP_COMMON_EXTENSION; + +typedef struct _ISAPNP_FDO_EXTENSION { + ISAPNP_COMMON_EXTENSION Common; + PDEVICE_OBJECT Ldo; PDEVICE_OBJECT Pdo; - // Lower device object - PDEVICE_OBJECT Ldo; - // List of ISA PnP cards managed by this driver - LIST_ENTRY CardListHead; - // List of devices managed by this driver LIST_ENTRY DeviceListHead; - // Number of devices managed by this driver - ULONG DeviceListCount; - // Spinlock for the linked lists - KSPIN_LOCK GlobalListLock; - // Current state of the driver - ISAPNP_DEVICE_STATE State; -} ISAPNP_DEVICE_EXTENSION, *PISAPNP_DEVICE_EXTENSION; + ULONG DeviceCount; + PUCHAR ReadDataPort; + KSPIN_LOCK Lock; +} ISAPNP_FDO_EXTENSION, *PISAPNP_FDO_EXTENSION; +typedef struct _ISAPNP_LOGICAL_DEVICE { + ISAPNP_COMMON_EXTENSION Common; + USHORT VendorId; + USHORT ProdId; + USHORT IoAddr; + UCHAR IrqNo; + UCHAR CSN; + UCHAR LDN; + LIST_ENTRY ListEntry; +} ISAPNP_LOGICAL_DEVICE, *PISAPNP_LOGICAL_DEVICE; + +/* isapnp.c */ NTSTATUS NTAPI DriverEntry( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath); +NTSTATUS +NTAPI +IsaForwardIrpSynchronous( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp); + +/* fdo.c */ +NTSTATUS +NTAPI +IsaFdoPnp( + IN PISAPNP_FDO_EXTENSION FdoExt, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp); + +/* pdo.c */ +NTSTATUS +NTAPI +IsaPdoPnp( + IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp); + +/* hardware.c */ +NTSTATUS +NTAPI +IsaHwDetectReadDataPort( + IN PISAPNP_FDO_EXTENSION FdoExt); + +NTSTATUS +NTAPI +IsaHwFillDeviceList( + IN PISAPNP_FDO_EXTENSION FdoExt); + +NTSTATUS +NTAPI +IsaHwDeactivateDevice( + IN PISAPNP_LOGICAL_DEVICE LogicalDevice); + +NTSTATUS +NTAPI +IsaHwActivateDevice( + IN PISAPNP_LOGICAL_DEVICE LogicalDevice); + #ifdef __cplusplus } #endif Modified: trunk/reactos/drivers/bus/isapnp/isapnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnp.… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/isapnp/isapnp.rbuild [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,9 +1,13 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="isapnp" type="kernelmodedriver" installbase="system32/drivers" installname="isapnp.sys"> + <bootstrap installbase="$(CDOUTPUT)"/> <include base="isapnp">.</include> <library>ntoskrnl</library> <library>hal</library> <file>isapnp.c</file> + <file>pdo.c</file> + <file>fdo.c</file> + <file>hardware.c</file> <file>isapnp.rc</file> </module> Added: trunk/reactos/drivers/bus/isapnp/isapnphw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/isapnph… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/isapnphw.h (added) +++ trunk/reactos/drivers/bus/isapnp/isapnphw.h [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,0 +1,106 @@ +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +#define ISAPNP_ADDRESS 0x279 +#define ISAPNP_WRITE_DATA 0xA79 + +#define ISAPNP_READ_PORT_MIN 0x203 +#define ISAPNP_READ_PORT_START 0x213 +#define ISAPNP_READ_PORT_MAX 0x3FF +#define ISAPNP_READ_PORT_STEP 0x10 + +#define ISAPNP_CSN_MIN 0x01 +#define ISAPNP_CSN_MAX 0x0F + +#define ISAPNP_READPORT 0x00 +#define ISAPNP_SERIALISOLATION 0x01 +#define ISAPNP_CONFIGCONTROL 0x02 +#define ISAPNP_WAKE 0x03 +#define ISAPNP_RESOURCEDATA 0x04 +#define ISAPNP_STATUS 0x05 +#define ISAPNP_CARDSELECTNUMBER 0x06 +#define ISAPNP_LOGICALDEVICENUMBER 0x07 + +#define ISAPNP_ACTIVATE 0x30 +#define ISAPNP_IORANGECHECK 0x31 + +#define ISAPNP_IOBASE(n) (0x60 + ((n)*2)) +#define ISAPNP_IRQNO(n) (0x70 + ((n)*2)) +#define ISAPNP_IRQTYPE(n) (0x71 + ((n) * 2)) + +#define ISAPNP_CONFIG_RESET (1 << 0) +#define ISAPNP_CONFIG_WAIT_FOR_KEY (1 << 1) +#define ISAPNP_CONFIG_RESET_CSN (1 << 2) + +#define ISAPNP_LFSR_SEED 0x6A + +#define ISAPNP_IS_SMALL_TAG(t) (!((t) & 0x80)) +#define ISAPNP_SMALL_TAG_NAME(t) (((t) >> 3) & 0xF) +#define ISAPNP_SMALL_TAG_LEN(t) (((t) & 0x7)) +#define ISAPNP_TAG_PNPVERNO 0x01 +#define ISAPNP_TAG_LOGDEVID 0x02 +#define ISAPNP_TAG_COMPATDEVID 0x03 +#define ISAPNP_TAG_IRQ 0x04 +#define ISAPNP_TAG_DMA 0x05 +#define ISAPNP_TAG_STARTDEP 0x06 +#define ISAPNP_TAG_ENDDEP 0x07 +#define ISAPNP_TAG_IOPORT 0x08 +#define ISAPNP_TAG_FIXEDIO 0x09 +#define ISAPNP_TAG_RSVDSHORTA 0x0A +#define ISAPNP_TAG_RSVDSHORTB 0x0B +#define ISAPNP_TAG_RSVDSHORTC 0x0C +#define ISAPNP_TAG_RSVDSHORTD 0x0D +#define ISAPNP_TAG_VENDORSHORT 0x0E +#define ISAPNP_TAG_END 0x0F + +#define ISAPNP_IS_LARGE_TAG(t) (((t) & 0x80)) +#define ISAPNP_LARGE_TAG_NAME(t) (t) +#define ISAPNP_TAG_MEMRANGE 0x81 +#define ISAPNP_TAG_ANSISTR 0x82 +#define ISAPNP_TAG_UNICODESTR 0x83 +#define ISAPNP_TAG_VENDORLONG 0x84 +#define ISAPNP_TAG_MEM32RANGE 0x85 +#define ISAPNP_TAG_FIXEDMEM32RANGE 0x86 +#define ISAPNP_TAG_RSVDLONG0 0xF0 +#define ISAPNP_TAG_RSVDLONG1 0xF1 +#define ISAPNP_TAG_RSVDLONG2 0xF2 +#define ISAPNP_TAG_RSVDLONG3 0xF3 +#define ISAPNP_TAG_RSVDLONG4 0xF4 +#define ISAPNP_TAG_RSVDLONG5 0xF5 +#define ISAPNP_TAG_RSVDLONG6 0xF6 +#define ISAPNP_TAG_RSVDLONG7 0xF7 +#define ISAPNP_TAG_RSVDLONG8 0xF8 +#define ISAPNP_TAG_RSVDLONG9 0xF9 +#define ISAPNP_TAG_RSVDLONGA 0xFA +#define ISAPNP_TAG_RSVDLONGB 0xFB +#define ISAPNP_TAG_RSVDLONGC 0xFC +#define ISAPNP_TAG_RSVDLONGD 0xFD +#define ISAPNP_TAG_RSVDLONGE 0xFE +#define ISAPNP_TAG_RSVDLONGF 0xFF +#define ISAPNP_TAG_PSEUDO_NEWBOARD 0x100 + +typedef struct _ISAPNP_IDENTIFIER { + USHORT VendorId; + USHORT ProdId; + ULONG Serial; + UCHAR Checksum; +} ISAPNP_IDENTIFIER, *PISAPNP_IDENTIFIER; + +typedef struct _ISAPNP_LOGDEVID { + USHORT VendorId; + USHORT ProdId; + USHORT Flags; +} ISAPNP_LOGDEVID, *PISAPNP_LOGDEVID; + +typedef struct _ISAPNP_DEVICEID { + CHAR* Name; + USHORT VendorId; + USHORT ProdId; +} ISAPNP_DEVICEID, *PISAPNP_DEVICEID; + +#ifdef __cplusplus +} +#endif Propchange: trunk/reactos/drivers/bus/isapnp/isapnphw.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/isapnp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/isapnp/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/isapnp/pdo.c (added) +++ trunk/reactos/drivers/bus/isapnp/pdo.c [iso-8859-1] Wed Apr 7 22:19:29 2010 @@ -1,0 +1,83 @@ +/* + * PROJECT: ReactOS ISA PnP Bus driver + * FILE: pdo.c + * PURPOSE: PDO-specific code + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ +#include <isapnp.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +IsaPdoQueryDeviceRelations( + IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + PDEVICE_RELATIONS DeviceRelations; + + if (IrpSp->Parameters.QueryDeviceRelations.Type != TargetDeviceRelation) + return Irp->IoStatus.Status; + + DeviceRelations = ExAllocatePool(PagedPool, sizeof(*DeviceRelations)); + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = LogDev->Common.Self; + ObReferenceObject(LogDev->Common.Self); + + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +IsaPdoPnp( + IN PISAPNP_LOGICAL_DEVICE LogDev, + IN PIRP Irp, + IN PIO_STACK_LOCATION IrpSp) +{ + NTSTATUS Status = Irp->IoStatus.Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_START_DEVICE: + Status = IsaHwActivateDevice(LogDev); + + if (NT_SUCCESS(Status)) + LogDev->Common.State = dsStarted; + break; + + case IRP_MN_STOP_DEVICE: + Status = IsaHwDeactivateDevice(LogDev); + + if (NT_SUCCESS(Status)) + LogDev->Common.State = dsStopped; + break; + + case IRP_MN_QUERY_DEVICE_RELATIONS: + Status = IsaPdoQueryDeviceRelations(LogDev, Irp, IrpSp); + break; + + case IRP_MN_QUERY_RESOURCES: + DPRINT1("IRP_MN_QUERY_RESOURCES is UNIMPLEMENTED!\n"); + break; + + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS is UNIMPLEMENTED!\n"); + break; + + default: + DPRINT1("Unknown PnP code: %x\n", IrpSp->MinorFunction); + break; + } + + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: trunk/reactos/drivers/bus/isapnp/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

[cgutman] 46767: [PCI] - Fix a crash that occurs when a device is started which requires no resources

by cgutman＠svn.reactos.org

Author: cgutman Date: Wed Apr 7 22:18:44 2010 New Revision: 46767 URL: http://svn.reactos.org/svn/reactos?rev=46767&view=rev Log: [PCI] - Fix a crash that occurs when a device is started which requires no resources Modified: trunk/reactos/drivers/bus/pci/pdo.c Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pci/pdo.c [iso-8859-1] Wed Apr 7 22:18:44 2010 @@ -1199,6 +1199,9 @@ PPDO_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; UCHAR Irq; + if (!RawResList) + return STATUS_SUCCESS; + /* TODO: Assign the other resources we get to the card */ for (i = 0; i < RawResList->Count; i++)

14 years, 8 months

← Newer
1
...
27
28
29
30
31
32
33
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010