Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[janderwald] 55385: [USBEHCI] - Use constants instead of hardcoding register offsets. Taken from Haiku - Elements in HCSP-PORTROUTE are 4 bit entries instead
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 22:18:58 2012 New Revision: 55385 URL: http://svn.reactos.org/svn/reactos?rev=55385&view=rev Log: [USBEHCI] - Use constants instead of hardcoding register offsets. Taken from Haiku - Elements in HCSP-PORTROUTE are 4 bit entries instead Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Thu Feb 2 22:18:58 2012 @@ -304,6 +304,8 @@ PHYSICAL_ADDRESS AsyncPhysicalAddress; PVOID ResourceBase; NTSTATUS Status; + UCHAR Value; + UCHAR PortCount; DPRINT1("CUSBHardwareDevice::PnpStart\n"); for(Index = 0; Index < TranslatedResources->List[0].PartialResourceList.Count; Index++) @@ -361,24 +363,38 @@ // // Get controllers capabilities // - m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase); - m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + 2)); - m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4)); - m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); + m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase + EHCI_CAPLENGTH); + m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + EHCI_HCIVERSION)); + m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCSPARAMS)); + m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + EHCI_HCCPARAMS)); DPRINT1("Controller has %d Length\n", m_Capabilities.Length); DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); DPRINT1("Controller EHCI Version %x\n", m_Capabilities.HCIVersion); - DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); - DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); - - DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); + DPRINT1("Controler EHCI Caps HCSParamsLong %x\n", m_Capabilities.HCSParamsLong); + DPRINT1("Controler EHCI Caps HCCParamsLong %x\n", m_Capabilities.HCCParamsLong); + DPRINT1("Controler EHCI Caps PowerControl %x\n", m_Capabilities.HCSParams.PortPowerControl); + + + + if (m_Capabilities.HCSParams.PortRouteRules) { - for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) + Count = 0; + PortCount = max(m_Capabilities.HCSParams.PortCount/2, (m_Capabilities.HCSParams.PortCount+1)/2); + do { - m_Capabilities.PortRoute[Count] = READ_REGISTER_UCHAR((PUCHAR)(ULONG)ResourceBase + 12 + Count); - } + // + // each entry is a 4 bit field EHCI 2.2.5 + // + Value = READ_REGISTER_UCHAR((PUCHAR)(ULONG)ResourceBase + EHCI_HCSP_PORTROUTE + Count); + m_Capabilities.PortRoute[Count*2] = (Value & 0xF0); + + if ((Count*2) + 1 < m_Capabilities.HCSParams.PortCount) + m_Capabilities.PortRoute[(Count*2)+1] = (Value & 0x0F); + + Count++; + }while(Count < PortCount); } // Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Thu Feb 2 22:18:58 2012 @@ -1,6 +1,16 @@ #pragma once #include <ntddk.h> + + +// +// Host Controller Capability Registers +// +#define EHCI_CAPLENGTH 0x00 +#define EHCI_HCIVERSION 0x02 +#define EHCI_HCSPARAMS 0x04 +#define EHCI_HCCPARAMS 0x08 +#define EHCI_HCSP_PORTROUTE 0x0c // // EHCI Operational Registers

1 0

[tkreuzer] 55384: [SMSS2] Fix MSVC build
by tkreuzer＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: tkreuzer Date: Thu Feb 2 20:50:22 2012 New Revision: 55384 URL: http://svn.reactos.org/svn/reactos?rev=55384&view=rev Log: [SMSS2] Fix MSVC build Modified: trunk/reactos/base/system/smss2/sminit.c Modified: trunk/reactos/base/system/smss2/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/sminit.c… ============================================================================== --- trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/sminit.c [iso-8859-1] Thu Feb 2 20:50:22 2012 @@ -447,8 +447,8 @@ if (DllPath->Buffer) { /* Fill out the rest of the string */ - DllPath->MaximumLength = Length; - DllPath->Length = Length - sizeof(UNICODE_NULL); + DllPath->MaximumLength = (USHORT)Length; + DllPath->Length = (USHORT)Length - sizeof(UNICODE_NULL); /* Copy the actual path and return success */ RtlCopyMemory(DllPath->Buffer, Buffer, Length); @@ -1261,7 +1261,7 @@ ULONG_PTR ErrorParameters[3]; UNICODE_STRING ErrorResponse; IO_STATUS_BLOCK IoStatusBlock; - ULONG OldFlag = 0; + SECURITY_DESCRIPTOR_CONTROL OldFlag = 0; USHORT ImageCharacteristics; /* Initialize to NULL */ @@ -1546,7 +1546,7 @@ /* We'll be writing all these environment variables over here */ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\System\\CurrentControlSet\\" - "Control\\Session Manager\\Environment"); + L"Control\\Session Manager\\Environment"); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -1636,7 +1636,7 @@ /* Now open the hardware CPU key */ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\Hardware\\Description\\System\\" - "CentralProcessor\\0"); + L"CentralProcessor\\0"); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -1764,7 +1764,7 @@ /* Now we need to write the safeboot option key in a different format */ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\System\\CurrentControlSet\\" - "Control\\Safeboot\\Option"); + L"Control\\Safeboot\\Option"); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -1879,7 +1879,7 @@ /* Check if we were booted in PE mode (LiveCD should have this) */ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\System\\CurrentControlSet\\" - "Control\\MiniNT"); + L"Control\\MiniNT"); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE, @@ -1899,7 +1899,7 @@ /* Open the environment key to see if we are booted in safe mode */ RtlInitUnicodeString(&DestinationString, L"\\Registry\\Machine\\System\\CurrentControlSet\\" - "Control\\Session Manager\\Environment"); + L"Control\\Session Manager\\Environment"); InitializeObjectAttributes(&ObjectAttributes, &DestinationString, OBJ_CASE_INSENSITIVE,

1 0

[akhaldi] 55383: [NTOSKRNL] * Fix MSVC build.
by akhaldi＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: akhaldi Date: Thu Feb 2 20:45:49 2012 New Revision: 55383 URL: http://svn.reactos.org/svn/reactos?rev=55383&view=rev Log: [NTOSKRNL] * Fix MSVC build. Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Thu Feb 2 20:45:49 2012 @@ -556,6 +556,7 @@ KAPC_STATE ApcState; ULONG ProtectionMask; BOOLEAN Attached = FALSE; + ULONG_PTR EndingAddress; BoundaryAddressMultiple.QuadPart = 0; PAGED_CODE(); @@ -876,7 +877,6 @@ MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress; - ULONG_PTR EndingAddress; EndingAddress = ((ULONG_PTR)MemoryArea->StartingAddress + RegionSize - 1) | (PAGE_SIZE - 1); RegionSize = (ULONG_PTR)EndingAddress - (ULONG_PTR)MemoryArea->StartingAddress + 1;

1 0

[cgutman] 55382: [USETUP] - Write the partition table back after CheckActiveBootPartition() because it could've changed the partition table on a disk with no active partition - Fixes issues install...
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 19:57:13 2012 New Revision: 55382 URL: http://svn.reactos.org/svn/reactos?rev=55382&view=rev Log: [USETUP] - Write the partition table back after CheckActiveBootPartition() because it could've changed the partition table on a disk with no active partition - Fixes issues installing ROS on new disks and disks with no active partitions (including USB disks) Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c Modified: branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/setup/us… ============================================================================== --- branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Feb 2 19:57:13 2012 @@ -3350,7 +3350,16 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); + /* Find or set the active partition */ CheckActiveBootPartition(PartitionList); + + /* Update the partition table because we may have changed the active partition */ + if (WritePartitionsToDisk(PartitionList) == FALSE) + { + DPRINT("WritePartitionsToDisk() failed\n"); + MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); + return QUIT_PAGE; + } RtlFreeUnicodeString(&SystemRootPath); swprintf(PathBuffer,

1 0

[janderwald] 55381: [USBSTOR] - Add sanity checks - Check if device needs CDB padding and return error in that case
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 19:37:38 2012 New Revision: 55381 URL: http://svn.reactos.org/svn/reactos?rev=55381&view=rev Log: [USBSTOR] - Add sanity checks - Check if device needs CDB padding and return error in that case Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Thu Feb 2 19:37:38 2012 @@ -193,13 +193,29 @@ // Check that this device uses bulk transfers and is SCSI // InterfaceDesc = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)DeviceExtension->ConfigurationDescriptor + sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + // + // sanity check + // + ASSERT(InterfaceDesc->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDesc->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + DPRINT1("bInterfaceSubClass %x\n", InterfaceDesc->bInterfaceSubClass); if (InterfaceDesc->bInterfaceProtocol != 0x50) { DPRINT1("USB Device is not a bulk only device and is not currently supported\n"); return STATUS_NOT_SUPPORTED; } - + + if (InterfaceDesc->bInterfaceSubClass != 0x06) + { + // + // FIXME: need to pad CDBs to 12 byte + // mode select commands must be translated from 1AH / 15h to 5AH / 55h + // + DPRINT1("[USBSTOR] Error: need to pad CDBs\n"); + return STATUS_NOT_IMPLEMENTED; + } // // now select an interface

1 0

[cgutman] 55380: [USBOHCI] - Fix device enumeration on boot
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 18:29:30 2012 New Revision: 55380 URL: http://svn.reactos.org/svn/reactos?rev=55380&view=rev Log: [USBOHCI] - Fix device enumeration on boot Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Thu Feb 2 18:29:30 2012 @@ -1349,10 +1349,15 @@ KeDelayExecutionThread(KernelMode, FALSE, &Timeout); // - // trigger the status change interrupt - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); - + // is there a status change callback + // + if (m_SCECallBack != NULL) + { + // + // issue callback + // + m_SCECallBack(m_SCEContext); + } return STATUS_SUCCESS; } return STATUS_SUCCESS;

1 0

[janderwald] 55379: [INF] - Add install section for hid compatible device - Reviewed by Cameron Gutman
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 18:26:10 2012 New Revision: 55379 URL: http://svn.reactos.org/svn/reactos?rev=55379&view=rev Log: [INF] - Add install section for hid compatible device - Reviewed by Cameron Gutman Modified: branches/usb-bringup-trunk/media/inf/input.inf Modified: branches/usb-bringup-trunk/media/inf/input.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/media/inf/inp… ============================================================================== --- branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/media/inf/input.inf [iso-8859-1] Thu Feb 2 18:26:10 2012 @@ -37,6 +37,20 @@ %HID.DeviceDesc% = HID_Inst,GENERIC_HID_DEVICE %HID.DeviceDesc% = HID_Inst,USB\Class_03&SubClass_01 %HID.DeviceDesc% = HID_Inst,USB\Class_03 +%HID_DEVICE%=HID_Raw_Inst,, HID_DEVICE + +;=========================== HID Raw Device ==================== + +[HID_Raw_Inst.NT] + +[HID_Raw_Inst.Services] +AddService = , 0x00000002 + +[HID_Raw_Inst.HW] + + +;=========================== HID Device ==================== + [HID_Inst.NT] Copyfiles = HID_Inst.CopyFiles.NT, HID_Inst.CopyFilesDLL.NT @@ -64,6 +78,7 @@ HID.ClassName = "Human Interface Devices" HID.DeviceDesc = "USB Human Interface Device" +HID_DEVICE = "HID-compatible Device" StdMfg = "(Standard Human Interface Devices)" MSMice = "Microsoft"

1 0

[janderwald] 55378: [HIDCLASS] - Also store the HID_DEVICE_UP format in the hardware id list
by janderwald＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: janderwald Date: Thu Feb 2 18:10:11 2012 New Revision: 55378 URL: http://svn.reactos.org/svn/reactos?rev=55378&view=rev Log: [HIDCLASS] - Also store the HID_DEVICE_UP format in the hardware id list Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Feb 2 18:10:11 2012 @@ -236,8 +236,9 @@ } // - // FIXME: add 'HID_DEVICE_UP:0001_U:0002' - // + // add HID_DEVICE_UP:0001_U:0002' + // + Offset += swprintf(&Buffer[Offset], L"HID_DEVICE_UP:%04x_U:%04x", CollectionDescription->UsagePage, CollectionDescription->Usage) + 1; // // add HID

1 0

[cgutman] 55377: [NTOSKRNL] - Revert 54008
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 18:08:28 2012 New Revision: 55377 URL: http://svn.reactos.org/svn/reactos?rev=55377&view=rev Log: [NTOSKRNL] - Revert 54008 Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/driver.c Modified: branches/usb-bringup-trunk/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/i… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Thu Feb 2 18:08:28 2012 @@ -32,6 +32,7 @@ #define TAG_RTLREGISTRY 'vrqR' extern BOOLEAN ExpInTextModeSetup; +extern BOOLEAN PnpSystemInit; USHORT IopGroupIndex; PLIST_ENTRY IopGroupTable; @@ -515,6 +516,8 @@ /* Set the driver as initialized */ IopReadyDeviceObjects(Driver); + + if (PnpSystemInit) IopReinitializeDrivers(); return STATUS_SUCCESS; }

1 0

[cgutman] 55376: [TXTSETUP.SIF] - Install hidusb for USB human interface devices during 1st stage setup
by cgutman＠svn.reactos.org 02 Feb '12

02 Feb '12

Author: cgutman Date: Thu Feb 2 17:46:28 2012 New Revision: 55376 URL: http://svn.reactos.org/svn/reactos?rev=55376&view=rev Log: [TXTSETUP.SIF] - Install hidusb for USB human interface devices during 1st stage setup Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif Modified: branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/txtsetup.sif [iso-8859-1] Thu Feb 2 17:46:28 2012 @@ -81,6 +81,8 @@ HID_DEVICE_SYSTEM_KEYBOARD = kbdhid USB\COMPOSITE = usbccgp GenDisk = disk +USB\Class_03 = hidusb +GENERIC_HID_DEVICE = hidusb [BootBusExtenders.Load] acpi = acpi.sys

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2012