Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55232: [USBEHCI] - Fix initialization bugs for EHCI controllers - Try again to release ownership of low-speed devices after reset - Wait for the port reset to complete
by cgutman＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: cgutman Date: Fri Jan 27 06:27:12 2012 New Revision: 55232 URL: http://svn.reactos.org/svn/reactos?rev=55232&view=rev Log: [USBEHCI] - Fix initialization bugs for EHCI controllers - Try again to release ownership of low-speed devices after reset - Wait for the port reset to complete Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp 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] Fri Jan 27 06:27:12 2012 @@ -525,39 +525,10 @@ StopController(); // - // Reset the device. Bit is set to 0 on completion. - // - GetCommandRegister(&UsbCmd); - UsbCmd.HCReset = TRUE; - SetCommandRegister(&UsbCmd); - - // - // Check that the controller reset - // - for (FailSafe = 100; FailSafe > 1; FailSafe--) - { - KeStallExecutionProcessor(10); - GetCommandRegister(&UsbCmd); - if (!UsbCmd.HCReset) - { - break; - } - } - - // - // If the controller did not reset then fail - // - if (UsbCmd.HCReset) - { - DPRINT1("EHCI ERROR: Controller failed to reset. Hardware problem!\n"); - return STATUS_UNSUCCESSFUL; - } - - // - // Disable Interrupts and clear status - // - EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, 0); - EHCI_WRITE_REGISTER_ULONG(EHCI_USBSTS, 0x0000001f); + // Enable Interrupts and start execution + // + EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); // // Assign the AsyncList Register @@ -574,18 +545,10 @@ // GetCommandRegister(&UsbCmd); UsbCmd.PeriodicEnable = TRUE; - UsbCmd.AsyncEnable = TRUE; //FIXME: Need USB Memory Manager - UsbCmd.IntThreshold = 1; - // FIXME: Set framelistsize when periodic is implemented. SetCommandRegister(&UsbCmd); - // - // Enable Interrupts and start execution - // - EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR - /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); - + GetCommandRegister(&UsbCmd); UsbCmd.Run = TRUE; SetCommandRegister(&UsbCmd); @@ -613,6 +576,14 @@ // Set port routing to EHCI controller // EHCI_WRITE_REGISTER_ULONG(EHCI_CONFIGFLAG, 1); + + // + // Enable async + // + GetCommandRegister(&UsbCmd); + UsbCmd.AsyncEnable = TRUE; //FIXME: Need USB Memory Manager + // FIXME: Set framelistsize when periodic is implemented. + SetCommandRegister(&UsbCmd); DPRINT1("EHCI Started!\n"); return STATUS_SUCCESS; @@ -669,6 +640,9 @@ return STATUS_UNSUCCESSFUL; PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + // + // check slow speed line before reset + // if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); @@ -676,6 +650,8 @@ return STATUS_DEVICE_NOT_CONNECTED; } + ASSERT(PortStatus & EHCI_PRT_CONNECTED); + // // Reset and clean enable // @@ -692,17 +668,35 @@ PortStatus &= ~EHCI_PRT_RESET; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); - KeStallExecutionProcessor(100); - - // - // Check that the port reset - // - PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); - if (PortStatus & EHCI_PRT_RESET) - { - DPRINT1("Port did not reset\n"); - return STATUS_RETRY; - } + do + { + // + // wait + // + KeStallExecutionProcessor(100); + + // + // Check that the port reset + // + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + if (!(PortStatus & EHCI_PRT_RESET)) + break; + } while (TRUE); + + // + // check slow speed line after reset + // + if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) + { + DPRINT1("Non HighSpeed device. Releasing Ownership\n"); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), EHCI_PRT_RELEASEOWNERSHIP); + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // this must be enabled now + // + ASSERT(PortStatus & EHCI_PRT_ENABLED); return STATUS_SUCCESS; } @@ -739,15 +733,17 @@ } } - // Get Speed. If SlowSpeedLine flag is there then its a slow speed device - if (Value & EHCI_PRT_SLOWSPEEDLINE) - Status |= USB_PORT_STATUS_LOW_SPEED; - else - Status |= USB_PORT_STATUS_HIGH_SPEED; - // Get Connected Status if (Value & EHCI_PRT_CONNECTED) + { Status |= USB_PORT_STATUS_CONNECT; + + // Get Speed. If SlowSpeedLine flag is there then its a slow speed device + if (Value & EHCI_PRT_SLOWSPEEDLINE) + Status |= USB_PORT_STATUS_LOW_SPEED; + else + Status |= USB_PORT_STATUS_HIGH_SPEED; + } // Get Enabled Status if (Value & EHCI_PRT_ENABLED) @@ -795,30 +791,17 @@ if (PortId > m_Capabilities.HCSParams.PortCount) return STATUS_UNSUCCESSFUL; - Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); - if (Status == C_PORT_RESET) { - if (Value & EHCI_PRT_RESET) - { - Value &= ~EHCI_PRT_RESET; - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); - KeStallExecutionProcessor(100); - } - + // + // update port status + // + m_ResetInProgress[PortId] = FALSE; + } + + if (Status == C_PORT_CONNECTION) + { Value = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId)); - // - // update port status - // - m_ResetInProgress[PortId] = FALSE; - if (!(Value & EHCI_PRT_ENABLED)) - { - DPRINT1("Port is not enabled.\n"); - } - } - - if (Status == C_PORT_CONNECTION) - { Value |= EHCI_PRT_CONNECTSTATUSCHANGE | EHCI_PRT_ENABLEDSTATUSCHANGE; EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value); } @@ -851,11 +834,6 @@ if (Feature == PORT_RESET) { - if (Value & EHCI_PRT_SLOWSPEEDLINE) - { - DPRINT1("Non HighSpeed device. Releasing Ownership\n"); - } - ResetPort(PortId); //

1 0

[cgutman] 55231: [USBOHCI] - Attempt to fix reset race conditions
by cgutman＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: cgutman Date: Fri Jan 27 05:20:37 2012 New Revision: 55231 URL: http://svn.reactos.org/svn/reactos?rev=55231&view=rev Log: [USBOHCI] - Attempt to fix reset race conditions 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] Fri Jan 27 05:20:37 2012 @@ -1172,6 +1172,119 @@ if (Status == C_PORT_RESET) { + // + // sanity checks + // + ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC)); + + // + // clear reset bit complete + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC); + + // + // sanity check + // + ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); + } + + if (Status == C_PORT_CONNECTION || Status == C_PORT_ENABLE) + { + // + // clear bits + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC); + } + + // + // re-enable root hub change + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); + + return STATUS_SUCCESS; +} + + +NTSTATUS +CUSBHardwareDevice::SetPortFeature( + ULONG PortId, + ULONG Feature) +{ + ULONG Value; + + DPRINT1("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); + + // + // read port status + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); + + + if (Feature == PORT_ENABLE) + { + // + // enable port + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PES); + return STATUS_SUCCESS; + } + else if (Feature == PORT_POWER) + { + LARGE_INTEGER Timeout; + + // + // enable power + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PPS); + + // + // read descriptor A for the delay data + // + Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); + + // + // compute the delay + // + Timeout.QuadPart = OHCI_RH_GET_POWER_ON_TO_POWER_GOOD_TIME(Value); + + // + // delay is multiplied by 2 ms + // + Timeout.QuadPart *= 2; + DPRINT1("Waiting %d milliseconds for port power up\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + return STATUS_SUCCESS; + } + else if (Feature == PORT_SUSPEND) + { + // + // enable port + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PSS); + return STATUS_SUCCESS; + } + else if (Feature == PORT_RESET) + { + // + // assert + // + ASSERT((Value & OHCI_RH_PORTSTATUS_CCS)); + + // + // reset port + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRS); + do { // @@ -1191,151 +1304,14 @@ // wait a bit // KeStallExecutionProcessor(100); - - //DPRINT1("Value %x Index %lu\n", Value, Index); - }while(TRUE); // - // check if reset bit is still set - // - if (Value & OHCI_RH_PORTSTATUS_PRS) - { - // - // reset failed - // - DPRINT1("PortId %lu Reset failed\n", PortId); - return STATUS_UNSUCCESSFUL; - } - - // - // sanity checks - // - ASSERT((Value & OHCI_RH_PORTSTATUS_PRSC)); - - // - // clear reset bit complete - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRSC); - - // - // sanity check - // - ASSERT((Value & OHCI_RH_PORTSTATUS_PES)); - } - - if (Status == C_PORT_CONNECTION || Status == C_PORT_ENABLE) - { - // - // clear bits - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC); - } - - // - // re-enable root hub change - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); - - return STATUS_SUCCESS; -} - - -NTSTATUS -CUSBHardwareDevice::SetPortFeature( - ULONG PortId, - ULONG Feature) -{ - ULONG Value; - - DPRINT1("CUSBHardwareDevice::SetPortFeature PortId %x Feature %x\n", PortId, Feature); - - // - // read port status - // - Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); - - - if (Feature == PORT_ENABLE) - { - // - // enable port - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PES); + // trigger the status change interrupt + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_INTERRUPT_ENABLE_OFFSET), OHCI_ROOT_HUB_STATUS_CHANGE); + return STATUS_SUCCESS; - } - else if (Feature == PORT_POWER) - { - LARGE_INTEGER Timeout; - - // - // enable power - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PPS); - - // - // read descriptor A for the delay data - // - Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); - - // - // compute the delay - // - Timeout.QuadPart = OHCI_RH_GET_POWER_ON_TO_POWER_GOOD_TIME(Value); - - // - // delay is multiplied by 2 ms - // - Timeout.QuadPart *= 2; - DPRINT1("Waiting %d milliseconds for port power up\n", Timeout.LowPart); - - // - // convert to 100 ns units (absolute) - // - Timeout.QuadPart *= -10000; - - // - // perform the wait - // - KeDelayExecutionThread(KernelMode, FALSE, &Timeout); - - return STATUS_SUCCESS; - } - else if (Feature == PORT_SUSPEND) - { - // - // enable port - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PSS); - return STATUS_SUCCESS; - } - else if (Feature == PORT_RESET) - { - // - // assert - // - ASSERT((Value & OHCI_RH_PORTSTATUS_CCS)); - - // - // reset port - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRS); - - // - // wait - // - KeStallExecutionProcessor(100); - - // - // is there a status change callback - // - if (m_SCECallBack != NULL) - { - // - // issue callback - // - m_SCECallBack(m_SCEContext); - } } return STATUS_SUCCESS; }

1 0

[janderwald] 55230: [USBOHCI] - Revert previous revision
by janderwald＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: janderwald Date: Fri Jan 27 02:12:32 2012 New Revision: 55230 URL: http://svn.reactos.org/svn/reactos?rev=55230&view=rev Log: [USBOHCI] - Revert previous revision Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Jan 27 02:12:32 2012 @@ -315,7 +315,6 @@ // // initialize request // - CtrlSetup->bmRequestType.B = 0xB; CtrlSetup->bRequest = USB_REQUEST_SET_ADDRESS; CtrlSetup->wValue.W = (USHORT)DeviceAddress;

1 0

[janderwald] 55229: [USBOHCI] - Fix setting device address
by janderwald＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: janderwald Date: Fri Jan 27 02:09:18 2012 New Revision: 55229 URL: http://svn.reactos.org/svn/reactos?rev=55229&view=rev Log: [USBOHCI] - Fix setting device address Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Jan 27 02:09:18 2012 @@ -315,6 +315,7 @@ // // initialize request // + CtrlSetup->bmRequestType.B = 0xB; CtrlSetup->bRequest = USB_REQUEST_SET_ADDRESS; CtrlSetup->wValue.W = (USHORT)DeviceAddress;

1 0

[cgutman] 55228: [USBHUB_NEW] - Fix buffer overflow for composite devices
by cgutman＠svn.reactos.org 27 Jan '12

27 Jan '12

Author: cgutman Date: Fri Jan 27 02:02:11 2012 New Revision: 55228 URL: http://svn.reactos.org/svn/reactos?rev=55228&view=rev Log: [USBHUB_NEW] - Fix buffer overflow for composite devices Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Fri Jan 27 02:02:11 2012 @@ -868,7 +868,7 @@ // // Initialize the CompatibleIds String // - UsbChildExtension->usCompatibleIds.Length = 144; //FIXME + UsbChildExtension->usCompatibleIds.Length = 188; //FIXME UsbChildExtension->usCompatibleIds.MaximumLength = UsbChildExtension->usCompatibleIds.Length; //

1 0

[ion] 55227: Laa-a-a-a-dies and gentlemen..... For your unique, viewing and executing pleasure.. For one time only....by popular demand.... The one... The only... The unforgettable, unforgivable......
by ion＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: ion Date: Thu Jan 26 21:16:59 2012 New Revision: 55227 URL: http://svn.reactos.org/svn/reactos?rev=55227&view=rev Log: Laa-a-a-a-dies and gentlemen..... For your unique, viewing and executing pleasure.. For one time only....by popular demand.... The one... The only... The unforgettable, unforgivable... Meanest, baddest, piece of code around... He's back..... with a vengeance... The ultimate... Mega... Uber.. Amazing... HACK OF DOOOOOOOOOOOOOOOOOOOOOOOOOOOOOM </applause> Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ke/i386/thrdini.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mmfault.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -5,6 +5,20 @@ /* TYPES *********************************************************************/ struct _EPROCESS; + +/* ReactOS Mm Hacks */ +VOID +FASTCALL +MiSyncForProcessAttach( + IN PKTHREAD NextThread, + IN PEPROCESS Process +); + +VOID +FASTCALL +MiSyncForContextSwitch( + IN PKTHREAD Thread +); extern PMMSUPPORT MmKernelAddressSpace; extern PFN_COUNT MiFreeSwapPages; Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -433,6 +433,9 @@ /* Get thread pointers */ OldThread = (PKTHREAD)(OldThreadAndApcFlag & ~3); NewThread = Pcr->PrcbData.CurrentThread; + + /* ReactOS Mm Hack */ + MiSyncForContextSwitch(NewThread); /* Get the old thread and set its kernel stack */ OldThread->KernelStack = SwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -97,6 +97,9 @@ /* Release lock */ KiReleaseApcLockFromDpcLevel(ApcLock); + /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ + MiSyncForProcessAttach(Thread, (PEPROCESS)Process); + /* Swap Processes */ KiSwapProcess(Process, SavedApcState->Process); @@ -615,6 +618,9 @@ /* Release lock */ KiReleaseApcLockFromDpcLevel(&ApcLock); + /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ + MiSyncForProcessAttach(Thread, (PEPROCESS)Process); + /* Swap Processes */ KiSwapProcess(Thread->ApcState.Process, Process); @@ -782,6 +788,9 @@ /* Release lock */ KiReleaseApcLockFromDpcLevel(&ApcLock); + /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ + MiSyncForProcessAttach(Thread, (PEPROCESS)Process); + /* Swap Processes */ KiSwapProcess(Thread->ApcState.Process, Process); Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -856,6 +856,9 @@ Thread->StackBase = KernelStack; Thread->StackLimit = (ULONG_PTR)KernelStack - KERNEL_STACK_SIZE; Thread->KernelStackResident = TRUE; + + /* Make sure that we are in the right page directory (ReactOS Mm Hack) */ + MiSyncForProcessAttach(Thread, (PEPROCESS)Process); /* Enter SEH to avoid crashes due to user mode */ Status = STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -394,6 +394,9 @@ /* Save the wait IRQL */ WaitIrql = CurrentThread->WaitIrql; + /* REACTOS Mm Hack of Doom */ + MiSyncForContextSwitch(NextThread); + /* Swap contexts */ ApcState = KiSwapContext(WaitIrql, CurrentThread); @@ -790,6 +793,9 @@ /* Sanity check */ ASSERT(OldIrql <= DISPATCH_LEVEL); + /* REACTOS Mm Hack of Doom */ + MiSyncForContextSwitch(NextThread); + /* Swap to new thread */ KiSwapContext(APC_LEVEL, Thread); Status = STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -1029,6 +1029,54 @@ } VOID +NTAPI +MmUpdatePageDir(PEPROCESS Process, PVOID Address, ULONG Size) +{ + ULONG StartOffset, EndOffset, Offset; + PULONG Pde; + + // + // Check if the process isn't there anymore + // This is probably a bad sign, since it means the caller is setting cr3 to + // 0 or something... + // + if ((PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0]) == 0) && (Process != PsGetCurrentProcess())) + { + DPRINT1("Process: %16s is dead: %p\n", Process->ImageFileName, Process->Pcb.DirectoryTableBase[0]); + ASSERT(FALSE); + return; + } + + if (Address < MmSystemRangeStart) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + StartOffset = ADDR_TO_PDE_OFFSET(Address); + EndOffset = ADDR_TO_PDE_OFFSET((PVOID)((ULONG_PTR)Address + Size)); + + if (Process != NULL && Process != PsGetCurrentProcess()) + { + Pde = MmCreateHyperspaceMapping(PTE_TO_PFN(Process->Pcb.DirectoryTableBase[0])); + } + else + { + Pde = (PULONG)PAGEDIRECTORY_MAP; + } + for (Offset = StartOffset; Offset <= EndOffset; Offset++) + { + if (Offset != ADDR_TO_PDE_OFFSET(PAGETABLE_MAP)) + { + InterlockedCompareExchangePte(&Pde[Offset], MmGlobalKernelPageDirectory[Offset], 0); + } + } + if (Pde != (PULONG)PAGEDIRECTORY_MAP) + { + MmDeleteHyperspaceMapping(Pde); + } +} + +VOID INIT_FUNCTION NTAPI MmInitGlobalKernelPageDirectory(VOID) Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Thu Jan 26 21:16:59 2012 @@ -19,6 +19,41 @@ #include "ARM3/miarm.h" /* PRIVATE FUNCTIONS **********************************************************/ + +VOID +FASTCALL +MiSyncForProcessAttach(IN PKTHREAD Thread, + IN PEPROCESS Process) +{ + PETHREAD Ethread = CONTAINING_RECORD(Thread, ETHREAD, Tcb); + //DPRINT1("Hack sync for process: %p and thread: %p\n", Process, Thread); + //DPRINT1("Thread stack hack: %p %d\n", Thread->StackLimit, Thread->LargeStack); + + /* Hack Sync because Mm is broken */ + MmUpdatePageDir(Process, Ethread, sizeof(ETHREAD)); + MmUpdatePageDir(Process, Ethread->ThreadsProcess, sizeof(EPROCESS)); + MmUpdatePageDir(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); +} + +VOID +FASTCALL +MiSyncForContextSwitch(IN PKTHREAD Thread) +{ + PVOID Process = PsGetCurrentProcess(); + PETHREAD Ethread = CONTAINING_RECORD(Thread, ETHREAD, Tcb); + //DPRINT1("Hack sync for thread: %p and process: %p\n", Thread, Process); + //DPRINT1("Thread stack hack: %p %d\n", Thread->StackLimit, Thread->LargeStack); + + /* Hack Sync because Mm is broken */ + MmUpdatePageDir(Process, Ethread->ThreadsProcess, sizeof(EPROCESS)); + MmUpdatePageDir(Process, + (PVOID)Thread->StackLimit, + Thread->LargeStack ? + KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); +} NTSTATUS NTAPI

1 0

[akhaldi] 55226: [MSADP32.ACM] * Sync to Wine 1.3.37.
by akhaldi＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: akhaldi Date: Thu Jan 26 20:59:35 2012 New Revision: 55226 URL: http://svn.reactos.org/svn/reactos?rev=55226&view=rev Log: [MSADP32.ACM] * Sync to Wine 1.3.37. Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.c [iso-8859-1] Thu Jan 26 20:59:35 2012 @@ -180,7 +180,7 @@ /*********************************************************************** * R16 * - * Read a 16 bit sample (correctly handles endianess) + * Read a 16 bit sample (correctly handles endianness) */ static inline short R16(const unsigned char* src) { @@ -190,7 +190,7 @@ /*********************************************************************** * W16 * - * Write a 16 bit sample (correctly handles endianess) + * Write a 16 bit sample (correctly handles endianness) */ static inline void W16(unsigned char* dst, short s) { Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Jan 26 20:59:35 2012 @@ -92,7 +92,7 @@ reactos/dll/win32/mpr # Autosync reactos/dll/win32/mprapi # Autosync reactos/dll/win32/msacm32 # Autosync -reactos/dll/win32/msadp32.acm # Autosync +reactos/dll/win32/msadp32.acm # Synced to Wine-1.3.37 reactos/dll/win32/mscat32 # Autosync reactos/dll/win32/mscms # Autosync reactos/dll/win32/mscoree # Autosync

1 0

[cgutman] 55225: [USBEHCI_NEW] - Disable debug spam
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 20:25:12 2012 New Revision: 55225 URL: http://svn.reactos.org/svn/reactos?rev=55225&view=rev Log: [USBEHCI_NEW] - Disable debug spam Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.cpp [iso-8859-1] Thu Jan 26 20:25:12 2012 @@ -1542,7 +1542,7 @@ if (USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)) { - DPRINT1("m_TotalBytesTransferred %x, %x - %x\n", + DPRINT("m_TotalBytesTransferred %x, %x - %x\n", m_TotalBytesTransferred, m_TransferDescriptors[DescriptorCount]->TotalBytesToTransfer, m_TransferDescriptors[DescriptorCount]->Token.Bits.TotalBytesToTransfer);

1 0

[akhaldi] 55224: [NTOSKRNL] * Remove some redundant definitions now that they've been added in r55220. Fixes build.
by akhaldi＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: akhaldi Date: Thu Jan 26 20:06:08 2012 New Revision: 55224 URL: http://svn.reactos.org/svn/reactos?rev=55224&view=rev Log: [NTOSKRNL] * Remove some redundant definitions now that they've been added in r55220. Fixes build. Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c Modified: trunk/reactos/ntoskrnl/fstub/fstubex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/fstubex.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/fstubex.c [iso-8859-1] Thu Jan 26 20:06:08 2012 @@ -52,27 +52,6 @@ ULONGLONG Attributes; // 48 WCHAR Name[0x24]; // 56 } EFI_PARTITION_ENTRY, *PEFI_PARTITION_ENTRY; - -typedef struct _CREATE_DISK_MBR -{ - ULONG Signature; -} CREATE_DISK_MBR, *PCREATE_DISK_MBR; - -typedef struct _CREATE_DISK_GPT -{ - GUID DiskId; - ULONG MaxPartitionCount; -} CREATE_DISK_GPT, *PCREATE_DISK_GPT; - -typedef struct _CREATE_DISK -{ - PARTITION_STYLE PartitionStyle; - union - { - CREATE_DISK_MBR Mbr; - CREATE_DISK_GPT Gpt; - }; -} CREATE_DISK, *PCREATE_DISK; typedef struct _PARTITION_TABLE_ENTRY {

1 0

[cgutman] 55223: [USBSTOR] - Set the correct transfer direction value in the CBW - Fixes the infamous system hang that occurred when writing to a USB drive
by cgutman＠svn.reactos.org 26 Jan '12

26 Jan '12

Author: cgutman Date: Thu Jan 26 20:02:42 2012 New Revision: 55223 URL: http://svn.reactos.org/svn/reactos?rev=55223&view=rev Log: [USBSTOR] - Set the correct transfer direction value in the CBW - Fixes the infamous system hang that occurred when writing to a USB drive Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/scsi.c [iso-8859-1] Thu Jan 26 20:02:42 2012 @@ -31,7 +31,7 @@ Control->Signature = CBW_SIGNATURE; Control->Tag = Tag; Control->DataTransferLength = DataTransferLength; - Control->Flags = 0x80; + Control->Flags = (CommandBlock[0] != SCSIOP_WRITE) ? 0x80 : 0x00; Control->LUN = (LUN & MAX_LUN); Control->CommandBlockLength = CommandBlockLength;

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