Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 68321: [HDAUDBUS] - interface stub
by janderwald＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: janderwald Date: Tue Jun 30 12:37:39 2015 New Revision: 68321 URL: http://svn.reactos.org/svn/reactos?rev=68321&view=rev Log: [HDAUDBUS] - interface stub Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] Tue Jun 30 12:37:39 2015 @@ -7,17 +7,255 @@ */ #include "hdaudbus.h" + +VOID +NTAPI +HDA_InterfaceReference( +PVOID BusContext) +{ + DPRINT1("HDA_InterfaceReference\n"); +} + +VOID +NTAPI +HDA_InterfaceDereference( +PVOID BusContext) +{ + DPRINT1("HDA_InterfaceDereference\n"); +} + +NTSTATUS +NTAPI +HDA_TransferCodecVerbs( +IN PVOID _context, +IN ULONG Count, +IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, +IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, +IN PVOID Context) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_AllocateCaptureDmaEngine( + IN PVOID _context, + IN UCHAR CodecAddress, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + OUT PHANDLE Handle, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_AllocateRenderDmaEngine( + IN PVOID _context, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + IN BOOLEAN Stripe, + OUT PHANDLE Handle, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_ChangeBandwidthAllocation( + IN PVOID _context, + IN HANDLE Handle, + IN PHDAUDIO_STREAM_FORMAT StreamFormat, + OUT PHDAUDIO_CONVERTER_FORMAT ConverterFormat) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_AllocateDmaBuffer( + IN PVOID _context, + IN HANDLE Handle, + IN SIZE_T RequestedBufferSize, + OUT PMDL *BufferMdl, + OUT PSIZE_T AllocatedBufferSize, + OUT PUCHAR StreamId, + OUT PULONG FifoSize) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_FreeDmaBuffer( + IN PVOID _context, + IN HANDLE Handle) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_FreeDmaEngine( + IN PVOID _context, + IN HANDLE Handle) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_SetDmaEngineState( + IN PVOID _context, + IN HDAUDIO_STREAM_STATE StreamState, + IN ULONG NumberOfHandles, + IN PHANDLE Handles) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +VOID +NTAPI +HDA_GetWallClockRegister( + IN PVOID _context, + OUT PULONG *Wallclock) +{ + UNIMPLEMENTED; + ASSERT(FALSE); +} + +NTSTATUS +NTAPI +HDA_GetLinkPositionRegister( + IN PVOID _context, + IN HANDLE Handle, + OUT PULONG *Position) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_RegisterEventCallback( + IN PVOID _context, + IN PHDAUDIO_UNSOLICITED_RESPONSE_CALLBACK Routine, + IN PVOID Context, + OUT PUCHAR Tag) +{ + UNIMPLEMENTED; + *Tag = 1; + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +HDA_UnregisterEventCallback( +IN PVOID _context, +IN UCHAR Tag) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +NTAPI +HDA_GetDeviceInformation( + IN PVOID _context, + OUT PHDAUDIO_DEVICE_INFORMATION DeviceInformation) +{ + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)_context; + + DPRINT1("HDA_GetDeviceInformation\n"); + + DeviceInformation->Size = sizeof(HDAUDIO_DEVICE_INFORMATION); + DeviceInformation->CodecsDetected = 1; // FIXME + DeviceInformation->DeviceVersion = DeviceExtension->Codec->Major << 8 | DeviceExtension->Codec->Minor; + DeviceInformation->DriverVersion = DeviceExtension->Codec->Major << 8 | DeviceExtension->Codec->Minor; + DeviceInformation->IsStripingSupported = FALSE; + + return STATUS_SUCCESS; +} + +VOID +NTAPI +HDA_GetResourceInformation( + IN PVOID _context, + OUT PUCHAR CodecAddress, + OUT PUCHAR FunctionGroupStartNode) +{ + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)_context; + + DPRINT1("HDA_GetResourceInformation Addr %x NodeId %x\n", DeviceExtension->Codec->Addr, DeviceExtension->AudioGroup->NodeId); + + *CodecAddress = DeviceExtension->Codec->Addr; + *FunctionGroupStartNode = DeviceExtension->AudioGroup->NodeId; +} + NTSTATUS HDA_PDOHandleQueryInterface( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - UNICODE_STRING GuidString; + PHDAUDIO_BUS_INTERFACE InterfaceHDA; + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + /* get device extension */ + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO == FALSE); IoStack = IoGetCurrentIrpStackLocation(Irp); - RtlStringFromGUID(*IoStack->Parameters.QueryInterface.InterfaceType, &GuidString); - - DPRINT1("hda: requesting interface %wZ Version %u Size %u", &GuidString, IoStack->Parameters.QueryInterface.Version, IoStack->Parameters.QueryInterface.Size); - return STATUS_NOT_IMPLEMENTED; -} + + if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, GUID_HDAUDIO_BUS_INTERFACE)) + { + InterfaceHDA = (PHDAUDIO_BUS_INTERFACE)IoStack->Parameters.QueryInterface.Interface; + InterfaceHDA->Version = IoStack->Parameters.QueryInterface.Version; + InterfaceHDA->Size = IoStack->Parameters.QueryInterface.Size; + InterfaceHDA->Context = DeviceExtension; + + InterfaceHDA->TransferCodecVerbs = HDA_TransferCodecVerbs; + InterfaceHDA->AllocateCaptureDmaEngine = HDA_AllocateCaptureDmaEngine; + InterfaceHDA->AllocateRenderDmaEngine = HDA_AllocateRenderDmaEngine; + InterfaceHDA->ChangeBandwidthAllocation = HDA_ChangeBandwidthAllocation; + InterfaceHDA->AllocateDmaBuffer = HDA_AllocateDmaBuffer; + InterfaceHDA->FreeDmaBuffer = HDA_FreeDmaBuffer; + InterfaceHDA->FreeDmaEngine = HDA_FreeDmaEngine; + InterfaceHDA->SetDmaEngineState = HDA_SetDmaEngineState; + InterfaceHDA->GetWallClockRegister = HDA_GetWallClockRegister; + InterfaceHDA->GetLinkPositionRegister = HDA_GetLinkPositionRegister; + InterfaceHDA->RegisterEventCallback = HDA_RegisterEventCallback; + InterfaceHDA->UnregisterEventCallback = HDA_UnregisterEventCallback; + InterfaceHDA->GetDeviceInformation = HDA_GetDeviceInformation; + InterfaceHDA->GetResourceInformation = HDA_GetResourceInformation; + + return STATUS_SUCCESS; + } + + // FIXME + // implement support for GUID_HDAUDIO_BUS_INTERFACE_BDL, GUID_HDAUDIO_BUS_INTERFACE_V2 + return STATUS_NOT_SUPPORTED; +}

1 0

[janderwald] 68320: [HDAUDBUS] - move code - set FILE_AUTOGENERATED_DEVICE_NAME for pdos. Hint by ThFabba - driver now gets further
by janderwald＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: janderwald Date: Tue Jun 30 11:36:52 2015 New Revision: 68320 URL: http://svn.reactos.org/svn/reactos?rev=68320&view=rev Log: [HDAUDBUS] - move code - set FILE_AUTOGENERATED_DEVICE_NAME for pdos. Hint by ThFabba - driver now gets further Added: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp (with props) trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp (with props) trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp (with props) Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/CMakeLists.txt trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/CMakeLists.txt [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -5,7 +5,10 @@ add_definitions(-D_WIN32_WINNT=0x600) list(APPEND SOURCE - hdaudbus.cpp) + hdaudbus.cpp + fdo.cpp + pdo.cpp + businterface.cpp) add_library(hdaudbus SHARED ${SOURCE}) set_module_type(hdaudbus kernelmodedriver) Added: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp (added) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -0,0 +1,23 @@ +/* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS Kernel Streaming +* FILE: drivers/wdm/audio/hdaudbus/hdaudbus.cpp +* PURPOSE: HDA Driver Entry +* PROGRAMMER: Johannes Anderwald +*/ +#include "hdaudbus.h" + +NTSTATUS +HDA_PDOHandleQueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + UNICODE_STRING GuidString; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + RtlStringFromGUID(*IoStack->Parameters.QueryInterface.InterfaceType, &GuidString); + + DPRINT1("hda: requesting interface %wZ Version %u Size %u", &GuidString, IoStack->Parameters.QueryInterface.Version, IoStack->Parameters.QueryInterface.Size); + return STATUS_NOT_IMPLEMENTED; +} Propchange: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp (added) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -0,0 +1,688 @@ +/* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS Kernel Streaming +* FILE: drivers/wdm/audio/hdaudbus/fdo.cpp +* PURPOSE: HDA Driver Entry +* PROGRAMMER: Johannes Anderwald +*/ +#include "hdaudbus.h" + +BOOLEAN +NTAPI +HDA_InterruptService( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext) +{ + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + ULONG InterruptStatus, Response, ResponseFlags, Cad; + UCHAR RirbStatus, CorbStatus; + USHORT WritePos; + PHDA_CODEC_ENTRY Codec; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)ServiceContext; + ASSERT(DeviceExtension->IsFDO == TRUE); + + // Check if this interrupt is ours + InterruptStatus = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_INTR_STATUS)); + + DPRINT1("HDA_InterruptService %lx\n", InterruptStatus); + if ((InterruptStatus & INTR_STATUS_GLOBAL) == 0) + return FALSE; + + // Controller or stream related? + if (InterruptStatus & INTR_STATUS_CONTROLLER) { + RirbStatus = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_STATUS); + CorbStatus = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_STATUS); + + // Check for incoming responses + if (RirbStatus) { + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_STATUS, RirbStatus); + + if (DeviceExtension->RirbLength == 0) + { + /* HACK: spurious interrupt */ + return FALSE; + } + + if ((RirbStatus & RIRB_STATUS_RESPONSE) != 0) { + WritePos = (READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) + 1) % DeviceExtension->RirbLength; + + for (; DeviceExtension->RirbReadPos != WritePos; DeviceExtension->RirbReadPos = (DeviceExtension->RirbReadPos + 1) % DeviceExtension->RirbLength) + { + + Response = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].response; + ResponseFlags = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].flags; + Cad = ResponseFlags & RESPONSE_FLAGS_CODEC_MASK; + DPRINT1("Response %lx ResponseFlags %lx Cad %lx\n", Response, ResponseFlags, Cad); + + /* get codec */ + Codec = DeviceExtension->Codecs[Cad]; + if (Codec == NULL) + { + DPRINT1("hda: response for unknown codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); + continue; + } + + /* check response count */ + if (Codec->ResponseCount >= MAX_CODEC_RESPONSES) + { + DPRINT1("too many responses for codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); + continue; + } + + // FIXME handle unsolicited responses + ASSERT((ResponseFlags & RESPONSE_FLAGS_UNSOLICITED) == 0); + + /* store response */ + Codec->Responses[Codec->ResponseCount] = Response; + Codec->ResponseCount++; + } + } + + if ((RirbStatus & RIRB_STATUS_OVERRUN) != 0) + DPRINT1("hda: RIRB Overflow\n"); + } + + // Check for sending errors + if (CorbStatus) { + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_STATUS, CorbStatus); + + if ((CorbStatus & CORB_STATUS_MEMORY_ERROR) != 0) + DPRINT1("hda: CORB Memory Error!\n"); + } + } +#if 0 + if ((intrStatus & INTR_STATUS_STREAM_MASK) != 0) { + for (uint32 index = 0; index < HDA_MAX_STREAMS; index++) { + if ((intrStatus & (1 << index)) != 0) { + if (controller->streams[index]) { + if (stream_handle_interrupt(controller, + controller->streams[index], index)) { + handled = B_INVOKE_SCHEDULER; + } + } + else { + dprintf("hda: Stream interrupt for unconfigured stream " + "%ld!\n", index); + } + } + } + } +#endif + return TRUE; +} + + +VOID +HDA_SendVerbs( + IN PDEVICE_OBJECT DeviceObject, + IN PHDA_CODEC_ENTRY Codec, + IN PULONG Verbs, + OUT PULONG Responses, + IN ULONG Count) +{ + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + ULONG Sent = 0, ReadPosition, WritePosition, Queued; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* reset response count */ + Codec->ResponseCount = 0; + + while (Sent < Count) { + ReadPosition = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); + + Queued = 0; + + while (Sent < Count) { + WritePosition = (DeviceExtension->CorbWritePos + 1) % DeviceExtension->CorbLength; + + if (WritePosition == ReadPosition) { + // There is no space left in the ring buffer; execute the + // queued commands and wait until + break; + } + + DeviceExtension->CorbBase[WritePosition] = Verbs[Sent++]; + DeviceExtension->CorbWritePos = WritePosition; + + // FIXME HACK + // do proper synchronization + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); + KeStallExecutionProcessor(30); + Queued++; + } + + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); + } + + if (Responses != NULL) { + memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG)); + } +} + +NTSTATUS +HDA_InitCodec( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG codecAddress) +{ + PHDA_CODEC_ENTRY Entry; + ULONG verbs[3]; + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + CODEC_RESPONSE Response; + ULONG NodeId, GroupType; + NTSTATUS Status; + PHDA_CODEC_AUDIO_GROUP AudioGroup; + PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; + + /* lets allocate the entry */ + Entry = (PHDA_CODEC_ENTRY)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_ENTRY)); + if (!Entry) + { + DPRINT1("hda: failed to allocate memory"); + return STATUS_UNSUCCESSFUL; + } + + /* init codec */ + Entry->Addr = codecAddress; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* store codec */ + DeviceExtension->Codecs[codecAddress] = Entry; + + verbs[0] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_VENDOR_ID); + verbs[1] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_REVISION_ID); + verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_SUB_NODE_COUNT); + + /* get basic info */ + HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3); + + /* store codec details */ + Entry->Major = Response.major; + Entry->Minor = Response.minor; + Entry->ProductId = Response.device; + Entry->Revision = Response.revision; + Entry->Stepping = Response.stepping; + Entry->VendorId = Response.vendor; + + DPRINT1("hda Codec %ld Vendor: %04lx Product: %04lx, Revision: %lu.%lu.%lu.%lu NodeStart %u NodeCount %u \n", codecAddress, Response.vendor, + Response.device, Response.major, Response.minor, Response.revision, Response.stepping, Response.start, Response.count); + + for (NodeId = Response.start; NodeId < Response.start + Response.count; NodeId++) { + + /* get function type */ + verbs[0] = MAKE_VERB(codecAddress, NodeId, VID_GET_PARAMETER, PID_FUNCTION_GROUP_TYPE); + + HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1); + DPRINT1("NodeId %u GroupType %x\n", NodeId, GroupType); + + if ((GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) { + + AudioGroup = (PHDA_CODEC_AUDIO_GROUP)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_AUDIO_GROUP)); + if (!AudioGroup) + { + DPRINT1("hda: insufficient memory\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init audio group */ + AudioGroup->NodeId = NodeId; + AudioGroup->FunctionGroup = FUNCTION_GROUP_NODETYPE_AUDIO; + + // Found an Audio Function Group! + DPRINT1("NodeId %x found an audio function group!\n"); + + Status = IoCreateDevice(DeviceObject->DriverObject, sizeof(HDA_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_SOUND, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &AudioGroup->ChildPDO); + if (!NT_SUCCESS(Status)) + { + FreeItem(AudioGroup); + DPRINT1("hda failed to create device object %x\n", Status); + return Status; + } + + /* init child pdo*/ + ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)AudioGroup->ChildPDO->DeviceExtension; + ChildDeviceExtension->IsFDO = FALSE; + ChildDeviceExtension->Codec = Entry; + ChildDeviceExtension->AudioGroup = AudioGroup; + + /* setup flags */ + AudioGroup->ChildPDO->Flags |= DO_POWER_PAGABLE; + AudioGroup->ChildPDO->Flags &= ~DO_DEVICE_INITIALIZING; + + /* add audio group*/ + Entry->AudioGroups[Entry->AudioGroupCount] = AudioGroup; + Entry->AudioGroupCount++; + } + } + return STATUS_SUCCESS; + +} + +NTSTATUS +NTAPI +HDA_InitCorbRirbPos( + IN PDEVICE_OBJECT DeviceObject) +{ + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + UCHAR corbSize, value, rirbSize; + PHYSICAL_ADDRESS HighestPhysicalAddress, CorbPhysicalAddress; + ULONG Index; + USHORT corbReadPointer, rirbWritePointer, interruptValue, corbControl, rirbControl; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // Determine and set size of CORB + corbSize = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE); + if ((corbSize & CORB_SIZE_CAP_256_ENTRIES) != 0) { + DeviceExtension->CorbLength = 256; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_256_ENTRIES); + } + else if (corbSize & CORB_SIZE_CAP_16_ENTRIES) { + DeviceExtension->CorbLength = 16; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_16_ENTRIES); + } + else if (corbSize & CORB_SIZE_CAP_2_ENTRIES) { + DeviceExtension->CorbLength = 2; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_2_ENTRIES); + } + + // Determine and set size of RIRB + rirbSize = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE); + if (rirbSize & RIRB_SIZE_CAP_256_ENTRIES) { + DeviceExtension->RirbLength = 256; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_256_ENTRIES); + } + else if (rirbSize & RIRB_SIZE_CAP_16_ENTRIES) { + DeviceExtension->RirbLength = 16; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_16_ENTRIES); + } + else if (rirbSize & RIRB_SIZE_CAP_2_ENTRIES) { + DeviceExtension->RirbLength = 2; + + value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_2_ENTRIES); + } + + /* init corb */ + HighestPhysicalAddress.QuadPart = 0x00000000FFFFFFFF; + DeviceExtension->CorbBase = (PULONG)MmAllocateContiguousMemory(PAGE_SIZE * 3, HighestPhysicalAddress); + ASSERT(DeviceExtension->CorbBase != NULL); + + // FIXME align rirb 128bytes + ASSERT(DeviceExtension->CorbLength == 256); + ASSERT(DeviceExtension->RirbLength == 256); + + CorbPhysicalAddress = MmGetPhysicalAddress(DeviceExtension->CorbBase); + ASSERT(CorbPhysicalAddress.QuadPart != 0LL); + + // Program CORB/RIRB for these locations + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_CORB_BASE_LOWER), CorbPhysicalAddress.LowPart); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_CORB_BASE_UPPER), CorbPhysicalAddress.HighPart); + + DeviceExtension->RirbBase = (PRIRB_RESPONSE)((ULONG_PTR)DeviceExtension->CorbBase + PAGE_SIZE); + CorbPhysicalAddress.QuadPart += PAGE_SIZE; + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_RIRB_BASE_LOWER), CorbPhysicalAddress.LowPart); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_RIRB_BASE_UPPER), CorbPhysicalAddress.HighPart); + + // Program DMA position update + DeviceExtension->StreamPositions = (PVOID)((ULONG_PTR)DeviceExtension->RirbBase + PAGE_SIZE); + CorbPhysicalAddress.QuadPart += PAGE_SIZE; + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_LOWER), CorbPhysicalAddress.LowPart); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_UPPER), CorbPhysicalAddress.HighPart); + + value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS)) & HDAC_CORB_WRITE_POS_MASK; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), value); + + // Reset CORB read pointer. Preseve bits marked as RsvdP. + // After setting the reset bit, we must wait for the hardware + // to acknowledge it, then manually unset it and wait for that + // to be acknowledged as well. + corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); + + corbReadPointer |= CORB_READ_POS_RESET; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); + + for (Index = 0; Index < 100; Index++) { + KeStallExecutionProcessor(10); + corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); + if ((corbReadPointer & CORB_READ_POS_RESET) != 0) + break; + } + if ((corbReadPointer & CORB_READ_POS_RESET) == 0) { + DPRINT1("hda: CORB read pointer reset not acknowledged\n"); + + // According to HDA spec v1.0a ch3.3.21, software must read the + // bit as 1 to verify that the reset completed. However, at least + // some nVidia HDA controllers do not update the bit after reset. + // Thus don't fail here on nVidia controllers. + //if (controller->pci_info.vendor_id != PCI_VENDOR_NVIDIA) + // return B_BUSY; + } + + corbReadPointer &= ~CORB_READ_POS_RESET; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); + for (Index = 0; Index < 10; Index++) { + KeStallExecutionProcessor(10); + corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); + if ((corbReadPointer & CORB_READ_POS_RESET) == 0) + break; + } + if ((corbReadPointer & CORB_READ_POS_RESET) != 0) { + DPRINT1("hda: CORB read pointer reset failed\n"); + return STATUS_UNSUCCESSFUL; + } + + // Reset RIRB write pointer + rirbWritePointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) & RIRB_WRITE_POS_RESET; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS), rirbWritePointer | RIRB_WRITE_POS_RESET); + + // Generate interrupt for every response + interruptValue = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT)) & HDAC_RESPONSE_INTR_COUNT_MASK; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT), interruptValue | 1); + + // Setup cached read/write indices + DeviceExtension->RirbReadPos = 1; + DeviceExtension->CorbWritePos = 0; + + // Gentlemen, start your engines... + corbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL)) &HDAC_CORB_CONTROL_MASK; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL), corbControl | CORB_CONTROL_RUN | CORB_CONTROL_MEMORY_ERROR_INTR); + + rirbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL)) & HDAC_RIRB_CONTROL_MASK; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL), rirbControl | RIRB_CONTROL_DMA_ENABLE | RIRB_CONTROL_OVERRUN_INTR | RIRB_CONTROL_RESPONSE_INTR); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HDA_ResetController( + IN PDEVICE_OBJECT DeviceObject) +{ + USHORT ValCapabilities; + ULONG Index; + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + ULONG InputStreams, OutputStreams, BiDirStreams, Control; + UCHAR corbControl, rirbControl; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* read caps */ + ValCapabilities = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_GLOBAL_CAP)); + + InputStreams = GLOBAL_CAP_INPUT_STREAMS(ValCapabilities); + OutputStreams = GLOBAL_CAP_OUTPUT_STREAMS(ValCapabilities); + BiDirStreams = GLOBAL_CAP_BIDIR_STREAMS(ValCapabilities); + + DPRINT1("NumInputStreams %u\n", InputStreams); + DPRINT1("NumOutputStreams %u\n", OutputStreams); + DPRINT1("NumBiDirStreams %u\n", BiDirStreams); + + /* stop all streams */ + for (Index = 0; Index < InputStreams; Index++) + { + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_INPUT_STREAM_OFFSET(Index), 0); + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_INPUT_STREAM_OFFSET(Index), 0); + } + + for (Index = 0; Index < OutputStreams; Index++) { + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_OUTPUT_STREAM_OFFSET(InputStreams, Index), 0); + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_OUTPUT_STREAM_OFFSET(InputStreams, Index), 0); + } + + for (Index = 0; Index < BiDirStreams; Index++) { + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_BIDIR_STREAM_OFFSET(InputStreams, OutputStreams, Index), 0); + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_BIDIR_STREAM_OFFSET(InputStreams, OutputStreams, Index), 0); + } + + // stop DMA + Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL) & HDAC_CORB_CONTROL_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL, Control); + + Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL) & HDAC_RIRB_CONTROL_MASK; + WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL, Control); + + for (int timeout = 0; timeout < 10; timeout++) { + KeStallExecutionProcessor(10); + + corbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL); + rirbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL); + if (corbControl == 0 && rirbControl == 0) + break; + } + if (corbControl != 0 || rirbControl != 0) { + DPRINT1("hda: unable to stop dma\n"); + return STATUS_UNSUCCESSFUL; + } + + // reset DMA position buffer + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_LOWER), 0); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_UPPER), 0); + + // Set reset bit - it must be asserted for at least 100us + Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control & ~GLOBAL_CONTROL_RESET); + + for (int timeout = 0; timeout < 10; timeout++) { + KeStallExecutionProcessor(10); + + Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); + if ((Control & GLOBAL_CONTROL_RESET) == 0) + break; + } + if ((Control & GLOBAL_CONTROL_RESET) != 0) + { + DPRINT1("hda: unable to reset controller\n"); + return STATUS_UNSUCCESSFUL; + } + + // Unset reset bit + Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control | GLOBAL_CONTROL_RESET); + + for (int timeout = 0; timeout < 10; timeout++) { + KeStallExecutionProcessor(10); + + Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); + if ((Control & GLOBAL_CONTROL_RESET) != 0) + break; + } + if ((Control & GLOBAL_CONTROL_RESET) == 0) { + DPRINT1("hda: unable to exit reset\n"); + return STATUS_UNSUCCESSFUL; + } + + // Wait for codecs to finish their own reset (apparently needs more + // time than documented in the specs) + KeStallExecutionProcessor(100); + + // Enable unsolicited responses + Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control | GLOBAL_CONTROL_UNSOLICITED); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +HDA_FDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status = STATUS_SUCCESS; + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + PCM_RESOURCE_LIST Resources; + ULONG Index; + USHORT Value; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO == TRUE); + + /* forward irp to lower device */ + Status = HDA_SyncForwardIrp(DeviceExtension->LowerDevice, Irp); + if (!NT_SUCCESS(Status)) + { + // failed to start + DPRINT1("HDA_StartDevice Lower device failed to start %x\n", Status); + return Status; + } + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + Resources = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; + for (Index = 0; Index < Resources->List[0].PartialResourceList.Count; Index++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = &Resources->List[0].PartialResourceList.PartialDescriptors[Index]; + + if (Descriptor->Type == CmResourceTypeMemory) + { + DeviceExtension->RegBase = (PUCHAR)MmMapIoSpace(Descriptor->u.Memory.Start, Descriptor->u.Memory.Length, MmNonCached); + if (DeviceExtension->RegBase == NULL) + { + DPRINT1("[HDAB] Failed to map registers\n"); + Status = STATUS_UNSUCCESSFUL; + break; + } + } + else if (Descriptor->Type == CmResourceTypeInterrupt) + { + Status = IoConnectInterrupt(&DeviceExtension->Interrupt, + HDA_InterruptService, + (PVOID)DeviceExtension, + NULL, + Descriptor->u.Interrupt.Vector, + Descriptor->u.Interrupt.Level, + Descriptor->u.Interrupt.Level, + (KINTERRUPT_MODE)(Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), + (Descriptor->ShareDisposition != CmResourceShareDeviceExclusive), + Descriptor->u.Interrupt.Affinity, + FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("[HDAB] Failed to connect interrupt\n"); + break; + } + + } + } + + if (NT_SUCCESS(Status)) + { + // Get controller into valid state + Status = HDA_ResetController(DeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + // Setup CORB/RIRB/DMA POS + Status = HDA_InitCorbRirbPos(DeviceObject); + if (!NT_SUCCESS(Status)) return Status; + + + // Don't enable codec state change interrupts. We don't handle + // them, as we want to use the STATE_STATUS register to identify + // available codecs. We'd have to clear that register in the interrupt + // handler to 'ack' the codec change. + Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE)) & HDAC_WAKE_ENABLE_MASK; + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE), Value); + + // Enable controller interrupts + WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_INTR_CONTROL), INTR_CONTROL_GLOBAL_ENABLE | INTR_CONTROL_CONTROLLER_ENABLE); + + KeStallExecutionProcessor(100); + + Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_STATE_STATUS)); + if (!Value) { + DPRINT1("hda: bad codec status\n"); + return STATUS_UNSUCCESSFUL; + } + WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_STATE_STATUS), Value); + + // Create codecs + DPRINT1("Codecs %lx\n", Value); + for (Index = 0; Index < HDA_MAX_CODECS; Index++) { + if ((Value & (1 << Index)) != 0) { + HDA_InitCodec(DeviceObject, Index); + } + } + } + + return Status; +} + +NTSTATUS +NTAPI +HDA_FDOQueryBusRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG DeviceCount, CodecIndex, AFGIndex; + PHDA_FDO_DEVICE_EXTENSION DeviceExtension; + PHDA_CODEC_ENTRY Codec; + PDEVICE_RELATIONS DeviceRelations; + + /* get device extension */ + DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO == TRUE); + + DeviceCount = 0; + for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) + { + if (DeviceExtension->Codecs[CodecIndex] == NULL) + continue; + + Codec = DeviceExtension->Codecs[CodecIndex]; + DeviceCount += Codec->AudioGroupCount; + } + + if (DeviceCount == 0) + return STATUS_UNSUCCESSFUL; + + DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(NonPagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? sizeof(PDEVICE_OBJECT) * (DeviceCount - 1) : 0)); + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + + DeviceCount = 0; + for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) + { + if (DeviceExtension->Codecs[CodecIndex] == NULL) + continue; + + Codec = DeviceExtension->Codecs[CodecIndex]; + for (AFGIndex = 0; AFGIndex < Codec->AudioGroupCount; AFGIndex++) + { + DeviceRelations->Objects[DeviceRelations->Count] = Codec->AudioGroups[AFGIndex]->ChildPDO; + ObReferenceObject(Codec->AudioGroups[AFGIndex]->ChildPDO); + DeviceRelations->Count++; + } + } + + /* FIXME handle existing device relations */ + ASSERT(Irp->IoStatus.Information == 0); + + /* store device relations */ + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; + + /* done */ + return STATUS_SUCCESS; +} + + Propchange: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -5,15 +5,13 @@ * PURPOSE: HDA Driver Entry * PROGRAMMER: Johannes Anderwald */ - - #include "hdaudbus.h" PVOID AllocateItem( -IN POOL_TYPE PoolType, -IN SIZE_T NumberOfBytes) + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes) { PVOID Item = ExAllocatePoolWithTag(PoolType, NumberOfBytes, TAG_HDA); if (!Item) @@ -84,881 +82,6 @@ return Status; } - -BOOLEAN -NTAPI -HDA_InterruptService( -IN PKINTERRUPT Interrupt, -IN PVOID ServiceContext) -{ - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - ULONG InterruptStatus, Response, ResponseFlags, Cad; - UCHAR RirbStatus, CorbStatus; - USHORT WritePos; - PHDA_CODEC_ENTRY Codec; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)ServiceContext; - - // Check if this interrupt is ours - InterruptStatus = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_INTR_STATUS)); - - DPRINT1("HDA_InterruptService %lx\n", InterruptStatus); - if ((InterruptStatus & INTR_STATUS_GLOBAL) == 0) - return FALSE; - - // Controller or stream related? - if (InterruptStatus & INTR_STATUS_CONTROLLER) { - RirbStatus = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_STATUS); - CorbStatus = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_STATUS); - - // Check for incoming responses - if (RirbStatus) { - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_STATUS, RirbStatus); - - if (DeviceExtension->RirbLength == 0) - { - /* HACK: spurious interrupt */ - return FALSE; - } - - if ((RirbStatus & RIRB_STATUS_RESPONSE) != 0) { - WritePos = (READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) + 1) % DeviceExtension->RirbLength; - - for (; DeviceExtension->RirbReadPos != WritePos; DeviceExtension->RirbReadPos = (DeviceExtension->RirbReadPos + 1) % DeviceExtension->RirbLength) - { - - Response = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].response; - ResponseFlags = DeviceExtension->RirbBase[DeviceExtension->RirbReadPos].flags; - Cad = ResponseFlags & RESPONSE_FLAGS_CODEC_MASK; - DPRINT1("Response %lx ResponseFlags %lx Cad %lx\n", Response, ResponseFlags, Cad); - - /* get codec */ - Codec = DeviceExtension->Codecs[Cad]; - if (Codec == NULL) - { - DPRINT1("hda: response for unknown codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); - continue; - } - - /* check response count */ - if (Codec->ResponseCount >= MAX_CODEC_RESPONSES) - { - DPRINT1("too many responses for codec %x Response %x ResponseFlags %x\n", Cad, Response, ResponseFlags); - continue; - } - - // FIXME handle unsolicited responses - ASSERT((ResponseFlags & RESPONSE_FLAGS_UNSOLICITED) == 0); - - /* store response */ - Codec->Responses[Codec->ResponseCount] = Response; - Codec->ResponseCount++; - } - } - - if ((RirbStatus & RIRB_STATUS_OVERRUN) != 0) - DPRINT1("hda: RIRB Overflow\n"); - } - - // Check for sending errors - if (CorbStatus) { - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_STATUS, CorbStatus); - - if ((CorbStatus & CORB_STATUS_MEMORY_ERROR) != 0) - DPRINT1("hda: CORB Memory Error!\n"); - } - } -#if 0 - if ((intrStatus & INTR_STATUS_STREAM_MASK) != 0) { - for (uint32 index = 0; index < HDA_MAX_STREAMS; index++) { - if ((intrStatus & (1 << index)) != 0) { - if (controller->streams[index]) { - if (stream_handle_interrupt(controller, - controller->streams[index], index)) { - handled = B_INVOKE_SCHEDULER; - } - } - else { - dprintf("hda: Stream interrupt for unconfigured stream " - "%ld!\n", index); - } - } - } - } -#endif - return TRUE; -} - -VOID -HDA_SendVerbs( - IN PDEVICE_OBJECT DeviceObject, - IN PHDA_CODEC_ENTRY Codec, - IN PULONG Verbs, - OUT PULONG Responses, - IN ULONG Count) -{ - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - ULONG Sent = 0, ReadPosition, WritePosition, Queued; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* reset response count */ - Codec->ResponseCount = 0; - - while (Sent < Count) { - ReadPosition = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); - - Queued = 0; - - while (Sent < Count) { - WritePosition = (DeviceExtension->CorbWritePos + 1) % DeviceExtension->CorbLength; - - if (WritePosition == ReadPosition) { - // There is no space left in the ring buffer; execute the - // queued commands and wait until - break; - } - - DeviceExtension->CorbBase[WritePosition] = Verbs[Sent++]; - DeviceExtension->CorbWritePos = WritePosition; - - // FIXME HACK - // do proper synchronization - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); - KeStallExecutionProcessor(30); - Queued++; - } - - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), DeviceExtension->CorbWritePos); - } - - if (Responses != NULL) { - memcpy(Responses, Codec->Responses, Codec->ResponseCount * sizeof(ULONG)); - } -} - -NTSTATUS -HDA_InitCodec( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG codecAddress) -{ - PHDA_CODEC_ENTRY Entry; - ULONG verbs[3]; - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - CODEC_RESPONSE Response; - ULONG NodeId, GroupType; - NTSTATUS Status; - PHDA_CODEC_AUDIO_GROUP AudioGroup; - PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; - - /* lets allocate the entry */ - Entry = (PHDA_CODEC_ENTRY)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_ENTRY)); - if (!Entry) - { - DPRINT1("hda: failed to allocate memory"); - return STATUS_UNSUCCESSFUL; - } - - /* init codec */ - Entry->Addr = codecAddress; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* store codec */ - DeviceExtension->Codecs[codecAddress] = Entry; - - verbs[0] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_VENDOR_ID); - verbs[1] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_REVISION_ID); - verbs[2] = MAKE_VERB(codecAddress, 0, VID_GET_PARAMETER, PID_SUB_NODE_COUNT); - - /* get basic info */ - HDA_SendVerbs(DeviceObject, Entry, verbs, (PULONG)&Response, 3); - - /* store codec details */ - Entry->Major = Response.major; - Entry->Minor = Response.minor; - Entry->ProductId = Response.device; - Entry->Revision = Response.revision; - Entry->Stepping = Response.stepping; - Entry->VendorId = Response.vendor; - - DPRINT1("hda Codec %ld Vendor: %04lx Product: %04lx, Revision: %lu.%lu.%lu.%lu NodeStart %u NodeCount %u \n", codecAddress, Response.vendor, - Response.device, Response.major, Response.minor, Response.revision, Response.stepping, Response.start, Response.count); - - for (NodeId = Response.start; NodeId < Response.start + Response.count; NodeId++) { - - /* get function type */ - verbs[0] = MAKE_VERB(codecAddress, NodeId, VID_GET_PARAMETER, PID_FUNCTION_GROUP_TYPE); - - HDA_SendVerbs(DeviceObject, Entry, verbs, &GroupType, 1); - DPRINT1("NodeId %u GroupType %x\n", NodeId, GroupType); - - if ((GroupType & FUNCTION_GROUP_NODETYPE_MASK) == FUNCTION_GROUP_NODETYPE_AUDIO) { - - AudioGroup = (PHDA_CODEC_AUDIO_GROUP)AllocateItem(NonPagedPool, sizeof(HDA_CODEC_AUDIO_GROUP)); - if (!AudioGroup) - { - DPRINT1("hda: insufficient memory\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* init audio group */ - AudioGroup->NodeId = NodeId; - AudioGroup->FunctionGroup = FUNCTION_GROUP_NODETYPE_AUDIO; - - // Found an Audio Function Group! - DPRINT1("NodeId %x found an audio function group!\n"); - - Status = IoCreateDevice(DeviceObject->DriverObject, sizeof(HDA_PDO_DEVICE_EXTENSION), NULL, FILE_DEVICE_SOUND, 0, FALSE, &AudioGroup->ChildPDO); - if (!NT_SUCCESS(Status)) - { - FreeItem(AudioGroup); - DPRINT1("hda failed to create device object %x\n", Status); - return Status; - } - - /* init child pdo*/ - ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)AudioGroup->ChildPDO->DeviceExtension; - ChildDeviceExtension->IsFDO = FALSE; - ChildDeviceExtension->Codec = Entry; - ChildDeviceExtension->AudioGroup = AudioGroup; - - /* setup flags */ - AudioGroup->ChildPDO->Flags |= DO_POWER_PAGABLE; - AudioGroup->ChildPDO->Flags &= ~DO_DEVICE_INITIALIZING; - - /* add audio group*/ - Entry->AudioGroups[Entry->AudioGroupCount] = AudioGroup; - Entry->AudioGroupCount++; - } - } - return STATUS_SUCCESS; - -} - -NTSTATUS -NTAPI -HDA_InitCorbRirbPos( - IN PDEVICE_OBJECT DeviceObject) -{ - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - UCHAR corbSize, value, rirbSize; - PHYSICAL_ADDRESS HighestPhysicalAddress, CorbPhysicalAddress; - ULONG Index; - USHORT corbReadPointer, rirbWritePointer, interruptValue, corbControl, rirbControl; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - // Determine and set size of CORB - corbSize = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE); - if ((corbSize & CORB_SIZE_CAP_256_ENTRIES) != 0) { - DeviceExtension->CorbLength = 256; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_256_ENTRIES); - } - else if (corbSize & CORB_SIZE_CAP_16_ENTRIES) { - DeviceExtension->CorbLength = 16; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_16_ENTRIES); - } - else if (corbSize & CORB_SIZE_CAP_2_ENTRIES) { - DeviceExtension->CorbLength = 2; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE) & HDAC_CORB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_SIZE, value | CORB_SIZE_2_ENTRIES); - } - - // Determine and set size of RIRB - rirbSize = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE); - if (rirbSize & RIRB_SIZE_CAP_256_ENTRIES) { - DeviceExtension->RirbLength = 256; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_256_ENTRIES); - } - else if (rirbSize & RIRB_SIZE_CAP_16_ENTRIES) { - DeviceExtension->RirbLength = 16; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_16_ENTRIES); - } - else if (rirbSize & RIRB_SIZE_CAP_2_ENTRIES) { - DeviceExtension->RirbLength = 2; - - value = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE) & HDAC_RIRB_SIZE_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_SIZE, value | RIRB_SIZE_2_ENTRIES); - } - - /* init corb */ - HighestPhysicalAddress.QuadPart = 0x00000000FFFFFFFF; - DeviceExtension->CorbBase = (PULONG)MmAllocateContiguousMemory(PAGE_SIZE * 3, HighestPhysicalAddress); - ASSERT(DeviceExtension->CorbBase != NULL); - - // FIXME align rirb 128bytes - ASSERT(DeviceExtension->CorbLength == 256); - ASSERT(DeviceExtension->RirbLength == 256); - - CorbPhysicalAddress = MmGetPhysicalAddress(DeviceExtension->CorbBase); - ASSERT(CorbPhysicalAddress.QuadPart != 0LL); - - // Program CORB/RIRB for these locations - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_CORB_BASE_LOWER), CorbPhysicalAddress.LowPart); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_CORB_BASE_UPPER), CorbPhysicalAddress.HighPart); - - DeviceExtension->RirbBase = (PRIRB_RESPONSE)((ULONG_PTR)DeviceExtension->CorbBase + PAGE_SIZE); - CorbPhysicalAddress.QuadPart += PAGE_SIZE; - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_RIRB_BASE_LOWER), CorbPhysicalAddress.LowPart); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_RIRB_BASE_UPPER), CorbPhysicalAddress.HighPart); - - // Program DMA position update - DeviceExtension->StreamPositions = (PVOID)((ULONG_PTR)DeviceExtension->RirbBase + PAGE_SIZE); - CorbPhysicalAddress.QuadPart += PAGE_SIZE; - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_LOWER), CorbPhysicalAddress.LowPart); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_UPPER), CorbPhysicalAddress.HighPart); - - value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS)) & HDAC_CORB_WRITE_POS_MASK; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_WRITE_POS), value); - - // Reset CORB read pointer. Preseve bits marked as RsvdP. - // After setting the reset bit, we must wait for the hardware - // to acknowledge it, then manually unset it and wait for that - // to be acknowledged as well. - corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); - - corbReadPointer |= CORB_READ_POS_RESET; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); - - for (Index = 0; Index < 100; Index++) { - KeStallExecutionProcessor(10); - corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); - if ((corbReadPointer & CORB_READ_POS_RESET) != 0) - break; - } - if ((corbReadPointer & CORB_READ_POS_RESET) == 0) { - DPRINT1("hda: CORB read pointer reset not acknowledged\n"); - - // According to HDA spec v1.0a ch3.3.21, software must read the - // bit as 1 to verify that the reset completed. However, at least - // some nVidia HDA controllers do not update the bit after reset. - // Thus don't fail here on nVidia controllers. - //if (controller->pci_info.vendor_id != PCI_VENDOR_NVIDIA) - // return B_BUSY; - } - - corbReadPointer &= ~CORB_READ_POS_RESET; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); - for (Index = 0; Index < 10; Index++) { - KeStallExecutionProcessor(10); - corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); - if ((corbReadPointer & CORB_READ_POS_RESET) == 0) - break; - } - if ((corbReadPointer & CORB_READ_POS_RESET) != 0) { - DPRINT1("hda: CORB read pointer reset failed\n"); - return STATUS_UNSUCCESSFUL; - } - - // Reset RIRB write pointer - rirbWritePointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) & RIRB_WRITE_POS_RESET; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS), rirbWritePointer | RIRB_WRITE_POS_RESET); - - // Generate interrupt for every response - interruptValue = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT)) & HDAC_RESPONSE_INTR_COUNT_MASK; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RESPONSE_INTR_COUNT), interruptValue | 1); - - // Setup cached read/write indices - DeviceExtension->RirbReadPos = 1; - DeviceExtension->CorbWritePos = 0; - - // Gentlemen, start your engines... - corbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL)) &HDAC_CORB_CONTROL_MASK; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_CONTROL), corbControl | CORB_CONTROL_RUN | CORB_CONTROL_MEMORY_ERROR_INTR); - - rirbControl = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL)) & HDAC_RIRB_CONTROL_MASK; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_CONTROL), rirbControl | RIRB_CONTROL_DMA_ENABLE | RIRB_CONTROL_OVERRUN_INTR | RIRB_CONTROL_RESPONSE_INTR); - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -HDA_ResetController( - IN PDEVICE_OBJECT DeviceObject) -{ - USHORT ValCapabilities; - ULONG Index; - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - ULONG InputStreams, OutputStreams, BiDirStreams, Control; - UCHAR corbControl, rirbControl; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* read caps */ - ValCapabilities = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_GLOBAL_CAP)); - - InputStreams = GLOBAL_CAP_INPUT_STREAMS(ValCapabilities); - OutputStreams = GLOBAL_CAP_OUTPUT_STREAMS(ValCapabilities); - BiDirStreams = GLOBAL_CAP_BIDIR_STREAMS(ValCapabilities); - - DPRINT1("NumInputStreams %u\n", InputStreams); - DPRINT1("NumOutputStreams %u\n", OutputStreams); - DPRINT1("NumBiDirStreams %u\n", BiDirStreams); - - /* stop all streams */ - for (Index = 0; Index < InputStreams; Index++) - { - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_INPUT_STREAM_OFFSET(Index), 0); - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_INPUT_STREAM_OFFSET(Index), 0); - } - - for (Index = 0; Index < OutputStreams; Index++) { - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_OUTPUT_STREAM_OFFSET(InputStreams, Index), 0); - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_OUTPUT_STREAM_OFFSET(InputStreams, Index), 0); - } - - for (Index = 0; Index < BiDirStreams; Index++) { - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_CONTROL0 + HDAC_STREAM_BASE + HDAC_BIDIR_STREAM_OFFSET(InputStreams, OutputStreams, Index), 0); - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_STREAM_STATUS + HDAC_STREAM_BASE + HDAC_BIDIR_STREAM_OFFSET(InputStreams, OutputStreams, Index), 0); - } - - // stop DMA - Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL) & HDAC_CORB_CONTROL_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL, Control); - - Control = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL) & HDAC_RIRB_CONTROL_MASK; - WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL, Control); - - for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); - - corbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL); - rirbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL); - if (corbControl == 0 && rirbControl == 0) - break; - } - if (corbControl != 0 || rirbControl != 0) { - DPRINT1("hda: unable to stop dma\n"); - return STATUS_UNSUCCESSFUL; - } - - // reset DMA position buffer - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_LOWER), 0); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_DMA_POSITION_BASE_UPPER), 0); - - // Set reset bit - it must be asserted for at least 100us - Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control & ~GLOBAL_CONTROL_RESET); - - for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); - - Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); - if ((Control & GLOBAL_CONTROL_RESET) == 0) - break; - } - if ((Control & GLOBAL_CONTROL_RESET) != 0) - { - DPRINT1("hda: unable to reset controller\n"); - return STATUS_UNSUCCESSFUL; - } - - // Unset reset bit - Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control | GLOBAL_CONTROL_RESET); - - for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); - - Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); - if ((Control & GLOBAL_CONTROL_RESET) != 0) - break; - } - if ((Control & GLOBAL_CONTROL_RESET) == 0) { - DPRINT1("hda: unable to exit reset\n"); - return STATUS_UNSUCCESSFUL; - } - - // Wait for codecs to finish their own reset (apparently needs more - // time than documented in the specs) - KeStallExecutionProcessor(100); - - // Enable unsolicited responses - Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control | GLOBAL_CONTROL_UNSOLICITED); - - return STATUS_SUCCESS; -} - -NTSTATUS -NTAPI -HDA_QueryId( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - WCHAR DeviceName[200]; - PHDA_PDO_DEVICE_EXTENSION DeviceExtension; - ULONG Length; - LPWSTR Device; - - /* get device extension */ - DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->IsFDO == FALSE); - - /* get current irp stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) - { - UNIMPLEMENTED; - - // FIXME - swprintf(DeviceName, L"%08x", 1); - Length = wcslen(DeviceName) + 20; - - /* allocate result buffer*/ - Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); - if (!Device) - return STATUS_INSUFFICIENT_RESOURCES; - - swprintf(Device, L"%08x", 1); - - DPRINT1("ID: %S\n", Device); - /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)Device; - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID || - IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) - { - - /* calculate size */ - swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&SUBSYS_%08X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->VendorId << 16 | DeviceExtension->Codec->ProductId); - Length = wcslen(DeviceName) + 20; - - /* allocate result buffer*/ - Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); - if (!Device) - return STATUS_INSUFFICIENT_RESOURCES; - - wcscpy(Device, DeviceName); - - DPRINT1("ID: %S\n", Device); - /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)Device; - return STATUS_SUCCESS; - } - else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) - { - RtlZeroMemory(DeviceName, sizeof(DeviceName)); - Length = swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&REV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->Major << 12 | DeviceExtension->Codec->Minor << 8 | DeviceExtension->Codec->Revision) + 1; - Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId) + 1; - Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId) + 1; - Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup) + 2; - - /* allocate result buffer*/ - Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); - if (!Device) - return STATUS_INSUFFICIENT_RESOURCES; - - RtlCopyMemory(Device, DeviceName, Length * sizeof(WCHAR)); - - DPRINT1("ID: %S\n", Device); - /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)Device; - return STATUS_SUCCESS; - } - else - { - DPRINT1("QueryID Type %x not implemented\n", IoStack->Parameters.QueryId.IdType); - return Irp->IoStatus.Status; - } - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS -NTAPI -HDA_StartDevice( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - NTSTATUS Status = STATUS_SUCCESS; - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - PCM_RESOURCE_LIST Resources; - ULONG Index; - USHORT Value; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->IsFDO == TRUE); - - /* forward irp to lower device */ - Status = HDA_SyncForwardIrp(DeviceExtension->LowerDevice, Irp); - if (!NT_SUCCESS(Status)) - { - // failed to start - DPRINT1("HDA_StartDevice Lower device failed to start %x\n", Status); - return Status; - } - - /* get current irp stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - Resources = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; - for (Index = 0; Index < Resources->List[0].PartialResourceList.Count; Index++) - { - PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor = &Resources->List[0].PartialResourceList.PartialDescriptors[Index]; - - if (Descriptor->Type == CmResourceTypeMemory) - { - DeviceExtension->RegBase = (PUCHAR)MmMapIoSpace(Descriptor->u.Memory.Start, Descriptor->u.Memory.Length, MmNonCached); - if (DeviceExtension->RegBase == NULL) - { - DPRINT1("[HDAB] Failed to map registers\n"); - Status = STATUS_UNSUCCESSFUL; - break; - } - } - else if (Descriptor->Type == CmResourceTypeInterrupt) - { - Status = IoConnectInterrupt(&DeviceExtension->Interrupt, - HDA_InterruptService, - (PVOID)DeviceExtension, - NULL, - Descriptor->u.Interrupt.Vector, - Descriptor->u.Interrupt.Level, - Descriptor->u.Interrupt.Level, - (KINTERRUPT_MODE)(Descriptor->Flags & CM_RESOURCE_INTERRUPT_LATCHED), - (Descriptor->ShareDisposition != CmResourceShareDeviceExclusive), - Descriptor->u.Interrupt.Affinity, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("[HDAB] Failed to connect interrupt\n"); - break; - } - - } - } - - if (NT_SUCCESS(Status)) - { - // Get controller into valid state - Status = HDA_ResetController(DeviceObject); - if (!NT_SUCCESS(Status)) return Status; - - // Setup CORB/RIRB/DMA POS - Status = HDA_InitCorbRirbPos(DeviceObject); - if (!NT_SUCCESS(Status)) return Status; - - - // Don't enable codec state change interrupts. We don't handle - // them, as we want to use the STATE_STATUS register to identify - // available codecs. We'd have to clear that register in the interrupt - // handler to 'ack' the codec change. - Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE)) & HDAC_WAKE_ENABLE_MASK; - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_WAKE_ENABLE), Value); - - // Enable controller interrupts - WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_INTR_CONTROL), INTR_CONTROL_GLOBAL_ENABLE | INTR_CONTROL_CONTROLLER_ENABLE); - - KeStallExecutionProcessor(100); - - Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_STATE_STATUS)); - if (!Value) { - DPRINT1("hda: bad codec status\n"); - return STATUS_UNSUCCESSFUL; - } - WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_STATE_STATUS), Value); - - // Create codecs - DPRINT1("Codecs %lx\n", Value); - for (Index = 0; Index < HDA_MAX_CODECS; Index++) { - if ((Value & (1 << Index)) != 0) { - HDA_InitCodec(DeviceObject, Index); - } - } - } - - return Status; -} - -NTSTATUS -NTAPI -HDA_QueryBusRelations( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) -{ - ULONG DeviceCount, CodecIndex, AFGIndex; - PHDA_FDO_DEVICE_EXTENSION DeviceExtension; - PHDA_CODEC_ENTRY Codec; - PDEVICE_RELATIONS DeviceRelations; - - /* get device extension */ - DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ASSERT(DeviceExtension->IsFDO == TRUE); - - DeviceCount = 0; - for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) - { - if (DeviceExtension->Codecs[CodecIndex] == NULL) - continue; - - Codec = DeviceExtension->Codecs[CodecIndex]; - DeviceCount += Codec->AudioGroupCount; - } - - if (DeviceCount == 0) - return STATUS_UNSUCCESSFUL; - - DeviceRelations = (PDEVICE_RELATIONS)AllocateItem(NonPagedPool, sizeof(DEVICE_RELATIONS) + (DeviceCount > 1 ? sizeof(PDEVICE_OBJECT) * (DeviceCount - 1) : 0)); - if (!DeviceRelations) - return STATUS_INSUFFICIENT_RESOURCES; - - DeviceCount = 0; - for (CodecIndex = 0; CodecIndex < HDA_MAX_CODECS; CodecIndex++) - { - if (DeviceExtension->Codecs[CodecIndex] == NULL) - continue; - - Codec = DeviceExtension->Codecs[CodecIndex]; - for (AFGIndex = 0; AFGIndex < Codec->AudioGroupCount; AFGIndex++) - { - DeviceRelations->Objects[DeviceRelations->Count] = Codec->AudioGroups[AFGIndex]->ChildPDO; - ObReferenceObject(Codec->AudioGroups[AFGIndex]->ChildPDO); - DeviceRelations->Count++; - } - } - - /* FIXME handle existing device relations */ - ASSERT(Irp->IoStatus.Information == 0); - - /* store device relations */ - Irp->IoStatus.Information = (ULONG_PTR)DeviceRelations; - - /* done */ - return STATUS_SUCCESS; -} - -NTSTATUS -HDA_QueryBusInformation( - IN PIRP Irp) -{ - PPNP_BUS_INFORMATION BusInformation; - - /* allocate bus information */ - BusInformation = (PPNP_BUS_INFORMATION)AllocateItem(PagedPool, sizeof(PNP_BUS_INFORMATION)); - - if (!BusInformation) - { - /* no memory */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* return info */ - BusInformation->BusNumber = 0; - BusInformation->LegacyBusType = PCIBus; - RtlMoveMemory(&BusInformation->BusTypeGuid, &GUID_HDAUDIO_BUS_INTERFACE, sizeof(GUID)); - - /* store result */ - Irp->IoStatus.Information = (ULONG_PTR)BusInformation; - - /* done */ - return STATUS_SUCCESS; -} - -NTSTATUS -HDA_QueryBusDeviceCapabilities( - IN PIRP Irp) -{ - PDEVICE_CAPABILITIES Capabilities; - PIO_STACK_LOCATION IoStack; - - /* get stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - - /* get capabilities */ - Capabilities = IoStack->Parameters.DeviceCapabilities.Capabilities; - - RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); - - /* setup capabilities */ - Capabilities->UniqueID = TRUE; - Capabilities->SilentInstall = TRUE; - Capabilities->SurpriseRemovalOK = TRUE; - Capabilities->Address = 0; - Capabilities->UINumber = 0; - Capabilities->SystemWake = PowerSystemWorking; /* FIXME common device extension */ - Capabilities->DeviceWake = PowerDeviceD0; - - /* done */ - return STATUS_SUCCESS; -} - -NTSTATUS -HDA_QueryBusDevicePnpState( - IN PIRP Irp) -{ - /* set device flags */ - Irp->IoStatus.Information = PNP_DEVICE_DONT_DISPLAY_IN_UI | PNP_DEVICE_NOT_DISABLEABLE; - - /* done */ - return STATUS_SUCCESS; -} - -NTSTATUS -HDA_PdoHandleQueryDeviceText( - IN PIRP Irp) -{ - PIO_STACK_LOCATION IoStack; - LPWSTR Buffer; - static WCHAR DeviceText[] = L"Audio Device on High Definition Audio Bus"; - - IoStack = IoGetCurrentIrpStackLocation(Irp); - if (IoStack->Parameters.QueryDeviceText.DeviceTextType == DeviceTextDescription) - { - DPRINT("HDA_PdoHandleQueryDeviceText DeviceTextDescription\n"); - - Buffer = (LPWSTR)AllocateItem(PagedPool, sizeof(DeviceText)); - if (!Buffer) - { - Irp->IoStatus.Information = 0; - return STATUS_INSUFFICIENT_RESOURCES; - } - - wcscpy(Buffer, DeviceText); - - Irp->IoStatus.Information = (ULONG_PTR)Buffer; - return STATUS_SUCCESS; - } - else - { - DPRINT("HDA_PdoHandleQueryDeviceText DeviceTextLocationInformation\n"); - - Buffer = (LPWSTR)AllocateItem(PagedPool, sizeof(DeviceText)); - if (!Buffer) - { - Irp->IoStatus.Information = 0; - return STATUS_INSUFFICIENT_RESOURCES; - } - - wcscpy(Buffer, DeviceText); - - /* save result */ - Irp->IoStatus.Information = (ULONG_PTR)Buffer; - return STATUS_SUCCESS; - } - -} - NTSTATUS NTAPI HDA_Pnp( @@ -982,7 +105,7 @@ if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { DPRINT1("IRP_MN_START_DEVICE\n"); - Status = HDA_StartDevice(DeviceObject, Irp); + Status = HDA_FDOStartDevice(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { @@ -990,7 +113,7 @@ /* handle bus device relations */ if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) { - Status = HDA_QueryBusRelations(DeviceObject, Irp); + Status = HDA_FDOQueryBusRelations(DeviceObject, Irp); } else { @@ -1015,13 +138,13 @@ { DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); /* query bus information */ - Status = HDA_QueryBusInformation(Irp); + Status = HDA_PDOQueryBusInformation(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) { DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE\n"); /* query pnp state */ - Status = HDA_QueryBusDevicePnpState(Irp); + Status = HDA_PDOQueryBusDevicePnpState(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { @@ -1059,7 +182,7 @@ { DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); /* query capabilities */ - Status = HDA_QueryBusDeviceCapabilities(Irp); + Status = HDA_PDOQueryBusDeviceCapabilities(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) { @@ -1067,15 +190,26 @@ /* no op */ Status = STATUS_SUCCESS; } + else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) + { + DPRINT1("IRP_MN_QUERY_RESOURCES\n"); + /* no op */ + Status = STATUS_SUCCESS; + } else if (IoStack->MinorFunction == IRP_MN_QUERY_ID) { DPRINT1("IRP_MN_QUERY_ID\n"); - Status = HDA_QueryId(DeviceObject, Irp); + Status = HDA_PDOQueryId(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_TEXT) { DPRINT1("IRP_MN_QUERY_DEVICE_TEXT\n"); - Status = HDA_PdoHandleQueryDeviceText(Irp); + Status = HDA_PDOHandleQueryDeviceText(Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) + { + DPRINT1("IRP_MN_QUERY_INTERFACE\n"); + Status = HDA_PDOHandleQueryInterface(DeviceObject, Irp); } else { @@ -1120,7 +254,6 @@ DeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); RtlZeroMemory(DeviceExtension->Codecs, sizeof(PHDA_CODEC_ENTRY) * (HDA_MAX_CODECS + 1)); - /* set device flags */ DeviceObject->Flags |= DO_POWER_PAGABLE; Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -101,3 +101,72 @@ ULONG start : 8; ULONG _reserved2 : 8; }CODEC_RESPONSE, *PCODEC_RESPONSE; + + +PVOID +AllocateItem( + IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes); + +VOID +FreeItem( + IN PVOID Item); + +/* fdo.cpp */ +BOOLEAN +NTAPI +HDA_InterruptService( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext); + +NTSTATUS +NTAPI +HDA_FDOStartDevice( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +NTAPI +HDA_FDOQueryBusRelations( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* pdo.cpp*/ + +NTSTATUS +HDA_PDOQueryBusInformation( + IN PIRP Irp); + +NTSTATUS +NTAPI +HDA_PDOQueryId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +NTSTATUS +HDA_PDOHandleQueryDeviceText( + IN PIRP Irp); + +NTSTATUS +HDA_PDOQueryBusDeviceCapabilities( + IN PIRP Irp); + +NTSTATUS +HDA_PDOQueryBusDevicePnpState( + IN PIRP Irp); + +/* businterface.cpp */ + +NTSTATUS +HDA_PDOHandleQueryInterface( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + +/* hdaudbus.cpp*/ + +NTSTATUS +NTAPI +HDA_SyncForwardIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp); + Added: trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp (added) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp [iso-8859-1] Tue Jun 30 11:36:52 2015 @@ -0,0 +1,208 @@ +/* +* COPYRIGHT: See COPYING in the top level directory +* PROJECT: ReactOS Kernel Streaming +* FILE: drivers/wdm/audio/hdaudbus/pdo.cpp +* PURPOSE: HDA Driver Entry +* PROGRAMMER: Johannes Anderwald +*/ +#include "hdaudbus.h" + +NTSTATUS +HDA_PDOQueryBusInformation( + IN PIRP Irp) +{ + PPNP_BUS_INFORMATION BusInformation; + + /* allocate bus information */ + BusInformation = (PPNP_BUS_INFORMATION)AllocateItem(PagedPool, sizeof(PNP_BUS_INFORMATION)); + + if (!BusInformation) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* return info */ + BusInformation->BusNumber = 0; + BusInformation->LegacyBusType = PCIBus; + RtlMoveMemory(&BusInformation->BusTypeGuid, &GUID_HDAUDIO_BUS_INTERFACE, sizeof(GUID)); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)BusInformation; + + /* done */ + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +HDA_PDOQueryId( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + WCHAR DeviceName[200]; + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + ULONG Length; + LPWSTR Device; + + /* get device extension */ + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO == FALSE); + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.QueryId.IdType == BusQueryInstanceID) + { + UNIMPLEMENTED; + + // FIXME + swprintf(DeviceName, L"%08x", 1); + Length = wcslen(DeviceName) + 20; + + /* allocate result buffer*/ + Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!Device) + return STATUS_INSUFFICIENT_RESOURCES; + + swprintf(Device, L"%08x", 1); + + DPRINT1("ID: %S\n", Device); + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Device; + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID || + IoStack->Parameters.QueryId.IdType == BusQueryHardwareIDs) + { + + /* calculate size */ + swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&SUBSYS_%08X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->VendorId << 16 | DeviceExtension->Codec->ProductId); + Length = wcslen(DeviceName) + 20; + + /* allocate result buffer*/ + Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!Device) + return STATUS_INSUFFICIENT_RESOURCES; + + wcscpy(Device, DeviceName); + + DPRINT1("ID: %S\n", Device); + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Device; + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + RtlZeroMemory(DeviceName, sizeof(DeviceName)); + Length = swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&REV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->Major << 12 | DeviceExtension->Codec->Minor << 8 | DeviceExtension->Codec->Revision) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup) + 2; + + /* allocate result buffer*/ + Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!Device) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Device, DeviceName, Length * sizeof(WCHAR)); + + DPRINT1("ID: %S\n", Device); + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Device; + return STATUS_SUCCESS; + } + else + { + DPRINT1("QueryID Type %x not implemented\n", IoStack->Parameters.QueryId.IdType); + return Irp->IoStatus.Status; + } + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +HDA_PDOHandleQueryDeviceText( + IN PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + LPWSTR Buffer; + static WCHAR DeviceText[] = L"Audio Device on High Definition Audio Bus"; + + IoStack = IoGetCurrentIrpStackLocation(Irp); + if (IoStack->Parameters.QueryDeviceText.DeviceTextType == DeviceTextDescription) + { + DPRINT("HDA_PdoHandleQueryDeviceText DeviceTextDescription\n"); + + Buffer = (LPWSTR)AllocateItem(PagedPool, sizeof(DeviceText)); + if (!Buffer) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(Buffer, DeviceText); + + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; + } + else + { + DPRINT("HDA_PdoHandleQueryDeviceText DeviceTextLocationInformation\n"); + + Buffer = (LPWSTR)AllocateItem(PagedPool, sizeof(DeviceText)); + if (!Buffer) + { + Irp->IoStatus.Information = 0; + return STATUS_INSUFFICIENT_RESOURCES; + } + + wcscpy(Buffer, DeviceText); + + /* save result */ + Irp->IoStatus.Information = (ULONG_PTR)Buffer; + return STATUS_SUCCESS; + } + +} + +NTSTATUS +HDA_PDOQueryBusDeviceCapabilities( + IN PIRP Irp) +{ + PDEVICE_CAPABILITIES Capabilities; + PIO_STACK_LOCATION IoStack; + + /* get stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* get capabilities */ + Capabilities = IoStack->Parameters.DeviceCapabilities.Capabilities; + + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); + + /* setup capabilities */ + Capabilities->UniqueID = TRUE; + Capabilities->SilentInstall = TRUE; + Capabilities->SurpriseRemovalOK = TRUE; + Capabilities->Address = 0; + Capabilities->UINumber = 0; + Capabilities->SystemWake = PowerSystemWorking; /* FIXME common device extension */ + Capabilities->DeviceWake = PowerDeviceD0; + + /* done */ + return STATUS_SUCCESS; +} + +NTSTATUS +HDA_PDOQueryBusDevicePnpState( + IN PIRP Irp) +{ + /* set device flags */ + Irp->IoStatus.Information = PNP_DEVICE_DONT_DISPLAY_IN_UI | PNP_DEVICE_NOT_DISABLEABLE; + + /* done */ + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 68319: [MSI_WINETEST] - Skip msi:msi test if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-180 ONLINE-441 ROSTESTS-179
by tfaber＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: tfaber Date: Tue Jun 30 11:34:34 2015 New Revision: 68319 URL: http://svn.reactos.org/svn/reactos?rev=68319&view=rev Log: [MSI_WINETEST] - Skip msi:msi test if running on Windows in non-interactive mode. This should allow WHS-Testbot to get a bit further ROSTESTS-180 ONLINE-441 ROSTESTS-179 Modified: trunk/rostests/winetests/msi/msi.c Modified: trunk/rostests/winetests/msi/msi.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msi/msi.c?rev=6… ============================================================================== --- trunk/rostests/winetests/msi/msi.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msi/msi.c [iso-8859-1] Tue Jun 30 11:34:34 2015 @@ -14367,6 +14367,15 @@ DWORD len; char temp_path[MAX_PATH], prev_path[MAX_PATH]; +#ifdef __REACTOS__ + if (!winetest_interactive && + !strcmp(winetest_platform, "windows")) + { + skip("ROSTESTS-180: Skipping msi_winetest:msi because it hangs on WHS-Testbot. Set winetest_interactive to run it anyway.\n"); + return; + } +#endif + init_functionpointers(); if (pIsWow64Process)

1 0

[tfaber] 68318: [KMTESTS:MM] - Fix some massive NP pool leakage.
by tfaber＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: tfaber Date: Tue Jun 30 10:54:41 2015 New Revision: 68318 URL: http://svn.reactos.org/svn/reactos?rev=68318&view=rev Log: [KMTESTS:MM] - Fix some massive NP pool leakage. Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c Modified: trunk/rostests/kmtests/ntos_mm/MmMdl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmMdl.c?r… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmMdl.c [iso-8859-1] Tue Jun 30 10:54:41 2015 @@ -35,6 +35,7 @@ ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MmFreePagesFromMdl(Mdl); + ExFreePoolWithTag(Mdl, 0); /* Now map/unmap it */ Mdl = MmAllocatePagesForMdl(LowAddress, @@ -66,6 +67,7 @@ ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MmFreePagesFromMdl(Mdl); + ExFreePoolWithTag(Mdl, 0); /* Now map it, and free without unmapping */ Mdl = MmAllocatePagesForMdl(LowAddress, @@ -90,6 +92,7 @@ ok(Mdl->MappedSystemVa == SystemVa, "MappedSystemVa: %p, System VA: %p\n", Mdl->MappedSystemVa, SystemVa); ok((Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MmFreePagesFromMdl(Mdl); + ExFreePoolWithTag(Mdl, 0); /* try to allocate 2 GB -- should succeed but not map */ Mdl = MmAllocatePagesForMdl(LowAddress, @@ -115,6 +118,7 @@ ok(MmGetMdlVirtualAddress(Mdl) == NULL, "Virtual address: %p\n", MmGetMdlVirtualAddress(Mdl)); ok(!(Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA), "MdlFlags: %lx\n", Mdl->MdlFlags); MmFreePagesFromMdl(Mdl); + ExFreePoolWithTag(Mdl, 0); } /* now allocate and map 32 MB Mdls until we fail */ @@ -157,6 +161,7 @@ if (SystemVas[i] != NULL) MmUnmapLockedPages(SystemVas[i], Mdls[i]); MmFreePagesFromMdl(Mdls[i]); + ExFreePoolWithTag(Mdls[i], 0); if (SystemVas[i] == NULL) break; }

1 0

[janderwald] 68317: [HDAUDBUS] - forward start device irp to lower device. Hint by ThFabba - implement BusQueryCompatibleIDs
by janderwald＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: janderwald Date: Tue Jun 30 10:16:41 2015 New Revision: 68317 URL: http://svn.reactos.org/svn/reactos?rev=68317&view=rev Log: [HDAUDBUS] - forward start device irp to lower device. Hint by ThFabba - implement BusQueryCompatibleIDs Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] Tue Jun 30 10:16:41 2015 @@ -30,6 +30,61 @@ ExFreePool(Item); } +NTSTATUS +NTAPI +HDA_SyncForwardIrpCompletionRoutine( + 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 +HDA_SyncForwardIrp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + KEVENT Event; + NTSTATUS Status; + + /* Initialize event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* Copy irp stack location */ + IoCopyCurrentIrpStackLocationToNext(Irp); + + /* Set completion routine */ + IoSetCompletionRoutine(Irp, + HDA_SyncForwardIrpCompletionRoutine, + &Event, + TRUE, + TRUE, + TRUE); + + /* Call driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Check if pending */ + if (Status == STATUS_PENDING) + { + /* Wait for the request to finish */ + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + /* Copy status code */ + Status = Irp->IoStatus.Status; + } + + /* Done */ + return Status; +} + + BOOLEAN NTAPI HDA_InterruptService( @@ -60,6 +115,12 @@ // Check for incoming responses if (RirbStatus) { WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_STATUS, RirbStatus); + + if (DeviceExtension->RirbLength == 0) + { + /* HACK: spurious interrupt */ + return FALSE; + } if ((RirbStatus & RIRB_STATUS_RESPONSE) != 0) { WritePos = (READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_RIRB_WRITE_POS)) + 1) % DeviceExtension->RirbLength; @@ -337,12 +398,14 @@ /* init corb */ HighestPhysicalAddress.QuadPart = 0x00000000FFFFFFFF; DeviceExtension->CorbBase = (PULONG)MmAllocateContiguousMemory(PAGE_SIZE * 3, HighestPhysicalAddress); + ASSERT(DeviceExtension->CorbBase != NULL); // FIXME align rirb 128bytes ASSERT(DeviceExtension->CorbLength == 256); ASSERT(DeviceExtension->RirbLength == 256); CorbPhysicalAddress = MmGetPhysicalAddress(DeviceExtension->CorbBase); + ASSERT(CorbPhysicalAddress.QuadPart != 0LL); // Program CORB/RIRB for these locations WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_CORB_BASE_LOWER), CorbPhysicalAddress.LowPart); @@ -585,7 +648,27 @@ if (!Device) return STATUS_INSUFFICIENT_RESOURCES; - swprintf(Device, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&SUBSYS_%08X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->VendorId << 16 | DeviceExtension->Codec->ProductId); + wcscpy(Device, DeviceName); + + DPRINT1("ID: %S\n", Device); + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)Device; + return STATUS_SUCCESS; + } + else if (IoStack->Parameters.QueryId.IdType == BusQueryCompatibleIDs) + { + RtlZeroMemory(DeviceName, sizeof(DeviceName)); + Length = swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&REV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->Major << 12 | DeviceExtension->Codec->Minor << 8 | DeviceExtension->Codec->Revision) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId) + 1; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup) + 2; + + /* allocate result buffer*/ + Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR)); + if (!Device) + return STATUS_INSUFFICIENT_RESOURCES; + + RtlCopyMemory(Device, DeviceName, Length * sizeof(WCHAR)); DPRINT1("ID: %S\n", Device); /* store result */ @@ -613,12 +696,21 @@ ULONG Index; USHORT Value; - /* get current irp stack location */ - IoStack = IoGetCurrentIrpStackLocation(Irp); - /* get device extension */ DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; ASSERT(DeviceExtension->IsFDO == TRUE); + + /* forward irp to lower device */ + Status = HDA_SyncForwardIrp(DeviceExtension->LowerDevice, Irp); + if (!NT_SUCCESS(Status)) + { + // failed to start + DPRINT1("HDA_StartDevice Lower device failed to start %x\n", Status); + return Status; + } + + /* get current irp stack location */ + IoStack = IoGetCurrentIrpStackLocation(Irp); Resources = IoStack->Parameters.StartDevice.AllocatedResourcesTranslated; for (Index = 0; Index < Resources->List[0].PartialResourceList.Count; Index++)

1 0

[pschweitzer] 68316: [BROWSEUI] Revert r68305 per Christoph's request
by pschweitzer＠svn.reactos.org 29 Jun '15

29 Jun '15

Author: pschweitzer Date: Mon Jun 29 20:40:12 2015 New Revision: 68316 URL: http://svn.reactos.org/svn/reactos?rev=68316&view=rev Log: [BROWSEUI] Revert r68305 per Christoph's request Modified: trunk/reactos/dll/win32/browseui/addressband.h trunk/reactos/dll/win32/browseui/addresseditbox.h trunk/reactos/dll/win32/browseui/bandsitemenu.h trunk/reactos/dll/win32/browseui/internettoolbar.h Modified: trunk/reactos/dll/win32/browseui/addressband.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addressband.h [iso-8859-1] Mon Jun 29 20:40:12 2015 @@ -136,5 +136,6 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObjectSite, IInputObjectSite) COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) + COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.h [iso-8859-1] Mon Jun 29 20:40:12 2015 @@ -97,6 +97,7 @@ COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) COM_INTERFACE_ENTRY_IID(IID_IDispatch, IDispatch) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/bandsitemenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsitemenu.h [iso-8859-1] Mon Jun 29 20:40:12 2015 @@ -55,7 +55,6 @@ BEGIN_COM_MAP(CBandSiteMenu) COM_INTERFACE_ENTRY_IID(IID_IShellService, IShellService) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) - COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) END_COM_MAP() }; Modified: trunk/reactos/dll/win32/browseui/internettoolbar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.h [iso-8859-1] Mon Jun 29 20:40:12 2015 @@ -228,6 +228,7 @@ COM_INTERFACE_ENTRY_IID(IID_IInputObject, IInputObject) COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow) COM_INTERFACE_ENTRY_IID(IID_IDockingWindow, IDockingWindow) + COM_INTERFACE_ENTRY_IID(IID_IPersist, IPersist) // COM_INTERFACE_ENTRY_IID(IID_IPersistStream, IPersistStream) COM_INTERFACE_ENTRY_IID(IID_IPersistStreamInit, IPersistStreamInit) COM_INTERFACE_ENTRY_IID(IID_IOleCommandTarget, IOleCommandTarget) @@ -236,5 +237,7 @@ COM_INTERFACE_ENTRY_IID(IID_IShellChangeNotify, IShellChangeNotify) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) COM_INTERFACE_ENTRY_IID(IID_IServiceProvider, IServiceProvider) + COM_INTERFACE_ENTRY_IID(IID_IWinEventHandler, IWinEventHandler) + COM_INTERFACE_ENTRY_IID(IID_IBandSite, IBandSite) END_COM_MAP() };

1 0

[ekohl] 68315: [NTOSKRNL] Fix CmpDestroyHiveViewList adding checks for empty lists. Thank you very much Thomas!
by ekohl＠svn.reactos.org 29 Jun '15

29 Jun '15

Author: ekohl Date: Mon Jun 29 20:29:19 2015 New Revision: 68315 URL: http://svn.reactos.org/svn/reactos?rev=68315&view=rev Log: [NTOSKRNL] Fix CmpDestroyHiveViewList adding checks for empty lists. Thank you very much Thomas! Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] Mon Jun 29 20:29:19 2015 @@ -34,7 +34,6 @@ NTAPI CmpDestroyHiveViewList(IN PCMHIVE Hive) { -#if 0 PCM_VIEW_OF_FILE CmView; PLIST_ENTRY EntryList; @@ -42,9 +41,10 @@ ASSERT(Hive->Hive.ReadOnly == FALSE); /* Free all the views inside the Pinned View List */ - EntryList = RemoveHeadList(&Hive->PinViewListHead); - while (EntryList != &Hive->PinViewListHead) + while (!IsListEmpty(&Hive->PinViewListHead)) { + EntryList = RemoveHeadList(&Hive->PinViewListHead); + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, PinViewList); /* FIXME: Unmap the view if it is mapped */ @@ -52,8 +52,6 @@ ExFreePool(CmView); Hive->PinnedViews--; - - EntryList = RemoveHeadList(&Hive->PinViewListHead); } /* The Pinned View List should be empty */ @@ -61,9 +59,10 @@ ASSERT(Hive->PinnedViews == 0); /* Now, free all the views inside the LRU View List */ - EntryList = RemoveHeadList(&Hive->LRUViewListHead); - while (EntryList != &Hive->LRUViewListHead) + while (!IsListEmpty(&Hive->LRUViewListHead)) { + EntryList = RemoveHeadList(&Hive->LRUViewListHead); + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, LRUViewList); /* FIXME: Unmap the view if it is mapped */ @@ -71,14 +70,11 @@ ExFreePool(CmView); Hive->MappedViews--; - - EntryList = RemoveHeadList(&Hive->LRUViewListHead); } /* The LRU View List should be empty */ ASSERT(IsListEmpty(&Hive->LRUViewListHead) == TRUE); ASSERT(Hive->MappedViews == 0); -#endif } /* EOF */

1 0

[ekohl] 68314: [NTOSKRNL] Disable code in CmpDestroyHiveViewList(). Needs more testing!
by ekohl＠svn.reactos.org 29 Jun '15

29 Jun '15

Author: ekohl Date: Mon Jun 29 18:50:18 2015 New Revision: 68314 URL: http://svn.reactos.org/svn/reactos?rev=68314&view=rev Log: [NTOSKRNL] Disable code in CmpDestroyHiveViewList(). Needs more testing! Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] Mon Jun 29 18:50:18 2015 @@ -34,6 +34,7 @@ NTAPI CmpDestroyHiveViewList(IN PCMHIVE Hive) { +#if 0 PCM_VIEW_OF_FILE CmView; PLIST_ENTRY EntryList; @@ -77,6 +78,7 @@ /* The LRU View List should be empty */ ASSERT(IsListEmpty(&Hive->LRUViewListHead) == TRUE); ASSERT(Hive->MappedViews == 0); +#endif } /* EOF */

1 0

[ekohl] 68313: [NTOSKRNL] Add CmpDestroySecurityCache() and CmpDestroyHiveViewList() stubs and call them in CmpDestroyHive and CmUnloadKey(). CORE-6492 #resolve #comment Thank you Hermes! This is e...
by ekohl＠svn.reactos.org 29 Jun '15

29 Jun '15

Author: ekohl Date: Mon Jun 29 18:26:56 2015 New Revision: 68313 URL: http://svn.reactos.org/svn/reactos?rev=68313&view=rev Log: [NTOSKRNL] Add CmpDestroySecurityCache() and CmpDestroyHiveViewList() stubs and call them in CmpDestroyHive and CmUnloadKey(). CORE-6492 #resolve #comment Thank you Hermes! This is exactly what I needed! Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/cminit.c trunk/reactos/ntoskrnl/config/cmmapvw.c trunk/reactos/ntoskrnl/config/cmsecach.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Mon Jun 29 18:26:56 2015 @@ -2241,7 +2241,11 @@ /* Remove the hive from the hive file list */ CmpRemoveFromHiveFileList(CmHive); - /* FIXME: More cleanup */ + /* Destroy the security descriptor cache */ + CmpDestroySecurityCache(CmHive); + + /* Destroy the view list */ + CmpDestroyHiveViewList(CmHive); /* Free the hive storage */ HvFree(Hive); Modified: trunk/reactos/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Mon Jun 29 18:26:56 2015 @@ -256,6 +256,12 @@ /* Delete the view lock */ ExFreePoolWithTag(CmHive->ViewLock, TAG_CM); + + /* Destroy the security descriptor cache */ + CmpDestroySecurityCache(CmHive); + + /* Destroy the view list */ + CmpDestroyHiveViewList(CmHive); /* Free the hive storage */ HvFree(&CmHive->Hive); Modified: trunk/reactos/ntoskrnl/config/cmmapvw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmmapvw.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmmapvw.c [iso-8859-1] Mon Jun 29 18:26:56 2015 @@ -29,3 +29,54 @@ Hive->PinnedViews = 0; Hive->UseCount = 0; } + +VOID +NTAPI +CmpDestroyHiveViewList(IN PCMHIVE Hive) +{ + PCM_VIEW_OF_FILE CmView; + PLIST_ENTRY EntryList; + + /* Do NOT destroy the views of read-only hives */ + ASSERT(Hive->Hive.ReadOnly == FALSE); + + /* Free all the views inside the Pinned View List */ + EntryList = RemoveHeadList(&Hive->PinViewListHead); + while (EntryList != &Hive->PinViewListHead) + { + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, PinViewList); + + /* FIXME: Unmap the view if it is mapped */ + + ExFreePool(CmView); + + Hive->PinnedViews--; + + EntryList = RemoveHeadList(&Hive->PinViewListHead); + } + + /* The Pinned View List should be empty */ + ASSERT(IsListEmpty(&Hive->PinViewListHead) == TRUE); + ASSERT(Hive->PinnedViews == 0); + + /* Now, free all the views inside the LRU View List */ + EntryList = RemoveHeadList(&Hive->LRUViewListHead); + while (EntryList != &Hive->LRUViewListHead) + { + CmView = CONTAINING_RECORD(EntryList, CM_VIEW_OF_FILE, LRUViewList); + + /* FIXME: Unmap the view if it is mapped */ + + ExFreePool(CmView); + + Hive->MappedViews--; + + EntryList = RemoveHeadList(&Hive->LRUViewListHead); + } + + /* The LRU View List should be empty */ + ASSERT(IsListEmpty(&Hive->LRUViewListHead) == TRUE); + ASSERT(Hive->MappedViews == 0); +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/config/cmsecach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsecach.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmsecach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsecach.c [iso-8859-1] Mon Jun 29 18:26:56 2015 @@ -35,3 +35,18 @@ InitializeListHead(&Hive->SecurityHash[i]); } } + +VOID +NTAPI +CmpDestroySecurityCache(IN PCMHIVE Hive) +{ + /* FIXME: clean Hive->SecurityHash and/or Hive->SecurityCache */ + + /* Reset data */ + Hive->SecurityCount = 0; + Hive->SecurityCacheSize = 0; + Hive->SecurityHitHint = -1; + Hive->SecurityCache = NULL; +} + +/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Mon Jun 29 18:26:56 2015 @@ -552,12 +552,24 @@ IN PCMHIVE Hive ); +VOID +NTAPI +CmpDestroyHiveViewList( + IN PCMHIVE Hive +); + // // Security Cache Functions // VOID NTAPI CmpInitSecurityCache( + IN PCMHIVE Hive +); + +VOID +NTAPI +CmpDestroySecurityCache( IN PCMHIVE Hive );

1 0

[janderwald] 68312: [HDAUDBUS] - add driver inf - fix build for gcc builds
by janderwald＠svn.reactos.org 29 Jun '15

29 Jun '15

Author: janderwald Date: Mon Jun 29 17:10:04 2015 New Revision: 68312 URL: http://svn.reactos.org/svn/reactos?rev=68312&view=rev Log: [HDAUDBUS] - add driver inf - fix build for gcc builds Added: trunk/reactos/media/inf/hdaudbus.inf (with props) Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp trunk/reactos/media/inf/CMakeLists.txt Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] Mon Jun 29 17:10:04 2015 @@ -877,10 +877,10 @@ PIO_STACK_LOCATION IoStack; PDEVICE_RELATIONS DeviceRelation; PHDA_FDO_DEVICE_EXTENSION FDODeviceExtension; - PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; + //PHDA_PDO_DEVICE_EXTENSION ChildDeviceExtension; FDODeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + //ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT1("HDA_Pnp Minor: %u IsFDO%d\n", IoStack->MinorFunction, FDODeviceExtension->IsFDO); Modified: trunk/reactos/media/inf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/inf/CMakeLists.txt [iso-8859-1] Mon Jun 29 17:10:04 2015 @@ -13,6 +13,7 @@ fdc.inf flpydisk.inf hal.inf + hdaudbus.inf hdc.inf input.inf keyboard.inf Added: trunk/reactos/media/inf/hdaudbus.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdaudbus.inf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/hdaudbus.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs