Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[janderwald] 51760: [USBSTOR] - Fix one more warning

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 15 12:49:17 2011 New Revision: 51760 URL: http://svn.reactos.org/svn/reactos?rev=51760&view=rev Log: [USBSTOR] - Fix one more warning Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 15 12:49:17 2011 @@ -56,7 +56,7 @@ // // data is transferred with this irp // - if ((Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)) || + if ((Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) || Request->DataTransferLength == 0 || Irp->MdlAddress == NULL) {

13 years, 6 months

[janderwald] 51759: [USBSTOR] - Silence warnings - Silence traces - Add asserts - Add code to detect usb reset in progress. In that case cancel the request - Add more code to synchronize urb action...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun May 15 12:47:54 2011 New Revision: 51759 URL: http://svn.reactos.org/svn/reactos?rev=51759&view=rev Log: [USBSTOR] - Silence warnings - Silence traces - Add asserts - Add code to detect usb reset in progress. In that case cancel the request - Add more code to synchronize urb action - WIP, still hangs are observed Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/queue.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Sun May 15 12:47:54 2011 @@ -46,7 +46,7 @@ { case SRB_FUNCTION_EXECUTE_SCSI: { - DPRINT1("SRB_FUNCTION_EXECUTE_SCSI\n"); + DPRINT("SRB_FUNCTION_EXECUTE_SCSI\n"); // // check if request is valid @@ -56,7 +56,7 @@ // // data is transferred with this irp // - if (Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) || + if ((Request->SrbFlags & (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT) == (SRB_FLAGS_DATA_IN | SRB_FLAGS_DATA_OUT)) || Request->DataTransferLength == 0 || Irp->MdlAddress == NULL) { Modified: branches/usb-bringup/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/queue.c [iso-8859-1] Sun May 15 12:47:54 2011 @@ -27,7 +27,6 @@ InitializeListHead(&FDODeviceExtension->IrpListHead); } - VOID NTAPI USBSTOR_CancelIo( @@ -89,11 +88,13 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; PFDO_DEVICE_EXTENSION FDODeviceExtension; BOOLEAN IrpListFreeze; + BOOLEAN SrbProcessing; // // get pdo device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // // get FDO device extension @@ -111,9 +112,22 @@ KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); // - // add irp to queue - // - InsertTailList(&FDODeviceExtension->IrpListHead, &Irp->Tail.Overlay.ListEntry); + // check if there are irp pending + // + SrbProcessing = FDODeviceExtension->IrpPendingCount != 0; + + if (SrbProcessing) + { + // + // add irp to queue + // + InsertTailList(&FDODeviceExtension->IrpListHead, &Irp->Tail.Overlay.ListEntry); + } + + // + // increment pending count + // + FDODeviceExtension->IrpPendingCount++; // // now set the driver cancel routine @@ -159,7 +173,9 @@ // // if list is freezed, dont start this packet // - return IrpListFreeze; + DPRINT1("IrpListFreeze: %lu IrpPendingCount %lu\n", IrpListFreeze, FDODeviceExtension->IrpPendingCount); + + return (IrpListFreeze || SrbProcessing); } PIRP @@ -442,6 +458,7 @@ PPDO_DEVICE_EXTENSION PDODeviceExtension; KIRQL OldLevel; NTSTATUS Status; + BOOLEAN ResetInProgress; DPRINT1("USBSTOR_StartIo\n"); @@ -519,9 +536,10 @@ KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); // - // remove irp from list - // - RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + // check reset is in progress + // + ResetInProgress = FDODeviceExtension->ResetInProgress; + ASSERT(ResetInProgress == FALSE); // // release lock @@ -544,9 +562,39 @@ ASSERT(PDODeviceExtension->Common.IsFDO == FALSE); // - // execute scsi - // - Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + // is a reset in progress + // + if (ResetInProgress) + { + // + // hard reset is in progress + // + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_DEVICE_DOES_NOT_EXIST; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else + { + // + // execute scsi + // + Status = USBSTOR_HandleExecuteSCSI(IoStack->DeviceObject, Irp); + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->IrpListLock, &OldLevel); + + // + // FIXME: synchronize with error handler + // + FDODeviceExtension->IrpPendingCount--; + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->IrpListLock, OldLevel); + } // // FIXME: synchronize action with error handling @@ -557,5 +605,4 @@ // start next request // IoStartNextPacket(DeviceObject, TRUE); - -} +} Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 15 12:47:54 2011 @@ -442,7 +442,7 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; PIRP Irp; PIO_STACK_LOCATION IoStack; - PULONG MdlVirtualAddress; + PUCHAR MdlVirtualAddress; // // first allocate irp context @@ -509,16 +509,16 @@ if (OriginalRequest) { if ((OriginalRequest->MdlAddress != NULL) && - (Context->TransferData == NULL || Command[0] == SCSIOP_READ || Command[0] == SCSIOP_WRITE)) + (Context->TransferData == NULL || Command[0] == SCSIOP_READ || Command[0] == SCSIOP_WRITE)) { - // - // Sanity check that the Mdl does describe the TransferData for read/write - // - if (CommandLength == UFI_READ_WRITE_CMD_LEN) - { - MdlVirtualAddress = MmGetMdlVirtualAddress(OriginalRequest->MdlAddress); - ASSERT(MdlVirtualAddress == Context->TransferData); - } + // + // Sanity check that the Mdl does describe the TransferData for read/write + // + if (CommandLength == UFI_READ_WRITE_CMD_LEN) + { + MdlVirtualAddress = MmGetMdlVirtualAddress(OriginalRequest->MdlAddress); + ASSERT(MdlVirtualAddress == Context->TransferData); + } // // I/O paging request @@ -736,6 +736,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { +#if 0 UFI_SENSE_CMD Cmd; NTSTATUS Status; PVOID Response; @@ -743,7 +744,7 @@ PCBW OutControl; PCDB pCDB; PUFI_MODE_PARAMETER_HEADER Header; - +#endif PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; @@ -908,13 +909,11 @@ IN PIRP Irp) { UFI_READ_WRITE_CMD Cmd; - NTSTATUS Status; PPDO_DEVICE_EXTENSION PDODeviceExtension; PCDB pCDB; ULONG BlockCount; PIO_STACK_LOCATION IoStack; PSCSI_REQUEST_BLOCK Request; - PVOID Buffer; // // get current stack location @@ -939,7 +938,7 @@ // // informal debug print // - DPRINT1("USBSTOR_SendReadWriteCmd DataTransferLength %x, BlockLength %x\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWriteCmd DataTransferLength %lu, BlockLength %lu\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); // // sanity check @@ -963,12 +962,12 @@ Cmd.LogicalBlockByte2 = pCDB->CDB10.LogicalBlockByte2; Cmd.LogicalBlockByte3 = pCDB->CDB10.LogicalBlockByte3; - DPRINT1("BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); + DPRINT1("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); // // send request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); + return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer); } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.c [iso-8859-1] Sun May 15 12:47:54 2011 @@ -148,8 +148,6 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - NTSTATUS Status; - // // handle requests // Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun May 15 12:47:54 2011 @@ -66,6 +66,8 @@ KSPIN_LOCK IrpListLock; // irp list lock LIST_ENTRY IrpListHead; // irp list head BOOLEAN IrpListFreeze; // if true the irp list is freezed + BOOLEAN ResetInProgress; // if hard reset is in progress + ULONG IrpPendingCount; // count of irp pending }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct @@ -371,6 +373,10 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +NTSTATUS +USBSTOR_SendInquiryCmd( + IN PDEVICE_OBJECT DeviceObject); + //--------------------------------------------------------------------- // // disk.c routines @@ -417,3 +423,4 @@ VOID USBSTOR_QueueInitialize( PFDO_DEVICE_EXTENSION FDODeviceExtension); +

13 years, 6 months

[jgardou] 51758: Revert something that shouldn't have been committed in 51757

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 12:38:35 2011 New Revision: 51758 URL: http://svn.reactos.org/svn/reactos?rev=51758&view=rev Log: Revert something that shouldn't have been committed in 51757 Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=51758&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sun May 15 12:38:35 2011 @@ -2645,7 +2645,7 @@ { RtlEnterHeapLock(Heap->LockVariable); HeapLocked = TRUE; - Flags &= ~HEAP_NO_SERIALIZE; + Flags ^= HEAP_NO_SERIALIZE; } /* Get the pointer to the in-use entry */

13 years, 6 months

[jgardou] 51757: [RTL/HEAP] Commit some stuff reviewed by aleksey long ago - get rid of LastEntryInSegment in HEAP_SEGMENT struct - Simplify code for page commit - Simplify code for splitting entries

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 12:20:44 2011 New Revision: 51757 URL: http://svn.reactos.org/svn/reactos?rev=51757&view=rev Log: [RTL/HEAP] Commit some stuff reviewed by aleksey long ago - get rid of LastEntryInSegment in HEAP_SEGMENT struct - Simplify code for page commit - Simplify code for splitting entries Modified: trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/heap.h Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=51757&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Sun May 15 12:20:44 2011 @@ -571,7 +571,7 @@ PLIST_ENTRY Current; ULONG_PTR Address = 0; PHEAP_UCR_DESCRIPTOR UcrDescriptor, PreviousUcr = NULL; - PHEAP_ENTRY FirstEntry, LastEntry, PreviousLastEntry; + PHEAP_ENTRY FirstEntry, LastEntry; NTSTATUS Status; DPRINT("RtlpFindAndCommitPages(%p %p %x %p)\n", Heap, Segment, *Size, Address); @@ -619,40 +619,17 @@ /* Calculate first and last entries */ FirstEntry = (PHEAP_ENTRY)Address; - if ((Segment->LastEntryInSegment->Flags & HEAP_ENTRY_LAST_ENTRY) && - (ULONG_PTR)(Segment->LastEntryInSegment + Segment->LastEntryInSegment->Size) == (ULONG_PTR)UcrDescriptor->Address) - { - LastEntry = Segment->LastEntryInSegment; - } + /* Go through the entries to find the last one */ + if (PreviousUcr) + LastEntry = (PHEAP_ENTRY)((ULONG_PTR)PreviousUcr->Address + PreviousUcr->Size); else - { - /* Go through the entries to find the last one */ - - if (PreviousUcr) - LastEntry = (PHEAP_ENTRY)((ULONG_PTR)PreviousUcr->Address + PreviousUcr->Size); - else - LastEntry = Segment->FirstEntry; - - while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) - { - PreviousLastEntry = LastEntry; - LastEntry += LastEntry->Size; - - if ((ULONG_PTR)LastEntry >= (ULONG_PTR)Segment->LastValidEntry || - LastEntry->Size == 0) - { - if (LastEntry == (PHEAP_ENTRY)Address) - { - /* Found it */ - LastEntry = PreviousLastEntry; - break; - } - - DPRINT1("Last entry not found in a committed range near to %p\n", PreviousLastEntry); - return NULL; - } - } - } + LastEntry = &Segment->Entry; + + while (!(LastEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) + { + LastEntry += LastEntry->Size; + } + ASSERT((LastEntry + LastEntry->Size) == FirstEntry); /* Unmark it as a last entry */ LastEntry->Flags &= ~HEAP_ENTRY_LAST_ENTRY; @@ -663,20 +640,28 @@ DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); + + /* Set various first entry fields*/ + FirstEntry->SegmentOffset = LastEntry->SegmentOffset; + FirstEntry->Size = *Size >> HEAP_ENTRY_SHIFT; + FirstEntry->PreviousSize = LastEntry->Size; /* Check if anything left in this UCR */ if (UcrDescriptor->Size == 0) { /* It's fully exhausted */ - if (UcrDescriptor->Address == Segment->LastValidEntry) + + /* Check if this is the end of the segment */ + if(UcrDescriptor->Address == Segment->LastValidEntry) { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; - Segment->LastEntryInSegment = FirstEntry; } else { FirstEntry->Flags = 0; - Segment->LastEntryInSegment = Segment->FirstEntry; + /* Update field of next entry */ + ASSERT((FirstEntry + FirstEntry->Size)->PreviousSize == 0); + (FirstEntry + FirstEntry->Size)->PreviousSize = FirstEntry->Size; } /* This UCR needs to be removed because it became useless */ @@ -688,18 +673,8 @@ else { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; - Segment->LastEntryInSegment = FirstEntry; - } - - /* Set various first entry fields*/ - FirstEntry->SegmentOffset = LastEntry->SegmentOffset; - FirstEntry->Size = *Size >> HEAP_ENTRY_SHIFT; - FirstEntry->PreviousSize = LastEntry->Size; - - /* Update previous size */ - if (!(FirstEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) - (FirstEntry + FirstEntry->Size)->PreviousSize = FirstEntry->Size; - + } + /* We're done */ return (PHEAP_FREE_ENTRY)FirstEntry; } @@ -820,9 +795,6 @@ FreeEntry->Size = PrecedingSize; Heap->TotalFreeSize += PrecedingSize; - /* Set last entry in the segment to this entry */ - Segment->LastEntryInSegment = (PHEAP_ENTRY)FreeEntry; - /* Insert it into the free list */ RtlpInsertFreeBlockHelper(Heap, FreeEntry, PrecedingSize, FALSE); } @@ -830,12 +802,6 @@ { /* Adjust preceding in use entry */ PrecedingInUseEntry->Flags |= HEAP_ENTRY_LAST_ENTRY; - Segment->LastEntryInSegment = PrecedingInUseEntry; - } else if ((ULONG_PTR)Segment->LastEntryInSegment >= DecommitBase && - ((PCHAR)Segment->LastEntryInSegment < ((PCHAR)DecommitBase + DecommitSize))) - { - /* Update this segment's last entry */ - Segment->LastEntryInSegment = Segment->FirstEntry; } /* Now the next one */ @@ -941,9 +907,6 @@ HeapEntry->PreviousSize = Segment->Entry.Size; HeapEntry->SegmentOffset = SegmentIndex; - /* Set last entry in segment */ - Segment->LastEntryInSegment = HeapEntry; - /* Insert it */ RtlpInsertFreeBlock(Heap, (PHEAP_FREE_ENTRY)HeapEntry, (PHEAP_ENTRY)UncommittedBase - HeapEntry); @@ -1108,10 +1071,6 @@ /* Copy flags */ CurrentEntry->Flags = FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY; - /* Update last entry in the segment */ - if (CurrentEntry->Flags & HEAP_ENTRY_LAST_ENTRY) - Heap->Segments[CurrentEntry->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)CurrentEntry; - /* Advance FreeEntry and update sizes */ FreeEntry = CurrentEntry; *FreeSize = *FreeSize + CurrentEntry->Size; @@ -1144,10 +1103,6 @@ /* Copy flags */ FreeEntry->Flags = NextEntry->Flags & HEAP_ENTRY_LAST_ENTRY; - - /* Update last entry in the segment */ - if (FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY) - Heap->Segments[FreeEntry->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)FreeEntry; /* Remove next entry now */ RtlpRemoveFreeBlock(Heap, NextEntry, FALSE, FALSE); @@ -1794,7 +1749,7 @@ SIZE_T Index, SIZE_T Size) { - PHEAP_FREE_ENTRY SplitBlock, SplitBlock2; + PHEAP_FREE_ENTRY SplitBlock; UCHAR FreeFlags; PHEAP_ENTRY InUseEntry; SIZE_T FreeSize; @@ -1836,70 +1791,13 @@ SplitBlock->SegmentOffset = InUseEntry->SegmentOffset; SplitBlock->Size = FreeSize; SplitBlock->PreviousSize = Index; - - /* Check if it's the last entry */ - if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) - { - /* Insert it to the free list if it's the last entry */ - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); - Heap->TotalFreeSize += FreeSize; - } - else - { - /* Not so easy - need to update next's previous size too */ - SplitBlock2 = (PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize); - - if (SplitBlock2->Flags & HEAP_ENTRY_BUSY) - { - SplitBlock2->PreviousSize = (USHORT)FreeSize; - RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); - Heap->TotalFreeSize += FreeSize; - } - else - { - /* Even more complex - the next entry is free, so we can merge them into one! */ - SplitBlock->Flags = SplitBlock2->Flags; - - /* Remove that next entry */ - RtlpRemoveFreeBlock(Heap, SplitBlock2, FALSE, FALSE); - - /* Update sizes */ - FreeSize += SplitBlock2->Size; - Heap->TotalFreeSize -= SplitBlock2->Size; - - if (FreeSize <= HEAP_MAX_BLOCK_SIZE) - { - /* Insert it back */ - SplitBlock->Size = FreeSize; - - /* Don't forget to update previous size of the next entry! */ - if (!(SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY)) - { - ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = FreeSize; - } - - /* Actually insert it */ - RtlpInsertFreeBlockHelper(Heap, SplitBlock, (USHORT)FreeSize, FALSE); - - /* Update total size */ - Heap->TotalFreeSize += FreeSize; - } - else - { - /* Resulting block is quite big */ - RtlpInsertFreeBlock(Heap, SplitBlock, FreeSize); - } - } - } - - /* Reset flags of the free entry */ + + /* Coalesce it with the next entry */ + SplitBlock = RtlpCoalesceFreeBlocks(Heap, SplitBlock, &FreeSize, FALSE); + RtlpInsertFreeBlock(Heap, SplitBlock, FreeSize); + + /* Reset the flag */ FreeFlags = 0; - - /* Update last entry in segment */ - if (SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY) - { - Heap->Segments[SplitBlock->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)SplitBlock; - } } } @@ -2535,9 +2433,7 @@ /* Either update previous size of the next entry or mark it as a last entry in the segment*/ - if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) - Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; - else + if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY)) (InUseEntry + InUseEntry->Size)->PreviousSize = InUseEntry->Size; } else @@ -2551,8 +2447,7 @@ /* Update the following block or set the last entry in the segment */ if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) { - /* Set last entry and set flags and size */ - Heap->Segments[InUseEntry->SegmentOffset]->LastEntryInSegment = InUseEntry; + /* Set flags and size */ UnusedEntry->Flags = RememberFlags; UnusedEntry->Size = FreeSize; @@ -2597,9 +2492,7 @@ /* Fine for a dedicated list */ UnusedEntry->Size = FreeSize; - if (RememberFlags & HEAP_ENTRY_LAST_ENTRY) - Heap->Segments[UnusedEntry->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)UnusedEntry; - else + if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY)) ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = FreeSize; /* Insert it back and update total size */ @@ -2752,7 +2645,7 @@ { RtlEnterHeapLock(Heap->LockVariable); HeapLocked = TRUE; - Flags ^= HEAP_NO_SERIALIZE; + Flags &= ~HEAP_NO_SERIALIZE; } /* Get the pointer to the in-use entry */ @@ -2918,9 +2811,6 @@ /* Is that the last entry */ if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) { - /* Update segment's last entry */ - Heap->Segments[SplitBlock->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)SplitBlock; - /* Set its size and insert it to the list */ SplitBlock->Size = (USHORT)FreeSize; RtlpInsertFreeBlockHelper(Heap, SplitBlock, FreeSize, FALSE); @@ -2967,10 +2857,6 @@ { /* Update previous size of the next entry */ ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = FreeSize; - } - else - { - Heap->Segments[SplitBlock->SegmentOffset]->LastEntryInSegment = (PHEAP_ENTRY)SplitBlock; } /* Insert the new one back and update total size */ Modified: trunk/reactos/lib/rtl/heap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.h?rev=51757&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.h [iso-8859-1] Sun May 15 12:20:44 2011 @@ -277,7 +277,6 @@ USHORT SegmentAllocatorBackTraceIndex; USHORT Reserved; LIST_ENTRY UCRSegmentList; - PHEAP_ENTRY LastEntryInSegment; //FIXME: non-Vista } HEAP_SEGMENT, *PHEAP_SEGMENT; typedef struct _HEAP_UCR_DESCRIPTOR

13 years, 6 months

[jgardou] 51756: addedum to r51755 : as a general rule, use quotes when creating directories with spaces

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 12:11:13 2011 New Revision: 51756 URL: http://svn.reactos.org/svn/reactos?rev=51756&view=rev Log: addedum to r51755 : as a general rule, use quotes when creating directories with spaces Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sun May 15 12:11:13 2011 @@ -17,15 +17,15 @@ file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles)\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users)\n") + "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users\")\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users/Desktop)\n") + "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users/Desktop\")\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User)\n") + "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User\")\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/Desktop)\n") + "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/Desktop\")\n") file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake - "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/My Documents)\n") + "file(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/My Documents\")\n") add_custom_target(livecd ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/livecd

13 years, 6 months

[jgardou] 51755: [CMAKE] - create profiles directories for livecd

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 11:52:14 2011 New Revision: 51755 URL: http://svn.reactos.org/svn/reactos?rev=51755&view=rev Log: [CMAKE] - create profiles directories for livecd Modified: branches/cmake-bringup/boot/CMakeLists.txt Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sun May 15 11:52:14 2011 @@ -13,6 +13,19 @@ #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd)\n") +#create profiles directories too +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles)\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users)\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/All Users/Desktop)\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User)\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/Desktop)\n") +file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd/Profiles/Default User/My Documents)\n") add_custom_target(livecd ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/livecd

13 years, 6 months

[mjmartin] 51754: [USBSTOR] - Start implementing error handling. - On errors use a worker thread to attempt a recovery. If successful restart the operation that failed. - If STALL_PID is received r...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun May 15 11:23:16 2011 New Revision: 51754 URL: http://svn.reactos.org/svn/reactos?rev=51754&view=rev Log: [USBSTOR] - Start implementing error handling. - On errors use a worker thread to attempt a recovery. If successful restart the operation that failed. - If STALL_PID is received reset the pipe of the device. - Not entered into code path yet. WIP. Added: branches/usb-bringup/drivers/usb/usbstor/error.c (with props) Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt Modified: branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/CMakeLists.txt [iso-8859-1] Sun May 15 11:23:16 2011 @@ -3,7 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) -add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c scsi.c usbstor.c usbstor.rc) +add_library(usbstor SHARED descriptor.c disk.c fdo.c misc.c pdo.c queue.c error.c scsi.c usbstor.c usbstor.rc) set_module_type(usbstor kernelmodedriver) add_importlibs(usbstor ntoskrnl hal usbd) Added: branches/usb-bringup/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/error.c (added) +++ branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] Sun May 15 11:23:16 2011 @@ -1,0 +1,159 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Storage Driver + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbstor/error.c + * PURPOSE: USB block storage device driver. + * PROGRAMMERS: + * James Tabor + * Michael Martin (michael.martin(a)reactos.org) + * Johannes Anderwald (johannes.anderwald(a)reactos.org) + */ + +#include "usbstor.h" + +NTSTATUS +USBSTOR_ResetPipeWithHandle( + IN PDEVICE_OBJECT DeviceObject, + IN USBD_PIPE_HANDLE PipeHandle) +{ + PURB Urb; + NTSTATUS Status; + + // + // allocate urb + // + DPRINT1("Allocating URB\n"); + Urb = (PURB)AllocateItem(NonPagedPool, sizeof(struct _URB_PIPE_REQUEST)); + if (!Urb) + { + // + // out of memory + // + DPRINT1("OutofMemory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize the urb + // + Urb->UrbPipeRequest.Hdr.Length = sizeof(struct _URB_PIPE_REQUEST); + Urb->UrbPipeRequest.Hdr.Function = URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL; + Urb->UrbPipeRequest.PipeHandle = PipeHandle; + + // + // send the request + // + DPRINT1("Sending Request DeviceObject %x, Urb %x\n", DeviceObject, Urb); + Status = USBSTOR_SyncUrbRequest(DeviceObject, Urb); + + // + // free urb + // + FreeItem(Urb); + + // + // done + // + return Status; +} + +NTSTATUS +USBSTOR_HandleTransferError( + PDEVICE_OBJECT DeviceObject, + PIRP Irp, + PIRP_CONTEXT Context) +{ + NTSTATUS Status; + PIO_STACK_LOCATION Stack; + PURB Urb; + USBD_PIPE_HANDLE PipeHandle; + PSCSI_REQUEST_BLOCK Request; + + DPRINT1("Entered Handle Transfer Error\n"); + // + // Determine pipehandle + // + if (Context->cbw->CommandBlock[0] == SCSIOP_WRITE) + { + // + // write request used bulk out pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkOutPipeIndex].PipeHandle; + } + else + { + // + // default bulk in pipe + // + PipeHandle = Context->FDODeviceExtension->InterfaceInformation->Pipes[Context->FDODeviceExtension->BulkInPipeIndex].PipeHandle; + } + + switch (Context->Urb.UrbHeader.Status) + { + case USBD_STATUS_STALL_PID: + { + // + // First attempt to reset the pipe + // + DPRINT1("Resetting Pipe\n"); + Status = USBSTOR_ResetPipeWithHandle(DeviceObject, PipeHandle); + if (NT_SUCCESS(Status)) + { + Status = STATUS_SUCCESS; + break; + } + + DPRINT1("Failed to reset pipe %x\n"); + + // + // FIXME: Reset of pipe failed, attempt to reset port + // + + Status = STATUS_UNSUCCESSFUL; + break; + } + // + // FIXME: Handle more errors + // + default: + { + DPRINT1("Error not handled\n"); + Status = STATUS_UNSUCCESSFUL; + } + } + + if (Status != STATUS_SUCCESS) + { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + } + else + { + Stack = IoGetCurrentIrpStackLocation(Context->Irp); + // + // Retry the operation + // + Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; + DPRINT1("Retrying\n"); + Status = USBSTOR_HandleExecuteSCSI(DeviceObject, Context->Irp, Request, Context->PDODeviceExtension); + } + + DPRINT1("USBSTOR_HandleTransferError returning with Status %x\n", Status); + return Status; +} + +VOID +NTAPI +ErrorHandlerWorkItemRoutine( + PVOID Context) +{ + NTSTATUS Status; + PERRORHANDLER_WORKITEM_DATA WorkItemData = (PERRORHANDLER_WORKITEM_DATA)Context; + + Status = USBSTOR_HandleTransferError(WorkItemData->DeviceObject, WorkItemData->Irp, WorkItemData->Context); + + // + // Free Work Item Data + // + ExFreePool(WorkItemData); +} Propchange: branches/usb-bringup/drivers/usb/usbstor/error.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 6 months

[jgardou] 51753: [CMAKE] remove dependency to nonexistent target

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 10:02:46 2011 New Revision: 51753 URL: http://svn.reactos.org/svn/reactos?rev=51753&view=rev Log: [CMAKE] remove dependency to nonexistent target Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Sun May 15 10:02:46 2011 @@ -195,7 +195,6 @@ add_importlibs(win32k ntoskrnl hal ftfd) add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) -add_dependencies(win32k gendib_generated) add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all) add_importlib_target(win32k.spec)

13 years, 6 months

[mjmartin] 51752: [USBSTOR] - USBSTOR_SendRequest: The buffer for read/write may not be NonPagedPool, which is documented as a requirement for using MmBuildMdlForNonPagedPool. Also locking the buff...

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sun May 15 08:23:32 2011 New Revision: 51752 URL: http://svn.reactos.org/svn/reactos?rev=51752&view=rev Log: [USBSTOR] - USBSTOR_SendRequest: The buffer for read/write may not be NonPagedPool, which is documented as a requirement for using MmBuildMdlForNonPagedPool. Also locking the buffers pages is also not an option as the routine is called at DISPATCH_LEVEL. It so happens that Irp->MdlAddress is valid for read/write operations. Use it instead of procedure above. - Add a sanity check to make sure the Mdl does describe the transfer buffer. Fixes IRQL_NOT_LESS_OR_EQUAL bugcheck in windows. These changes also may fixed writing to device. Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun May 15 08:23:32 2011 @@ -442,6 +442,7 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; PIRP Irp; PIO_STACK_LOCATION IoStack; + PULONG MdlVirtualAddress; // // first allocate irp context @@ -507,8 +508,18 @@ // if (OriginalRequest) { - if (OriginalRequest->MdlAddress != NULL && Context->TransferData == NULL) + if ((OriginalRequest->MdlAddress != NULL) && + (Context->TransferData == NULL || Command[0] == SCSIOP_READ || Command[0] == SCSIOP_WRITE)) { + // + // Sanity check that the Mdl does describe the TransferData for read/write + // + if (CommandLength == UFI_READ_WRITE_CMD_LEN) + { + MdlVirtualAddress = MmGetMdlVirtualAddress(OriginalRequest->MdlAddress); + ASSERT(MdlVirtualAddress == Context->TransferData); + } + // // I/O paging request // @@ -1052,7 +1063,7 @@ // Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp); } - else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ /*|| pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE*/) + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ || pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE) { DPRINT1("SCSIOP_READ / SCSIOP_WRITE DataTransferLength %lu\n", Request->DataTransferLength);

13 years, 6 months

[jgardou] 51751: [CMAKE] - add livecd target

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 15 07:50:26 2011 New Revision: 51751 URL: http://svn.reactos.org/svn/reactos?rev=51751&view=rev Log: [CMAKE] - add livecd target Modified: branches/cmake-bringup/CMakeLists.txt branches/cmake-bringup/CMakeMacros.cmake branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/boot/bootdata/CMakeLists.txt Modified: branches/cmake-bringup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeLists.txt?re… ============================================================================== --- branches/cmake-bringup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeLists.txt [iso-8859-1] Sun May 15 07:50:26 2011 @@ -105,10 +105,6 @@ # IDL macros for widl/midl include(cmake/idl-support.cmake) - - #Some useful variables - set(LIVECD_DIR "${REACTOS_BINARY_DIR}/boot/livecd") - set(BOOTCD_DIR "${REACTOS_BINARY_DIR}/boot/bootcd") # Activate support for assembly source files enable_language(ASM) Modified: branches/cmake-bringup/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/CMakeMacros.cmake… ============================================================================== --- branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/CMakeMacros.cmake [iso-8859-1] Sun May 15 07:50:26 2011 @@ -157,4 +157,22 @@ endif() endif() endif() #end bootcd + + #do we add it to livecd? + list(FIND _CD_FOR livecd __cd) + if(NOT __cd EQUAL -1) + #manage dependency + if(_CD_TARGET) + add_dependencies(livecd ${_CD_TARGET}) + endif() + foreach(item ${_CD_FILE}) + file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(COPY \"${item}\" DESTINATION \"\${CD_DIR}/${_CD_DESTINATION}\")\n") + endforeach() + if(_CD_NAME_ON_CD) + get_filename_component(__file ${_CD_FILE} NAME) + #rename it in the cd tree + file(APPEND ${REACTOS_BINARY_DIR}/boot/livecd.cmake "file(RENAME \${CD_DIR}/${_CD_DESTINATION}/${__file} \${CD_DIR}/${_CD_DESTINATION}/${_CD_NAME_ON_CD})\n") + endif() + endif() #end livecd + endfunction() Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.t… ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Sun May 15 07:50:26 2011 @@ -1,4 +1,4 @@ - +##bootcd #clear it out file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bootcd)\n") @@ -6,8 +6,18 @@ add_custom_target(bootcd ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/bootcd -P ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake - COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${BOOTCD_DIR} REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso - #DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/bootcd.cmake + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/bootcd REACTOS ${REACTOS_BINARY_DIR}/bootcd.iso + VERBATIM) + +##livecd +#clear it out +file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + "file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/livecd)\n") + +add_custom_target(livecd + ${CMAKE_COMMAND} -D CD_DIR=${CMAKE_CURRENT_BINARY_DIR}/livecd + -P ${CMAKE_CURRENT_BINARY_DIR}/livecd.cmake + COMMAND native-cdmake -v -j -m -b ${CMAKE_CURRENT_BINARY_DIR}/freeldr/bootsect/isoboot.bin ${CMAKE_CURRENT_BINARY_DIR}/livecd REACTOS ${REACTOS_BINARY_DIR}/livecd.iso VERBATIM) add_subdirectory(freeldr) Modified: branches/cmake-bringup/boot/bootdata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/bootdata/CMa… ============================================================================== --- branches/cmake-bringup/boot/bootdata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/bootdata/CMakeLists.txt [iso-8859-1] Sun May 15 07:50:26 2011 @@ -7,7 +7,7 @@ add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesft_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesft.inf FOR bootcd) add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/hivesys_${ARCH}.inf DESTINATION reactos NO_CAB NAME_ON_CD hivesys.inf FOR bootcd) -# bootcd/livecd hives +# livecd hives list(APPEND CD_HIVES ${CMAKE_CURRENT_SOURCE_DIR}/livecd.inf ${CMAKE_CURRENT_SOURCE_DIR}/hiveinst_${ARCH}.inf) @@ -16,8 +16,20 @@ native-mkhive ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ARCH} ${CD_HIVES} DEPENDS native-mkhive ${CD_HIVES}) +add_cd_file( + FILE ${CMAKE_CURRENT_BINARY_DIR}/sam + ${CMAKE_CURRENT_BINARY_DIR}/default + ${CMAKE_CURRENT_BINARY_DIR}/security + ${CMAKE_CURRENT_BINARY_DIR}/software + ${CMAKE_CURRENT_BINARY_DIR}/system + TARGET livecd_hives + DESTINATION reactos/system32/config + FOR livecd) + #regtest add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcdregtest/regtest.cmd DESTINATION reactos/bin FOR all) #freeldr.ini add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/bootcd.ini DESTINATION root NO_CAB NAME_ON_CD freeldr.ini FOR bootcd) +add_cd_file(FILE ${CMAKE_CURRENT_SOURCE_DIR}/livecd.ini DESTINATION root NAME_ON_CD freeldr.ini FOR livecd) +

13 years, 6 months

← Newer
1
...
25
26
27
28
29
30
31
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011