Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Use the possible resources not the current resources for IRP_MN_QUERY_RESOURCE_REQUIREMENTS

Browse source 
- Initialize MaximumVector for IRQs, MaximumChannel for DMA, and Alignment for Port

svn path=/trunk/; revision=46121
This commit is contained in:
Cameron Gutman 2010-03-11 22:36:22 +00:00
parent 75c500f4b0
commit 1f5e020800
1 changed files with 65 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

113
reactos/drivers/bus/acpi/buspdo.c
View file

@ -695,25 +695,25 @@ Bus_PDO_QueryResources(
{ {
ResourceDescriptor->Type = CmResourceTypeDma; ResourceDescriptor->Type = CmResourceTypeDma;
ResourceDescriptor->Flags = 0; ResourceDescriptor->Flags = 0;
switch (dma_data->Type) switch (dma_data->Type)
{ {
case ACPI_TYPE_A: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; case ACPI_TYPE_A: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break;
case ACPI_TYPE_B: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; case ACPI_TYPE_B: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break;
case ACPI_TYPE_F: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; case ACPI_TYPE_F: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break;
} }
if (dma_data->BusMaster == ACPI_BUS_MASTER) if (dma_data->BusMaster == ACPI_BUS_MASTER)
ResourceDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; ResourceDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER;
switch (dma_data->Transfer) switch (dma_data->Transfer)
{ {
case ACPI_TRANSFER_8: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; break; case ACPI_TRANSFER_8: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8; break;
case ACPI_TRANSFER_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; break; case ACPI_TRANSFER_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_16; break;
case ACPI_TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; case ACPI_TRANSFER_8_16: ResourceDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break;
} }
ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i]; ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i];
ResourceDescriptor++; ResourceDescriptor++;
} }
break; break;
} }
case ACPI_RESOURCE_TYPE_IO: case ACPI_RESOURCE_TYPE_IO:
{ {
@ -757,24 +757,39 @@ Bus_PDO_QueryResourceRequirements(
ULONG i, RequirementsListSize; ULONG i, RequirementsListSize;
PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList; PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
PIO_RESOURCE_DESCRIPTOR RequirementDescriptor; PIO_RESOURCE_DESCRIPTOR RequirementDescriptor;
BOOLEAN CurrentRes = FALSE;
PAGED_CODE (); PAGED_CODE ();
/* Get current resources */ /* Get current resources */
Buffer.Length = 0; while (TRUE)
AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer);
if ((!ACPI_SUCCESS(AcpiStatus) && AcpiStatus != AE_BUFFER_OVERFLOW) ||
Buffer.Length == 0)
{ {
return Irp->IoStatus.Status; Buffer.Length = 0;
if (CurrentRes)
AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer);
else
AcpiStatus = AcpiGetPossibleResources(DeviceData->AcpiHandle, &Buffer);
if ((!ACPI_SUCCESS(AcpiStatus) && AcpiStatus != AE_BUFFER_OVERFLOW) ||
Buffer.Length == 0)
{
if (!CurrentRes)
CurrentRes = TRUE;
else
return Irp->IoStatus.Status;
}
else
break;
} }
Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length); Buffer.Pointer = ExAllocatePool(PagedPool, Buffer.Length);
if (!Buffer.Pointer) if (!Buffer.Pointer)
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer); if (CurrentRes)
AcpiStatus = AcpiGetCurrentResources(DeviceData->AcpiHandle, &Buffer);
else
AcpiStatus = AcpiGetPossibleResources(DeviceData->AcpiHandle, &Buffer);
if (!ACPI_SUCCESS(AcpiStatus)) if (!ACPI_SUCCESS(AcpiStatus))
{ {
DPRINT1("AcpiGetCurrentResources #2 failed (0x%x)\n", AcpiStatus); DPRINT1("AcpiGetCurrentResources #2 failed (0x%x)\n", AcpiStatus);
@ -841,11 +856,12 @@ Bus_PDO_QueryResourceRequirements(
ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data; ACPI_RESOURCE_IRQ *irq_data = (ACPI_RESOURCE_IRQ*) &resource->Data;
for (i = 0; i < irq_data->InterruptCount; i++) for (i = 0; i < irq_data->InterruptCount; i++)
{ {
RequirementDescriptor->Option = 0; /* Required */ RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED;
RequirementDescriptor->Type = CmResourceTypeInterrupt; RequirementDescriptor->Type = CmResourceTypeInterrupt;
RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive); RequirementDescriptor->ShareDisposition = (irq_data->Sharable == ACPI_SHARED ? CmResourceShareShared : CmResourceShareDeviceExclusive);
RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED); RequirementDescriptor->Flags =(irq_data->Triggering == ACPI_LEVEL_SENSITIVE ? CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE : CM_RESOURCE_INTERRUPT_LATCHED);
RequirementDescriptor->u.Interrupt.MinimumVector = irq_data->Interrupts[i]; RequirementDescriptor->u.Interrupt.MinimumVector =
RequirementDescriptor->u.Interrupt.MaximumVector = irq_data->Interrupts[i];
RequirementDescriptor++; RequirementDescriptor++;
} }
@ -858,27 +874,28 @@ Bus_PDO_QueryResourceRequirements(
{ {
RequirementDescriptor->Type = CmResourceTypeDma; RequirementDescriptor->Type = CmResourceTypeDma;
RequirementDescriptor->Flags = 0; RequirementDescriptor->Flags = 0;
switch (dma_data->Type) switch (dma_data->Type)
{ {
case ACPI_TYPE_A: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break; case ACPI_TYPE_A: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_A; break;
case ACPI_TYPE_B: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break; case ACPI_TYPE_B: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_B; break;
case ACPI_TYPE_F: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break; case ACPI_TYPE_F: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_TYPE_F; break;
} }
if (dma_data->BusMaster == ACPI_BUS_MASTER) if (dma_data->BusMaster == ACPI_BUS_MASTER)
RequirementDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER; RequirementDescriptor->Flags |= CM_RESOURCE_DMA_BUS_MASTER;
switch (dma_data->Transfer) switch (dma_data->Transfer)
{ {
case ACPI_TRANSFER_8: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8; break; case ACPI_TRANSFER_8: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8; break;
case ACPI_TRANSFER_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_16; break; case ACPI_TRANSFER_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_16; break;
case ACPI_TRANSFER_8_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break; case ACPI_TRANSFER_8_16: RequirementDescriptor->Flags |= CM_RESOURCE_DMA_8_AND_16; break;
} }
RequirementDescriptor->Option = 0; /* Required */ RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED;
RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive;
RequirementDescriptor->u.Dma.MinimumChannel = dma_data->Channels[i]; RequirementDescriptor->u.Dma.MinimumChannel =
RequirementDescriptor++; RequirementDescriptor->u.Dma.MaximumChannel = dma_data->Channels[i];
} RequirementDescriptor++;
break; }
break;
} }
case ACPI_RESOURCE_TYPE_IO: case ACPI_RESOURCE_TYPE_IO:
{ {
@ -891,10 +908,10 @@ Bus_PDO_QueryResourceRequirements(
RequirementDescriptor->u.Port.Length = io_data->AddressLength; RequirementDescriptor->u.Port.Length = io_data->AddressLength;
RequirementDescriptor->Option = 0; /* Required */ RequirementDescriptor->Option = CurrentRes ? 0 : IO_RESOURCE_PREFERRED;
RequirementDescriptor->Type = CmResourceTypePort; RequirementDescriptor->Type = CmResourceTypePort;
RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive;
RequirementDescriptor->u.Port.Alignment = 1; /* Start address is specified, so it doesn't matter */ RequirementDescriptor->u.Port.Alignment = io_data->Alignment;
RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum;
RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum; RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum;