Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 55544: [PSDK] * ntdddisk.h: Import a recent fix from trunk.
by akhaldi＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: akhaldi Date: Sat Feb 11 10:34:28 2012 New Revision: 55544 URL: http://svn.reactos.org/svn/reactos?rev=55544&view=rev Log: [PSDK] * ntdddisk.h: Import a recent fix from trunk. Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h Modified: branches/usb-bringup-trunk/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/include/psdk/… ============================================================================== --- branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/include/psdk/ntdddisk.h [iso-8859-1] Sat Feb 11 10:34:28 2012 @@ -151,6 +151,19 @@ #define IOCTL_DISK_SET_CACHE_INFORMATION \ CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +// +// NTDDI_WIN2003 was an older define used in the early beta builds, which +// Microsoft forgot to fix in a few headers. +// NTDDI_WS03 is the correct term. +// +#if (NTDDI_VERSION < NTDDI_WS03) +#define IOCTL_DISK_GET_WRITE_CACHE_STATE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) +#else +#define OBSOLETE_DISK_GET_WRITE_CACHE_STATE \ + CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) +#endif + #define IOCTL_DISK_SET_DRIVE_LAYOUT \ CTL_CODE(IOCTL_DISK_BASE, 0x0004, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) @@ -183,7 +196,6 @@ #define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_DISK_GET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0035, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DISK_SET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_GET_WRITE_CACHE_STATE CTL_CODE(IOCTL_DISK_BASE, 0x0037, METHOD_BUFFERED, FILE_READ_ACCESS) #define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) #define IOCTL_DISK_UPDATE_PROPERTIES CTL_CODE(IOCTL_DISK_BASE, 0x0050, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_DISK_FORMAT_DRIVE CTL_CODE(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS)

1 0

[akhaldi] 55543: [PSDK] * ntdddisk.h: Improve some definitions and add some missing ones.
by akhaldi＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: akhaldi Date: Sat Feb 11 10:32:22 2012 New Revision: 55543 URL: http://svn.reactos.org/svn/reactos?rev=55543&view=rev Log: [PSDK] * ntdddisk.h: Improve some definitions and add some missing ones. Modified: trunk/reactos/include/psdk/ntdddisk.h Modified: trunk/reactos/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdddisk.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] Sat Feb 11 10:32:22 2012 @@ -191,8 +191,16 @@ #define SMART_SEND_DRIVE_COMMAND \ CTL_CODE(IOCTL_DISK_BASE, 0x0021, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) -#define IOCTL_DISK_UPDATE_PROPERTIES \ - CTL_CODE(IOCTL_DISK_BASE, 0x50, METHOD_BUFFERED, FILE_ANY_ACCESS) +#if(_WIN32_WINNT >= 0x0500) +#define IOCTL_DISK_UPDATE_DRIVE_SIZE CTL_CODE(IOCTL_DISK_BASE, 0x0032, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GROW_PARTITION CTL_CODE(IOCTL_DISK_BASE, 0x0034, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_GET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0035, METHOD_BUFFERED, FILE_READ_ACCESS) +#define IOCTL_DISK_SET_CACHE_INFORMATION CTL_CODE(IOCTL_DISK_BASE, 0x0036, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_DELETE_DRIVE_LAYOUT CTL_CODE(IOCTL_DISK_BASE, 0x0040, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_UPDATE_PROPERTIES CTL_CODE(IOCTL_DISK_BASE, 0x0050, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_DISK_FORMAT_DRIVE CTL_CODE(IOCTL_DISK_BASE, 0x00f3, METHOD_BUFFERED, FILE_READ_ACCESS | FILE_WRITE_ACCESS) +#define IOCTL_DISK_SENSE_DEVICE CTL_CODE(IOCTL_DISK_BASE, 0x00f8, METHOD_BUFFERED, FILE_ANY_ACCESS) +#endif #define PARTITION_ENTRY_UNUSED 0x00 #define PARTITION_FAT_12 0x01 @@ -473,67 +481,10 @@ } DUMMYUNIONNAME; } SET_PARTITION_INFORMATION_EX, *PSET_PARTITION_INFORMATION_EX; -typedef struct _CREATE_DISK_GPT { - GUID DiskId; - ULONG MaxPartitionCount; -} CREATE_DISK_GPT, *PCREATE_DISK_GPT; - -typedef struct _CREATE_DISK_MBR { - ULONG Signature; -} CREATE_DISK_MBR, *PCREATE_DISK_MBR; - -typedef struct _CREATE_DISK { - PARTITION_STYLE PartitionStyle; - _ANONYMOUS_UNION union { - CREATE_DISK_MBR Mbr; - CREATE_DISK_GPT Gpt; - } DUMMYUNIONNAME; -} CREATE_DISK, *PCREATE_DISK; - typedef struct _VERIFY_INFORMATION { LARGE_INTEGER StartingOffset; ULONG Length; } VERIFY_INFORMATION, *PVERIFY_INFORMATION; - -#if (OSVER(NTDDI_VERSION) == NTDDI_WINXP) -typedef enum _DISK_WRITE_CACHE_STATE { - DiskWriteCacheNormal, - DiskWriteCacheForceDisable, - DiskWriteCacheDisableNotSupported -} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE; -#endif - -typedef enum { - EqualPriority, - KeepPrefetchedData, - KeepReadData -} DISK_CACHE_RETENTION_PRIORITY; - -typedef struct _DISK_CACHE_INFORMATION { - BOOLEAN ParametersSavable; - BOOLEAN ReadCacheEnabled; - BOOLEAN WriteCacheEnabled; - DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; - DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; - USHORT DisablePrefetchTransferLength; - BOOLEAN PrefetchScalar; - _ANONYMOUS_UNION union { - struct { - USHORT Minimum; - USHORT Maximum; - USHORT MaximumBlocks; - } ScalarPrefetch; - struct { - USHORT Minimum; - USHORT Maximum; - } BlockPrefetch; - } DUMMYUNIONNAME; -} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION; - -typedef struct _DISK_GROW_PARTITION { - ULONG PartitionNumber; - LARGE_INTEGER BytesToGrow; -} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION; /* GETVERSIONINPARAMS.fCapabilities constants */ #define CAP_ATA_ID_CMD 1 @@ -640,6 +591,75 @@ } MAPPED_ADDRESS, *PMAPPED_ADDRESS; + +#if(_WIN32_WINNT >= 0x0500) + +typedef struct _CREATE_DISK_GPT +{ + GUID DiskId; + ULONG MaxPartitionCount; +} CREATE_DISK_GPT, *PCREATE_DISK_GPT; + +typedef struct _CREATE_DISK_MBR +{ + ULONG Signature; +} CREATE_DISK_MBR, *PCREATE_DISK_MBR; + + +typedef struct _CREATE_DISK +{ + PARTITION_STYLE PartitionStyle; + union { + CREATE_DISK_MBR Mbr; + CREATE_DISK_GPT Gpt; + }; +} CREATE_DISK, *PCREATE_DISK; + + +typedef enum { + EqualPriority, + KeepPrefetchedData, + KeepReadData +} DISK_CACHE_RETENTION_PRIORITY; + +typedef enum _DISK_WRITE_CACHE_STATE { + DiskWriteCacheNormal, + DiskWriteCacheForceDisable, + DiskWriteCacheDisableNotSupported +} DISK_WRITE_CACHE_STATE, *PDISK_WRITE_CACHE_STATE; + + +typedef struct _DISK_CACHE_INFORMATION +{ + BOOLEAN ParametersSavable; + BOOLEAN ReadCacheEnabled; + BOOLEAN WriteCacheEnabled; + DISK_CACHE_RETENTION_PRIORITY ReadRetentionPriority; + DISK_CACHE_RETENTION_PRIORITY WriteRetentionPriority; + USHORT DisablePrefetchTransferLength; + BOOLEAN PrefetchScalar; + union { + struct { + USHORT Minimum; + USHORT Maximum; + USHORT MaximumBlocks; + } ScalarPrefetch; + + struct { + USHORT Minimum; + USHORT Maximum; + } BlockPrefetch; + }; + +} DISK_CACHE_INFORMATION, *PDISK_CACHE_INFORMATION; + +typedef struct _DISK_GROW_PARTITION { + ULONG PartitionNumber; + LARGE_INTEGER BytesToGrow; +} DISK_GROW_PARTITION, *PDISK_GROW_PARTITION; +#endif + + #ifdef __cplusplus } #endif

1 0

[cgutman] 55542: [PCI] - Add forgotten line
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 06:56:10 2012 New Revision: 55542 URL: http://svn.reactos.org/svn/reactos?rev=55542&view=rev Log: [PCI] - Add forgotten line Modified: branches/usb-bringup-trunk/drivers/bus/pci/pdo.c Modified: branches/usb-bringup-trunk/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] Sat Feb 11 06:56:10 2012 @@ -1260,6 +1260,8 @@ } } + Command = 0; + DPRINT1("Enabling command flags for PCI device 0x%x on bus 0x%x: ", DeviceExtension->PciDevice->SlotNumber.u.AsULONG, DeviceExtension->PciDevice->BusNumber);

1 0

[cgutman] 55541: [ACPI] - Fix incorrect maximum bound for resource requirements - Handle PCI buses manually [HAL] - Don't hang if the IRP_MN_QUERY_INTERFACE is received [INF] - Misc fixes
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 06:25:16 2012 New Revision: 55541 URL: http://svn.reactos.org/svn/reactos?rev=55541&view=rev Log: [ACPI] - Fix incorrect maximum bound for resource requirements - Handle PCI buses manually [HAL] - Don't hang if the IRP_MN_QUERY_INTERFACE is received [INF] - Misc fixes Modified: branches/usb-bringup-trunk/drivers/bus/acpi/buspdo.c branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c branches/usb-bringup-trunk/media/inf/keyboard.inf branches/usb-bringup-trunk/media/inf/msmouse.inf Modified: branches/usb-bringup-trunk/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/a… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/acpi/buspdo.c [iso-8859-1] Sat Feb 11 06:25:16 2012 @@ -1136,6 +1136,12 @@ return Irp->IoStatus.Status; } + /* Handle the PCI root manually */ + if (wcsstr(DeviceData->HardwareIDs, L"PNP0A03") != 0) + { + return Irp->IoStatus.Status; + } + /* Get current resources */ while (TRUE) { @@ -1315,7 +1321,7 @@ RequirementDescriptor->ShareDisposition = CmResourceShareDriverExclusive; RequirementDescriptor->u.Port.Alignment = io_data->Alignment; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = io_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = io_data->Maximum + io_data->AddressLength - 1; RequirementDescriptor++; break; @@ -1330,7 +1336,7 @@ RequirementDescriptor->ShareDisposition = CmResourceShareShared; RequirementDescriptor->Flags = 0; RequirementDescriptor->u.BusNumber.MinBusNumber = addr16_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = addr16_data->Maximum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr16_data->Maximum + addr16_data->AddressLength - 1; RequirementDescriptor->u.BusNumber.Length = addr16_data->AddressLength; } else if (addr16_data->ResourceType == ACPI_IO_RANGE) @@ -1341,7 +1347,7 @@ if (addr16_data->Decode == ACPI_POS_DECODE) RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr16_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr16_data->Maximum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; RequirementDescriptor->u.Port.Length = addr16_data->AddressLength; } else @@ -1360,7 +1366,7 @@ case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; } RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr16_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr16_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr16_data->Maximum + addr16_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = addr16_data->AddressLength; } RequirementDescriptor++; @@ -1376,7 +1382,7 @@ RequirementDescriptor->ShareDisposition = CmResourceShareShared; RequirementDescriptor->Flags = 0; RequirementDescriptor->u.BusNumber.MinBusNumber = addr32_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = addr32_data->Maximum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = addr32_data->Maximum + addr32_data->AddressLength - 1; RequirementDescriptor->u.BusNumber.Length = addr32_data->AddressLength; } else if (addr32_data->ResourceType == ACPI_IO_RANGE) @@ -1387,7 +1393,7 @@ if (addr32_data->Decode == ACPI_POS_DECODE) RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr32_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr32_data->Maximum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; RequirementDescriptor->u.Port.Length = addr32_data->AddressLength; } else @@ -1406,7 +1412,7 @@ case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; } RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr32_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr32_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr32_data->Maximum + addr32_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = addr32_data->AddressLength; } RequirementDescriptor++; @@ -1423,7 +1429,7 @@ RequirementDescriptor->ShareDisposition = CmResourceShareShared; RequirementDescriptor->Flags = 0; RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; } else if (addr64_data->ResourceType == ACPI_IO_RANGE) @@ -1434,7 +1440,7 @@ if (addr64_data->Decode == ACPI_POS_DECODE) RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; } else @@ -1453,7 +1459,7 @@ case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; } RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; } RequirementDescriptor++; @@ -1470,7 +1476,7 @@ RequirementDescriptor->ShareDisposition = CmResourceShareShared; RequirementDescriptor->Flags = 0; RequirementDescriptor->u.BusNumber.MinBusNumber = (ULONG)addr64_data->Minimum; - RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum; + RequirementDescriptor->u.BusNumber.MaxBusNumber = (ULONG)addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.BusNumber.Length = addr64_data->AddressLength; } else if (addr64_data->ResourceType == ACPI_IO_RANGE) @@ -1481,7 +1487,7 @@ if (addr64_data->Decode == ACPI_POS_DECODE) RequirementDescriptor->Flags |= CM_RESOURCE_PORT_POSITIVE_DECODE; RequirementDescriptor->u.Port.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Port.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Port.Length = addr64_data->AddressLength; } else @@ -1500,7 +1506,7 @@ case ACPI_PREFETCHABLE_MEMORY: RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_PREFETCHABLE; break; } RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = addr64_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = addr64_data->Maximum + addr64_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = addr64_data->AddressLength; } RequirementDescriptor++; @@ -1518,7 +1524,7 @@ else RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem24_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem24_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem24_data->Maximum + mem24_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = mem24_data->AddressLength; RequirementDescriptor++; @@ -1536,7 +1542,7 @@ else RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = mem32_data->Minimum; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem32_data->Maximum; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = mem32_data->Maximum + mem32_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = mem32_data->AddressLength; RequirementDescriptor++; @@ -1554,7 +1560,7 @@ else RequirementDescriptor->Flags |= CM_RESOURCE_MEMORY_READ_WRITE; RequirementDescriptor->u.Memory.MinimumAddress.QuadPart = fixedmem32_data->Address; - RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address; + RequirementDescriptor->u.Memory.MaximumAddress.QuadPart = fixedmem32_data->Address + fixedmem32_data->AddressLength - 1; RequirementDescriptor->u.Memory.Length = fixedmem32_data->AddressLength; RequirementDescriptor++; Modified: branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/ac… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/acpi/halpnpdd.c [iso-8859-1] Sat Feb 11 06:25:16 2012 @@ -172,8 +172,7 @@ OUT PULONG Length) { UNIMPLEMENTED; - while (TRUE); - return STATUS_NO_SUCH_DEVICE; + return STATUS_NOT_SUPPORTED; } NTSTATUS Modified: branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/halpnpdd.c [iso-8859-1] Sat Feb 11 06:25:16 2012 @@ -164,8 +164,7 @@ OUT PULONG Length) { UNIMPLEMENTED; - while (TRUE); - return STATUS_NO_SUCH_DEVICE; + return STATUS_NOT_SUPPORTED; } NTSTATUS Modified: branches/usb-bringup-trunk/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/key… ============================================================================== Binary files - no diff available. Modified: branches/usb-bringup-trunk/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/msm… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 55540: [PCI] - Set device command flags when starting the PCI device PDO
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 05:47:56 2012 New Revision: 55540 URL: http://svn.reactos.org/svn/reactos?rev=55540&view=rev Log: [PCI] - Set device command flags when starting the PCI device PDO Modified: branches/usb-bringup-trunk/drivers/bus/pci/fdo.c branches/usb-bringup-trunk/drivers/bus/pci/pci.h branches/usb-bringup-trunk/drivers/bus/pci/pdo.c Modified: branches/usb-bringup-trunk/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/fdo.c [iso-8859-1] Sat Feb 11 05:47:56 2012 @@ -341,15 +341,13 @@ } } - if (!Device->RemovePending) { - /* Reference the physical device object. The PnP manager - will dereference it again when it is no longer needed */ - ObReferenceObject(Device->Pdo); - - Relations->Objects[i] = Device->Pdo; - - i++; - } + /* Reference the physical device object. The PnP manager + will dereference it again when it is no longer needed */ + ObReferenceObject(Device->Pdo); + + Relations->Objects[i] = Device->Pdo; + + i++; CurrentEntry = CurrentEntry->Flink; } Modified: branches/usb-bringup-trunk/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/pci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/pci.h [iso-8859-1] Sat Feb 11 05:47:56 2012 @@ -17,8 +17,12 @@ PCI_SLOT_NUMBER SlotNumber; // PCI configuration data PCI_COMMON_CONFIG PciConfig; - // Flag used during enumeration to locate removed devices - BOOLEAN RemovePending; + // Enable memory space + BOOLEAN EnableMemorySpace; + // Enable I/O space + BOOLEAN EnableIoSpace; + // Enable bus master + BOOLEAN EnableBusMaster; } PCI_DEVICE, *PPCI_DEVICE; Modified: branches/usb-bringup-trunk/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] Sat Feb 11 05:47:56 2012 @@ -766,6 +766,9 @@ Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Port.Length = Length; + + /* Enable IO space access */ + DeviceExtension->PciDevice->EnableIoSpace = TRUE; } else { @@ -775,6 +778,9 @@ Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Memory.Length = Length; + + /* Enable memory space access */ + DeviceExtension->PciDevice->EnableMemorySpace = TRUE; } Descriptor++; @@ -792,6 +798,9 @@ Descriptor->u.Interrupt.Vector = PciConfig.u.type0.InterruptLine; Descriptor->u.Interrupt.Affinity = 0xFFFFFFFF; } + + /* Allow bus master mode */ + DeviceExtension->PciDevice->EnableBusMaster = TRUE; } else if (PCI_CONFIGURATION_TYPE(&PciConfig) == PCI_BRIDGE_TYPE) { @@ -821,6 +830,9 @@ Descriptor->u.Port.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Port.Length = Length; + + /* Enable IO space access */ + DeviceExtension->PciDevice->EnableIoSpace = TRUE; } else { @@ -830,6 +842,9 @@ Descriptor->u.Memory.Start.QuadPart = (ULONGLONG)Base; Descriptor->u.Memory.Length = Length; + + /* Enable memory space access */ + DeviceExtension->PciDevice->EnableMemorySpace = TRUE; } Descriptor++; @@ -1206,45 +1221,86 @@ IN PIRP Irp, PIO_STACK_LOCATION IrpSp) { - PCM_RESOURCE_LIST RawResList = IrpSp->Parameters.StartDevice.AllocatedResources; - PCM_FULL_RESOURCE_DESCRIPTOR RawFullDesc; - PCM_PARTIAL_RESOURCE_DESCRIPTOR RawPartialDesc; - ULONG i, ii; - PPDO_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; - UCHAR Irq; - - if (!RawResList) - return STATUS_SUCCESS; - - /* TODO: Assign the other resources we get to the card */ - - for (i = 0; i < RawResList->Count; i++) - { - RawFullDesc = &RawResList->List[i]; - - for (ii = 0; ii < RawFullDesc->PartialResourceList.Count; ii++) - { - RawPartialDesc = &RawFullDesc->PartialResourceList.PartialDescriptors[ii]; - - if (RawPartialDesc->Type == CmResourceTypeInterrupt) - { - DPRINT1("Assigning IRQ %x to PCI device (%x, %x)\n", - RawPartialDesc->u.Interrupt.Vector, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - DeviceExtension->PciDevice->BusNumber); - - Irq = (UCHAR)RawPartialDesc->u.Interrupt.Vector; - HalSetBusDataByOffset(PCIConfiguration, - DeviceExtension->PciDevice->BusNumber, - DeviceExtension->PciDevice->SlotNumber.u.AsULONG, - &Irq, - 0x3c /* PCI_INTERRUPT_LINE */, - sizeof(UCHAR)); - } - } - } - - return STATUS_SUCCESS; + PCM_RESOURCE_LIST RawResList = IrpSp->Parameters.StartDevice.AllocatedResources; + PCM_FULL_RESOURCE_DESCRIPTOR RawFullDesc; + PCM_PARTIAL_RESOURCE_DESCRIPTOR RawPartialDesc; + ULONG i, ii; + PPDO_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + UCHAR Irq; + USHORT Command; + + if (!RawResList) + return STATUS_SUCCESS; + + /* TODO: Assign the other resources we get to the card */ + + for (i = 0; i < RawResList->Count; i++) + { + RawFullDesc = &RawResList->List[i]; + + for (ii = 0; ii < RawFullDesc->PartialResourceList.Count; ii++) + { + RawPartialDesc = &RawFullDesc->PartialResourceList.PartialDescriptors[ii]; + + if (RawPartialDesc->Type == CmResourceTypeInterrupt) + { + DPRINT1("Assigning IRQ %d to PCI device 0x%x on bus 0x%x\n", + RawPartialDesc->u.Interrupt.Vector, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber); + + Irq = (UCHAR)RawPartialDesc->u.Interrupt.Vector; + HalSetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + &Irq, + 0x3c /* PCI_INTERRUPT_LINE */, + sizeof(UCHAR)); + } + } + } + + DPRINT1("Enabling command flags for PCI device 0x%x on bus 0x%x: ", + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + DeviceExtension->PciDevice->BusNumber); + if (DeviceExtension->PciDevice->EnableBusMaster) + { + Command |= PCI_ENABLE_BUS_MASTER; + DbgPrint("[Bus master] "); + } + + if (DeviceExtension->PciDevice->EnableMemorySpace) + { + Command |= PCI_ENABLE_MEMORY_SPACE; + DbgPrint("[Memory space enable] "); + } + + if (DeviceExtension->PciDevice->EnableIoSpace) + { + Command |= PCI_ENABLE_IO_SPACE; + DbgPrint("[I/O space enable] "); + } + + if (Command != 0) + { + DbgPrint("\n"); + + /* OR with the previous value */ + Command |= DeviceExtension->PciDevice->PciConfig.Command; + + HalSetBusDataByOffset(PCIConfiguration, + DeviceExtension->PciDevice->BusNumber, + DeviceExtension->PciDevice->SlotNumber.u.AsULONG, + &Command, + FIELD_OFFSET(PCI_COMMON_CONFIG, Command), + sizeof(USHORT)); + } + else + { + DbgPrint("None\n"); + } + + return STATUS_SUCCESS; } static NTSTATUS

1 0

[cgutman] 55539: [PCIX] - Ignore invalid extended capabilities pointer - Don't hang on unimplemented IRPs that we actually use
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 05:15:25 2012 New Revision: 55539 URL: http://svn.reactos.org/svn/reactos?rev=55539&view=rev Log: [PCIX] - Ignore invalid extended capabilities pointer - Don't hang on unimplemented IRPs that we actually use Modified: branches/usb-bringup-trunk/drivers/bus/pcix/enum.c branches/usb-bringup-trunk/drivers/bus/pcix/fdo.c branches/usb-bringup-trunk/drivers/bus/pcix/pdo.c Modified: branches/usb-bringup-trunk/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pcix/enum.c [iso-8859-1] Sat Feb 11 05:15:25 2012 @@ -1196,71 +1196,79 @@ CapPtr = PciData->u.type0.CapabilitiesPtr; } - /* Make sure the pointer is spec-aligned and located, and save it */ - DPRINT1("Device has capabilities at: %lx\n", CapPtr); - ASSERT(((CapPtr & 0x3) == 0) && (CapPtr >= PCI_COMMON_HDR_LENGTH)); - PdoExtension->CapabilitiesPtr = CapPtr; - - /* Check for PCI-to-PCI Bridges and AGP bridges */ - if ((PdoExtension->BaseClass == PCI_CLASS_BRIDGE_DEV) && - ((PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST) || - (PdoExtension->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI))) - { - /* Query either the raw AGP capabilitity, or the Target AGP one */ - TargetAgpCapabilityId = (PdoExtension->SubClass == - PCI_SUBCLASS_BR_PCI_TO_PCI) ? - PCI_CAPABILITY_ID_AGP_TARGET : - PCI_CAPABILITY_ID_AGP; - if (PciReadDeviceCapability(PdoExtension, - PdoExtension->CapabilitiesPtr, - TargetAgpCapabilityId, - &AgpCapability, - sizeof(PCI_CAPABILITIES_HEADER))) - { - /* AGP target ID was found, store it */ - DPRINT1("AGP ID: %lx\n", TargetAgpCapabilityId); - PdoExtension->TargetAgpCapabilityId = TargetAgpCapabilityId; - } - } - - /* Check for devices that are known not to have proper power management */ - if (!(PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS)) - { - /* Query if this device supports power management */ - if (!PciReadDeviceCapability(PdoExtension, - PdoExtension->CapabilitiesPtr, - PCI_CAPABILITY_ID_POWER_MANAGEMENT, - &PowerCapabilities.Header, - sizeof(PCI_PM_CAPABILITY))) - { - /* No power management, so act as if it had the hackflag set */ - DPRINT1("No PM caps, disabling PM\n"); - PdoExtension->HackFlags |= PCI_HACK_NO_PM_CAPS; - } - else - { - /* Otherwise, pick the highest wake level that is supported */ - WakeLevel = PowerDeviceUnspecified; - if (PowerCapabilities.PMC.Capabilities.Support.PMED0) - WakeLevel = PowerDeviceD0; - if (PowerCapabilities.PMC.Capabilities.Support.PMED1) - WakeLevel = PowerDeviceD1; - if (PowerCapabilities.PMC.Capabilities.Support.PMED2) - WakeLevel = PowerDeviceD2; - if (PowerCapabilities.PMC.Capabilities.Support.PMED3Hot) - WakeLevel = PowerDeviceD3; - if (PowerCapabilities.PMC.Capabilities.Support.PMED3Cold) - WakeLevel = PowerDeviceD3; - PdoExtension->PowerState.DeviceWakeLevel = WakeLevel; - - /* Convert the PCI power state to the NT power state */ - PdoExtension->PowerState.CurrentDeviceState = + /* Skip garbage capabilities pointer */ + if (((CapPtr & 0x3) != 0) || (CapPtr < PCI_COMMON_HDR_LENGTH)) + { + /* Report no extended capabilities */ + PdoExtension->CapabilitiesPtr = 0; + PdoExtension->HackFlags |= PCI_HACK_NO_PM_CAPS; + } + else + { + DPRINT1("Device has capabilities at: %lx\n", CapPtr); + PdoExtension->CapabilitiesPtr = CapPtr; + + /* Check for PCI-to-PCI Bridges and AGP bridges */ + if ((PdoExtension->BaseClass == PCI_CLASS_BRIDGE_DEV) && + ((PdoExtension->SubClass == PCI_SUBCLASS_BR_HOST) || + (PdoExtension->SubClass == PCI_SUBCLASS_BR_PCI_TO_PCI))) + { + /* Query either the raw AGP capabilitity, or the Target AGP one */ + TargetAgpCapabilityId = (PdoExtension->SubClass == + PCI_SUBCLASS_BR_PCI_TO_PCI) ? + PCI_CAPABILITY_ID_AGP_TARGET : + PCI_CAPABILITY_ID_AGP; + if (PciReadDeviceCapability(PdoExtension, + PdoExtension->CapabilitiesPtr, + TargetAgpCapabilityId, + &AgpCapability, + sizeof(PCI_CAPABILITIES_HEADER))) + { + /* AGP target ID was found, store it */ + DPRINT1("AGP ID: %lx\n", TargetAgpCapabilityId); + PdoExtension->TargetAgpCapabilityId = TargetAgpCapabilityId; + } + } + + /* Check for devices that are known not to have proper power management */ + if (!(PdoExtension->HackFlags & PCI_HACK_NO_PM_CAPS)) + { + /* Query if this device supports power management */ + if (!PciReadDeviceCapability(PdoExtension, + PdoExtension->CapabilitiesPtr, + PCI_CAPABILITY_ID_POWER_MANAGEMENT, + &PowerCapabilities.Header, + sizeof(PCI_PM_CAPABILITY))) + { + /* No power management, so act as if it had the hackflag set */ + DPRINT1("No PM caps, disabling PM\n"); + PdoExtension->HackFlags |= PCI_HACK_NO_PM_CAPS; + } + else + { + /* Otherwise, pick the highest wake level that is supported */ + WakeLevel = PowerDeviceUnspecified; + if (PowerCapabilities.PMC.Capabilities.Support.PMED0) + WakeLevel = PowerDeviceD0; + if (PowerCapabilities.PMC.Capabilities.Support.PMED1) + WakeLevel = PowerDeviceD1; + if (PowerCapabilities.PMC.Capabilities.Support.PMED2) + WakeLevel = PowerDeviceD2; + if (PowerCapabilities.PMC.Capabilities.Support.PMED3Hot) + WakeLevel = PowerDeviceD3; + if (PowerCapabilities.PMC.Capabilities.Support.PMED3Cold) + WakeLevel = PowerDeviceD3; + PdoExtension->PowerState.DeviceWakeLevel = WakeLevel; + + /* Convert the PCI power state to the NT power state */ + PdoExtension->PowerState.CurrentDeviceState = PowerCapabilities.PMCSR.ControlStatus.PowerState + 1; - /* Save all the power capabilities */ - PdoExtension->PowerCapabilities = PowerCapabilities.PMC.Capabilities; - DPRINT1("PM Caps Found! Wake Level: %d Power State: %d\n", - WakeLevel, PdoExtension->PowerState.CurrentDeviceState); + /* Save all the power capabilities */ + PdoExtension->PowerCapabilities = PowerCapabilities.PMC.Capabilities; + DPRINT1("PM Caps Found! Wake Level: %d Power State: %d\n", + WakeLevel, PdoExtension->PowerState.CurrentDeviceState); + } } } } Modified: branches/usb-bringup-trunk/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pcix/fdo.c [iso-8859-1] Sat Feb 11 05:15:25 2012 @@ -127,7 +127,6 @@ IN PPCI_FDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); return STATUS_NOT_SUPPORTED; } Modified: branches/usb-bringup-trunk/drivers/bus/pcix/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pcix/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pcix/pdo.c [iso-8859-1] Sat Feb 11 05:15:25 2012 @@ -91,7 +91,6 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -210,7 +209,6 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); return STATUS_NOT_SUPPORTED; } @@ -429,7 +427,6 @@ IN PPCI_PDO_EXTENSION DeviceExtension) { UNIMPLEMENTED; - while (TRUE); return STATUS_NOT_SUPPORTED; }

1 0

[cgutman] 55538: [NTOSKRNL] - Call HalAdjustResourceList to fixup the requirements list before building the resource list
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 04:14:41 2012 New Revision: 55538 URL: http://svn.reactos.org/svn/reactos?rev=55538&view=rev Log: [NTOSKRNL] - Call HalAdjustResourceList to fixup the requirements list before building the resource list Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat Feb 11 04:14:41 2012 @@ -1060,6 +1060,9 @@ if (!DeviceNode->ResourceRequirements) goto Finish; + /* Call HAL to fixup our resource requirements list */ + HalAdjustResourceList(&DeviceNode->ResourceRequirements); + /* Add resource requirements that aren't in the list we already got */ Status = IopFixupResourceListWithRequirements(DeviceNode->ResourceRequirements, &DeviceNode->ResourceList);

1 0

[cgutman] 55537: [NTOSKRNL] - Implement IopFixupResourceListWithRequirements to replace IopCreateResourceListFromRequirements - This functions fills in gaps between required resources and currently...
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 03:54:10 2012 New Revision: 55537 URL: http://svn.reactos.org/svn/reactos?rev=55537&view=rev Log: [NTOSKRNL] - Implement IopFixupResourceListWithRequirements to replace IopCreateResourceListFromRequirements - This functions fills in gaps between required resources and currently allocated resources in the resource list - It also implements support for alternate requirement descriptors which IopCreateResourceListFromRequirements ignored - Fix a critical bug in requirement processing that could result in the kernel allocating resources outside the devices requested range - Now the PnP manager will actually claim resources that the device reports that it needs but it does not currently have Modified: branches/usb-bringup-trunk/ntoskrnl/include/internal/io.h branches/usb-bringup-trunk/ntoskrnl/io/iomgr/iorsrce.c branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c Modified: branches/usb-bringup-trunk/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/incl… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/include/internal/io.h [iso-8859-1] Sat Feb 11 03:54:10 2012 @@ -516,7 +516,7 @@ NTSTATUS NTAPI -IopCreateResourceListFromRequirements( +IopFixupResourceListWithRequirements( IN PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList, OUT PCM_RESOURCE_LIST *ResourceList ); Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/i… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sat Feb 11 03:54:10 2012 @@ -930,9 +930,10 @@ NTSTATUS Status; DPRINT1("IoAssignResources is halfplemented!\n"); - - Status = IopCreateResourceListFromRequirements(RequestedResources, - AllocatedResources); + + *AllocatedResources = NULL; + Status = IopFixupResourceListWithRequirements(RequestedResources, + AllocatedResources); if (!NT_SUCCESS(Status)) { if (Status == STATUS_CONFLICTING_ADDRESSES) Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat Feb 11 03:54:10 2012 @@ -47,7 +47,7 @@ ASSERT(IoDesc->Type == CmResourceTypeBusNumber); for (Start = IoDesc->u.BusNumber.MinBusNumber; - Start <= IoDesc->u.BusNumber.MaxBusNumber; + Start <= IoDesc->u.BusNumber.MaxBusNumber - IoDesc->u.BusNumber.Length + 1; Start++) { CmDesc->u.BusNumber.Length = IoDesc->u.BusNumber.Length; @@ -59,6 +59,7 @@ } else { + DPRINT1("Satisfying bus number requirement with 0x%x (length: 0x%x)\n", Start, CmDesc->u.BusNumber.Length); return TRUE; } } @@ -82,7 +83,7 @@ if (IoDesc->u.Memory.Alignment == 0) IoDesc->u.Memory.Alignment = 1; for (Start = IoDesc->u.Memory.MinimumAddress.QuadPart; - Start <= IoDesc->u.Memory.MaximumAddress.QuadPart; + Start <= IoDesc->u.Memory.MaximumAddress.QuadPart - IoDesc->u.Memory.Length + 1; Start += IoDesc->u.Memory.Alignment) { CmDesc->u.Memory.Length = IoDesc->u.Memory.Length; @@ -95,6 +96,7 @@ } else { + DPRINT1("Satisfying memory requirement with 0x%I64x (length: 0x%x)\n", Start, CmDesc->u.Memory.Length); return TRUE; } } @@ -118,7 +120,7 @@ if (IoDesc->u.Port.Alignment == 0) IoDesc->u.Port.Alignment = 1; for (Start = IoDesc->u.Port.MinimumAddress.QuadPart; - Start <= IoDesc->u.Port.MaximumAddress.QuadPart; + Start <= IoDesc->u.Port.MaximumAddress.QuadPart - IoDesc->u.Port.Length + 1; Start += IoDesc->u.Port.Alignment) { CmDesc->u.Port.Length = IoDesc->u.Port.Length; @@ -130,6 +132,7 @@ } else { + DPRINT1("Satisfying port requirement with 0x%I64x (length: 0x%x)\n", Start, CmDesc->u.Port.Length); return TRUE; } } @@ -156,7 +159,10 @@ CmDesc->u.Dma.Port = 0; if (!IopCheckDescriptorForConflict(CmDesc, NULL)) + { + DPRINT1("Satisfying DMA requirement with channel 0x%x\n", Channel); return TRUE; + } } return FALSE; @@ -182,163 +188,298 @@ CmDesc->u.Interrupt.Affinity = (KAFFINITY)-1; if (!IopCheckDescriptorForConflict(CmDesc, NULL)) + { + DPRINT1("Satisfying interrupt requirement with IRQ 0x%x\n", Vector); return TRUE; + } } return FALSE; } - NTSTATUS NTAPI -IopCreateResourceListFromRequirements( +IopFixupResourceListWithRequirements( IN PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList, OUT PCM_RESOURCE_LIST *ResourceList) { - ULONG i, ii, Size; - PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc; - - Size = FIELD_OFFSET(CM_RESOURCE_LIST, List); - for (i = 0; i < RequirementsList->AlternativeLists; i++) - { - PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; - Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) - + ResList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - } - - *ResourceList = ExAllocatePool(PagedPool, Size); - if (!*ResourceList) - return STATUS_INSUFFICIENT_RESOURCES; - - (*ResourceList)->Count = 1; - (*ResourceList)->List[0].BusNumber = RequirementsList->BusNumber; - (*ResourceList)->List[0].InterfaceType = RequirementsList->InterfaceType; - (*ResourceList)->List[0].PartialResourceList.Version = 1; - (*ResourceList)->List[0].PartialResourceList.Revision = 1; - (*ResourceList)->List[0].PartialResourceList.Count = 0; - - ResDesc = &(*ResourceList)->List[0].PartialResourceList.PartialDescriptors[0]; - - for (i = 0; i < RequirementsList->AlternativeLists; i++) - { - PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; - for (ii = 0; ii < ResList->Count; ii++) - { - PIO_RESOURCE_DESCRIPTOR ReqDesc = &ResList->Descriptors[ii]; - BOOLEAN FoundResource = TRUE; - - /* FIXME: Handle alternate ranges */ - if (ReqDesc->Option == IO_RESOURCE_ALTERNATIVE) - continue; - - ResDesc->Type = ReqDesc->Type; - ResDesc->Flags = ReqDesc->Flags; - ResDesc->ShareDisposition = ReqDesc->ShareDisposition; - - switch (ReqDesc->Type) - { - case CmResourceTypeInterrupt: - if (!IopFindInterruptResource(ReqDesc, ResDesc)) - { - DPRINT1("Failed to find an available interrupt resource (0x%x to 0x%x)\n", - ReqDesc->u.Interrupt.MinimumVector, ReqDesc->u.Interrupt.MaximumVector); - - if (ReqDesc->Option == 0) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - return STATUS_CONFLICTING_ADDRESSES; - } - - FoundResource = FALSE; - } - break; - - case CmResourceTypePort: - if (!IopFindPortResource(ReqDesc, ResDesc)) - { - DPRINT1("Failed to find an available port resource (0x%I64x to 0x%I64x length: 0x%x)\n", - ReqDesc->u.Port.MinimumAddress.QuadPart, ReqDesc->u.Port.MaximumAddress.QuadPart, - ReqDesc->u.Port.Length); - - if (ReqDesc->Option == 0) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - return STATUS_CONFLICTING_ADDRESSES; - } - - FoundResource = FALSE; - } - break; - - case CmResourceTypeMemory: - if (!IopFindMemoryResource(ReqDesc, ResDesc)) - { - DPRINT1("Failed to find an available memory resource (0x%I64x to 0x%I64x length: 0x%x)\n", - ReqDesc->u.Memory.MinimumAddress.QuadPart, ReqDesc->u.Memory.MaximumAddress.QuadPart, - ReqDesc->u.Memory.Length); - - if (ReqDesc->Option == 0) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - return STATUS_CONFLICTING_ADDRESSES; - } - - FoundResource = FALSE; - } - break; - - case CmResourceTypeBusNumber: - if (!IopFindBusNumberResource(ReqDesc, ResDesc)) - { - DPRINT1("Failed to find an available bus number resource (0x%x to 0x%x length: 0x%x)\n", - ReqDesc->u.BusNumber.MinBusNumber, ReqDesc->u.BusNumber.MaxBusNumber, - ReqDesc->u.BusNumber.Length); - - if (ReqDesc->Option == 0) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - return STATUS_CONFLICTING_ADDRESSES; - } - - FoundResource = FALSE; - } - break; - - case CmResourceTypeDma: - if (!IopFindDmaResource(ReqDesc, ResDesc)) - { - DPRINT1("Failed to find an available dma resource (0x%x to 0x%x)\n", - ReqDesc->u.Dma.MinimumChannel, ReqDesc->u.Dma.MaximumChannel); - - if (ReqDesc->Option == 0) - { - ExFreePool(*ResourceList); - *ResourceList = NULL; - return STATUS_CONFLICTING_ADDRESSES; - } - - FoundResource = FALSE; - } - break; - - default: - DPRINT1("Unsupported resource type: %x\n", ReqDesc->Type); - FoundResource = FALSE; - break; - } - - if (FoundResource) - { - (*ResourceList)->List[0].PartialResourceList.Count++; - ResDesc++; - } - } - } - - return STATUS_SUCCESS; + ULONG i; + for (i = 0; i < RequirementsList->AlternativeLists; i++) + { + ULONG ii; + PIO_RESOURCE_LIST ResList = &RequirementsList->List[i]; + BOOLEAN AlternateRequired = FALSE; + + for (ii = 0; ii < ResList->Count; ii++) + { + ULONG iii; + PCM_PARTIAL_RESOURCE_LIST PartialList = (*ResourceList) ? &(*ResourceList)->List[0].PartialResourceList : NULL; + PIO_RESOURCE_DESCRIPTOR IoDesc = &ResList->Descriptors[ii]; + BOOLEAN Matched = FALSE; + + /* Skip alternates if we don't need one */ + if (!AlternateRequired && (IoDesc->Option & IO_RESOURCE_ALTERNATIVE)) + { + DPRINT("Skipping unneeded alternate\n"); + continue; + } + + /* Check if we couldn't satsify a requirement or its alternates */ + if (AlternateRequired && !(IoDesc->Option & IO_RESOURCE_ALTERNATIVE)) + { + DPRINT1("Unable to satisfy preferred resource or alternates\n"); + + if (*ResourceList) + { + ExFreePool(*ResourceList); + *ResourceList = NULL; + } + return STATUS_CONFLICTING_ADDRESSES; + } + + for (iii = 0; PartialList && iii < PartialList->Count && !Matched; iii++) + { + PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc = &PartialList->PartialDescriptors[iii]; + + /* First check types */ + if (IoDesc->Type != CmDesc->Type) + continue; + + switch (IoDesc->Type) + { + case CmResourceTypeInterrupt: + /* Make sure it satisfies our vector range */ + if (CmDesc->u.Interrupt.Vector >= IoDesc->u.Interrupt.MinimumVector && + CmDesc->u.Interrupt.Vector <= IoDesc->u.Interrupt.MaximumVector) + { + /* Found it */ + Matched = TRUE; + } + else + { + DPRINT("Interrupt - Not a match! 0x%x not inside 0x%x to 0x%x\n", + CmDesc->u.Interrupt.Vector, + IoDesc->u.Interrupt.MinimumVector, + IoDesc->u.Interrupt.MaximumVector); + } + break; + + case CmResourceTypeMemory: + case CmResourceTypePort: + /* Make sure the length matches and it satisfies our address range */ + if (CmDesc->u.Memory.Length == IoDesc->u.Memory.Length && + CmDesc->u.Memory.Start.QuadPart >= IoDesc->u.Memory.MinimumAddress.QuadPart && + CmDesc->u.Memory.Start.QuadPart + CmDesc->u.Memory.Length - 1 <= IoDesc->u.Memory.MaximumAddress.QuadPart) + { + /* Found it */ + Matched = TRUE; + } + else + { + DPRINT("Memory/Port - Not a match! 0x%I64x with length 0x%x not inside 0x%I64x to 0x%I64x with length 0x%x\n", + CmDesc->u.Memory.Start.QuadPart, + CmDesc->u.Memory.Length, + IoDesc->u.Memory.MinimumAddress.QuadPart, + IoDesc->u.Memory.MaximumAddress.QuadPart, + IoDesc->u.Memory.Length); + } + break; + + case CmResourceTypeBusNumber: + /* Make sure the length matches and it satisfies our bus number range */ + if (CmDesc->u.BusNumber.Length == IoDesc->u.BusNumber.Length && + CmDesc->u.BusNumber.Start >= IoDesc->u.BusNumber.MinBusNumber && + CmDesc->u.BusNumber.Start + CmDesc->u.BusNumber.Length - 1 <= IoDesc->u.BusNumber.MaxBusNumber) + { + /* Found it */ + Matched = TRUE; + } + else + { + DPRINT("Bus Number - Not a match! 0x%x with length 0x%x not inside 0x%x to 0x%x with length 0x%x\n", + CmDesc->u.BusNumber.Start, + CmDesc->u.BusNumber.Length, + IoDesc->u.BusNumber.MinBusNumber, + IoDesc->u.BusNumber.MaxBusNumber, + IoDesc->u.BusNumber.Length); + } + break; + + case CmResourceTypeDma: + /* Make sure it fits in our channel range */ + if (CmDesc->u.Dma.Channel >= IoDesc->u.Dma.MinimumChannel && + CmDesc->u.Dma.Channel <= IoDesc->u.Dma.MaximumChannel) + { + /* Found it */ + Matched = TRUE; + } + else + { + DPRINT("DMA - Not a match! 0x%x not inside 0x%x to 0x%x\n", + CmDesc->u.Dma.Channel, + IoDesc->u.Dma.MinimumChannel, + IoDesc->u.Dma.MaximumChannel); + } + break; + + default: + /* Other stuff is fine */ + Matched = TRUE; + break; + } + } + + /* Check if we found a matching descriptor */ + if (!Matched) + { + PCM_RESOURCE_LIST NewList; + CM_PARTIAL_RESOURCE_DESCRIPTOR NewDesc; + PCM_PARTIAL_RESOURCE_DESCRIPTOR DescPtr; + BOOLEAN FoundResource = TRUE; + + /* Setup the new CM descriptor */ + NewDesc.Type = IoDesc->Type; + NewDesc.Flags = IoDesc->Flags; + NewDesc.ShareDisposition = IoDesc->ShareDisposition; + + /* Let'se see if we can find a resource to satisfy this */ + switch (IoDesc->Type) + { + case CmResourceTypeInterrupt: + /* Find an available interrupt */ + if (!IopFindInterruptResource(IoDesc, &NewDesc)) + { + DPRINT1("Failed to find an available interrupt resource (0x%x to 0x%x)\n", + IoDesc->u.Interrupt.MinimumVector, IoDesc->u.Interrupt.MaximumVector); + + FoundResource = FALSE; + } + break; + + case CmResourceTypePort: + /* Find an available port range */ + if (!IopFindPortResource(IoDesc, &NewDesc)) + { + DPRINT1("Failed to find an available port resource (0x%I64x to 0x%I64x length: 0x%x)\n", + IoDesc->u.Port.MinimumAddress.QuadPart, IoDesc->u.Port.MaximumAddress.QuadPart, + IoDesc->u.Port.Length); + + FoundResource = FALSE; + } + break; + + case CmResourceTypeMemory: + /* Find an available memory range */ + if (!IopFindMemoryResource(IoDesc, &NewDesc)) + { + DPRINT1("Failed to find an available memory resource (0x%I64x to 0x%I64x length: 0x%x)\n", + IoDesc->u.Memory.MinimumAddress.QuadPart, IoDesc->u.Memory.MaximumAddress.QuadPart, + IoDesc->u.Memory.Length); + + FoundResource = FALSE; + } + break; + + case CmResourceTypeBusNumber: + /* Find an available bus address range */ + if (!IopFindBusNumberResource(IoDesc, &NewDesc)) + { + DPRINT1("Failed to find an available bus number resource (0x%x to 0x%x length: 0x%x)\n", + IoDesc->u.BusNumber.MinBusNumber, IoDesc->u.BusNumber.MaxBusNumber, + IoDesc->u.BusNumber.Length); + + FoundResource = FALSE; + } + break; + + case CmResourceTypeDma: + /* Find an available DMA channel */ + if (!IopFindDmaResource(IoDesc, &NewDesc)) + { + DPRINT1("Failed to find an available dma resource (0x%x to 0x%x)\n", + IoDesc->u.Dma.MinimumChannel, IoDesc->u.Dma.MaximumChannel); + + FoundResource = FALSE; + } + break; + + default: + DPRINT1("Unsupported resource type: %x\n", IoDesc->Type); + FoundResource = FALSE; + break; + } + + /* Check if it's missing and required */ + if (!FoundResource && IoDesc->Option == 0) + { + if (*ResourceList) + { + ExFreePool(*ResourceList); + *ResourceList = NULL; + } + return STATUS_CONFLICTING_ADDRESSES; + } + else if (!FoundResource) + { + /* Try an alternate for this preferred descriptor */ + AlternateRequired = TRUE; + continue; + } + else + { + /* Move on to the next preferred or required descriptor after this one */ + AlternateRequired = FALSE; + } + + /* Figure out what we need */ + if (PartialList == NULL) + { + /* We need a new list */ + NewList = ExAllocatePool(PagedPool, sizeof(CM_RESOURCE_LIST)); + if (!NewList) + return STATUS_NO_MEMORY; + + /* Set it up */ + NewList->Count = 1; + NewList->List[0].InterfaceType = RequirementsList->InterfaceType; + NewList->List[0].BusNumber = RequirementsList->BusNumber; + NewList->List[0].PartialResourceList.Version = 1; + NewList->List[0].PartialResourceList.Revision = 1; + NewList->List[0].PartialResourceList.Count = 1; + + /* Set our pointer */ + DescPtr = &NewList->List[0].PartialResourceList.PartialDescriptors[0]; + } + else + { + /* Allocate the new larger list */ + NewList = ExAllocatePool(PagedPool, PnpDetermineResourceListSize(*ResourceList) + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR)); + if (!NewList) + return STATUS_NO_MEMORY; + + /* Copy the old stuff back */ + RtlCopyMemory(NewList, *ResourceList, PnpDetermineResourceListSize(*ResourceList)); + + /* Set our pointer */ + DescPtr = &NewList->List[0].PartialResourceList.PartialDescriptors[NewList->List[0].PartialResourceList.Count]; + + /* Increment the descriptor count */ + NewList->List[0].PartialResourceList.Count++; + + /* Free the old list */ + ExFreePool(*ResourceList); + } + + /* Copy the descriptor in */ + *DescPtr = NewDesc; + + /* Store the new list */ + *ResourceList = NewList; + } + } + } + + /* Done */ + return STATUS_SUCCESS; } static @@ -888,50 +1029,47 @@ return STATUS_SUCCESS; } - /* Fill DeviceNode->ResourceList - * FIXME: the PnP arbiter should go there! - * Actually, use the BootResources if provided, else the resource requirements - */ - if (DeviceNode->BootResources) { - ListSize = PnpDetermineResourceListSize(DeviceNode->BootResources); - - DeviceNode->ResourceList = ExAllocatePool(PagedPool, ListSize); - if (!DeviceNode->ResourceList) - { - Status = STATUS_NO_MEMORY; - goto ByeBye; - } - RtlCopyMemory(DeviceNode->ResourceList, DeviceNode->BootResources, ListSize); - - Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL); - if (NT_SUCCESS(Status) || !DeviceNode->ResourceRequirements) - { - if (!NT_SUCCESS(Status) && !DeviceNode->ResourceRequirements) - { - DPRINT1("Using conflicting boot resources because no requirements were supplied!\n"); - } - - goto Finish; - } - else - { - DPRINT1("Boot resources for %wZ cause a resource conflict!\n", &DeviceNode->InstancePath); - ExFreePool(DeviceNode->ResourceList); - DeviceNode->ResourceList = NULL; - } - } - - Status = IopCreateResourceListFromRequirements(DeviceNode->ResourceRequirements, - &DeviceNode->ResourceList); + ListSize = PnpDetermineResourceListSize(DeviceNode->BootResources); + + DeviceNode->ResourceList = ExAllocatePool(PagedPool, ListSize); + if (!DeviceNode->ResourceList) + { + Status = STATUS_NO_MEMORY; + goto ByeBye; + } + + RtlCopyMemory(DeviceNode->ResourceList, DeviceNode->BootResources, ListSize); + + Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Boot resources for %wZ cause a resource conflict!\n", &DeviceNode->InstancePath); + ExFreePool(DeviceNode->ResourceList); + DeviceNode->ResourceList = NULL; + } + } + else + { + /* We'll make this from the requirements */ + DeviceNode->ResourceList = NULL; + } + + /* No resources requirements */ + if (!DeviceNode->ResourceRequirements) + goto Finish; + + /* Add resource requirements that aren't in the list we already got */ + Status = IopFixupResourceListWithRequirements(DeviceNode->ResourceRequirements, + &DeviceNode->ResourceList); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create a resource list from supplied resources for %wZ\n", &DeviceNode->InstancePath); + DPRINT1("Failed to fixup a resource list from supplied resources for %wZ\n", &DeviceNode->InstancePath); goto ByeBye; } - /* IopCreateResourceListFromRequirements should NEVER succeed with a conflicting list */ + /* IopFixupResourceListWithRequirements should NEVER give us a conflicting list */ ASSERT(IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL) != STATUS_CONFLICTING_ADDRESSES); Finish:

1 0

[janderwald] 55536: [USBEHCI] - Store configuration index in the setup packet - Perform retrieving the configuration request before storing the configuration details. Perform the same action for th...
by janderwald＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: janderwald Date: Sat Feb 11 02:10:20 2012 New Revision: 55536 URL: http://svn.reactos.org/svn/reactos?rev=55536&view=rev Log: [USBEHCI] - Store configuration index in the setup packet - Perform retrieving the configuration request before storing the configuration details. Perform the same action for the select interface request - EHCI now supports selecting configuration & interface on devices with more than one configuration (previously only one configuration was supported) - Code has not yet been tested, as no available usb device has such feature Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci/usb_device.cpp [iso-8859-1] Sat Feb 11 02:10:20 2012 @@ -58,7 +58,7 @@ // local function virtual NTSTATUS CommitIrp(PIRP Irp); virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); - virtual NTSTATUS CreateConfigurationDescriptor(ULONG ConfigurationIndex); + virtual NTSTATUS CreateConfigurationDescriptor(UCHAR ConfigurationIndex); virtual NTSTATUS CreateDeviceDescriptor(); virtual VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual VOID DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); @@ -302,7 +302,7 @@ PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; UCHAR OldAddress; - ULONG Index; + UCHAR Index; DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); @@ -685,7 +685,7 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::CreateConfigurationDescriptor( - ULONG Index) + UCHAR Index) { PVOID Buffer; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; @@ -722,14 +722,10 @@ CtrlSetup.bmRequestType._BM.Reserved = 0; CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.LowByte = Index; CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = PAGE_SIZE; - - // - // FIXME: where put configuration index? - // // // now build MDL describing the buffer @@ -1077,21 +1073,54 @@ IN PUSBD_INTERFACE_INFORMATION InterfaceInfo, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle) { - ULONG ConfigurationIndex = 0; ULONG InterfaceIndex, PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; // - // FIXME: support multiple configurations - // - PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - PC_ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor.iConfiguration); + // sanity checks + // + ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor.iConfiguration); // // sanity check // - PC_ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor.bNumInterfaces); + ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor.bNumInterfaces); + + // + // now build setup packet + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; + CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; + + // + // select configuration + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + + // + // informal debug print + // + DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store configuration device index + // + m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; + + // + // store configuration handle + // + *ConfigurationHandle = &m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration]; // // copy interface info and pipe info @@ -1101,7 +1130,7 @@ // // sanity check: is the info pre-layed out // - PC_ASSERT(InterfaceInfo->NumberOfPipes == m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints); + PC_ASSERT(InterfaceInfo->NumberOfPipes == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints); PC_ASSERT(InterfaceInfo->Length != 0); #ifdef _MSC_VER PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); @@ -1110,10 +1139,10 @@ // // copy interface info // - InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)&m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex]; - InterfaceInfo->Class = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceClass; - InterfaceInfo->SubClass = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceSubClass; - InterfaceInfo->Protocol = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceProtocol; + InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex]; + InterfaceInfo->Class = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceClass; + InterfaceInfo->SubClass = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceSubClass; + InterfaceInfo->Protocol = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceProtocol; InterfaceInfo->Reserved = 0; // @@ -1124,47 +1153,22 @@ // // copy pipe info // - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&m_ConfigurationDescriptors[ConfigurationIndex].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor; + InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[PipeIndex].EndpointAddress = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[PipeIndex].Interval = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; + InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor; + + // + // data toggle is reset on configuration requests + // + m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].DataToggle = FALSE; } // // move offset // InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)PtrToUlong(InterfaceInfo) + InterfaceInfo->Length); - } - - // - // now build setup packet - // - RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; - CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; - - // - // select configuration - // - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); - - // - // informal debug print - // - DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); - - if (NT_SUCCESS(Status)) - { - // - // store configuration device index - // - m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; - - // - // store configuration handle - // - *ConfigurationHandle = &m_ConfigurationDescriptors[ConfigurationIndex]; } // @@ -1179,21 +1183,50 @@ IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo) { - ULONG ConfigurationIndex = 0; PUSB_CONFIGURATION Configuration; ULONG PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; // - // FIXME support multiple configurations - // - PC_ASSERT(&m_ConfigurationDescriptors[ConfigurationIndex] == (PUSB_CONFIGURATION)ConfigurationHandle); - - // // get configuration struct // Configuration = (PUSB_CONFIGURATION)ConfigurationHandle; + + // + // sanity check + // + ASSERT(Configuration->ConfigurationDescriptor.bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(Configuration->ConfigurationDescriptor.bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(Configuration->ConfigurationDescriptor.iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(&m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor.iConfiguration] == Configuration); + + // + // initialize setup packet + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE; + CtrlSetup.wValue.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting; + CtrlSetup.wIndex.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber; + CtrlSetup.bmRequestType.B = 0x01; + + // + // issue request + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + + // + // informal debug print + // + DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); + if (!NT_SUCCESS(Status)) + { + // + // failed to select interface + // + return Status; + } + // // sanity checks @@ -1224,6 +1257,11 @@ InterfaceInfo->Pipes[PipeIndex].PipeHandle = &Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor; + // + // data toggle is reset on select interface requests + // + m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor.iConfiguration].Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].DataToggle = FALSE; + if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) { // @@ -1232,24 +1270,6 @@ } } - // - // initialize setup packet - // - RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE; - CtrlSetup.wValue.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting; - CtrlSetup.wIndex.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber; - CtrlSetup.bmRequestType.B = 0x01; - - // - // issue request - // - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); - - // - // informal debug print - // - DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); // // done

1 0

[cgutman] 55535: [HAL] - Print a message when a PCI device requires an interrupt but has none assigned
by cgutman＠svn.reactos.org 11 Feb '12

11 Feb '12

Author: cgutman Date: Sat Feb 11 01:11:47 2012 New Revision: 55535 URL: http://svn.reactos.org/svn/reactos?rev=55535&view=rev Log: [HAL] - Print a message when a PCI device requires an interrupt but has none assigned Modified: branches/usb-bringup-trunk/hal/halx86/legacy/bussupp.c Modified: branches/usb-bringup-trunk/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/hal/halx86/le… ============================================================================== --- branches/usb-bringup-trunk/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/hal/halx86/legacy/bussupp.c [iso-8859-1] Sat Feb 11 01:11:47 2012 @@ -802,6 +802,7 @@ if (PciData->u.type0.InterruptPin != 0 && PciData->u.type0.InterruptLine != 0 && PciData->u.type0.InterruptLine != 0xFF) DbgPrint(", IRQ %02d", PciData->u.type0.InterruptLine); + else if (PciData->u.type0.InterruptPin != 0) DbgPrint(", IRQ assignment required"); DbgPrint("\n"); /* Scan addresses */

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