Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-02 10:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

[VIDEOPRT]

Browse source 
- Don't add legacy resources twice in VideoPortGetAccessRanges
- Fixes Cirrus driver initialization

svn path=/trunk/; revision=56124
This commit is contained in:
Cameron Gutman 2012-03-12 01:38:21 +00:00
parent 72a03e8c29
commit 4450ed65cd
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
reactos/drivers/video/videoprt/resource.c
View file

@ -567,7 +567,7 @@ VideoPortGetAccessRanges(
PCI_COMMON_CONFIG Config;
PCM_RESOURCE_LIST AllocatedResources;
NTSTATUS Status;
UINT AssignedCount;
UINT AssignedCount = 0;
CM_FULL_RESOURCE_DESCRIPTOR *FullList;
CM_PARTIAL_RESOURCE_DESCRIPTOR *Descriptor;
PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension;
@ -682,6 +682,21 @@ VideoPortGetAccessRanges(
}
DeviceExtension->AllocatedResources = AllocatedResources;
DeviceExtension->SystemIoSlotNumber = PciSlotNumber.u.AsULONG;
/* Add legacy resources to the resources from HAL */
Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension,
&LegacyAccessRanges, &LegacyAccessRangeCount);
if (!NT_SUCCESS(Status))
return ERROR_DEV_NOT_EXIST;
if (NumAccessRanges < LegacyAccessRangeCount)
{
ERR_(VIDEOPRT, "Too many legacy access ranges found\n");
return ERROR_NOT_ENOUGH_MEMORY;
}
RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE));
AssignedCount = LegacyAccessRangeCount;
}
}
else
@ -725,18 +740,7 @@ VideoPortGetAccessRanges(
/* Return the slot number if the caller wants it */
if (Slot != NULL) *Slot = DeviceExtension->SystemIoBusNumber;
Status = IntVideoPortGetLegacyResources(DriverExtension, DeviceExtension,
&LegacyAccessRanges, &LegacyAccessRangeCount);
if (!NT_SUCCESS(Status))
return ERROR_DEV_NOT_EXIST;
if (NumAccessRanges < LegacyAccessRangeCount)
{
ERR_(VIDEOPRT, "Too many legacy access ranges found\n");
return ERROR_NOT_ENOUGH_MEMORY;
}
RtlCopyMemory(AccessRanges, LegacyAccessRanges, LegacyAccessRangeCount * sizeof(VIDEO_ACCESS_RANGE));
AssignedCount = LegacyAccessRangeCount;
for (FullList = AllocatedResources->List;
FullList < AllocatedResources->List + AllocatedResources->Count;
FullList++)