Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55484: [USBEHCI] - Fix data toggle misuse - EHCI host error is now fixed - Fixed by the Haiku dev Michael Lotz
by janderwald＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: janderwald Date: Tue Feb 7 16:46:19 2012 New Revision: 55484 URL: http://svn.reactos.org/svn/reactos?rev=55484&view=rev Log: [USBEHCI] - Fix data toggle misuse - EHCI host error is now fixed - Fixed by the Haiku dev Michael Lotz 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] Tue Feb 7 16:46:19 2012 @@ -722,7 +722,7 @@ // m_TransferDescriptors[2]->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; m_TransferDescriptors[2]->Token.Bits.TotalBytesToTransfer = 0; - m_TransferDescriptors[2]->Token.Bits.DataToggle = FALSE; + m_TransferDescriptors[2]->Token.Bits.DataToggle = TRUE; // // special case, setup alternative next descriptor in case of error @@ -733,9 +733,6 @@ // interrupt on completion // m_TransferDescriptors[2]->Token.Bits.InterruptOnComplete = TRUE; - - _TransferDescriptors[3]->Token.Bits.Halted = TRUE; - } else { @@ -744,6 +741,7 @@ // m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = 0; + m_TransferDescriptors[1]->Token.Bits.DataToggle = TRUE; // // interrupt on completion

1 0

[janderwald] 55483: [USBEHCI] - Don't set NumberOfTransaction 0x3 for the async queue head(Haiku doesnt do it too) - Also don't set maximum packet length or interrupt on complete - Stop the async /...
by janderwald＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: janderwald Date: Tue Feb 7 16:18:56 2012 New Revision: 55483 URL: http://svn.reactos.org/svn/reactos?rev=55483&view=rev Log: [USBEHCI] - Don't set NumberOfTransaction 0x3 for the async queue head(Haiku doesnt do it too) - Also don't set maximum packet length or interrupt on complete - Stop the async / periodic schedules after acquiring ownership from os (ported from the Pedigree OS) - Remove unused structs from header - Allocate device descriptor from start of a page to prevent alignment issues - Clear halted bit in the queue overlay transaction layer (usb_queue.cpp:507) - Always set the alternative and next pointers in BuildControlTransferQueueHead - Use data the toggle in the transfer requests - Start using toggle in bulk requests, invert data toggle after each descriptor - EHCI controller still reports error 0xA / 0xB which is USB Error Interrupt + Frame List Rollover + [USB Interrupt] - Errors need to be researched more, though the control transfers results appear o.k. - Tested in real hw + ros stack with USB Mass Storage Device - Currently hangs after first completed CDB/Data/CSW block Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/hardware.h branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_request.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] Tue Feb 7 16:18:56 2012 @@ -467,18 +467,15 @@ // m_MemoryManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&AsyncQueueHead, &AsyncPhysicalAddress); - AsyncQueueHead->AlternateNextPointer = TERMINATE_POINTER; - AsyncQueueHead->NextPointer = TERMINATE_POINTER; AsyncQueueHead->PhysicalAddr = AsyncPhysicalAddress.LowPart; AsyncQueueHead->HorizontalLinkPointer = AsyncQueueHead->PhysicalAddr | QH_TYPE_QH; - AsyncQueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; - AsyncQueueHead->Token.Bits.InterruptOnComplete = FALSE; AsyncQueueHead->EndPointCharacteristics.HeadOfReclamation = TRUE; + AsyncQueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; AsyncQueueHead->Token.Bits.Halted = TRUE; - AsyncQueueHead->EndPointCharacteristics.MaximumPacketLength = 64; - AsyncQueueHead->EndPointCharacteristics.NakCountReload = 0; - AsyncQueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; - AsyncQueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; + + AsyncQueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x01; + AsyncQueueHead->NextPointer = TERMINATE_POINTER; + AsyncQueueHead->CurrentLinkPointer = TERMINATE_POINTER; InitializeListHead(&AsyncQueueHead->LinkedQueueHeads); @@ -655,6 +652,39 @@ } // + // get command register + // + GetCommandRegister(&UsbCmd); + + // + // disable running schedules + // + UsbCmd.PeriodicEnable = FALSE; + UsbCmd.AsyncEnable = FALSE; + SetCommandRegister(&UsbCmd); + + // + // Wait for execution to start + // + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(100); + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + + if (!(UsbSts & EHCI_STS_PSS) && (UsbSts & EHCI_STS_ASS)) + { + break; + } + } + + if ((UsbSts & (EHCI_STS_PSS | EHCI_STS_ASS))) + { + DPRINT1("Failed to stop running schedules %x\n", UsbSts); + ASSERT(FALSE); + } + + + // // Stop the controller if its running // UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); @@ -1240,6 +1270,8 @@ CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); + DPRINT1("CStatus %x\n", CStatus); + // // Check that it belongs to EHCI // @@ -1307,9 +1339,6 @@ // controller reported error // DPRINT1("CStatus %x\n", CStatus); - Status = STATUS_UNSUCCESSFUL; - PC_ASSERT(FALSE); - return; } // 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] Tue Feb 7 16:18:56 2012 @@ -152,6 +152,8 @@ ULONG TotalBytesToTransfer; } QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; +C_ASSERT(FIELD_OFFSET(QUEUE_TRANSFER_DESCRIPTOR, PhysicalAddr) == 0x20); + // // EndPointSpeeds Flags and END_POINT_CHARACTERISTICS // @@ -216,6 +218,9 @@ LIST_ENTRY LinkedQueueHeads; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; + +C_ASSERT(FIELD_OFFSET(QUEUE_HEAD, PhysicalAddr) == 0x30); + // // Command register content @@ -281,30 +286,6 @@ UCHAR PortRoute [15]; } EHCI_CAPS, *PEHCI_CAPS; - -typedef struct -{ - PKSPIN_LOCK Lock; - RTL_BITMAP Bitmap; - PULONG BitmapBuffer; - ULONG BlockSize; - PVOID VirtualBase; - PHYSICAL_ADDRESS PhysicalBase; - ULONG Length; -}DMA_MEMORY_ALLOCATOR, *LPDMA_MEMORY_ALLOCATOR; - -typedef struct _EHCI_HOST_CONTROLLER -{ - ULONG OpRegisters; - EHCI_CAPS ECHICaps; - PVOID CommonBufferVA; - PHYSICAL_ADDRESS CommonBufferPA; - ULONG CommonBufferSize; - PQUEUE_HEAD AsyncListQueue; - KSPIN_LOCK Lock; - LPDMA_MEMORY_ALLOCATOR DmaMemAllocator; -} EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; - typedef struct { ULONG PortStatus; Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_device.cpp [iso-8859-1] Tue Feb 7 16:18:56 2012 @@ -617,6 +617,7 @@ USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; PMDL Mdl; NTSTATUS Status; + PVOID Buffer; // // zero descriptor @@ -633,9 +634,26 @@ CtrlSetup.bmRequestType.B = 0x80; // + // allocate buffer + // + Buffer = ExAllocatePool(NonPagedPool, PAGE_SIZE); + if (!Buffer) + { + // + // failed to allocate + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero buffer + // + RtlZeroMemory(Buffer, PAGE_SIZE); + + // // allocate mdl describing the device descriptor // - Mdl = IoAllocateMdl(&m_DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR), FALSE, FALSE, 0); + Mdl = IoAllocateMdl(Buffer, sizeof(USB_DEVICE_DESCRIPTOR), FALSE, FALSE, 0); if (!Mdl) { // @@ -664,8 +682,14 @@ // // informal dbg print // + RtlCopyMemory(&m_DeviceDescriptor, Buffer, sizeof(USB_DEVICE_DESCRIPTOR)); DumpDeviceDescriptor(&m_DeviceDescriptor); } + + // + // free buffer + // + ExFreePool(Buffer); // // done Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Tue Feb 7 16:18:56 2012 @@ -447,7 +447,7 @@ // // head queue head must be halted // - PC_ASSERT(HeadQueueHead->Token.Bits.Halted == TRUE); + //PC_ASSERT(HeadQueueHead->Token.Bits.Halted == TRUE); } // @@ -463,7 +463,7 @@ // // sanity check: there must be at least one queue head with halted bit set // - PC_ASSERT(QueueHead->Token.Bits.Halted == 0); + //PC_ASSERT(QueueHead->Token.Bits.Halted == 0); // // get previous link @@ -499,6 +499,11 @@ // remove software link // RemoveEntryList(&QueueHead->LinkedQueueHeads); + + // + // FIXME: clear failure + // + QueueHead->Token.Bits.Halted = FALSE; } // @@ -653,7 +658,7 @@ // IsQueueHeadComplete = Request->IsQueueHeadComplete(QueueHead); - DPRINT("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); + DPRINT1("Request %p QueueHead %p Complete %d\n", Request, QueueHead, IsQueueHeadComplete); // // check if queue head is complete 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] Tue Feb 7 16:18:56 2012 @@ -128,7 +128,7 @@ // // DMA transfer descriptors linked to the queue head // - PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[3]; + PQUEUE_TRANSFER_DESCRIPTOR m_TransferDescriptors[4]; // // allocated setup packet from the DMA pool @@ -690,14 +690,15 @@ QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->wMaxPacketSize; } - QueueHead->Token.Bits.DataToggle = TRUE; - // // setup descriptors // m_TransferDescriptors[0]->Token.Bits.PIDCode = PID_CODE_SETUP_TOKEN; m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer = sizeof(USB_DEFAULT_PIPE_SETUP_PACKET); m_TransferDescriptors[0]->Token.Bits.DataToggle = FALSE; + m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); + m_TransferDescriptors[0]->NextPointer = m_TransferDescriptors[1]->PhysicalAddr; + m_TransferDescriptors[0]->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; if (m_TransferBufferMDL) { @@ -706,6 +707,9 @@ // m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = m_TransferBufferLength; + m_TransferDescriptors[1]->NextPointer = m_TransferDescriptors[2]->PhysicalAddr; + m_TransferDescriptors[1]->Token.Bits.DataToggle = TRUE; + m_TransferDescriptors[1]->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; // // FIXME: check if the request spawns over a page -> fill other members @@ -718,63 +722,69 @@ // m_TransferDescriptors[2]->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; m_TransferDescriptors[2]->Token.Bits.TotalBytesToTransfer = 0; - - // - // link descriptors - // - m_TransferDescriptors[0]->NextPointer = m_TransferDescriptors[1]->PhysicalAddr; + m_TransferDescriptors[2]->Token.Bits.DataToggle = FALSE; // // special case, setup alternative next descriptor in case of error // HAIKU links to dead descriptor // - m_TransferDescriptors[0]->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; - m_TransferDescriptors[1]->NextPointer = m_TransferDescriptors[2]->PhysicalAddr; - m_TransferDescriptors[1]->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; // // interrupt on completion // m_TransferDescriptors[2]->Token.Bits.InterruptOnComplete = TRUE; + _TransferDescriptors[3]->Token.Bits.Halted = TRUE; + } else { // // no buffer, setup in descriptor // - m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_OUT_TOKEN; + m_TransferDescriptors[1]->Token.Bits.PIDCode = PID_CODE_IN_TOKEN; m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer = 0; // - // link descriptors - // - m_TransferDescriptors[0]->NextPointer = m_TransferDescriptors[1]->PhysicalAddr; - m_TransferDescriptors[0]->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; - - // // interrupt on completion // m_TransferDescriptors[1]->Token.Bits.InterruptOnComplete = TRUE; } // - // link setup packet into buffer - Physical Address!!! - // - m_TransferDescriptors[0]->BufferPointer[0] = (ULONG)PtrToUlong(m_DescriptorSetupPacket.LowPart); - - // // link transfer descriptors to queue head // QueueHead->NextPointer = m_TransferDescriptors[0]->PhysicalAddr; -/* - if (m_TransferBufferMDL) - QueueHead->AlternateNextPointer = m_TransferDescriptors[2]->PhysicalAddr; - else - QueueHead->AlternateNextPointer = m_TransferDescriptors[1]->PhysicalAddr; - - QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x0; -*/ + + DPRINT("QueueHead %p Addr %x\n", QueueHead, QueueHead->PhysicalAddr); + DPRINT("NumDescriptors %lu\n", NumTransferDescriptors); + DPRINT("QueueHead AlternateNextPointer %x\n", QueueHead->AlternateNextPointer); + DPRINT("QueueHead NextPointer %x\n", QueueHead->NextPointer); + DPRINT("m_DescriptorSetupPacket HiPart %x LoPart %x\n", m_DescriptorSetupPacket.HighPart, m_DescriptorSetupPacket.LowPart); + + + DPRINT("TransferDescriptor 0 Addr %x\n", m_TransferDescriptors[0]->PhysicalAddr); + DPRINT("TransferDescriptor 0 Next %x\n", m_TransferDescriptors[0]->NextPointer); + DPRINT("TransferDescriptor 0 AlternativeNext %x\n", m_TransferDescriptors[0]->AlternateNextPointer); + DPRINT("TransferDescriptor 0 Buffer Pointer %x\n", m_TransferDescriptors[0]->BufferPointer[0]); + DPRINT("TransferDescriptor 0 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[0]->Token.Bits.TotalBytesToTransfer); + + DPRINT("TransferDescriptor 1 Addr %x\n", m_TransferDescriptors[1]->PhysicalAddr); + DPRINT("TransferDescriptor 1 Next %x\n", m_TransferDescriptors[1]->NextPointer); + DPRINT("TransferDescriptor 1 AlternativeNext %x\n", m_TransferDescriptors[1]->AlternateNextPointer); + DPRINT("TransferDescriptor 1 Buffer Pointer %x\n", m_TransferDescriptors[1]->BufferPointer[0]); + DPRINT("TransferDescriptor 1 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[1]->Token.Bits.TotalBytesToTransfer); + + if (NumTransferDescriptors == 3) + { + DPRINT("TransferDescriptor 2 Addr %x\n", m_TransferDescriptors[2]->PhysicalAddr); + DPRINT("TransferDescriptor 2 Next %x\n", m_TransferDescriptors[2]->NextPointer); + DPRINT("TransferDescriptor 2 AlternativeNext %x\n", m_TransferDescriptors[2]->AlternateNextPointer); + DPRINT("TransferDescriptor 2 Buffer Pointer %x\n", m_TransferDescriptors[2]->BufferPointer[0]); + DPRINT("TransferDescriptor 2 TotalBytesToTransfer 0x%x\n", m_TransferDescriptors[2]->Token.Bits.TotalBytesToTransfer); + } + + // // store result // @@ -797,6 +807,7 @@ ULONG BytesAvailable, BufferIndex; PVOID Base; ULONG PageOffset, CurrentTransferBufferLength; + UCHAR DataToggle; // // Allocate the queue head @@ -867,6 +878,8 @@ // m_TransferBufferLengthCompleted += CurrentTransferBufferLength; BytesAvailable = CurrentTransferBufferLength; + + DPRINT1("BuildBulkTransferQueueHead\n"); DPRINT("CurrentTransferBufferLength %x, m_TransferBufferLengthCompleted %x\n", CurrentTransferBufferLength, m_TransferBufferLengthCompleted); DPRINT("EndPointAddress %x\n", m_EndpointDescriptor->bEndpointAddress); @@ -877,6 +890,11 @@ DPRINT("Irp %p QueueHead %p\n", m_Irp, QueueHead); //PC_ASSERT(InternalGetPidDirection() == USB_ENDPOINT_DIRECTION_IN(m_EndpointDescriptor->bEndpointAddress)); + + // + // DataToggle + // + DataToggle = FALSE; // // Allocated transfer descriptors @@ -940,7 +958,7 @@ // BytesAvailable -= m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); } else @@ -972,32 +990,35 @@ // BytesAvailable -= PAGE_SIZE; - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); } else { PC_ASSERT(BytesAvailable); - // - // store address - // - m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; - - // - // increment transfer descriptor bytes - // - m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; - - // - // decrement available byte count - // - BytesAvailable -= BytesAvailable; - - // - // done as this is the last partial or full page - // - DPRINT("TransferDescriptor %p BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], m_TransferDescriptors[Index]->BufferPointer[BufferIndex], + if (BytesAvailable) + { + // + // store address + // + m_TransferDescriptors[Index]->BufferPointer[BufferIndex] = MmGetPhysicalAddress(Base).LowPart; + + // + // increment transfer descriptor bytes + // + m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer += BytesAvailable; + + // + // decrement available byte count + // + BytesAvailable -= BytesAvailable; + + // + // done as this is the last partial or full page + // + } + DPRINT1("TransferDescriptor %p Index %lu BufferPointer %p BufferIndex %lu TotalBytes %lu Remaining %lu\n", m_TransferDescriptors[Index], Index, m_TransferDescriptors[Index]->BufferPointer[BufferIndex], BufferIndex, m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer, BytesAvailable); break; @@ -1010,11 +1031,6 @@ if (BytesAvailable == 0) break; } - - // - // store transfer bytes of descriptor - // - m_TransferDescriptors[Index]->TotalBytesToTransfer = m_TransferDescriptors[Index]->Token.Bits.TotalBytesToTransfer; // // Go ahead and link descriptors @@ -1024,19 +1040,26 @@ m_TransferDescriptors[Index - 1]->NextPointer = m_TransferDescriptors[Index]->PhysicalAddr; } + + // + // status descriptor + // + m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; + + // + // FIXME: need status descriptor? + // + // // setup direction // m_TransferDescriptors[Index]->Token.Bits.PIDCode = InternalGetPidDirection(); // - // FIXME: performance penality? - // - m_TransferDescriptors[Index]->Token.Bits.InterruptOnComplete = TRUE; - - // - // FIXME need dead queue transfer descriptor? - // + // set data toggle + // + m_TransferDescriptors[Index]->Token.Bits.DataToggle = DataToggle; + DataToggle = !DataToggle; // // Check if all bytes have been consumed @@ -1064,7 +1087,10 @@ QueueHead->EndPointCharacteristics.MaximumPacketLength = m_EndpointDescriptor->wMaxPacketSize; } - QueueHead->Token.Bits.DataToggle = TRUE; + // + // store number of transactions + // + QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = min(Index, 1); // // link descriptor with queue head @@ -1168,7 +1194,7 @@ // // Get the Initial Data Toggle from the QEDT // - QueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; + QueueHead->EndPointCharacteristics.QEDTDataToggleControl = TRUE; // // FIXME: check if High Speed Device @@ -1593,7 +1619,8 @@ // // queue head is active (currently processed) // - return FALSE; + ASSERT(QueueHead->Token.Bits.Halted == FALSE); + //return FALSE; } // @@ -1609,7 +1636,13 @@ // // check for serious error // - //PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Halted == 0); + DPRINT("Descriptor Addr %x\n", m_TransferDescriptors[Index]->PhysicalAddr); + DPRINT("Descriptor BabbleDetected %x\n", m_TransferDescriptors[Index]->Token.Bits.BabbleDetected); + DPRINT("Descriptor DataBufferError %x\n", m_TransferDescriptors[Index]->Token.Bits.DataBufferError); + DPRINT("Descriptor DataToggle %x\n", m_TransferDescriptors[Index]->Token.Bits.DataToggle); + DPRINT("Descriptor ErrorCounter %x\n", m_TransferDescriptors[Index]->Token.Bits.ErrorCounter); + DPRINT("Descriptor TransactionError %x\n", m_TransferDescriptors[Index]->Token.Bits.TransactionError); + // // the transfer descriptor should be in the same state as the queue head @@ -1617,6 +1650,7 @@ //PC_ASSERT(m_TransferDescriptors[Index]->Token.Bits.Active == 0); } } + //ASSERT(FALSE); return TRUE; }

1 0

[jgardou] 55482: [WIN32KDLL] - use spec file - fix use of def files
by jgardou＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: jgardou Date: Tue Feb 7 14:54:02 2012 New Revision: 55482 URL: http://svn.reactos.org/svn/reactos?rev=55482&view=rev Log: [WIN32KDLL] - use spec file - fix use of def files Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec (with props) trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.spec (with props) trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec (with props) trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.spec (with props) trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.spec (with props) Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt trunk/rostests/apitests/w32knapi/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2ksp4/w32kdll_2ksp4.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/w32kdll/w32kdll_ros/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_ros/w32kdll_ros.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/w32kdll/w32kdll_vista/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_vista/w32kdll_vista.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_xpsp2/w32kdll_xpsp2.spec URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Modified: trunk/rostests/apitests/w32knapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32knapi/CMakeLi…

1 0

[tkreuzer] 55481: [smmsg.h] Fix 64 bit compilation
by tkreuzer＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: tkreuzer Date: Tue Feb 7 13:21:04 2012 New Revision: 55481 URL: http://svn.reactos.org/svn/reactos?rev=55481&view=rev Log: [smmsg.h] Fix 64 bit compilation Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Tue Feb 7 13:21:04 2012 @@ -17,7 +17,7 @@ // The exact names are not known, but we are basing them on the SmpApiName array // in the checked build of SMSS, which is probably a close approximation. We add // "p" to use the similar nomenclature seen/leaked out in the Base CSRSS APIs. -// +// // typedef enum _SMSRV_API_NUMBER { @@ -56,7 +56,9 @@ RTL_USER_PROCESS_INFORMATION ProcessInformation; BOOLEAN DebugFlag; } SM_EXEC_PGM_MSG, *PM_EXEC_PGM_MSG; +#ifndef _WIN64 C_ASSERT(sizeof(SM_EXEC_PGM_MSG) == 0x48); +#endif typedef struct _SM_LOAD_DEFERED_SUBSYSTEM_MSG { @@ -101,7 +103,9 @@ // // This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. // +#ifndef _WIN64 C_ASSERT(sizeof(SM_API_MSG) == 0x130); +#endif // // There are the APIs that the SMSS Serve can send to a client (such as CSRSS) @@ -112,7 +116,7 @@ // array in the checked build of CSRSRV which is probably a close approximation. // We add "p" to use the similar nomenclature seen/leaked out in the Base CSRSS // APIs. -// +// // typedef enum _SB_API_NUMBER { @@ -206,8 +210,10 @@ // // This is the size that Server 2003 SP1 SMSS expects, so make sure we conform. // +#ifndef _WIN64 C_ASSERT(sizeof(SB_CONNECTION_INFO) == 0xF4); C_ASSERT(sizeof(SB_API_MSG) == 0x110); +#endif // // The actual server functions that a client linking with smlib can call @@ -228,5 +234,5 @@ IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, IN BOOLEAN DebugFlag ); - -#endif + +#endif

1 0

[ion] 55480: [SMLIB]: Rbuild fix.
by ion＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: ion Date: Tue Feb 7 08:05:06 2012 New Revision: 55480 URL: http://svn.reactos.org/svn/reactos?rev=55480&view=rev Log: [SMLIB]: Rbuild fix. Modified: trunk/reactos/lib/smlib/smlib.rbuild Modified: trunk/reactos/lib/smlib/smlib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smlib.rbuild?rev… ============================================================================== --- trunk/reactos/lib/smlib/smlib.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smlib.rbuild [iso-8859-1] Tue Feb 7 08:05:06 2012 @@ -7,5 +7,6 @@ <file>execpgm.c</file> <file>compses.c</file> <file>lookupss.c</file> + <file>smclient.c</file> <pch>precomp.h</pch> </module>

1 0

[ion] 55479: [SMLIB]: Forgot to commit this directory.
by ion＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: ion Date: Tue Feb 7 07:43:20 2012 New Revision: 55479 URL: http://svn.reactos.org/svn/reactos?rev=55479&view=rev Log: [SMLIB]: Forgot to commit this directory. Modified: trunk/reactos/lib/smlib/smclient.c Modified: trunk/reactos/lib/smlib/smclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/smclient.c?rev=5… ============================================================================== --- trunk/reactos/lib/smlib/smclient.c [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/smclient.c [iso-8859-1] Tue Feb 7 07:43:20 2012 @@ -38,7 +38,7 @@ SmApiMsg.h.u1.s1.TotalLength = sizeof(SmApiMsg); /* Initalize this specific API's parameters */ - SmApiMsg.ApiNumber = SmpExecPgm; + SmApiMsg.ApiNumber = SmExecPgmApi; RtlCopyMemory(&SmApiMsg.u.ExecPgm.ProcessInformation, ProcessInformation, sizeof(SmApiMsg.u.ExecPgm.ProcessInformation)); @@ -48,7 +48,7 @@ Status = NtRequestWaitReplyPort(SmApiPort, &SmApiMsg.h, &SmApiMsg.h); if (!NT_SUCCESS(Status)) { - DbgPrint("SmExecPgm: NtRequestWaitReply Failed %lx\n", Status); + DPRINT1("SmExecPgm: NtRequestWaitReply Failed %lx\n", Status); } else { @@ -81,7 +81,7 @@ SecurityQos.EffectiveOnly = TRUE; /* Set the SM API port name */ - RtlInitUnicodeString(&DestinationString, L"\\SmApiPort"); + RtlInitUnicodeString(&DestinationString, L"\\SmApiPort2"); /* Check if this is a client connecting to SMSS, or SMSS to itself */ if (SbApiPortName)

1 0

[ion] 55478: [SMSS2]: Implement executing the initial command as well as doing the SM-to-SM initial connection. [SMSS2]: Implement the main LPC loop and handle all the supported APIs (all stubs for...
by ion＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: ion Date: Tue Feb 7 07:13:42 2012 New Revision: 55478 URL: http://svn.reactos.org/svn/reactos?rev=55478&view=rev Log: [SMSS2]: Implement executing the initial command as well as doing the SM-to-SM initial connection. [SMSS2]: Implement the main LPC loop and handle all the supported APIs (all stubs for now). Also handle new connection requests and implement SmpHandleConnectionRequest. [SMSS2]: Implement subsystem helper functions. [SMSS2]: Use SmApiPort2 instead of Sm2ApiPort. [SMSS2]: Rename the SMSRV_APIs not to conflict with the function names, nor with the client functions in smlib. Modified: trunk/reactos/base/system/smss2/CMakeLists.txt trunk/reactos/base/system/smss2/sminit.c trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smsessn.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smss.h trunk/reactos/base/system/smss2/smss2.rbuild trunk/reactos/base/system/smss2/smsubsys.c trunk/reactos/include/reactos/subsys/sm/smmsg.h Modified: trunk/reactos/base/system/smss2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/CMakeLis… ============================================================================== --- trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/CMakeLists.txt [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -15,7 +15,7 @@ add_executable(smss2 WIN32 ${SOURCE}) -target_link_libraries(smss2 nt pseh) +target_link_libraries(smss2 nt pseh smlib) add_pch(smss2 smss.h) 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] Tue Feb 7 07:13:42 2012 @@ -2439,7 +2439,7 @@ RtlInitUnicodeString(&Os2Name, L"OS2"); /* Create the SM API Port */ - RtlInitUnicodeString(&PortName, L"\\Sm2ApiPort"); + RtlInitUnicodeString(&PortName, L"\\SmApiPort2"); InitializeObjectAttributes(&ObjectAttributes, &PortName, 0, NULL, NULL); Status = NtCreatePort(&PortHandle, &ObjectAttributes, Modified: trunk/reactos/base/system/smss2/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smloop.c… ============================================================================== --- trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smloop.c [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -14,7 +14,263 @@ /* GLOBALS ********************************************************************/ +typedef struct _SMP_CLIENT_CONTEXT +{ + PVOID Subsystem; + HANDLE ProcessHandle; + HANDLE PortHandle; + ULONG dword10; +} SMP_CLIENT_CONTEXT, *PSMP_CLIENT_CONTEXT; + +typedef +NTSTATUS +(NTAPI *PSM_API_HANDLER)( + IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort +); + +volatile LONG SmTotalApiThreads; +HANDLE SmUniqueProcessId; + +/* API HANDLERS ***************************************************************/ + +NTSTATUS +NTAPI +SmpCreateForeignSession(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpSessionComplete(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpTerminateForeignSession(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpExecPgm(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpLoadDeferedSubsystem(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpStartCsr(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpStopCsr(IN PSM_API_MSG SmApiMsg, + IN PSMP_CLIENT_CONTEXT ClientContext, + IN HANDLE SmApiPort) +{ + DPRINT1("%s is not yet implemented\n", __FUNCTION__); + return STATUS_SUCCESS; +} + +PSM_API_HANDLER SmpApiDispatch[SmMaxApiNumber] = +{ + SmpCreateForeignSession, + SmpSessionComplete, + SmpTerminateForeignSession, + SmpExecPgm, + SmpLoadDeferedSubsystem, + SmpStartCsr, + SmpStopCsr +}; + /* FUNCTIONS ******************************************************************/ + +NTSTATUS +NTAPI +SmpHandleConnectionRequest(IN HANDLE SmApiPort, + IN PSB_API_MSG SbApiMsg) +{ + BOOLEAN Accept = TRUE; + HANDLE PortHandle, ProcessHandle; + ULONG SessionId; + UNICODE_STRING SubsystemPort; + SMP_CLIENT_CONTEXT *ClientContext; + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + REMOTE_PORT_VIEW PortView; + SECURITY_QUALITY_OF_SERVICE SecurityQos; + PSMP_SUBSYSTEM CidSubsystem, TypeSubsystem; + + /* Initialize QoS data */ + SecurityQos.ImpersonationLevel = SecurityIdentification; + SecurityQos.ContextTrackingMode = SECURITY_DYNAMIC_TRACKING; + SecurityQos.EffectiveOnly = TRUE; + + /* Check if this is SM connecting to itself */ + if (SbApiMsg->h.ClientId.UniqueProcess == SmUniqueProcessId) + { + /* No need to get any handle -- assume session 0 */ + DPRINT1("SM connecting to SM\n"); + ProcessHandle = NULL; + SessionId = 0; + } + else + { + /* Reference the foreign process */ + DPRINT1("Incoming request from %lx\n", SbApiMsg->h.ClientId.UniqueProcess); + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&ProcessHandle, + PROCESS_QUERY_INFORMATION, + &ObjectAttributes, + &SbApiMsg->h.ClientId); + if (!NT_SUCCESS(Status)) Accept = FALSE; + + /* Get its session ID */ + SmpGetProcessMuSessionId(ProcessHandle, &SessionId); + } + + /* See if we already know about the caller's subystem */ + CidSubsystem = SmpLocateKnownSubSysByCid(&SbApiMsg->h.ClientId); + if ((CidSubsystem) && (Accept)) + { + /* Check if we already have a subsystem for this kind of image */ + TypeSubsystem = SmpLocateKnownSubSysByType(SessionId, + SbApiMsg->ConnectionInfo.SubsystemType); + if (TypeSubsystem == CidSubsystem) + { + /* Someone is trying to take control of an existing subsystem, fail */ + Accept = FALSE; + DPRINT1("SMSS: Connection from SubSystem rejected\n"); + DPRINT1("SMSS: Image type already being served\n"); + } + else + { + /* Set this image type as the type for this subsystem */ + CidSubsystem->ImageType = SbApiMsg->ConnectionInfo.SubsystemType; + } + + /* Drop the reference we had acquired */ + if (TypeSubsystem) SmpDereferenceSubsystem(TypeSubsystem); + } + + /* Check if we'll be accepting the connection */ + if (Accept) + { + /* We will, so create a client context for it */ + ClientContext = RtlAllocateHeap(SmpHeap, 0, sizeof(SMP_CLIENT_CONTEXT)); + if (ClientContext) + { + ClientContext->ProcessHandle = ProcessHandle; + ClientContext->Subsystem = CidSubsystem; + ClientContext->dword10 = 0; + ClientContext->PortHandle = NULL; + } + else + { + /* Failed to allocate a client context, so reject the connection */ + DPRINT1("Rejecting connectiond due to lack of memory\n"); + Accept = FALSE; + } + } + else + { + /* Use a bogus context since we're going to reject the message */ + ClientContext = (PSMP_CLIENT_CONTEXT)SbApiMsg; + } + + /* Now send the actual accept reply (which could be a rejection) */ + PortView.Length = sizeof(PortView); + DPRINT1("Accepting: %d connection with context: %p\n", Accept, ClientContext); + Status = NtAcceptConnectPort(&PortHandle, + ClientContext, + &SbApiMsg->h, + Accept, + NULL, + &PortView); + if (!(Accept) || !(NT_SUCCESS(Status))) + { + /* Close the process handle, reference the subsystem, and exit */ + DPRINT1("Accept failed or rejected: %lx\n", Status); + if (ClientContext != (PVOID)SbApiMsg) RtlFreeHeap(SmpHeap, 0, ClientContext); + if (ProcessHandle) NtClose(ProcessHandle); + if (CidSubsystem) SmpDereferenceSubsystem(CidSubsystem); + return Status; + } + + /* Save the port handle now that we've accepted it */ + if (ClientContext) ClientContext->PortHandle = PortHandle; + if (CidSubsystem) CidSubsystem->PortHandle = PortHandle; + + /* Complete the port connection */ + Status = NtCompleteConnectPort(PortHandle); + if ((NT_SUCCESS(Status)) && (CidSubsystem)) + { + /* This was an actual subsystem, so connect back to it */ + DPRINT1("Connecting back to %wZ\n", &SubsystemPort); + SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL; + RtlCreateUnicodeString(&SubsystemPort, + SbApiMsg->ConnectionInfo.SbApiPortName); + Status = NtConnectPort(&CidSubsystem->SbApiPort, + &SubsystemPort, + &SecurityQos, + NULL, + NULL, + NULL, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Connect back to Sb %wZ failed %lx\n", &SubsystemPort, Status); + } + RtlFreeUnicodeString(&SubsystemPort); + + /* Now that we're connected, signal the event handle */ + NtSetEvent(CidSubsystem->Event, NULL); + } + else if (CidSubsystem) + { + /* We failed to complete the connection, so clear the port handle */ + DPRINT1("Completing the connection failed: %lx\n", Status); + CidSubsystem->PortHandle = NULL; + } + + /* Dereference the subsystem and return the result */ + if (CidSubsystem) SmpDereferenceSubsystem(CidSubsystem); + return Status; +} ULONG NTAPI @@ -22,18 +278,101 @@ { HANDLE SmApiPort = (HANDLE)Parameter; NTSTATUS Status; - PVOID ClientContext; - PSM_API_MSG RequestMsg = NULL; - SM_API_MSG ReplyMsg; - - DPRINT1("API Loop: %p\n", SmApiPort); + PSMP_CLIENT_CONTEXT ClientContext; + PSM_API_MSG ReplyMsg = NULL; + SM_API_MSG RequestMsg; + PROCESS_BASIC_INFORMATION ProcessInformation; + LARGE_INTEGER Timeout; + + /* Increase the number of API threads for throttling code for later */ + _InterlockedExchangeAdd(&SmTotalApiThreads, 1); + + /* Mark us critical */ + RtlSetThreadIsCritical(TRUE, NULL, TRUE); + + /* Set the PID of the SM process itself for later checking */ + NtQueryInformationProcess(NtCurrentProcess(), + ProcessBasicInformation, + &ProcessInformation, + sizeof(ProcessInformation), + NULL); + SmUniqueProcessId = (HANDLE)ProcessInformation.UniqueProcessId; + + /* Now process incoming messages */ while (TRUE) { + /* Begin waiting on a request */ + DPRINT1("API Loop: %p\n", SmApiPort); Status = NtReplyWaitReceivePort(SmApiPort, - &ClientContext, - &RequestMsg->h, - &ReplyMsg.h); - DPRINT1("API loop returned: %lx\n", Status); - } - return STATUS_SUCCESS; -} + (PVOID*)&ClientContext, + &ReplyMsg->h, + &RequestMsg.h); + if (Status == STATUS_NO_MEMORY) + { + /* Ran out of memory, so do a little timeout and try again */ + if (ReplyMsg) DPRINT1("SMSS: Failed to reply to calling thread, retrying.\n"); + Timeout.QuadPart = -50000000; + NtDelayExecution(FALSE, &Timeout); + continue; + } + + /* Check what kind of request we received */ + switch (RequestMsg.h.u2.s2.Type) + { + /* A new connection */ + case LPC_CONNECTION_REQUEST: + /* Create the right structures for it */ + DPRINT1("New connection request\n"); + SmpHandleConnectionRequest(SmApiPort, (PSB_API_MSG)&RequestMsg); + ReplyMsg = NULL; + break; + + /* A closed connection */ + case LPC_PORT_CLOSED: + /* Destroy any state we had for this client */ + DPRINT1("Port closed\n"); + //if (ClientContext) SmpPushDeferredClientContext(ClientContext); + ReplyMsg = NULL; + break; + + /* An actual API message */ + default: + if (!ClientContext) + { + ReplyMsg = NULL; + break; + } + + RequestMsg.ReturnValue = STATUS_PENDING; + + /* Check if the API is valid */ + if (RequestMsg.ApiNumber >= SmMaxApiNumber) + { + /* It isn't, fail */ + DPRINT1("Invalid API: %lx\n", RequestMsg.ApiNumber); + Status = STATUS_NOT_IMPLEMENTED; + } + else if ((RequestMsg.ApiNumber <= SmTerminateForeignSessionApi) && + !(ClientContext->Subsystem)) + { + /* It's valid, but doesn't have a subsystem with it */ + DPRINT1("Invalid session API\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + /* It's totally okay, so call the dispatcher for it */ + DPRINT1("Calling dispatcher for ID: %lx\n", RequestMsg.ApiNumber); + Status = SmpApiDispatch[RequestMsg.ApiNumber](&RequestMsg, + ClientContext, + SmApiPort); + } + + /* Write the result valud and return the message back */ + RequestMsg.ReturnValue = Status; + ReplyMsg = &RequestMsg; + break; + } + } + return STATUS_SUCCESS; +} Modified: trunk/reactos/base/system/smss2/smsessn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsessn.… ============================================================================== --- trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsessn.c [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -25,12 +25,43 @@ NTSTATUS NTAPI +SmpGetProcessMuSessionId(IN HANDLE ProcessHandle, + OUT PULONG SessionId) +{ + NTSTATUS Status; + ULONG ProcessSession; + + /* Query the kernel for the session ID */ + Status = NtQueryInformationProcess(ProcessHandle, + ProcessSessionInformation, + &ProcessSession, + sizeof(ProcessSession), + NULL); + if (NT_SUCCESS(Status)) + { + /* Copy it back into the buffer */ + *SessionId = ProcessSession; + } + else + { + /* Failure -- assume session zero */ + DPRINT1("SMSS: GetProcessMuSessionId, Process=%x, Status=%x\n", + ProcessHandle, Status); + *SessionId = 0; + } + + /* Return result */ + return Status; +} + +NTSTATUS +NTAPI SmpSetProcessMuSessionId(IN HANDLE ProcessHandle, IN ULONG SessionId) { NTSTATUS Status; - /* Tell the kernel about our session ID */ + /* Tell the kernel about the session ID */ Status = NtSetInformationProcess(ProcessHandle, ProcessSessionInformation, &SessionId, Modified: trunk/reactos/base/system/smss2/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.c?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.c [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -29,6 +29,8 @@ UNICODE_STRING SmpSystemRoot; ULONG AttachedSessionId = -1; BOOLEAN SmpDebug, SmpEnableDots; +HANDLE SmApiPort; +HANDLE SmpInitialCommandProcessId; /* FUNCTIONS ******************************************************************/ @@ -57,6 +59,7 @@ NTSTATUS Status; RTL_USER_PROCESS_INFORMATION LocalProcessInfo; PRTL_USER_PROCESS_PARAMETERS ProcessParameters; + DPRINT1("Executing image: %wZ\n", FileName); /* Use the input process information if we have it, otherwise use local */ ProcessInfo = ProcessInformation; @@ -297,6 +300,103 @@ NTSTATUS NTAPI +SmpExecuteInitialCommand(IN ULONG MuSessionId, + IN PUNICODE_STRING InitialCommand, + IN HANDLE InitialCommandProcess, + OUT PHANDLE ReturnPid) +{ + NTSTATUS Status; + RTL_USER_PROCESS_INFORMATION ProcessInfo; + UNICODE_STRING Arguments, ImageFileDirectory, ImageFileName; + ULONG Flags = 0; + + /* Check if we haven't yet connected to ourselves */ + if (!SmApiPort) + { + /* Connect to ourselves, as a client */ + Status = SmConnectToSm(0, 0, 0, &SmApiPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: Unable to connect to SM - Status == %lx\n", Status); + return Status; + } + } + + /* Parse the initial command line */ + Status = SmpParseCommandLine(InitialCommand, + (PULONG)&Flags, + &ImageFileName, + &ImageFileDirectory, + &Arguments); + if (Flags & SMP_INVALID_PATH) + { + /* Fail if it doesn't exist */ + DPRINT1("SMSS: Initial command image (%wZ) not found\n", &ImageFileName); + if (ImageFileName.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileName.Buffer); + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + /* And fail if any other reason is also true */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS: SmpParseCommand( %wZ ) failed - Status == %lx\n", + InitialCommand, Status); + return Status; + } + + /* Execute the initial command -- but defer its full execution */ + Status = SmpExecuteImage(&ImageFileName, + &ImageFileDirectory, + InitialCommand, + MuSessionId, + SMP_DEFERRED_FLAG, + &ProcessInfo); + + /* Free any buffers we had lying around */ + if (ImageFileName.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileName.Buffer); + } + if (ImageFileDirectory.Buffer) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, ImageFileDirectory.Buffer); + } + if (Arguments.Buffer) RtlFreeHeap(RtlGetProcessHeap(), 0, Arguments.Buffer); + + /* Bail out if we couldn't execute the initial command */ + if (!NT_SUCCESS(Status)) return Status; + + /* Now duplicate the handle to this process */ + Status = NtDuplicateObject(NtCurrentProcess(), + ProcessInfo.ProcessHandle, + NtCurrentProcess(), + InitialCommandProcess, + PROCESS_ALL_ACCESS, + 0, + 0); + if (!NT_SUCCESS(Status)) + { + /* Kill it utterly if duplication failed */ + DPRINT1("SMSS: DupObject Failed. Status == %lx\n", Status); + NtTerminateProcess(ProcessInfo.ProcessHandle, Status); + NtResumeThread(ProcessInfo.ThreadHandle, NULL); + NtClose(ProcessInfo.ThreadHandle); + NtClose(ProcessInfo.ProcessHandle); + return Status; + } + + /* Return PID to the caller, and set this as the initial command PID */ + if (ReturnPid) *ReturnPid = ProcessInfo.ClientId.UniqueProcess; + if (!MuSessionId) SmpInitialCommandProcessId = ProcessInfo.ClientId.UniqueProcess; + + /* Now call our server execution function to wrap up its initialization */ + Status = SmExecPgm(SmApiPort, &ProcessInfo, FALSE); + if (!NT_SUCCESS(Status)) DPRINT1("SMSS: SmExecPgm Failed. Status == %lx\n", Status); + return Status; +} + +NTSTATUS +NTAPI ExpLoadInitialProcess(IN PINIT_BUFFER InitBuffer, OUT PRTL_USER_PROCESS_PARAMETERS *ProcessParameters, OUT PCHAR *ProcessEnvironment) @@ -630,6 +730,9 @@ DPRINT1("SMSS: SmpInit return failure - Status == %x\n", Status); RtlInitUnicodeString(&DbgString, L"Session Manager Initialization"); Parameters[1] = Status; + DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); + Status = LaunchOldSmss(Handles); + goto SetupHack; //_SEH2_LEAVE; Hack so that setup can work. will go away later } @@ -647,14 +750,21 @@ DPRINT1("Global Flags Set to SMSS Debugging: Not yet supported\n"); } -#if 0 - /* Execute the initial command (Winlogon.exe) */ - Status = SmpExecuteInitialCommand(0, &InitialCommand, &Handles[1], NULL); -#else /* Launch the original SMSS */ DPRINT1("SMSS-2 Loaded... Launching original SMSS\n"); Status = LaunchOldSmss(Handles); -#endif + if (!NT_SUCCESS(Status)) + { + /* Fail and raise a hard error */ + DPRINT1("SMSS: Execute Old SMSS failed\n"); + RtlInitUnicodeString(&DbgString, + L"Session Manager LaunchOldSmss"); + Parameters[1] = Status; + _SEH2_LEAVE; + } + + /* Execute the initial command (Winlogon.exe) */ + Status = SmpExecuteInitialCommand(0, &InitialCommand, &Handles[1], NULL); if (!NT_SUCCESS(Status)) { /* Fail and raise a hard error */ @@ -679,6 +789,7 @@ SmpReleasePrivilege(State); /* Wait on either CSRSS or Winlogon to die */ +SetupHack: Status = NtWaitForMultipleObjects(RTL_NUMBER_OF(Handles), Handles, WaitAny, Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -48,6 +48,20 @@ UNICODE_STRING Value; PCHAR AnsiValue; } SMP_REGISTRY_VALUE, *PSMP_REGISTRY_VALUE; + +typedef struct _SMP_SUBSYSTEM +{ + LIST_ENTRY Entry; + HANDLE Event; + HANDLE ProcessHandle; + ULONG ImageType; + HANDLE PortHandle; + HANDLE SbApiPort; + CLIENT_ID ClientId; + ULONG MuSessionId; + BOOLEAN Terminating; + ULONG ReferenceCount; +} SMP_SUBSYSTEM, *PSMP_SUBSYSTEM; /* EXTERNALS ******************************************************************/ @@ -209,4 +223,31 @@ SmpTranslateSystemPartitionInformation( VOID ); + +PSMP_SUBSYSTEM +NTAPI +SmpLocateKnownSubSysByCid( + IN PCLIENT_ID ClientId +); + +PSMP_SUBSYSTEM +NTAPI +SmpLocateKnownSubSysByType( + IN ULONG MuSessionId, + IN ULONG ImageType +); + +NTSTATUS +NTAPI +SmpGetProcessMuSessionId( + IN HANDLE ProcessHandle, + OUT PULONG SessionId +); + +VOID +NTAPI +SmpDereferenceSubsystem( + IN PSMP_SUBSYSTEM SubSystem +); + #endif Modified: trunk/reactos/base/system/smss2/smss2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss2.rb… ============================================================================== --- trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss2.rbuild [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -7,6 +7,7 @@ <library>nt</library> <library>pseh</library> <library>ntdll</library> + <library>smlib</library> <pch>smss.h</pch> <compilationunit name="unit.c"> <file>smss.c</file> Modified: trunk/reactos/base/system/smss2/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smsubsys… ============================================================================== --- trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smsubsys.c [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -22,6 +22,97 @@ WCHAR InitialCommandBuffer[256]; /* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +SmpDereferenceSubsystem(IN PSMP_SUBSYSTEM SubSystem) +{ + /* Acquire the database lock while we (potentially) destroy this subsystem */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + + /* Drop the reference and see if it's terminating */ + if (!(--SubSystem->ReferenceCount) && (SubSystem->Terminating)) + { + /* Close all handles and free it */ + if (SubSystem->Event) NtClose(SubSystem->Event); + if (SubSystem->ProcessHandle) NtClose(SubSystem->ProcessHandle); + if (SubSystem->SbApiPort) NtClose(SubSystem->SbApiPort); + RtlFreeHeap(SmpHeap, 0, SubSystem); + } + + /* Release the database lock */ + RtlLeaveCriticalSection(&SmpKnownSubSysLock); +} + +PSMP_SUBSYSTEM +NTAPI +SmpLocateKnownSubSysByCid(IN PCLIENT_ID ClientId) +{ + PSMP_SUBSYSTEM Subsystem = NULL; + PLIST_ENTRY NextEntry; + + /* Lock the subsystem database */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + + /* Loop each subsystem in the database */ + NextEntry = SmpKnownSubSysHead.Flink; + while (NextEntry != &SmpKnownSubSysHead) + { + /* Check if this one matches the client ID and is still valid */ + Subsystem = CONTAINING_RECORD(NextEntry, SMP_SUBSYSTEM, Entry); + if ((*(PULONGLONG)&Subsystem->ClientId == *(PULONGLONG)&ClientId) && + !(Subsystem->Terminating)) + { + /* Add a reference and return it */ + Subsystem->ReferenceCount++; + break; + } + + /* Reset the current pointer and keep earching */ + Subsystem = NULL; + NextEntry = NextEntry->Flink; + } + + /* Release the lock and return the subsystem we found */ + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return Subsystem; +} + +PSMP_SUBSYSTEM +NTAPI +SmpLocateKnownSubSysByType(IN ULONG MuSessionId, + IN ULONG ImageType) +{ + PSMP_SUBSYSTEM Subsystem = NULL; + PLIST_ENTRY NextEntry; + + /* Lock the subsystem database */ + RtlEnterCriticalSection(&SmpKnownSubSysLock); + + /* Loop each subsystem in the database */ + NextEntry = SmpKnownSubSysHead.Flink; + while (NextEntry != &SmpKnownSubSysHead) + { + /* Check if this one matches the image and uID, and is still valid */ + Subsystem = CONTAINING_RECORD(NextEntry, SMP_SUBSYSTEM, Entry); + if ((Subsystem->ImageType == ImageType) && + !(Subsystem->Terminating) && + (Subsystem->MuSessionId == MuSessionId)) + { + /* Return it referenced for the caller */ + Subsystem->ReferenceCount++; + break; + } + + /* Reset the current pointer and keep earching */ + Subsystem = NULL; + NextEntry = NextEntry->Flink; + } + + /* Release the lock and return the subsystem we found */ + RtlLeaveCriticalSection(&SmpKnownSubSysLock); + return Subsystem; +} NTSTATUS NTAPI Modified: trunk/reactos/include/reactos/subsys/sm/smmsg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/sm/… ============================================================================== --- trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/sm/smmsg.h [iso-8859-1] Tue Feb 7 07:13:42 2012 @@ -21,14 +21,14 @@ // typedef enum _SMSRV_API_NUMBER { - SmpCreateForeignSession, - SmpSessionComplete, - SmpTerminateForeignSession, - SmpExecPgm, - SmpLoadDeferedSubsystem, - SmpStartCsr, - SmpStopCsr, - SmpMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... + SmCreateForeignSessionApi, + SmSessionCompleteApi, + SmTerminateForeignSessionApi, + SmExecPgmApi, + SmLoadDeferedSubsystemApi, + SmStartCsrApi, + SmStopCsrApi, + SmMaxApiNumber // Based on BasepMaxApiNumber, UserpMaxApiNumber... } SMSRV_API_NUMBER; // @@ -184,7 +184,7 @@ // typedef struct _SB_API_MSG { - PORT_MESSAGE Header; + PORT_MESSAGE h; union { SB_CONNECTION_INFO ConnectionInfo; @@ -208,4 +208,25 @@ // C_ASSERT(sizeof(SB_CONNECTION_INFO) == 0xF4); C_ASSERT(sizeof(SB_API_MSG) == 0x110); + +// +// The actual server functions that a client linking with smlib can call +// +NTSTATUS +NTAPI +SmConnectToSm( + IN PUNICODE_STRING SbApiPortName, + IN HANDLE SbApiPort, + IN ULONG ImageType, + IN HANDLE SmApiPort +); + +NTSTATUS +NTAPI +SmExecPgm( + IN HANDLE SmApiPort, + IN PRTL_USER_PROCESS_INFORMATION ProcessInformation, + IN BOOLEAN DebugFlag +); + #endif

1 0

[cgutman] 55477: [USBEHCI] - Wait for periodic scheduling to start - Increase the wait interval for asynchronous scheduling to start
by cgutman＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: cgutman Date: Tue Feb 7 02:22:34 2012 New Revision: 55477 URL: http://svn.reactos.org/svn/reactos?rev=55477&view=rev Log: [USBEHCI] - Wait for periodic scheduling to start - Increase the wait interval for asynchronous scheduling to start 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] Tue Feb 7 02:22:34 2012 @@ -714,22 +714,29 @@ // for (FailSafe = 100; FailSafe > 1; FailSafe--) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); - if (!(UsbSts & EHCI_STS_HALT)) + if (!(UsbSts & EHCI_STS_HALT) && (UsbSts & EHCI_STS_PSS)) { break; } } - if (UsbSts & EHCI_STS_HALT) { DPRINT1("Could not start execution on the controller\n"); + ASSERT(FALSE); return STATUS_UNSUCCESSFUL; } + if (!(UsbSts & EHCI_STS_PSS)) + { + DPRINT1("Could not enable periodic scheduling\n"); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + // // Assign the AsyncList Register // @@ -755,7 +762,7 @@ // for (FailSafe = 100; FailSafe > 1; FailSafe--) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); if ((UsbSts & EHCI_STS_ASS)) @@ -1282,7 +1289,7 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; - DPRINT("CStatus %x\n", CStatus); + DPRINT("CStatus %x\n", CStatus); // // check for completion of async schedule

1 0

[cgutman] 55476: [USBOHCI] - Enable bus master on OHCI controllers if it's not set by default
by cgutman＠svn.reactos.org 07 Feb '12

07 Feb '12

Author: cgutman Date: Tue Feb 7 01:59:18 2012 New Revision: 55476 URL: http://svn.reactos.org/svn/reactos?rev=55476&view=rev Log: [USBOHCI] - Enable bus master on OHCI controllers if it's not set by default 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] Tue Feb 7 01:59:18 2012 @@ -221,13 +221,40 @@ return STATUS_SUCCESS; } - if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) - { - DPRINT1("PCI Configuration shows this as a non Bus Mastering device!\n"); - } - m_VendorID = PciConfig.VendorID; m_DeviceID = PciConfig.DeviceID; + + if (PciConfig.Command & PCI_ENABLE_BUS_MASTER) + { + // + // master is enabled + // + return STATUS_SUCCESS; + } + + DPRINT1("PCI Configuration shows this as a non Bus Mastering device! Enabling...\n"); + + PciConfig.Command |= PCI_ENABLE_BUS_MASTER; + BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH); + + BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT1("Failed to get pci config information!\n"); + ASSERT(FALSE); + return STATUS_SUCCESS; + } + + if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) + { + DPRINT1("Failed to enable master\n"); + return STATUS_UNSUCCESSFUL; + } return STATUS_SUCCESS; }

1 0

[akhaldi] 55475: [CLASSPNP] * Rename class.spec to classpnp.spec and adjust the build files accordingly. [DISK_NEW] * Fix the build files (cmake and rbuild). * Fix InitSafeBootMode use. * Add disk_...
by akhaldi＠svn.reactos.org 06 Feb '12

06 Feb '12

Author: akhaldi Date: Mon Feb 6 22:48:17 2012 New Revision: 55475 URL: http://svn.reactos.org/svn/reactos?rev=55475&view=rev Log: [CLASSPNP] * Rename class.spec to classpnp.spec and adjust the build files accordingly. [DISK_NEW] * Fix the build files (cmake and rbuild). * Fix InitSafeBootMode use. * Add disk_new to build. Added: branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.spec - copied unchanged from r55470, branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec Removed: branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec Modified: branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild Modified: branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -2,4 +2,5 @@ add_subdirectory(cdrom) add_subdirectory(class2) add_subdirectory(disk) +add_subdirectory(disk_new) add_subdirectory(ramdisk) Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -1,16 +1,12 @@ include_directories(..) -add_library(disk SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) +add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) -if(ARCH MATCHES i386) - add_target_compile_flags(disk "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") +target_link_libraries(disk_new libcntpr wdmguid) +if(NOT MSVC AND ARCH MATCHES i386) + add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif() -set_module_type(disk kernelmodedriver) -add_importlibs(disk - classpnp - scsiport - ntoskrnl - hal) - -add_cd_file(TARGET disk DESTINATION reactos/system32/drivers NO_CAB FOR all) +set_module_type(disk_new kernelmodedriver) +add_importlibs(disk_new classpnp ntoskrnl hal) +add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all) Modified: branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/class/disk_new/pnp.c [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -22,7 +22,7 @@ #include "disk.h" -extern PULONG InitSafeBootMode; +extern NTSYSAPI ULONG InitSafeBootMode; #ifdef ALLOC_PRAGMA @@ -500,7 +500,7 @@ // and enable failure prediction polling. // - if (*InitSafeBootMode == 0) + if (InitSafeBootMode == 0) { DiskDetectFailurePrediction(fdoExtension, &diskData->FailurePredictionCapability); Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -17,7 +17,7 @@ endif() endif() -spec2def(classpnp.sys class.spec) +spec2def(classpnp.sys classpnp.spec) list(APPEND SOURCE autorun.c @@ -35,12 +35,12 @@ utils.c xferpkt.c class.rc - ${CMAKE_CURRENT_BINARY_DIR}/class.def) + ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) add_library(classpnp SHARED ${SOURCE}) add_pch(classpnp classp.h) target_link_libraries(classpnp ${PSEH_LIB} libcntpr) set_module_type(classpnp kernelmodedriver) add_importlibs(classpnp hal ntoskrnl) -add_importlib_target(class.spec) +add_importlib_target(classpnp.spec) add_cd_file(TARGET classpnp DESTINATION reactos/system32/drivers NO_CAB FOR all) Removed: branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/class.spec (removed) @@ -1,59 +1,0 @@ - - @ stdcall ClassInitialize(ptr ptr ptr) - @ stdcall ClassInitializeEx(ptr ptr ptr) - @ stdcall ClassGetDescriptor(ptr ptr ptr) - @ stdcall ClassReadDriveCapacity(ptr) - @ stdcall ClassReleaseQueue(ptr) - @ stdcall ClassAsynchronousCompletion(ptr ptr ptr) - @ stdcall ClassSplitRequest(ptr ptr long) - @ stdcall ClassDeviceControl(ptr ptr) - @ stdcall ClassIoComplete(ptr ptr ptr) - @ stdcall ClassIoCompleteAssociated(ptr ptr ptr) - @ stdcall ClassInterpretSenseInfo(ptr ptr long long long ptr ptr) - @ stdcall ClassSendDeviceIoControlSynchronous(long ptr ptr long long long ptr) - @ stdcall ClassSendIrpSynchronous(ptr ptr) - @ stdcall ClassForwardIrpSynchronous(ptr ptr) - @ stdcall ClassSendSrbSynchronous(ptr ptr ptr long long) - @ stdcall ClassSendSrbAsynchronous(ptr ptr ptr ptr long long) - @ stdcall ClassBuildRequest(ptr ptr) - @ stdcall ClassModeSense(ptr ptr long long) - @ stdcall ClassFindModePage(ptr long long long) - @ stdcall ClassClaimDevice(ptr long) - @ stdcall ClassInternalIoControl(ptr ptr) - @ stdcall ClassCreateDeviceObject(ptr ptr ptr long ptr) - @ stdcall ClassRemoveDevice(ptr long) - @ stdcall ClassInitializeSrbLookasideList(ptr long) - @ stdcall ClassDeleteSrbLookasideList(ptr) - @ stdcall ClassQueryTimeOutRegistryValue(ptr) - @ stdcall ClassInvalidateBusRelations(ptr) - @ stdcall ClassMarkChildrenMissing(ptr) - @ stdcall ClassMarkChildMissing(ptr long) - @ varargs ClassDebugPrint(long long) - @ stdcall ClassGetDriverExtension(ptr) - @ stdcall ClassCompleteRequest(ptr ptr long) - @ stdcall ClassReleaseRemoveLock(ptr ptr) - @ stdcall ClassAcquireRemoveLockEx(ptr ptr ptr long) - @ stdcall ClassUpdateInformationInRegistry(ptr ptr long ptr long) - @ stdcall ClassWmiCompleteRequest(ptr ptr long long long) - @ stdcall ClassWmiFireEvent(ptr ptr long long ptr) - @ stdcall ClassGetVpb(ptr) - @ stdcall ClassSetFailurePredictionPoll(ptr long long) - @ stdcall ClassNotifyFailurePredicted(ptr ptr long long long long long long) - @ stdcall ClassInitializeTestUnitPolling(ptr long) - @ stdcall ClassSignalCompletion(ptr ptr ptr) - @ stdcall ClassSendStartUnit(ptr) - @ stdcall ClassSetMediaChangeState(ptr long long) - @ stdcall ClassResetMediaChangeTimer(ptr) - @ stdcall ClassCheckMediaState(ptr) - @ stdcall ClassInitializeMediaChangeDetection(ptr ptr) - @ stdcall ClassCleanupMediaChangeDetection(ptr) - @ stdcall ClassEnableMediaChangeDetection(ptr) - @ stdcall ClassDisableMediaChangeDetection(ptr) - @ stdcall ClassSpinDownPowerHandler(ptr ptr) - @ stdcall ClassStopUnitPowerHandler(ptr ptr) - @ stdcall ClassAcquireChildLock(ptr) - @ stdcall ClassReleaseChildLock(ptr) - @ stdcall ClassScanForSpecial(ptr ptr ptr) - @ stdcall ClassSetDeviceParameter(ptr ptr ptr long) - @ stdcall ClassGetDeviceParameter(ptr ptr ptr ptr) - Modified: branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/stora… ============================================================================== --- branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/storage/classpnp/classpnp.rbuild [iso-8859-1] Mon Feb 6 22:48:17 2012 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="classpnp" type="kernelmodedriver" installbase="system32/drivers" installname="classpnp.sys"> <bootstrap installbase="$(CDOUTPUT)/system32/drivers" /> - <importlibrary definition="class.spec" /> + <importlibrary definition="classpnp.spec" /> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library>

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