Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 55695: [USBSTOR] - Queue inquriry & format capacity command with an irp
by janderwald＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: janderwald Date: Sun Feb 19 02:47:35 2012 New Revision: 55695 URL: http://svn.reactos.org/svn/reactos?rev=55695&view=rev Log: [USBSTOR] - Queue inquriry & format capacity command with an irp Modified: trunk/reactos/drivers/usb/usbstor/error.c trunk/reactos/drivers/usb/usbstor/pdo.c trunk/reactos/drivers/usb/usbstor/scsi.c trunk/reactos/drivers/usb/usbstor/usbstor.h Modified: trunk/reactos/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/error.… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/error.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -116,6 +116,14 @@ PCDB pCDB; // + // sanity checks + // + ASSERT(Context); + ASSERT(Context->PDODeviceExtension); + ASSERT(Context->PDODeviceExtension->Self); + ASSERT(Context->Irp); + + // // first perform a mass storage reset step 1 in 5.3.4 USB Mass Storage Bulk Only Specification // Status = USBSTOR_ResetDevice(Context->FDODeviceExtension->LowerDeviceObject, Context->FDODeviceExtension); @@ -134,91 +142,51 @@ } } - if (Context->Irp) - { - // - // get next stack location - // - Stack = IoGetCurrentIrpStackLocation(Context->Irp); - - // - // get request block - // - Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; - ASSERT(Request); - - // - // obtain request type - // - pCDB = (PCDB)Request->Cdb; - ASSERT(pCDB); - - // - // Cleanup the IRP context - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) - { - FreeItem(Context->TransferData); - } - - if (Status != STATUS_SUCCESS) - { - // - // Complete the master IRP - // - Context->Irp->IoStatus.Status = Status; - Context->Irp->IoStatus.Information = 0; - USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); - IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - - // - // Start the next request - // - USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); - - // - // srb handling finished - // - Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; - - // - // clear timer srb - // - Context->FDODeviceExtension->LastTimerActiveSrb = NULL; - } + // + // get next stack location + // + Stack = IoGetCurrentIrpStackLocation(Context->Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)Stack->Parameters.Others.Argument1; + ASSERT(Request); + + // + // obtain request type + // + pCDB = (PCDB)Request->Cdb; + ASSERT(pCDB); + + if (Status != STATUS_SUCCESS) + { + // + // Complete the master IRP + // + Context->Irp->IoStatus.Status = Status; + Context->Irp->IoStatus.Information = 0; + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); + IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // Start the next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); + + // + // srb handling finished + // + Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; + + // + // clear timer srb + // + Context->FDODeviceExtension->LastTimerActiveSrb = NULL; } else { - if (Status != STATUS_SUCCESS) - { - // - // Signal the context event - // - ASSERT(Context->Event); - KeSetEvent(Context->Event, 0, FALSE); - - // - // srb handling finished - // - Context->FDODeviceExtension->SrbErrorHandlingActive = FALSE; - - // - // clear timer srb - // - Context->FDODeviceExtension->LastTimerActiveSrb = NULL; - } - } - - if (NT_SUCCESS(Status)) - { - // - // FIXME: inquiry cmd / read format capacity are send w/o irp - // - ASSERT(Context); - ASSERT(Context->PDODeviceExtension); - ASSERT(Context->PDODeviceExtension->Self); - ASSERT(Context->Irp); - - DPRINT1("Retrying Count %x %p\n", Context->RetryCount, Context->PDODeviceExtension->Self); + DPRINT1("Retrying Count %lu %p\n", Context->RetryCount, Context->PDODeviceExtension->Self); // // re-schedule request Modified: trunk/reactos/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/pdo.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -957,6 +957,299 @@ } NTSTATUS +NTAPI +USBSTOR_CompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Ctx) +{ + PKEVENT Event = (PKEVENT)Ctx; + + // + // signal event + // + KeSetEvent(Event, 0, FALSE); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS +USBSTOR_AllocateIrp( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DataTransferLength, + IN UCHAR OpCode, + IN PKEVENT Event, + OUT PSCSI_REQUEST_BLOCK *OutRequest, + OUT PIRP *OutIrp) +{ + PIRP Irp; + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + PCDB pCDB; + + // + // allocate irp + // + Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); + if (!Irp) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // get next stack location + // + IoStack = IoGetNextIrpStackLocation(Irp); + + // + // create scsi block + // + Request = (PSCSI_REQUEST_BLOCK)ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK)); + if (!Request) + { + // + // no memory + // + IoFreeIrp(Irp); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // init request + // + RtlZeroMemory(Request, sizeof(SCSI_REQUEST_BLOCK)); + + // + // allocate data transfer block + // + Request->DataBuffer = ExAllocatePool(NonPagedPool, DataTransferLength); + if (!Request) + { + // + // no memory + // + IoFreeIrp(Irp); + ExFreePool(Request); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // allocate MDL + // + Irp->MdlAddress = IoAllocateMdl(Request->DataBuffer, DataTransferLength, FALSE, FALSE, NULL); + if (!Irp->MdlAddress) + { + // + // no memory + // + IoFreeIrp(Irp); + ExFreePool(Request); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // non paged pool + // + MmBuildMdlForNonPagedPool(Irp->MdlAddress); + + // + // init scsi block + // + Request->DataTransferLength = DataTransferLength; + Request->Function = SRB_FUNCTION_EXECUTE_SCSI; + Request->SrbFlags = SRB_FLAGS_DATA_IN; + + RtlZeroMemory(Request->DataBuffer, DataTransferLength); + + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // set op code + // + pCDB->AsByte[0] = OpCode; + + // + // store result + // + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.Others.Argument1 = Request; + IoStack->DeviceObject = DeviceObject; + + // + // init event + // + KeInitializeEvent(Event, NotificationEvent, FALSE); + + // + // lets setup a completion routine + // + IoSetCompletionRoutine(Irp, USBSTOR_CompletionRoutine, (PVOID)Event, TRUE, TRUE, TRUE); + + // + // output result + // + *OutIrp = Irp; + *OutRequest = Request; + return STATUS_SUCCESS; +} + +NTSTATUS +USBSTOR_SendIrp( + IN PDEVICE_OBJECT PDODeviceObject, + IN ULONG DataTransferLength, + IN UCHAR OpCode, + OUT PVOID *OutData) +{ + NTSTATUS Status; + PIRP Irp; + KEVENT Event; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PSCSI_REQUEST_BLOCK Request; + + // + // let's allocate an irp + // + Status = USBSTOR_AllocateIrp(PDODeviceObject, sizeof(UFI_INQUIRY_RESPONSE), SCSIOP_INQUIRY, &Event, &Request, &Irp); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + DPRINT1("[USBSTOR] Failed to build irp\n"); + return Status; + } + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send irp + // + ASSERT(Irp); + ASSERT(PDODeviceExtension->LowerDeviceObject); + Status = IoCallDriver(PDODeviceExtension->Self, Irp); + + if (Status == STATUS_PENDING) + { + // + // wait for completion + // + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + if (NT_SUCCESS(Status)) + { + // + // store result + // + *OutData = Request->DataBuffer; + } + + // + // free resources + // + ExFreePool(Request); + IoFreeIrp(Irp); + return Status; +} + +NTSTATUS +USBSTOR_SendInquiryIrp( + IN PDEVICE_OBJECT PDODeviceObject) +{ + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUFI_INQUIRY_RESPONSE Response; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send request + // + Status = USBSTOR_SendIrp(PDODeviceObject, sizeof(UFI_INQUIRY_RESPONSE), SCSIOP_INQUIRY, (PVOID*)&Response); + if (!NT_SUCCESS(Status)) + { + // + // command failed + // + DPRINT1("USBSTOR_SendInquiryIrp Failed with %x\n", Status); + return Status; + } + + DPRINT1("Response %p\n", Response); + DPRINT1("DeviceType %x\n", Response->DeviceType); + DPRINT1("RMB %x\n", Response->RMB); + DPRINT1("Version %x\n", Response->Version); + DPRINT1("Format %x\n", Response->Format); + DPRINT1("Length %x\n", Response->Length); + DPRINT1("Reserved %x\n", Response->Reserved); + DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); + DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], + Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], + Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], + Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]); + + DPRINT1("Revision %c%c%c%c\n", Response->Revision[0], Response->Revision[1], Response->Revision[2], Response->Revision[3]); + + // + // store result + // + PDODeviceExtension->InquiryData = (PVOID)Response; + return Status; +} + +NTSTATUS +USBSTOR_SendFormatCapacityIrp( + IN PDEVICE_OBJECT PDODeviceObject) +{ + NTSTATUS Status; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PUCHAR Response; + + // + // get device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)PDODeviceObject->DeviceExtension; + + // + // send request + // + Status = USBSTOR_SendIrp(PDODeviceObject, 0xFC, SCSIOP_READ_FORMATTED_CAPACITY, (PVOID*)&Response); + if (!NT_SUCCESS(Status)) + { + // + // command failed + // + return Status; + } + + // + // check if its a floppy + // + PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(Response, 0xFC /*FIXME*/, &PDODeviceExtension->MediumTypeCode); + + // + // free response + // + ExFreePool(Response); + return Status; +} + + + +NTSTATUS USBSTOR_CreatePDO( IN PDEVICE_OBJECT DeviceObject, OUT PDEVICE_OBJECT *ChildDeviceObject) @@ -1013,9 +1306,10 @@ *ChildDeviceObject = PDO; // - // FIXME: send inquiry command by irp - // - USBSTOR_SendInquiryCmd(PDO, 0); + // send inquiry command by irp + // + Status = USBSTOR_SendInquiryIrp(PDO); + ASSERT(Status == STATUS_SUCCESS); // // check response data @@ -1028,15 +1322,12 @@ // // check if it is a floppy // - Status = USBSTOR_SendFormatCapacity(PDO, 0); - if (NT_SUCCESS(Status)) - { - // - // check if its a floppy - // - PDODeviceExtension->IsFloppy = USBSTOR_IsFloppy(PDODeviceExtension->FormatData, PAGE_SIZE /*FIXME*/, &PDODeviceExtension->MediumTypeCode); - DPRINT1("[USBSTOR] IsFloppy %x MediumTypeCode %x\n", PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); - } + Status = USBSTOR_SendFormatCapacityIrp(PDO); + + // + // display result + // + DPRINT1("[USBSTOR] Status %x IsFloppy %x MediumTypeCode %x\n", Status, PDODeviceExtension->IsFloppy, PDODeviceExtension->MediumTypeCode); // // failing command is non critical @@ -1044,7 +1335,6 @@ Status = STATUS_SUCCESS; } - // // done // Modified: trunk/reactos/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/scsi.c… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/scsi.c [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -262,79 +262,75 @@ } - if (Context->Irp) - { - // - // get current stack location - // - IoStack = IoGetCurrentIrpStackLocation(Context->Irp); - - // - // get request block - // - Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; - ASSERT(Request); - - Status = Irp->IoStatus.Status; - - Urb = &Context->Urb; - - // - // get SCSI command data block - // - pCDB = (PCDB)Request->Cdb; - Request->SrbStatus = SRB_STATUS_SUCCESS; - - // - // read capacity needs special work - // - if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Context->Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; + ASSERT(Request); + + Status = Irp->IoStatus.Status; + Urb = &Context->Urb; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + Request->SrbStatus = SRB_STATUS_SUCCESS; + + // + // read capacity needs special work + // + if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY) + { + // + // get output buffer + // + Response = (PUFI_CAPACITY_RESPONSE)Context->TransferData; + + // + // store in pdo + // + Context->PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); + Context->PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); + + if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) { // - // get output buffer - // - Response = (PUFI_CAPACITY_RESPONSE)Context->TransferData; - - // - // store in pdo - // - Context->PDODeviceExtension->BlockLength = NTOHL(Response->BlockLength); - Context->PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress); - - if (Request->DataTransferLength == sizeof(READ_CAPACITY_DATA_EX)) - { - // - // get input buffer - // - CapacityDataEx = (PREAD_CAPACITY_DATA_EX)Request->DataBuffer; - - // - // set result - // - CapacityDataEx->BytesPerBlock = Response->BlockLength; - CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; - Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA_EX); - } - else - { - // - // get input buffer - // - CapacityData = (PREAD_CAPACITY_DATA)Request->DataBuffer; - - // - // set result - // - CapacityData->BytesPerBlock = Response->BlockLength; - CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; - Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA); - } - - // - // free response - // - FreeItem(Context->TransferData); - } + // get input buffer + // + CapacityDataEx = (PREAD_CAPACITY_DATA_EX)Request->DataBuffer; + + // + // set result + // + CapacityDataEx->BytesPerBlock = Response->BlockLength; + CapacityDataEx->LogicalBlockAddress.QuadPart = Response->LastLogicalBlockAddress; + Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA_EX); + } + else + { + // + // get input buffer + // + CapacityData = (PREAD_CAPACITY_DATA)Request->DataBuffer; + + // + // set result + // + CapacityData->BytesPerBlock = Response->BlockLength; + CapacityData->LogicalBlockAddress = Response->LastLogicalBlockAddress; + Irp->IoStatus.Information = sizeof(READ_CAPACITY_DATA); + } + + // + // free response + // + FreeItem(Context->TransferData); } // @@ -342,37 +338,26 @@ // FreeItem(Context->cbw); - if (Context->Irp) - { - // - // FIXME: check status - // - Context->Irp->IoStatus.Status = Irp->IoStatus.Status; - Context->Irp->IoStatus.Information = Context->TransferDataLength; - - // - // terminate current request - // - USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); - - // - // complete request - // - IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); - - // - // start next request - // - USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); - } - - if (Context->Event) - { - // - // signal event - // - KeSetEvent(Context->Event, 0, FALSE); - } + // + // FIXME: check status + // + Context->Irp->IoStatus.Status = Irp->IoStatus.Status; + Context->Irp->IoStatus.Information = Context->TransferDataLength; + + // + // terminate current request + // + USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp); + + // + // complete request + // + IoCompleteRequest(Context->Irp, IO_NO_INCREMENT); + + // + // start next request + // + USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject); // // free our allocated irp @@ -639,7 +624,6 @@ USBSTOR_SendRequest( IN PDEVICE_OBJECT DeviceObject, IN PIRP OriginalRequest, - IN OPTIONAL PKEVENT Event, IN UCHAR CommandLength, IN PUCHAR Command, IN ULONG TransferDataLength, @@ -707,7 +691,6 @@ Context->TransferDataLength = TransferDataLength; Context->FDODeviceExtension = FDODeviceExtension; Context->PDODeviceExtension = PDODeviceExtension; - Context->Event = Event; Context->RetryCount = RetryCount; // @@ -836,31 +819,28 @@ NTSTATUS USBSTOR_SendFormatCapacity( IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, IN ULONG RetryCount) { UFI_READ_FORMAT_CAPACITY Cmd; - NTSTATUS Status; - KEVENT Event; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PUCHAR Response; - - - // - // allocate inquiry response - // - Response = AllocateItem(NonPagedPool, PAGE_SIZE); - if (!Response) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); // // get PDO device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // // initialize inquiry cmd @@ -868,58 +848,35 @@ RtlZeroMemory(&Cmd, sizeof(UFI_READ_FORMAT_CAPACITY)); Cmd.Code = SCSIOP_READ_FORMATTED_CAPACITY; Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN) << 5; - Cmd.AllocationLengthLsb = 0xFC; // FIXME: compute some same value - - // - // initialize event - // - KeInitializeEvent(&Event, NotificationEvent, FALSE); + Cmd.AllocationLengthMsb = HTONS(Request->DataTransferLength & 0xFFFF) >> 8; + Cmd.AllocationLengthLsb = HTONS(Request->DataTransferLength & 0xFFFF) & 0xFF; // // now send the request // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_READ_FORMAT_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); - - // - // wait for the action to complete - // - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - // - // store inquiry data - // - PDODeviceExtension->FormatData = Response; - - // - // done - // - return Status; - + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_FORMAT_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendInquiryCmd( +USBSTOR_SendInquiry( IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, IN ULONG RetryCount) { UFI_INQUIRY_CMD Cmd; - NTSTATUS Status; - KEVENT Event; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PUFI_INQUIRY_RESPONSE Response; - - - // - // allocate inquiry response - // - Response = AllocateItem(NonPagedPool, PAGE_SIZE); - if (!Response) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } + PIO_STACK_LOCATION IoStack; + PSCSI_REQUEST_BLOCK Request; + + // + // get current stack location + // + IoStack = IoGetCurrentIrpStackLocation(Irp); + + // + // get request block + // + Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1; // // get PDO device extension @@ -935,48 +892,18 @@ Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // - // initialize event - // - KeInitializeEvent(&Event, NotificationEvent, FALSE); + // sanity check + // + ASSERT(Request->DataTransferLength >= sizeof(UFI_INQUIRY_RESPONSE)); // // now send the request // - Status = USBSTOR_SendRequest(DeviceObject, NULL, &Event, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_INQUIRY_RESPONSE), (PUCHAR)Response, RetryCount); - - // - // wait for the action to complete - // - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - - DPRINT1("Response %p\n", Response); - DPRINT1("DeviceType %x\n", Response->DeviceType); - DPRINT1("RMB %x\n", Response->RMB); - DPRINT1("Version %x\n", Response->Version); - DPRINT1("Format %x\n", Response->Format); - DPRINT1("Length %x\n", Response->Length); - DPRINT1("Reserved %x\n", Response->Reserved); - DPRINT1("Vendor %c%c%c%c%c%c%c%c\n", Response->Vendor[0], Response->Vendor[1], Response->Vendor[2], Response->Vendor[3], Response->Vendor[4], Response->Vendor[5], Response->Vendor[6], Response->Vendor[7]); - DPRINT1("Product %c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c\n", Response->Product[0], Response->Product[1], Response->Product[2], Response->Product[3], - Response->Product[4], Response->Product[5], Response->Product[6], Response->Product[7], - Response->Product[8], Response->Product[9], Response->Product[10], Response->Product[11], - Response->Product[12], Response->Product[13], Response->Product[14], Response->Product[15]); - - DPRINT1("Revision %c%c%c%c\n", Response->Revision[0], Response->Revision[1], Response->Revision[2], Response->Revision[3]); - - // - // store inquiry data - // - PDODeviceExtension->InquiryData = (PVOID)Response; - - // - // done - // - return Status; + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_INQUIRY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendCapacityCmd( +USBSTOR_SendCapacity( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -984,19 +911,11 @@ UFI_CAPACITY_CMD Cmd; PUFI_CAPACITY_RESPONSE Response; PPDO_DEVICE_EXTENSION PDODeviceExtension; - PFDO_DEVICE_EXTENSION FDODeviceExtension; // // get PDO device extension // PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - - // - // get FDO device extension - // - FDODeviceExtension = (PFDO_DEVICE_EXTENSION)PDODeviceExtension->LowerDeviceObject->DeviceExtension; - // // allocate capacity response @@ -1020,11 +939,11 @@ // // send request, response will be freed in completion routine // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), (PUCHAR)Response, RetryCount); } NTSTATUS -USBSTOR_SendModeSenseCmd( +USBSTOR_SendModeSense( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -1213,7 +1132,7 @@ } NTSTATUS -USBSTOR_SendReadWriteCmd( +USBSTOR_SendReadWrite( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, IN ULONG RetryCount) @@ -1248,7 +1167,7 @@ // // informal debug print // - DPRINT("USBSTOR_SendReadWriteCmd DataTransferLength %lu, BlockLength %lu\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWrite DataTransferLength %lu, BlockLength %lu\n", Request->DataTransferLength, PDODeviceExtension->BlockLength); // // sanity check @@ -1279,16 +1198,16 @@ Temp = (Cmd.ContiguousLogicBlocksByte0 << 8 | Cmd.ContiguousLogicBlocksByte1); ASSERT(NTOHL(Temp == BlockCount)); - DPRINT("USBSTOR_SendReadWriteCmd BlockAddress %x%x%x%x BlockCount %lu BlockLength %lu\n", Cmd.LogicalBlockByte0, Cmd.LogicalBlockByte1, Cmd.LogicalBlockByte2, Cmd.LogicalBlockByte3, BlockCount, PDODeviceExtension->BlockLength); + DPRINT("USBSTOR_SendReadWrite 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, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_READ_WRITE_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, (PUCHAR)Request->DataBuffer, RetryCount); } NTSTATUS -USBSTOR_SendTestUnitCmd( +USBSTOR_SendTestUnit( IN PDEVICE_OBJECT DeviceObject, IN OUT PIRP Irp, IN ULONG RetryCount) @@ -1328,7 +1247,7 @@ // // send the request // - return USBSTOR_SendRequest(DeviceObject, Irp, NULL, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); + return USBSTOR_SendRequest(DeviceObject, Irp, UFI_TEST_UNIT_CMD_LEN, (PUCHAR)&Cmd, 0, NULL, RetryCount); } @@ -1379,7 +1298,7 @@ ASSERT(Request->DataBuffer); DPRINT("SCSIOP_READ_CAPACITY Length %lu\n", Request->DataTransferLength); - Status = USBSTOR_SendCapacityCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendCapacity(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) { @@ -1390,7 +1309,25 @@ // // send mode sense command // - Status = USBSTOR_SendModeSenseCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendModeSense(DeviceObject, Irp, RetryCount); + } + else if (pCDB->AsByte[0] == SCSIOP_READ_FORMATTED_CAPACITY) + { + DPRINT("SCSIOP_READ_FORMATTED_CAPACITY DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read format capacity + // + Status = USBSTOR_SendFormatCapacity(DeviceObject, Irp, RetryCount); + } + else if (pCDB->AsByte[0] == SCSIOP_INQUIRY) + { + DPRINT("SCSIOP_INQUIRY DataTransferLength %lu\n", Request->DataTransferLength); + + // + // send read format capacity + // + Status = USBSTOR_SendInquiry(DeviceObject, Irp, RetryCount); } else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_READ || pCDB->MODE_SENSE.OperationCode == SCSIOP_WRITE) { @@ -1399,7 +1336,7 @@ // // send read / write command // - Status = USBSTOR_SendReadWriteCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendReadWrite(DeviceObject, Irp, RetryCount); } else if (pCDB->AsByte[0] == SCSIOP_MEDIUM_REMOVAL) { @@ -1428,7 +1365,7 @@ // // send test unit command // - Status = USBSTOR_SendTestUnitCmd(DeviceObject, Irp, RetryCount); + Status = USBSTOR_SendTestUnit(DeviceObject, Irp, RetryCount); } else { Modified: trunk/reactos/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbstor/usbsto… ============================================================================== --- trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbstor/usbstor.h [iso-8859-1] Sun Feb 19 02:47:35 2012 @@ -330,16 +330,15 @@ PFDO_DEVICE_EXTENSION FDODeviceExtension; PPDO_DEVICE_EXTENSION PDODeviceExtension; PMDL TransferBufferMDL; - PKEVENT Event; ULONG ErrorIndex; ULONG RetryCount; }IRP_CONTEXT, *PIRP_CONTEXT; typedef struct _ERRORHANDLER_WORKITEM_DATA { - PDEVICE_OBJECT DeviceObject; - PIRP_CONTEXT Context; - WORK_QUEUE_ITEM WorkQueueItem; + PDEVICE_OBJECT DeviceObject; + PIRP_CONTEXT Context; + WORK_QUEUE_ITEM WorkQueueItem; PIRP Irp; } ERRORHANDLER_WORKITEM_DATA, *PERRORHANDLER_WORKITEM_DATA; @@ -449,18 +448,6 @@ IN ULONG RetryCount); NTSTATUS -USBSTOR_SendInquiryCmd( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG RetryCount); - -NTSTATUS -USBSTOR_SendFormatCapacity( - IN PDEVICE_OBJECT DeviceObject, - IN ULONG RetryCount); - - - -NTSTATUS NTAPI USBSTOR_CSWCompletionRoutine( PDEVICE_OBJECT DeviceObject,

1 0

[ion] 55694: Missed these guys.
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 02:25:31 2012 New Revision: 55694 URL: http://svn.reactos.org/svn/reactos?rev=55694&view=rev Log: Missed these guys. Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/smloop.c trunk/reactos/base/system/smss2/smss.c trunk/reactos/base/system/smss2/smsubsys.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -326,7 +326,7 @@ NtDrivePath[wcslen(NtDrivePath)-1] = 0; RtlInitUnicodeString(&DrivePathU, NtDrivePath); - DPRINT1("AUTOCHK: Checking %wZ\n", &DrivePathU); + DPRINT("AUTOCHK: Checking %wZ\n", &DrivePathU); Status = ChkdskFunc(&DrivePathU, TRUE, // FixErrors TRUE, // Verbose Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Sun Feb 19 02:25:31 2012 @@ -96,7 +96,7 @@ } /* Parse the specified and get the name and arguments out of it */ - DPRINT1("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); + DPRINT("SMSS:PFILE: Paging file specifier `%wZ' \n", PageFileToken); Status = SmpParseCommandLine(PageFileToken, NULL, &PageFileName, @@ -212,7 +212,7 @@ /* This means no duplicates exist, so insert our descriptor! */ InsertTailList(&SmpPagingFileDescriptorList, &Descriptor->Entry); SmpNumberOfPagingFiles++; - DPRINT1("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", + DPRINT("SMSS:PFILE: Created descriptor for `%wZ' (`%wZ') \n", PageFileToken, &Descriptor->Name); return STATUS_SUCCESS; } @@ -241,7 +241,7 @@ HANDLE FileHandle; FILE_STANDARD_INFORMATION StandardInfo; - DPRINT1("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName); + DPRINT("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName); Size->QuadPart = 0; InitializeObjectAttributes(&ObjectAttributes, @@ -350,7 +350,7 @@ VolumeName.Length = wcslen(PathString) * sizeof(WCHAR); VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL); VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; - DPRINT1("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); + DPRINT("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); /* Open the volume */ InitializeObjectAttributes(&ObjectAttributes, @@ -395,10 +395,6 @@ SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; Volume->FreeSpace = FinalFreeSpace; - DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n", - SizeInfo.AvailableAllocationUnits.QuadPart, - SizeInfo.SectorsPerAllocationUnit, - SizeInfo.BytesPerSector); /* Check if there's less than 32MB free so we don't starve the disk */ if (FinalFreeSpace.QuadPart <= 0x2000000) @@ -460,7 +456,7 @@ Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); if (NT_SUCCESS(Status)) { - DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", + DPRINT("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", Name, MinSize->QuadPart, MaxSize->QuadPart); @@ -508,7 +504,7 @@ if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED)) { /* Try to find a crash dump and extract it */ - DPRINT1("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", + DPRINT("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", &Descriptor->Name); SmpCheckForCrashDump(&Descriptor->Name); @@ -521,7 +517,7 @@ } else { - DPRINT1("Queried free space for boot volume `%wC: %I64x'\n", + DPRINT("Queried free space for boot volume `%wC: %I64x'\n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); } @@ -532,7 +528,7 @@ else { /* Crashdumps can only be on the boot volume */ - DPRINT1("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" + DPRINT("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" "volume `%wC' \n", &Descriptor->Name, Volume->DriveLetter); @@ -545,10 +541,10 @@ /* Check how big we can make the pagefile */ Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize); if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE; - DPRINT1("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", + DPRINT("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", PageFileSize, &Descriptor->Name); - DPRINT1("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", + DPRINT("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", Volume->DriveLetter, Volume->FreeSpace.QuadPart); @@ -562,7 +558,7 @@ { Descriptor->ActualMaxSize = PageFileSize; } - DPRINT1("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", + DPRINT("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", Descriptor->ActualMinSize.QuadPart, Descriptor->ActualMaxSize.QuadPart, MinimumSize->QuadPart); @@ -697,7 +693,7 @@ /* Capture the min and max */ MinSize = Descriptor->MinSize.QuadPart; MaxSize = Descriptor->MaxSize.QuadPart; - DPRINT1("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", + DPRINT("SMSS:PFILE: Validating sizes for `%wZ' %I64X %I64X\n", &Descriptor->Name, MinSize, MaxSize); /* Don't let minimum be bigger than maximum */ @@ -732,7 +728,7 @@ if (WasTooBig) { /* Notify debugger output and write a flag in the descriptor */ - DPRINT1("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", + DPRINT("SMSS:PFILE: Trimmed size of `%wZ' to maximum allowed \n", &Descriptor->Name); Descriptor->Flags |= SMP_PAGEFILE_WAS_TOO_BIG; } @@ -972,10 +968,6 @@ SizeInfo.SectorsPerAllocationUnit; FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; Volume->FreeSpace = FinalFreeSpace; - DPRINT1("AUs: %I64x Sectors: %lx Bytes Per Sector: %lx\n", - SizeInfo.AvailableAllocationUnits.QuadPart, - SizeInfo.SectorsPerAllocationUnit, - SizeInfo.BytesPerSector); /* Check if there's less than 32MB free so we don't starve the disk */ if (FinalFreeSpace.QuadPart <= 0x2000000) @@ -992,7 +984,7 @@ /* All done, add this volume to our descriptor list */ InsertTailList(&SmpVolumeDescriptorList, &Volume->Entry); Volume->Flags |= SMP_VOLUME_INSERTED; - DPRINT1("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); + DPRINT("SMSS:PFILE: Created volume descriptor for`%wZ' \n", &VolumePath); } /* We must've found at least the boot volume */ @@ -1045,7 +1037,7 @@ if (Descriptor->Flags & SMP_PAGEFILE_SYSTEM_MANAGED) { /* This is a system-managed descriptor. Create the correct file */ - DPRINT1("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", + DPRINT("SMSS:PFILE: Creating a system managed paging file (`%wZ')\n", &Descriptor->Name); Status = SmpCreateSystemManagedPagingFile(Descriptor, FALSE); if (!NT_SUCCESS(Status)) @@ -1062,7 +1054,7 @@ SmpValidatePagingFileSizes(Descriptor); /* Check if this is an ANY pagefile or a FIXED pagefile */ - DPRINT1("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", + DPRINT("SMSS:PFILE: Creating a normal paging file (`%wZ') \n", &Descriptor->Name); if (Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?') { 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] Sun Feb 19 02:25:31 2012 @@ -204,14 +204,12 @@ 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, @@ -274,7 +272,6 @@ /* 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, @@ -303,7 +300,6 @@ SbApiMsg->ConnectionInfo.SbApiPortName[119] = UNICODE_NULL; RtlCreateUnicodeString(&SubsystemPort, SbApiMsg->ConnectionInfo.SbApiPortName); - DPRINT1("Connecting back to %wZ\n", &SubsystemPort); Status = NtConnectPort(&CidSubsystem->SbApiPort, &SubsystemPort, &SecurityQos, @@ -363,7 +359,6 @@ while (TRUE) { /* Begin waiting on a request */ - DPRINT1("API Loop: %p\n", SmApiPort); Status = NtReplyWaitReceivePort(SmApiPort, (PVOID*)&ClientContext, &ReplyMsg->h, @@ -383,7 +378,6 @@ /* 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; @@ -423,7 +417,6 @@ 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); 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] Sun Feb 19 02:25:31 2012 @@ -47,7 +47,6 @@ 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; 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] Sun Feb 19 02:25:31 2012 @@ -150,7 +150,6 @@ PVOID State; PSB_CREATE_PROCESS_MSG CreateProcess = &SbApiMsg.CreateProcess; PSB_CREATE_SESSION_MSG CreateSession = &SbApiMsg.CreateSession; - DPRINT1("Loading subsystem: %wZ\n", FileName); /* Make sure this is a found subsystem */ if (Flags & SMP_INVALID_PATH) @@ -202,7 +201,6 @@ /* Allocate a new subsystem! */ NewSubsystem = RtlAllocateHeap(SmpHeap, SmBaseTag, sizeof(SMP_SUBSYSTEM)); - DPRINT1("new subsystem created: %p\n", NewSubsystem); if (!NewSubsystem) { RtlLeaveCriticalSection(&SmpKnownSubSysLock); @@ -279,7 +277,6 @@ else { /* This must be CSRSS itself, so just launch it and that's it */ - DPRINT1("Executing CSRSS\n"); Status = SmpExecuteImage(FileName, Directory, CommandLine, @@ -314,7 +311,6 @@ SmpWindowsSubSysProcess = ProcessInformation.ProcessHandle; } ASSERT(NT_SUCCESS(Status)); - DPRINT1("CSRSS is up and running: %lx %lx\n", SmpWindowsSubSysProcessId, SmpWindowsSubSysProcess); } else { @@ -399,7 +395,6 @@ } /* Okay, everything looks good to go, initialize this subsystem now! */ - DPRINT1("Resuming the subsystem!\n"); Status = NtResumeThread(ProcessInformation.ThreadHandle, NULL); if (!NT_SUCCESS(Status)) { @@ -436,15 +431,12 @@ else { /* This a session 0 subsystem, just wait for it to initialize */ - DPRINT1("Waiting on the subsystem to initialize...\n"); NtWaitForSingleObject(NewSubsystem->Event, FALSE, NULL); - DPRINT1("Subsystem is ready!!!\n"); } /* Subsystem is created, resumed, and initialized. Close handles and exit */ NtClose(ProcessInformation.ThreadHandle); Status = STATUS_SUCCESS; - DPRINT1("Returning success\n"); goto Quickie2; Quickie: @@ -537,7 +529,6 @@ { /* Execute each one and move on */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("SetupExecute entry: %wZ\n", &RegEntry->Name); SmpExecuteCommand(&RegEntry->Name, 0, NULL, 0); NextEntry = NextEntry->Flink; } @@ -548,7 +539,6 @@ { /* Get the entry and check if this is the special Win32k entry */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Subsystem: %wZ\n", &RegEntry->Name); if (!_wcsicmp(RegEntry->Name.Buffer, L"Kmode")) { /* Translate it */ @@ -581,7 +571,6 @@ AttachedSessionId = *MuSessionId; /* Start Win32k.sys on this session */ - DPRINT1("Starting win32k.sys...\n"); RtlInitUnicodeString(&DestinationString, L"\\SystemRoot\\System32\\win32k.sys"); Status = NtSetSystemInformation(SystemExtendServiceTableInformation, @@ -608,7 +597,6 @@ { /* Get each entry and check if it's the internal debug or not */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Subsystem (required): %wZ\n", &RegEntry->Name); if (_wcsicmp(RegEntry->Name.Buffer, L"debug")) { /* Load the required subsystem */ @@ -641,7 +629,6 @@ { /* Get the custom initial command */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Initial command found: %wZ\n", &RegEntry->Name); /* Write the initial command and wait for 5 seconds (why??!) */ *InitialCommand = RegEntry->Name; @@ -653,7 +640,6 @@ /* Use the default Winlogon initial command */ RtlInitUnicodeString(InitialCommand, L"winlogon.exe"); InitialCommandBuffer[0] = UNICODE_NULL; - DPRINT1("Initial command found: %wZ\n", InitialCommand); /* Check if there's a debugger for Winlogon */ Status2 = LdrQueryImageFileExecutionOptions(InitialCommand, @@ -678,7 +664,6 @@ { /* Execute each one */ RegEntry = CONTAINING_RECORD(NextEntry, SMP_REGISTRY_VALUE, Entry); - DPRINT1("Initial command (custom): %wZ\n", &RegEntry->Name); SmpExecuteCommand(&RegEntry->Name, *MuSessionId, NULL, 0); NextEntry = NextEntry->Flink; }

1 0

[ion] 55693: [NTOSKRNL]: Implement ThreadBreakOnTermination for the SET case. Cleanup some dbgprints.
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 02:24:52 2012 New Revision: 55693 URL: http://svn.reactos.org/svn/reactos?rev=55693&view=rev Log: [NTOSKRNL]: Implement ThreadBreakOnTermination for the SET case. Cleanup some dbgprints. Modified: trunk/reactos/hal/halx86/acpi/halacpi.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/subsystems/win32/win32k/eng/mouse.c Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -190,7 +190,6 @@ } /* Validate the signature */ - DPRINT1("ACPI DSDT at 0x%p\n", Header); if (Header->Signature != DSDT_SIGNATURE) { /* Fail and unmap */ @@ -231,7 +230,6 @@ if (!Xsdt) return NULL; /* Won't be using the RSDT */ - DPRINT1("ACPI XSDT at 0x%p\n", Xsdt); Rsdt = NULL; } @@ -333,12 +331,6 @@ MmUnmapIoSpace(Header, 2 * PAGE_SIZE); } - DPRINT1("Failed to find ACPI table %c%c%c%c\n", - (Signature & 0xFF), - (Signature & 0xFF00) >> 8, - (Signature & 0xFF0000) >> 16, - (Signature & 0xFF000000) >> 24); - /* Didn't find anything */ return NULL; } @@ -532,8 +524,7 @@ /* Get the boot table */ BootTable = HalAcpiGetTable(LoaderBlock, BOOT_SIGNATURE); HalpSimpleBootFlagTable = BootTable; - DPRINT1("ACPI BOOT at 0x%p\n", HalpSimpleBootFlagTable); - + /* Validate it */ if ((BootTable) && (BootTable->Header.Length >= sizeof(BOOT_TABLE)) && @@ -693,7 +684,6 @@ } /* Validate it */ - DPRINT1("ACPI RSDT at 0x%p\n", Rsdt); if ((Rsdt->Header.Signature != RSDT_SIGNATURE) && (Rsdt->Header.Signature != XSDT_SIGNATURE)) { @@ -772,8 +762,6 @@ } } - DPRINT1("ACPI %d.0 detected\n", (Rsdt->Header.Revision + 1)); - /* Done */ return Status; } @@ -786,15 +774,15 @@ PAGED_CODE(); /* Is this in the init phase? */ - if (!TimerPort ) + if (!TimerPort) { /* Get the data from the FADT */ TimerPort = HalpFixedAcpiDescTable.pm_tmr_blk_io_port; TimerValExt = HalpFixedAcpiDescTable.flags & ACPI_TMR_VAL_EXT; + DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); } /* FIXME: Now proceed to the timer initialization */ - DPRINT1("ACPI Timer at: %Xh (EXT: %d)\n", TimerPort, TimerValExt); //HalaAcpiTimerInit(TimerPort, TimerValExt); } @@ -808,7 +796,6 @@ PHYSICAL_ADDRESS PhysicalAddress; /* Only do this once */ - DPRINT("You are booting the ACPI HAL!\n"); if (HalpProcessedACPIPhase0) return STATUS_SUCCESS; /* Setup the ACPI table cache */ @@ -825,7 +812,6 @@ } /* Assume typical size, otherwise whatever the descriptor table says */ - DPRINT1("ACPI FACP at 0x%p\n", Fadt); TableLength = sizeof(FADT); if (Fadt->Header.Length < sizeof(FADT)) TableLength = Fadt->Header.Length; @@ -837,14 +823,12 @@ /* Get the debug table for KD */ HalpDebugPortTable = HalAcpiGetTable(LoaderBlock, DBGP_SIGNATURE); - DPRINT1("ACPI DBGP at 0x%p\n", HalpDebugPortTable); /* Initialize NUMA through the SRAT */ HalpNumaInitializeStaticConfiguration(LoaderBlock); /* Initialize hotplug through the SRAT */ HalpDynamicSystemResourceConfiguration(LoaderBlock); - DPRINT1("ACPI SRAT at 0x%p\n", HalpAcpiSrat); if (HalpAcpiSrat) { DPRINT1("Your machine has a SRAT, but NUMA/HotPlug are not supported!\n"); @@ -885,6 +869,38 @@ /* Setup the boot table */ HalpInitBootTable(LoaderBlock); + + /* Debugging code */ + { + PLIST_ENTRY ListHead, NextEntry; + PACPI_CACHED_TABLE CachedTable; + + /* Loop cached tables */ + ListHead = &HalpAcpiTableCacheList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the table */ + CachedTable = CONTAINING_RECORD(NextEntry, ACPI_CACHED_TABLE, Links); + + /* Compare signatures */ + if ((CachedTable->Header.Signature == RSDT_SIGNATURE) || + (CachedTable->Header.Signature == XSDT_SIGNATURE)) + { + DPRINT1("ACPI %d.0 Detected. Tables: ", (CachedTable->Header.Revision + 1)); + } + + DbgPrint("[%c%c%c%c] ", + (CachedTable->Header.Signature & 0xFF), + (CachedTable->Header.Signature & 0xFF00) >> 8, + (CachedTable->Header.Signature & 0xFF0000) >> 16, + (CachedTable->Header.Signature & 0xFF000000) >> 24); + + /* Keep going */ + NextEntry = NextEntry->Flink; + } + DbgPrint("\n"); + } /* Return success */ return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -2467,7 +2467,7 @@ if (NT_SUCCESS(IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps)) && DeviceCaps.RawDeviceOK) { - DPRINT1("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); + DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName); DeviceNode->ServiceName.Length = 0; DeviceNode->ServiceName.MaximumLength = 0; Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -1551,7 +1551,6 @@ /* Set and assert the flags, and return */ PspSetProcessFlag(Process, PSF_PROCESS_IN_SESSION_BIT); ASSERT(MiSessionLeaderExists == 1); - if (NT_SUCCESS(Status)) DPRINT1("New session created: %lx\n", *SessionId); return Status; } Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -1727,6 +1727,7 @@ PEPROCESS Process; ULONG_PTR DisableBoost = 0; ULONG_PTR IdealProcessor = 0; + ULONG_PTR Break = 0; PTEB Teb; ULONG_PTR TlsIndex = 0; PVOID *ExpansionSlots; @@ -2121,10 +2122,51 @@ /* All done */ break; + + case ThreadBreakOnTermination: + + /* Check buffer length */ + if (ThreadInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + Break = *(PULONG)ThreadInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Break = 0; + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Setting 'break on termination' requires the SeDebugPrivilege */ + if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode)) + { + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Set or clear the flag */ + if (Break) + { + PspSetCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT); + } + else + { + PspClearCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT); + } + break; default: /* We don't implement it yet */ - DPRINT1("Not implemented: %lx\n", ThreadInformationClass); + DPRINT1("Not implemented: %d\n", ThreadInformationClass); Status = STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/subsystems/win32/win32k/eng/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/mouse.c [iso-8859-1] Sun Feb 19 02:24:52 2012 @@ -148,7 +148,7 @@ if (!pgp->psurfSave) { - DPRINT1("No SaveSurface!\n"); + DPRINT("No SaveSurface!\n"); return; }

1 0

[ion] 55692: [CSRSRV/WIN32CSR]: Make Win32CSR much closer to a real CSRSS Server DLL than before, and make calling the Server callbacks compatible with the correct CSR_SERVER_DLL structure. API dis...
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 01:53:58 2012 New Revision: 55692 URL: http://svn.reactos.org/svn/reactos?rev=55692&view=rev Log: [CSRSRV/WIN32CSR]: Make Win32CSR much closer to a real CSRSS Server DLL than before, and make calling the Server callbacks compatible with the correct CSR_SERVER_DLL structure. API dispatching is still all wrong, though. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -20,8 +20,6 @@ UNICODE_STRING CsrSbApiPortName; HANDLE CsrSbApiPort = 0; PCSR_THREAD CsrSbApiRequestThreadPtr; -static unsigned ServerProcCount; -static CSRPLUGIN_SERVER_PROCS *ServerProcs = NULL; HANDLE CsrSmApiPort; HANDLE hSbApiPort = (HANDLE) 0; HANDLE hApiPort = (HANDLE) 0; @@ -37,44 +35,26 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static NTSTATUS FASTCALL -CsrpAddServerProcs(CSRPLUGIN_SERVER_PROCS *Procs) -{ - CSRPLUGIN_SERVER_PROCS *NewProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - NewProcs = RtlAllocateHeap(CsrHeap, 0, - (ServerProcCount + 1) - * sizeof(CSRPLUGIN_SERVER_PROCS)); - if (NULL == NewProcs) - { - return STATUS_NO_MEMORY; - } - if (0 != ServerProcCount) - { - RtlCopyMemory(NewProcs, ServerProcs, - ServerProcCount * sizeof(CSRPLUGIN_SERVER_PROCS)); - RtlFreeHeap(CsrHeap, 0, ServerProcs); - } - NewProcs[ServerProcCount] = *Procs; - ServerProcs = NewProcs; - ServerProcCount++; - - return STATUS_SUCCESS; -} - VOID CallHardError(IN PCSR_THREAD ThreadData, IN PHARDERROR_MSG HardErrorMessage) { unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - { - ServerProcs[i].HardErrorProc(ThreadData, HardErrorMessage); + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->HardErrorCallback)) + { + ServerDll->HardErrorCallback(ThreadData, HardErrorMessage); + } } } @@ -84,13 +64,21 @@ { NTSTATUS Status = STATUS_SUCCESS; unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - { - Status = ServerProcs[i].ProcessInheritProc(SourceProcessData, TargetProcessData); - if (!NT_SUCCESS(Status)) break; + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->NewProcessCallback)) + { + Status = ServerDll->NewProcessCallback(SourceProcessData, TargetProcessData); + } } return Status; @@ -101,65 +89,24 @@ { ULONG Result = 0; unsigned i; + PCSR_SERVER_DLL ServerDll; DPRINT("CSR: %s called\n", __FUNCTION__); - for (i = 0; i < ServerProcCount; i++) - Result = ServerProcs[i].ProcessDeletedProc(ProcessData, 0, FALSE); + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->ShutdownProcessCallback)) + { + Result = ServerDll->ShutdownProcessCallback(ProcessData, 0, FALSE); + } + } return Result; -} - -/********************************************************************** - * CsrpInitWin32Csr/3 - * - * TODO: this function should be turned more general to load an - * TODO: hosted server DLL as received from the command line; - * TODO: for instance: ServerDll=winsrv:ConServerDllInitialization,2 - * TODO: ^method ^dll ^api ^sid - * TODO: - * TODO: CsrpHostServerDll (LPWSTR DllName, - * TODO: LPWSTR ApiName, - * TODO: DWORD ServerId) - */ -static NTSTATUS -CsrpInitWin32Csr (VOID) -{ - NTSTATUS Status; - UNICODE_STRING DllName; - HINSTANCE hInst; - ANSI_STRING ProcName; - CSRPLUGIN_INITIALIZE_PROC InitProc; - PCSRSS_API_DEFINITION ApiDefinitions; - CSRPLUGIN_SERVER_PROCS ServerProcs; - - DPRINT("CSR: %s called\n", __FUNCTION__); - - RtlInitUnicodeString(&DllName, L"win32csr.dll"); - Status = LdrLoadDll(NULL, 0, &DllName, (PVOID *) &hInst); - if (! NT_SUCCESS(Status)) - { - return Status; - } - RtlInitAnsiString(&ProcName, "Win32CsrInitialization"); - Status = LdrGetProcedureAddress(hInst, &ProcName, 0, (PVOID *) &InitProc); - if (! NT_SUCCESS(Status)) - { - return Status; - } - - if (! (*InitProc)(&ApiDefinitions, &ServerProcs)) - { - return STATUS_UNSUCCESSFUL; - } - - Status = CsrApiRegisterDefinitions(ApiDefinitions); - if (! NT_SUCCESS(Status)) - { - return Status; - } - Status = CsrpAddServerProcs(&ServerProcs); - return Status; } CSRSS_API_DEFINITION NativeDefinitions[] = @@ -819,12 +766,19 @@ if (NT_SUCCESS(Status)) ServerString[-1] = ANSI_NULL; /* Load it */ - if (CsrDebug & 1) DPRINT1("CSRSS: Should be loading ServerDll=%s:%s\n", ParameterValue, EntryPoint); + if (CsrDebug & 1) DPRINT1("CSRSS: Loading ServerDll=%s:%s\n", ParameterValue, EntryPoint); /* Hackito ergo sum */ - BasepFakeStaticServerData(); - Status = STATUS_SUCCESS; + if (strstr(ParameterValue, "basesrv")) + { + DPRINT1("Fake basesrv init\n"); + BasepFakeStaticServerData(); + } +// else +// { +// Status = CsrLoadServerDll(ParameterValue, EntryPoint, 2); +// } if (!NT_SUCCESS(Status)) { DPRINT1("CSRSS: *** Failed loading ServerDll=%s (Status == 0x%x)\n", @@ -1103,10 +1057,11 @@ return Status; } - Status = CsrpInitWin32Csr(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrpInitWin32Csr", Status); + /* Initialize Win32csr */ + Status = CsrLoadServerDll("win32csr", "Win32CsrInitialization", 2); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV failed in %s with status %lx\n", "CsrLoadServerDll", Status); } /* Initialize the API Port for SM communication */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -230,10 +230,7 @@ /* ReactOS Specific hax */ if (ServerDll->HighestApiSupported == 0xDEADBABE) { - DPRINT1("Registering: %p\n", (PVOID)ServerDll->DispatchTable); Status = CsrApiRegisterDefinitions((PVOID)ServerDll->DispatchTable); - DPRINT1("Status: %lx\n", Status); - goto LoadFailed; } } else Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -326,7 +326,7 @@ NTSTATUS WINAPI -#if 0 +#if 1 Win32CsrInitialization(IN PCSR_SERVER_DLL ServerDll) #else Win32CsrInitialization(PCSRSS_API_DEFINITION *ApiDefinitions, @@ -347,7 +347,7 @@ CsrInitConsoleSupport(); /* HACK */ -#if 0 +#if 1 ServerDll->DispatchTable = (PVOID)Win32CsrApiDefinitions; ServerDll->HighestApiSupported = 0xDEADBABE; @@ -374,7 +374,7 @@ else DPRINT1("Cannot start Raw Input Thread!\n"); - return TRUE; + return STATUS_SUCCESS; } /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] Sun Feb 19 01:53:58 2012 @@ -1,1 +1,1 @@ -@ stdcall Win32CsrInitialization(ptr ptr) +@ stdcall Win32CsrInitialization(ptr)

1 0

[janderwald] 55691: [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched
by janderwald＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: janderwald Date: Sun Feb 19 00:16:50 2012 New Revision: 55691 URL: http://svn.reactos.org/svn/reactos?rev=55691&view=rev Log: [USBEHCI] - Remove assertion which no longer holds - Delete old queue head after a new queue head has been sucessfully fetched Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012 @@ -770,15 +770,15 @@ if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS)) { // - // let IUSBRequest free the queue head - // - Request->FreeQueueHead(CurrentQH); - - // // request is incomplete, get new queue head // if (Request->GetQueueHead(&NewQueueHead) == STATUS_SUCCESS) { + // + // let IUSBRequest free the queue head + // + Request->FreeQueueHead(CurrentQH); + // // first acquire request lock // Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Sun Feb 19 00:16:50 2012 @@ -731,7 +731,6 @@ // *OutDescriptorLength = Length; } - NTSTATUS CUSBRequest::BuildTransferDescriptorChain( @@ -1193,11 +1192,6 @@ &ChainDescriptorLength); // - // FIXME: handle errors - // - //ASSERT(ChainDescriptorLength == m_TransferBufferLength); - - // // move to next offset // m_TransferBufferLengthCompleted += ChainDescriptorLength;

1 0

[ion] 55690: [NTOSKRNL]: When you rewrite my ASM code, get it right, dumbasses. Thanks Stefan.
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 00:08:50 2012 New Revision: 55690 URL: http://svn.reactos.org/svn/reactos?rev=55690&view=rev Log: [NTOSKRNL]: When you rewrite my ASM code, get it right, dumbasses. Thanks Stefan. Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/trap_x.h [iso-8859-1] Sun Feb 19 00:08:50 2012 @@ -171,7 +171,7 @@ } /* Make sure we're not attached and that APCs are not disabled */ - if ((KeGetCurrentThread()->ApcStateIndex != CurrentApcEnvironment) || + if ((KeGetCurrentThread()->ApcStateIndex != OriginalApcEnvironment) || (KeGetCurrentThread()->CombinedApcDisable != 0)) { /* Fail */

1 0

[ion] 55689: [CSRSRV]: Remove a bunch of hacks and don't attach the shared section when CSRSS is connecting to itself (which happens because our Win32k does that). Things are cleaner now :)
by ion＠svn.reactos.org 19 Feb '12

19 Feb '12

Author: ion Date: Sun Feb 19 00:04:05 2012 New Revision: 55689 URL: http://svn.reactos.org/svn/reactos?rev=55689&view=rev Log: [CSRSRV]: Remove a bunch of hacks and don't attach the shared section when CSRSS is connecting to itself (which happens because our Win32k does that). Things are cleaner now :) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/server.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Sun Feb 19 00:04:05 2012 @@ -771,25 +771,7 @@ } } - if (ProcessData->ProcessHandle == NULL) - { - OBJECT_ATTRIBUTES ObjectAttributes; - - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - DPRINT1("WARNING: CSR PROCESS WITH NO CSR PROCESS HANDLE???\n"); - ClientId.UniqueThread = 0; - Status = NtOpenProcess(&ProcessData->ProcessHandle, - PROCESS_ALL_ACCESS, - &ObjectAttributes, - &Request->ClientId); - DPRINT1("Status: %lx. Handle: %lx\n", Status, ProcessData->ProcessHandle); - } - - if (ProcessData) + if ((ProcessData) && (ProcessData != CsrRootProcess)) { /* Attach the Shared Section */ Status = CsrSrvAttachSharedSection(ProcessData, ConnectInfo); @@ -802,6 +784,10 @@ { DPRINT1("Shared section map failed: %lx\n", Status); } + } + else if (ProcessData == CsrRootProcess) + { + AllowConnection = TRUE; } Status = NtAcceptConnectPort(&ServerPort, Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Sun Feb 19 00:04:05 2012 @@ -494,12 +494,6 @@ ViewUnmap, SEC_NO_CHANGE, PAGE_EXECUTE_READ); - if (Status == STATUS_CONFLICTING_ADDRESSES) - { - /* I Think our csrss tries to connect to itself... */ - DPRINT1("Multiple mapping hack\n"); - Status = STATUS_SUCCESS; - } if (!NT_SUCCESS(Status)) return Status; }

1 0

[ion] 55688: [NTOSKRNL]: Implement SeCheckPrivilegedObject and call it in the two cases where it's needed (when changing process priority) instead of spamming the debug log that we're not doing the...
by ion＠svn.reactos.org 18 Feb '12

18 Feb '12

Author: ion Date: Sat Feb 18 23:59:31 2012 New Revision: 55688 URL: http://svn.reactos.org/svn/reactos?rev=55688&view=rev Log: [NTOSKRNL]: Implement SeCheckPrivilegedObject and call it in the two cases where it's needed (when changing process priority) instead of spamming the debug log that we're not doing the check. [NTOSKRNL]: Implement ProcessUserModeIOPL info level (and implement Ke386SetIopl) instead of spamming we can't do this. [NTOSKRNL]: Implement ProcessExecuteOptions info level (and implement MmSetExecuteOptions) instead of spamming we can't do this. [NDK]: Add NoExecute Flags based on ProcessHacker. No longer spammed to death for every process all the time. Modified: trunk/reactos/include/ndk/mmtypes.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/include/internal/se.h trunk/reactos/ntoskrnl/ke/i386/v86vdm.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/se/priv.c Modified: trunk/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/mmtypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/mmtypes.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -63,8 +63,18 @@ #define MAP_PROCESS 1 #define MAP_SYSTEM 2 +// +// Flags for ProcessExecutionOptions +// +#define MEM_EXECUTE_OPTION_DISABLE 0x1 +#define MEM_EXECUTE_OPTION_ENABLE 0x2 +#define MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION 0x4 +#define MEM_EXECUTE_OPTION_PERMANENT 0x8 +#define MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE 0x10 +#define MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE 0x20 +#define MEM_EXECUTE_OPTION_VALID_FLAGS 0x3F + #ifndef NTOS_MODE_USER - // // Virtual Memory Flags // Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -729,6 +729,10 @@ VOID NTAPI +Ke386SetIOPL(VOID); + +VOID +NTAPI KiCheckForKernelApcDelivery(VOID); LONG Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -1503,6 +1503,10 @@ NTAPI MmReleaseMmInfo(struct _EPROCESS *Process); +NTSTATUS +NTAPI +MmSetExecuteOptions(IN ULONG ExecuteOptions); + VOID NTAPI MmDeleteProcessPageDirectory(struct _EPROCESS *Process); Modified: trunk/reactos/ntoskrnl/include/internal/se.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/se.h [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -226,6 +226,15 @@ KPROCESSOR_MODE PreviousMode ); +BOOLEAN +NTAPI +SeCheckPrivilegedObject( + IN LUID PrivilegeValue, + IN HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE PreviousMode +); + NTSTATUS NTAPI SepDuplicateToken( Modified: trunk/reactos/ntoskrnl/ke/i386/v86vdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86vdm.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86vdm.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -563,6 +563,34 @@ /* Exit to V86 mode */ KiEoiHelper(TrapFrame); } + +VOID +NTAPI +Ke386SetIOPL(VOID) +{ + + PKTHREAD Thread = KeGetCurrentThread(); + PKPROCESS Process = Thread->ApcState.Process; + PKTRAP_FRAME TrapFrame; + CONTEXT Context; + + /* IOPL was enabled for this process/thread */ + Process->Iopl = TRUE; + Thread->Iopl = TRUE; + + /* Get the trap frame on exit */ + TrapFrame = KeGetTrapFrame(Thread); + + /* Convert to a context */ + Context.ContextFlags = CONTEXT_CONTROL; + KeTrapFrameToContext(TrapFrame, NULL, &Context); + + /* Set the IOPL flag */ + Context.EFlags |= EFLAGS_IOPL; + + /* Convert back to a trap frame */ + KeContextToTrapFrame(&Context, NULL, TrapFrame, CONTEXT_CONTROL, UserMode); +} /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -1094,4 +1094,73 @@ return Status; } +NTSTATUS +NTAPI +MmSetExecuteOptions(IN ULONG ExecuteOptions) +{ + + PKPROCESS CurrentProcess = &PsGetCurrentProcess()->Pcb; + KLOCK_QUEUE_HANDLE ProcessLock; + NTSTATUS Status = STATUS_ACCESS_DENIED; + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* Only accept valid flags */ + if (ExecuteOptions & ~MEM_EXECUTE_OPTION_VALID_FLAGS) + { + /* Fail */ + DPRINT1("Invalid no-execute options\n"); + return STATUS_INVALID_PARAMETER; + } + + /* Change the NX state in the process lock */ + KiAcquireProcessLock(CurrentProcess, &ProcessLock); + + /* Don't change anything if the permanent flag was set */ + if (!CurrentProcess->Flags.Permanent) + { + /* Start by assuming it's not disabled */ + CurrentProcess->Flags.ExecuteDisable = FALSE; + + /* Now process each flag and turn the equivalent bit on */ + if (ExecuteOptions & MEM_EXECUTE_OPTION_DISABLE) + { + CurrentProcess->Flags.ExecuteDisable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_ENABLE) + { + CurrentProcess->Flags.ExecuteEnable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION) + { + CurrentProcess->Flags.DisableThunkEmulation = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_PERMANENT) + { + CurrentProcess->Flags.Permanent = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_EXECUTE_DISPATCH_ENABLE) + { + CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; + } + if (ExecuteOptions & MEM_EXECUTE_OPTION_IMAGE_DISPATCH_ENABLE) + { + CurrentProcess->Flags.ImageDispatchEnable = TRUE; + } + + /* These are turned on by default if no-execution is also eanbled */ + if (CurrentProcess->Flags.ExecuteEnable) + { + CurrentProcess->Flags.ExecuteDispatchEnable = TRUE; + CurrentProcess->Flags.ImageDispatchEnable = TRUE; + } + + /* All good */ + Status = STATUS_SUCCESS; + } + + /* Release the lock and return status */ + KiReleaseProcessLock(&ProcessLock); + return Status; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -928,6 +928,8 @@ KAFFINITY ValidAffinity, Affinity = 0; ULONG DefaultHardErrorMode = 0, BasePriority = 0, MemoryPriority = 0; ULONG DisableBoost = 0, DebugFlags = 0, EnableFixup = 0, Boost = 0; + ULONG NoExecute = 0; + BOOLEAN HasPrivilege; PLIST_ENTRY Next; PETHREAD Thread; PAGED_CODE(); @@ -1189,8 +1191,17 @@ if ((PriorityClass.PriorityClass != Process->PriorityClass) && (PriorityClass.PriorityClass == PROCESS_PRIORITY_CLASS_REALTIME)) { - /* TODO: Check privileges */ - DPRINT1("Should check privilege\n"); + /* Check the privilege */ + HasPrivilege = SeCheckPrivilegedObject(SeIncreaseBasePriorityPrivilege, + ProcessHandle, + PROCESS_SET_INFORMATION, + PreviousMode); + if (!HasPrivilege) + { + ObDereferenceObject(Process); + DPRINT1("Privilege to change priority to realtime lacking\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } } /* Check if we have a job */ @@ -1284,7 +1295,16 @@ /* Check if the new base is higher */ if (BasePriority > Process->Pcb.BasePriority) { - DPRINT1("Should check privilege\n"); + HasPrivilege = SeCheckPrivilegedObject(SeIncreaseBasePriorityPrivilege, + ProcessHandle, + PROCESS_SET_INFORMATION, + PreviousMode); + if (!HasPrivilege) + { + ObDereferenceObject(Process); + DPRINT1("Privilege to change priority from %lx to %lx lacking\n", BasePriority, Process->Pcb.BasePriority); + return STATUS_PRIVILEGE_NOT_HELD; + } } /* Call Ke */ @@ -1595,12 +1615,61 @@ KeSetAutoAlignmentProcess(&Process->Pcb, FALSE); Status = STATUS_SUCCESS; break; - + + case ProcessUserModeIOPL: + + /* Only TCB can do this */ + if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode)) + { + /* Fail */ + DPRINT1("Need TCB to set IOPL\n"); + Status = STATUS_PRIVILEGE_NOT_HELD; + break; + } + + /* Only supported on x86 */ +#if defined (_X86_) + Ke386SetIOPL(); +#endif + /* Done */ + break; + + case ProcessExecuteFlags: + + /* Check buffer length */ + if (ProcessInformationLength != sizeof(ULONG)) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + break; + } + + if (ProcessHandle != NtCurrentProcess()) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Enter SEH for direct buffer read */ + _SEH2_TRY + { + NoExecute = *(PULONG)ProcessInformation; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get exception code */ + Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(break); + } + _SEH2_END; + + /* Call Mm for the update */ + Status = MmSetExecuteOptions(NoExecute); + break; + /* We currently don't implement any of these */ case ProcessLdtInformation: case ProcessLdtSize: case ProcessIoPortHandlers: - case ProcessUserModeIOPL: case ProcessWx86Information: DPRINT1("VDM/16-bit Request not implemented: %lx\n", ProcessInformationClass); Status = STATUS_NOT_IMPLEMENTED; @@ -1623,11 +1692,6 @@ case ProcessHandleTracing: DPRINT1("Handle tracing not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; - break; - - case ProcessExecuteFlags: - DPRINT1("No execute support not implemented\n"); Status = STATUS_NOT_IMPLEMENTED; break; Modified: trunk/reactos/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/priv.c?rev=556… ============================================================================== --- trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/priv.c [iso-8859-1] Sat Feb 18 23:59:31 2012 @@ -426,6 +426,44 @@ return Result; } +BOOLEAN +NTAPI +SeCheckPrivilegedObject(IN LUID PrivilegeValue, + IN HANDLE ObjectHandle, + IN ACCESS_MASK DesiredAccess, + IN KPROCESSOR_MODE PreviousMode) +{ + SECURITY_SUBJECT_CONTEXT SubjectContext; + PRIVILEGE_SET Priv; + BOOLEAN Result; + + PAGED_CODE(); + + SeCaptureSubjectContext(&SubjectContext); + + Priv.PrivilegeCount = 1; + Priv.Control = PRIVILEGE_SET_ALL_NECESSARY; + Priv.Privilege[0].Luid = PrivilegeValue; + Priv.Privilege[0].Attributes = SE_PRIVILEGE_ENABLED; + + Result = SePrivilegeCheck(&Priv, &SubjectContext, PreviousMode); + if (PreviousMode != KernelMode) + { +#if 0 + SePrivilegeObjectAuditAlarm(ObjectHandle, + &SubjectContext, + DesiredAccess, + &PrivilegeValue, + Result, + PreviousMode); +#endif + } + + SeReleaseSubjectContext(&SubjectContext); + + return Result; +} + /* SYSTEM CALLS ***************************************************************/ NTSTATUS

1 0

[janderwald] 55687: [USBOHCI] - Don't preserve command status values when notifying controller of a new bulk / control endpoint - Abort pipe & reset data toggle in the sync reset routine - Allocate...
by janderwald＠svn.reactos.org 18 Feb '12

18 Feb '12

Author: janderwald Date: Sat Feb 18 23:23:13 2012 New Revision: 55687 URL: http://svn.reactos.org/svn/reactos?rev=55687&view=rev Log: [USBOHCI] - Don't preserve command status values when notifying controller of a new bulk / control endpoint - Abort pipe & reset data toggle in the sync reset routine - Allocate interface descriptors and endpoint handles when creating the configuration descriptor - Implement routine for allocating chained descriptors - Implement data toggle for bulk&interrupt transfers - Mass storage devices should now work in real hardware with OHCI controller - Tested in real hardware with NEC Corporation USB [1033:0035] (rev 43) Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/drivers/usb/usbohci/hardware.h trunk/reactos/drivers/usb/usbohci/hub_controller.cpp trunk/reactos/drivers/usb/usbohci/interfaces.h trunk/reactos/drivers/usb/usbohci/usb_device.cpp trunk/reactos/drivers/usb/usbohci/usb_queue.cpp trunk/reactos/drivers/usb/usbohci/usb_request.cpp trunk/reactos/drivers/usb/usbohci/usbohci.h Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -732,21 +732,19 @@ CUSBHardwareDevice::HeadEndpointDescriptorModified( ULONG Type) { - ULONG Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET)); - if (Type == USB_ENDPOINT_TYPE_CONTROL) { // // notify controller // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), Value | OHCI_CONTROL_LIST_FILLED); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_CONTROL_LIST_FILLED); } else if (Type == USB_ENDPOINT_TYPE_BULK) { // // notify controller // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), Value | OHCI_BULK_LIST_FILLED); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_COMMAND_STATUS_OFFSET), OHCI_BULK_LIST_FILLED); } } @@ -1579,7 +1577,7 @@ CStatus = (ULONG) SystemArgument1; DoneHead = (ULONG)SystemArgument2; - DPRINT("OhciDefferedRoutine Status %x\n", CStatus); + DPRINT("OhciDefferedRoutine Status %x DoneHead %x\n", CStatus, DoneHead); if (CStatus & OHCI_WRITEBACK_DONE_HEAD) { Modified: trunk/reactos/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.h [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -224,6 +224,7 @@ PVOID HeadLogicalDescriptor; PVOID NextDescriptor; PVOID Request; + LIST_ENTRY DescriptorListEntry; }OHCI_ENDPOINT_DESCRIPTOR, *POHCI_ENDPOINT_DESCRIPTOR; @@ -242,7 +243,9 @@ #define OHCI_ENDPOINT_ISOCHRONOUS_FORMAT 0x00008000 #define OHCI_ENDPOINT_HEAD_MASK 0xfffffffc #define OHCI_ENDPOINT_HALTED 0x00000001 +#define OHCI_ENDPOINT_TOGGLE_CARRY 0x00000002 #define OHCI_ENDPOINT_DIRECTION_DESCRIPTOR 0x00000000 + // // Maximum port count set by OHCI // Modified: trunk/reactos/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -1710,7 +1710,7 @@ IN OUT PURB Urb) { NTSTATUS Status = STATUS_SUCCESS; - PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + PUSB_ENDPOINT EndpointDescriptor; ULONG Type; // @@ -1736,12 +1736,24 @@ // // get endpoint descriptor // - EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + EndpointDescriptor = (PUSB_ENDPOINT)Urb->UrbPipeRequest.PipeHandle; + + // + // abort pipe + // + Status = HandleAbortPipe(Irp, Urb); + if (!NT_SUCCESS(Status)) + { + // + // abort pipe failed + // + DPRINT1("[USBOHCI] AbortPipe failed with %x\n", Status); + } // // get type // - Type = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + Type = (EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK); if (Type != USB_ENDPOINT_TYPE_ISOCHRONOUS) { // @@ -1752,8 +1764,9 @@ DPRINT1("URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); // - // FIXME reset data toggle - // + // reset data toggle + // + EndpointDescriptor->DataToggle = 0; // // done Modified: trunk/reactos/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/interfaces.h [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -371,6 +371,8 @@ }; typedef IDMAMemoryManager *PDMAMEMORYMANAGER; + +struct _USB_ENDPOINT; //========================================================================================= @@ -401,7 +403,7 @@ virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN OPTIONAL struct _USB_ENDPOINT* EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) = 0; @@ -470,7 +472,7 @@ // // Description: notifies request that the endpoint descriptor is complete - virtual VOID CompletionCallback(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) = 0; + virtual VOID CompletionCallback() = 0; //----------------------------------------------------------------------------------------- // Modified: trunk/reactos/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -54,10 +54,11 @@ virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface); virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); + // local function virtual NTSTATUS CommitIrp(PIRP Irp); - virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); - virtual NTSTATUS CreateConfigurationDescriptor(ULONG ConfigurationIndex); + virtual NTSTATUS CommitSetupPacket(PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl); + virtual NTSTATUS CreateConfigurationDescriptor(UCHAR ConfigurationIndex); virtual NTSTATUS CreateDeviceDescriptor(); virtual VOID DumpDeviceDescriptor(PUSB_DEVICE_DESCRIPTOR DeviceDescriptor); virtual VOID DumpConfigurationDescriptor(PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor); @@ -80,9 +81,8 @@ ULONG m_PortStatus; PUSBQUEUE m_Queue; PDMAMEMORYMANAGER m_DmaManager; - PUSB_CONFIGURATION_DESCRIPTOR *m_ConfigurationDescriptors; - LIST_ENTRY m_IrpListHead; - + + PUSB_CONFIGURATION m_ConfigurationDescriptors; }; //---------------------------------------------------------------------------------------- @@ -121,11 +121,6 @@ KeInitializeSpinLock(&m_Lock); // - // initialize irp list - // - InitializeListHead(&m_IrpListHead); - - // // no device address has been set yet // m_DeviceAddress = 0; @@ -276,6 +271,7 @@ DPRINT1("CUSBDevice::GetType Unknown bcdUSB Type %x\n", m_DeviceDescriptor.bcdUSB); //PC_ASSERT(FALSE); + return Usb11Device; } @@ -306,7 +302,7 @@ PUSB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; UCHAR OldAddress; - ULONG Index; + UCHAR Index; DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); @@ -388,12 +384,12 @@ // // allocate configuration descriptor // - m_ConfigurationDescriptors = (PUSB_CONFIGURATION_DESCRIPTOR*) ExAllocatePoolWithTag(NonPagedPool, sizeof(PUSB_CONFIGURATION_DESCRIPTOR) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); + m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); // // zero configuration descriptor // - RtlZeroMemory(m_ConfigurationDescriptors, sizeof(PUSB_CONFIGURATION_DESCRIPTOR) * m_DeviceDescriptor.bNumConfigurations); + RtlZeroMemory(m_ConfigurationDescriptors, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations); // // retrieve the configuration descriptors @@ -525,7 +521,7 @@ NTSTATUS CUSBDevice::CommitSetupPacket( IN PUSB_DEFAULT_PIPE_SETUP_PACKET Packet, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN OPTIONAL PUSB_ENDPOINT EndpointDescriptor, IN ULONG BufferLength, IN OUT PMDL Mdl) { @@ -663,18 +659,14 @@ if (NT_SUCCESS(Status)) { // - // copy back device descriptor + // informal dbg print // RtlCopyMemory(&m_DeviceDescriptor, DeviceDescriptor, sizeof(USB_DEVICE_DESCRIPTOR)); - - // - // informal dbg print - // DumpDeviceDescriptor(&m_DeviceDescriptor); } // - // free item + // free buffer // ExFreePool(DeviceDescriptor); @@ -688,13 +680,16 @@ //---------------------------------------------------------------------------------------- NTSTATUS CUSBDevice::CreateConfigurationDescriptor( - ULONG Index) + UCHAR Index) { PVOID Buffer; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; PMDL Mdl; + ULONG InterfaceIndex, EndPointIndex; PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSB_ENDPOINT_DESCRIPTOR EndPointDescriptor; // @@ -713,11 +708,6 @@ // return STATUS_INSUFFICIENT_RESOURCES; } - - // - // zero buffer - // - RtlZeroMemory(Buffer, PAGE_SIZE); // // build setup packet @@ -727,16 +717,12 @@ CtrlSetup.bmRequestType._BM.Reserved = 0; CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; - CtrlSetup.wValue.LowByte = 0; + CtrlSetup.wValue.LowByte = Index; CtrlSetup.wValue.HiByte = USB_CONFIGURATION_DESCRIPTOR_TYPE; CtrlSetup.wIndex.W = 0; CtrlSetup.wLength = PAGE_SIZE; // - // FIXME: where put configuration index? - // - - // // now build MDL describing the buffer // Mdl = IoAllocateMdl(Buffer, PAGE_SIZE, FALSE, FALSE, 0); @@ -791,9 +777,124 @@ PC_ASSERT(ConfigurationDescriptor->bNumInterfaces); // - // store configuration descriptor - // - m_ConfigurationDescriptors[Index] = ConfigurationDescriptor; + // request is complete, initialize configuration descriptor + // + m_ConfigurationDescriptors[Index].ConfigurationDescriptor = ConfigurationDescriptor; + + // + // now allocate interface descriptors + // + m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBOHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces) + { + // + // failed to allocate interface descriptors + // + ExFreePool(Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // zero interface descriptor + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces); + + // + // get first interface descriptor + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)(ConfigurationDescriptor + 1); + + // + // setup interface descriptors + // + for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) + { + while(InterfaceDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE && InterfaceDescriptor->bLength != sizeof(USB_INTERFACE_DESCRIPTOR)) + { + // + // move to next descriptor + // + ASSERT(InterfaceDescriptor->bLength); + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)((ULONG_PTR)InterfaceDescriptor + InterfaceDescriptor->bLength); + } + + // + // sanity checks + // + ASSERT(InterfaceDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(InterfaceDescriptor->bLength == sizeof(USB_INTERFACE_DESCRIPTOR)); + ASSERT(InterfaceDescriptor->bNumEndpoints); + + // + // copy current interface descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor, InterfaceDescriptor, InterfaceDescriptor->bLength); + + // + // allocate end point descriptors + // + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBOHCI); + if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) + { + // + // failed to allocate endpoint + // + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + } + + // + // zero memory + // + RtlZeroMemory(m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints); + + // + // initialize end point descriptors + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)(InterfaceDescriptor + 1); + + for(EndPointIndex = 0; EndPointIndex < InterfaceDescriptor->bNumEndpoints; EndPointIndex++) + { + // + // skip other descriptors + // + while(EndPointDescriptor->bDescriptorType != USB_ENDPOINT_DESCRIPTOR_TYPE && EndPointDescriptor->bLength != sizeof(USB_ENDPOINT_DESCRIPTOR)) + { + // + // assert when next interface descriptor is reached before the next endpoint + // + ASSERT(EndPointDescriptor->bDescriptorType != USB_INTERFACE_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength); + + DPRINT1("InterfaceDescriptor bNumEndpoints %x EndpointIndex %x Skipping Descriptor Type %x\n", InterfaceDescriptor->bNumEndpoints, EndPointIndex, EndPointDescriptor->bDescriptorType); + // + // move to next descriptor + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // sanity check + // + ASSERT(EndPointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); + ASSERT(EndPointDescriptor->bLength == sizeof(USB_ENDPOINT_DESCRIPTOR)); + + // + // copy endpoint descriptor + // + RtlCopyMemory(&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndPointIndex].EndPointDescriptor, EndPointDescriptor, EndPointDescriptor->bLength); + + // + // move to next offset + // + EndPointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)((ULONG_PTR)EndPointDescriptor + EndPointDescriptor->bLength); + } + + // + // update interface descriptor offset + // + InterfaceDescriptor = (PUSB_INTERFACE_DESCRIPTOR)EndPointDescriptor; + } // // done @@ -827,8 +928,8 @@ // // copy configuration descriptor // - RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0], min(m_ConfigurationDescriptors[0]->wTotalLength, BufferLength)); - *OutBufferLength = m_ConfigurationDescriptors[0]->wTotalLength; + RtlCopyMemory(ConfigDescriptorBuffer, m_ConfigurationDescriptors[0].ConfigurationDescriptor, min(m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength, BufferLength)); + *OutBufferLength = m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- @@ -839,11 +940,7 @@ // FIXME: support multiple configurations // PC_ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - - ASSERT(m_ConfigurationDescriptors[0]); - ASSERT(m_ConfigurationDescriptors[0]->wTotalLength); - - return m_ConfigurationDescriptors[0]->wTotalLength; + return m_ConfigurationDescriptors[0].ConfigurationDescriptor->wTotalLength; } //---------------------------------------------------------------------------------------- VOID @@ -897,7 +994,12 @@ // Mdl = IoAllocateMdl(Buffer, BufferLength, FALSE, FALSE, 0); if (!Mdl) + { + // + // no memory + // return STATUS_INSUFFICIENT_RESOURCES; + } // // HACK HACK HACK: assume the buffer is build from non paged pool @@ -934,25 +1036,51 @@ ULONG InterfaceIndex, PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - PUSB_CONFIGURATION_DESCRIPTOR CurrentConfigurationDescriptor; - PUSB_INTERFACE_DESCRIPTOR CurrentInterfaceDescriptor; - PUSB_ENDPOINT_DESCRIPTOR CurrentEndpointDescriptor; - PVOID StartPosition; - - // - // FIXME: support multiple configurations - // - ASSERT(m_DeviceDescriptor.bNumConfigurations == 1); - ASSERT(m_ConfigurationDescriptors[0]); - CurrentConfigurationDescriptor = m_ConfigurationDescriptors[0]; + + // + // sanity checks + // + ASSERT(ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(ConfigurationDescriptor->iConfiguration == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->iConfiguration); // // sanity check // - PC_ASSERT(ConfigurationDescriptor->iConfiguration == CurrentConfigurationDescriptor->iConfiguration); - PC_ASSERT(ConfigurationDescriptor->bNumInterfaces <= CurrentConfigurationDescriptor->bNumInterfaces); - DPRINT1("CUSBDevice::SelectConfiguration NumInterfaces %lu\n", ConfigurationDescriptor->bNumInterfaces); - + ASSERT(ConfigurationDescriptor->bNumInterfaces <= m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].ConfigurationDescriptor->bNumInterfaces); + + // + // now build setup packet + // + RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); + CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; + CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; + + // + // select configuration + // + Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); + + // + // informal debug print + // + DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); + if (!NT_SUCCESS(Status)) + { + // + // failed + // + return Status; + } + + // + // store configuration device index + // + m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; + + // + // store configuration handle + // + *ConfigurationHandle = &m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration]; // // copy interface info and pipe info @@ -960,98 +1088,47 @@ for(InterfaceIndex = 0; InterfaceIndex < ConfigurationDescriptor->bNumInterfaces; InterfaceIndex++) { // - // find interface descriptor - // - CurrentInterfaceDescriptor = USBD_ParseConfigurationDescriptor(CurrentConfigurationDescriptor, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); - - // - // sanity check - // - ASSERT(CurrentInterfaceDescriptor); - ASSERT(CurrentInterfaceDescriptor->bLength != 0); - ASSERT(InterfaceInfo->NumberOfPipes == CurrentInterfaceDescriptor->bNumEndpoints); - ASSERT(InterfaceInfo->Length != 0); + // sanity check: is the info pre-layed out + // + PC_ASSERT(InterfaceInfo->NumberOfPipes == m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints); + PC_ASSERT(InterfaceInfo->Length != 0); #ifdef _MSC_VER PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); #endif - DPRINT1("CUSBDevice::SelectConfiguration InterfaceNumber %lu AlternativeSetting %lu bNumEndpoints %lu\n", InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting, CurrentInterfaceDescriptor->bNumEndpoints); - // // copy interface info // - InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)CurrentInterfaceDescriptor; - InterfaceInfo->Class = CurrentInterfaceDescriptor->bInterfaceClass; - InterfaceInfo->SubClass = CurrentInterfaceDescriptor->bInterfaceSubClass; - InterfaceInfo->Protocol = CurrentInterfaceDescriptor->bInterfaceProtocol; + InterfaceInfo->InterfaceHandle = (USBD_INTERFACE_HANDLE)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex]; + InterfaceInfo->Class = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceClass; + InterfaceInfo->SubClass = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceSubClass; + InterfaceInfo->Protocol = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].InterfaceDescriptor.bInterfaceProtocol; InterfaceInfo->Reserved = 0; // // copy endpoint info // - StartPosition = CurrentInterfaceDescriptor; for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) { // - // find corresponding endpoint descriptor - // - CurrentEndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)USBD_ParseDescriptors(CurrentConfigurationDescriptor, CurrentConfigurationDescriptor->wTotalLength, StartPosition, USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // sanity checks - // - ASSERT(CurrentEndpointDescriptor); - ASSERT(CurrentEndpointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); - - // // copy pipe info // - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = CurrentEndpointDescriptor->wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = CurrentEndpointDescriptor->bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = CurrentEndpointDescriptor->bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)CurrentEndpointDescriptor->bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)CurrentEndpointDescriptor; - - // - // move start position beyond the current endpoint descriptor - // - StartPosition = (PVOID)(CurrentEndpointDescriptor + 1); + InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[PipeIndex].EndpointAddress = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[PipeIndex].Interval = m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes; + InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)&m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].EndPointDescriptor; + + // + // data toggle is reset on configuration requests + // + m_ConfigurationDescriptors[ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceIndex].EndPoints[PipeIndex].DataToggle = FALSE; } // // move offset // InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((ULONG_PTR)PtrToUlong(InterfaceInfo) + InterfaceInfo->Length); - } - - // - // now build setup packet - // - RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); - CtrlSetup.bRequest = USB_REQUEST_SET_CONFIGURATION; - CtrlSetup.wValue.W = ConfigurationDescriptor->bConfigurationValue; - - // - // select configuration - // - Status = CommitSetupPacket(&CtrlSetup, 0, 0, 0); - - // - // informal debug print - // - DPRINT1("CUsbDevice::SelectConfiguration New Configuration %x Old Configuration %x Result %x\n", ConfigurationDescriptor->iConfiguration, m_ConfigurationIndex, Status); - - if (NT_SUCCESS(Status)) - { - // - // store configuration device index - // - m_ConfigurationIndex = ConfigurationDescriptor->iConfiguration; - - // - // store configuration handle - // - *ConfigurationHandle = m_ConfigurationDescriptors[0]; } // @@ -1066,49 +1143,31 @@ IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo) { - PUSB_CONFIGURATION_DESCRIPTOR Configuration; + PUSB_CONFIGURATION Configuration; ULONG PipeIndex; USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; - PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; - PUSB_ENDPOINT_DESCRIPTOR CurrentEndpointDescriptor; - PVOID StartPosition; - - // - // FIXME support multiple configurations - // - PC_ASSERT(m_ConfigurationDescriptors[0] == (PUSB_CONFIGURATION_DESCRIPTOR)ConfigurationHandle); // // get configuration struct // - Configuration = (PUSB_CONFIGURATION_DESCRIPTOR)ConfigurationHandle; - - // - // sanity checks - // - PC_ASSERT(Configuration->bNumInterfaces > InterfaceInfo->InterfaceNumber); -#ifdef _MSC_VER - //PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); -#endif - - // - // FIXME: check bandwidth - // - - // - // find interface number - // - InterfaceDescriptor = USBD_ParseConfigurationDescriptor(Configuration, InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting); - ASSERT(InterfaceDescriptor); + Configuration = (PUSB_CONFIGURATION)ConfigurationHandle; + + // + // sanity check + // + ASSERT(Configuration->ConfigurationDescriptor->bDescriptorType == USB_CONFIGURATION_DESCRIPTOR_TYPE); + ASSERT(Configuration->ConfigurationDescriptor->bLength == sizeof(USB_CONFIGURATION_DESCRIPTOR)); + ASSERT(Configuration->ConfigurationDescriptor->iConfiguration < m_DeviceDescriptor.bNumConfigurations); + ASSERT(&m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration] == Configuration); // // initialize setup packet // RtlZeroMemory(&CtrlSetup, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET)); CtrlSetup.bRequest = USB_REQUEST_SET_INTERFACE; - CtrlSetup.wValue.W = InterfaceDescriptor->bAlternateSetting; - CtrlSetup.wIndex.W = InterfaceDescriptor->bInterfaceNumber; + CtrlSetup.wValue.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bAlternateSetting; + CtrlSetup.wIndex.W = Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bInterfaceNumber; CtrlSetup.bmRequestType.B = 0x01; // @@ -1120,55 +1179,58 @@ // informal debug print // DPRINT1("CUSBDevice::SelectInterface AlternateSetting %x InterfaceNumber %x Status %x\n", InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber, Status); - DPRINT1("CUSBDevice::SelectInterface bInterfaceNumber %u bAlternateSetting %u NumberOfPipes %u Length %lu\n", - InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting, InterfaceInfo->NumberOfPipes, InterfaceInfo->Length); - InterfaceInfo->InterfaceHandle = InterfaceDescriptor; - InterfaceInfo->NumberOfPipes = InterfaceDescriptor->bNumEndpoints; - - // - // are there end points - // - if (InterfaceDescriptor->bNumEndpoints) - { - // - // sanity check - // - ASSERT(InterfaceInfo->Length == sizeof(USBD_INTERFACE_INFORMATION) + (InterfaceDescriptor->bNumEndpoints > 1 ? sizeof(USBD_PIPE_INFORMATION) * (InterfaceDescriptor->bNumEndpoints - 1) : 0)); - - // - // store number of pipes - // - InterfaceInfo->NumberOfPipes = InterfaceDescriptor->bNumEndpoints; - - StartPosition = InterfaceDescriptor; - for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) + if (!NT_SUCCESS(Status)) + { + // + // failed to select interface + // + return Status; + } + + + // + // sanity checks + // + PC_ASSERT(Configuration->ConfigurationDescriptor->bNumInterfaces > InterfaceInfo->InterfaceNumber); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].InterfaceDescriptor.bNumEndpoints == InterfaceInfo->NumberOfPipes); +#ifdef _MSC_VER + PC_ASSERT(InterfaceInfo->Length == FIELD_OFFSET(USBD_INTERFACE_INFORMATION, Pipes[InterfaceInfo->NumberOfPipes])); +#endif + + // + // copy pipe handles + // + for(PipeIndex = 0; PipeIndex < InterfaceInfo->NumberOfPipes; PipeIndex++) + { + // + // copy pipe handle + // + DPRINT1("PipeIndex %lu\n", PipeIndex); + DPRINT1("EndpointAddress %x\n", InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + DPRINT1("Interval %d\n", InterfaceInfo->Pipes[PipeIndex].Interval); + DPRINT1("MaximumPacketSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize); + DPRINT1("MaximumTransferSize %d\n", InterfaceInfo->Pipes[PipeIndex].MaximumTransferSize); + DPRINT1("PipeFlags %d\n", InterfaceInfo->Pipes[PipeIndex].PipeFlags); + DPRINT1("PipeType %dd\n", InterfaceInfo->Pipes[PipeIndex].PipeType); + DPRINT1("UsbEndPoint %x\n", Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress); + PC_ASSERT(Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bEndpointAddress == InterfaceInfo->Pipes[PipeIndex].EndpointAddress); + + InterfaceInfo->Pipes[PipeIndex].PipeHandle = &Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor; + + // + // data toggle is reset on select interface requests + // + m_ConfigurationDescriptors[Configuration->ConfigurationDescriptor->iConfiguration].Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].DataToggle = FALSE; + + if (Configuration->Interfaces[InterfaceInfo->InterfaceNumber].EndPoints[PipeIndex].EndPointDescriptor.bmAttributes & (USB_ENDPOINT_TYPE_ISOCHRONOUS | USB_ENDPOINT_TYPE_INTERRUPT)) { // - // find corresponding endpoint descriptor - // - CurrentEndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)USBD_ParseDescriptors(Configuration, Configuration->wTotalLength, StartPosition, USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // sanity checks - // - ASSERT(CurrentEndpointDescriptor); - ASSERT(CurrentEndpointDescriptor->bDescriptorType == USB_ENDPOINT_DESCRIPTOR_TYPE); - - // - // copy pipe info - // - InterfaceInfo->Pipes[PipeIndex].MaximumPacketSize = CurrentEndpointDescriptor->wMaxPacketSize; - InterfaceInfo->Pipes[PipeIndex].EndpointAddress = CurrentEndpointDescriptor->bEndpointAddress; - InterfaceInfo->Pipes[PipeIndex].Interval = CurrentEndpointDescriptor->bInterval; - InterfaceInfo->Pipes[PipeIndex].PipeType = (USBD_PIPE_TYPE)CurrentEndpointDescriptor->bmAttributes; - InterfaceInfo->Pipes[PipeIndex].PipeHandle = (PVOID)CurrentEndpointDescriptor; - - // - // move start position beyond the current endpoint descriptor - // - StartPosition = (PVOID)(CurrentEndpointDescriptor + 1); + // FIXME: check if enough bandwidth is available + // } } + + // // done // @@ -1191,6 +1253,7 @@ return m_Queue->AbortDevicePipe(m_DeviceAddress, EndpointDescriptor); } + //---------------------------------------------------------------------------------------- NTSTATUS CreateUSBDevice( Modified: trunk/reactos/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -53,6 +53,8 @@ POHCI_ENDPOINT_DESCRIPTOR FindInterruptEndpointDescriptor(UCHAR InterruptInterval); VOID PrintEndpointList(POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor); VOID LinkEndpoint(POHCI_ENDPOINT_DESCRIPTOR HeadEndpointDescriptor, POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor); + VOID AddEndpointDescriptor(IN POHCI_ENDPOINT_DESCRIPTOR Descriptor); + // constructor / destructor CUSBQueue(IUnknown *OuterUnknown){} @@ -66,6 +68,7 @@ POHCI_ENDPOINT_DESCRIPTOR m_ControlHeadEndpointDescriptor; // control head descriptor POHCI_ENDPOINT_DESCRIPTOR m_IsoHeadEndpointDescriptor; // isochronous head descriptor POHCI_ENDPOINT_DESCRIPTOR * m_InterruptEndpoints; + LIST_ENTRY m_PendingRequestList; // pending request list }; //================================================================================================= @@ -120,6 +123,12 @@ KeInitializeSpinLock(&m_Lock); // + // init list + // + InitializeListHead(&m_PendingRequestList); + + + // // store hardware // m_Hardware = Hardware; @@ -164,17 +173,142 @@ } +VOID +CUSBQueue::AddEndpointDescriptor( + IN POHCI_ENDPOINT_DESCRIPTOR Descriptor) +{ + IUSBRequest *Request; + ULONG Type; + POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor; + POHCI_ISO_TD CurrentDescriptor; + ULONG FrameNumber; + USHORT Frame; + + + // + // sanity check + // + ASSERT(Descriptor->Request); + Request = (IUSBRequest*)Descriptor->Request; + + // + // get request type + // + Type = Request->GetTransferType(); + + // + // check type + // + if (Type == USB_ENDPOINT_TYPE_BULK) + { + // + // get head descriptor + // + HeadDescriptor = m_BulkHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_CONTROL) + { + // + // get head descriptor + // + HeadDescriptor = m_ControlHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // get head descriptor + // + HeadDescriptor = FindInterruptEndpointDescriptor(Request->GetInterval()); + ASSERT(HeadDescriptor); + } + else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // get head descriptor + // + HeadDescriptor = m_IsoHeadEndpointDescriptor; + + // + // get current frame number + // + m_Hardware->GetCurrentFrameNumber(&FrameNumber); + + // + // FIXME: increment frame number + // + FrameNumber += 300; + + // + // apply frame number to iso transfer descriptors + // + CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; + + DPRINT("ISO: NextFrameNumber %x\n", FrameNumber); + Frame = (FrameNumber & 0xFFFF); + + while(CurrentDescriptor) + { + // + // set current frame number + // + CurrentDescriptor->Flags |= OHCI_ITD_SET_STARTING_FRAME(Frame); + + // + // move to next frame number + // + Frame += OHCI_ITD_GET_FRAME_COUNT(CurrentDescriptor->Flags); + + // + // move to next descriptor + // + CurrentDescriptor = CurrentDescriptor->NextLogicalDescriptor; + } + + // + // get current frame number + // + m_Hardware->GetCurrentFrameNumber(&FrameNumber); + + DPRINT("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); + ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); + + PrintEndpointList(m_IsoHeadEndpointDescriptor); + } + else + { + // + // bad request type + // + ASSERT(FALSE); + return; + } + + // + // set descriptor active + // + Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; + + // + // insert endpoint at end + // + LinkEndpoint(HeadDescriptor, Descriptor); + + if (Type == USB_ENDPOINT_TYPE_CONTROL || Type == USB_ENDPOINT_TYPE_BULK) + { + // + // notify hardware of our request + // + m_Hardware->HeadEndpointDescriptorModified(Type); + } +} + + NTSTATUS CUSBQueue::AddUSBRequest( IUSBRequest * Request) { NTSTATUS Status; - ULONG Type; - POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor; - POHCI_ENDPOINT_DESCRIPTOR Descriptor; - POHCI_ISO_TD CurrentDescriptor; - ULONG FrameNumber; - USHORT Frame; + IN POHCI_ENDPOINT_DESCRIPTOR Descriptor; DPRINT("CUSBQueue::AddUSBRequest\n"); @@ -182,11 +316,6 @@ // sanity check // ASSERT(Request != NULL); - - // - // get request type - // - Type = Request->GetTransferType(); // // add extra reference which is released when the request is completed @@ -212,110 +341,9 @@ } // - // check type - // - if (Type == USB_ENDPOINT_TYPE_BULK) - { - // - // get head descriptor - // - HeadDescriptor = m_BulkHeadEndpointDescriptor; - } - else if (Type == USB_ENDPOINT_TYPE_CONTROL) - { - // - // get head descriptor - // - HeadDescriptor = m_ControlHeadEndpointDescriptor; - } - else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) - { - // - // get head descriptor - // - HeadDescriptor = FindInterruptEndpointDescriptor(Request->GetInterval()); - ASSERT(HeadDescriptor); - } - else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) - { - // - // get head descriptor - // - HeadDescriptor = m_IsoHeadEndpointDescriptor; - - // - // get current frame number - // - m_Hardware->GetCurrentFrameNumber(&FrameNumber); - - // - // FIXME: increment frame number - // - FrameNumber += 300; - - // - // apply frame number to iso transfer descriptors - // - CurrentDescriptor = (POHCI_ISO_TD)Descriptor->HeadLogicalDescriptor; - - DPRINT("ISO: NextFrameNumber %x\n", FrameNumber); - Frame = (FrameNumber & 0xFFFF); - - while(CurrentDescriptor) - { - // - // set current frame number - // - CurrentDescriptor->Flags |= OHCI_ITD_SET_STARTING_FRAME(Frame); - - // - // move to next frame number - // - Frame += OHCI_ITD_GET_FRAME_COUNT(CurrentDescriptor->Flags); - - // - // move to next descriptor - // - CurrentDescriptor = CurrentDescriptor->NextLogicalDescriptor; - } - - // - // get current frame number - // - m_Hardware->GetCurrentFrameNumber(&FrameNumber); - - DPRINT("Hardware 1ms %p Iso %p\n",m_InterruptEndpoints[0], m_IsoHeadEndpointDescriptor); - ASSERT(m_InterruptEndpoints[0]->NextPhysicalEndpoint == m_IsoHeadEndpointDescriptor->PhysicalAddress.LowPart); - - PrintEndpointList(m_IsoHeadEndpointDescriptor); - } - else - { - // - // bad request type - // - Request->Release(); - return STATUS_INVALID_PARAMETER; - } - - // - // set descriptor active - // - Descriptor->Flags &= ~OHCI_ENDPOINT_SKIP; - - // - // insert endpoint at end - // - LinkEndpoint(HeadDescriptor, Descriptor); - - if (Type == USB_ENDPOINT_TYPE_CONTROL || Type == USB_ENDPOINT_TYPE_BULK) - { - // - // notify hardware of our request - // - m_Hardware->HeadEndpointDescriptorModified(Type); - } - + // add the request + // + AddEndpointDescriptor(Descriptor); return STATUS_SUCCESS; } @@ -562,6 +590,9 @@ POHCI_ENDPOINT_DESCRIPTOR PreviousEndpointDescriptor) { PUSBREQUEST Request; + POHCI_ENDPOINT_DESCRIPTOR NewEndpointDescriptor; + USBD_STATUS UrbStatus; + KIRQL OldLevel; // // FIXME: verify unlinking process @@ -576,21 +607,90 @@ ASSERT(Request); // + // check for errors + // + if (EndpointDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HALTED) + { + // + // the real error will processed by IUSBRequest + // + UrbStatus = USBD_STATUS_STALL_PID; + } + else + { + // + // well done ;) + // + UrbStatus = USBD_STATUS_SUCCESS; + } + + // + // Check if the transfer was completed and if UrbStatus is ok + // + if ((Request->IsRequestComplete() == FALSE) && (UrbStatus == USBD_STATUS_SUCCESS)) + { + // + // request is incomplete, get new queue head + // + if (Request->GetEndpointDescriptor(&NewEndpointDescriptor) == STATUS_SUCCESS) + { + // + // notify of completion + // + Request->FreeEndpointDescriptor(EndpointDescriptor); + + // + // first acquire request lock + // + KeAcquireSpinLock(&m_Lock, &OldLevel); + + // + // add to pending list + // + InsertTailList(&m_PendingRequestList, &NewEndpointDescriptor->DescriptorListEntry); + + // + // release queue head + // + KeReleaseSpinLock(&m_Lock, OldLevel); + + // + // Done for now + // + return; + } + DPRINT1("Unable to create a new QueueHead\n"); + //ASSERT(FALSE); + + // + // Else there was a problem + // FIXME: Find better return + UrbStatus = USBD_STATUS_INSUFFICIENT_RESOURCES; + } + + if (UrbStatus != USBD_STATUS_SUCCESS) + { + DPRINT1("URB failed with status 0x%x\n", UrbStatus); + //PC_ASSERT(FALSE); + } + + // + // free endpoint descriptor + // + Request->FreeEndpointDescriptor(EndpointDescriptor); + + // // notify of completion // - Request->CompletionCallback(EndpointDescriptor); - - // - // free endpoint descriptor - // - Request->FreeEndpointDescriptor(EndpointDescriptor); + Request->CompletionCallback(); + // // release request // Request->Release(); - -} +} + VOID CUSBQueue::PrintEndpointList( POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor) @@ -618,6 +718,7 @@ ULONG TransferDescriptorLogicalAddress) { POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, PreviousEndpointDescriptor; + PLIST_ENTRY Entry; NTSTATUS Status; DPRINT("CUSBQueue::TransferDescriptorCompletionCallback transfer descriptor %x\n", TransferDescriptorLogicalAddress); @@ -697,15 +798,41 @@ // // no more completed descriptors found // - return; + break; }while(TRUE); - // - // hardware reported dead endpoint completed - // - DPRINT1("CUSBQueue::TransferDescriptorCompletionCallback invalid transfer descriptor %x\n", TransferDescriptorLogicalAddress); - ASSERT(FALSE); + + // + // acquire spin lock + // + KeAcquireSpinLockAtDpcLevel(&m_Lock); + + // + // is there a pending list item + // + if (!IsListEmpty(&m_PendingRequestList)) + { + // + // get list entry + // + Entry = RemoveHeadList(&m_PendingRequestList); + + // + // get entry + // + EndpointDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CONTAINING_RECORD(Entry, OHCI_ENDPOINT_DESCRIPTOR, DescriptorListEntry); + + // + // add entry + // + AddEndpointDescriptor(EndpointDescriptor); + } + + // + // release lock + // + KeReleaseSpinLockFromDpcLevel(&m_Lock); } POHCI_ENDPOINT_DESCRIPTOR @@ -789,8 +916,12 @@ HeadDescriptor = FindInterruptEndpointDescriptor(EndpointDescriptor->bInterval); ASSERT(HeadDescriptor); } - else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) - { + else + { + // + // IMPLEMENT me + // + ASSERT(Type == USB_ENDPOINT_TYPE_ISOCHRONOUS); UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/drivers/usb/usbohci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usb_request.cpp [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -36,7 +36,7 @@ } // IUSBRequest interface functions - virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); + virtual NTSTATUS InitializeWithSetupPacket(IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, IN OPTIONAL struct _USB_ENDPOINT* EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer); virtual NTSTATUS InitializeWithIrp(IN PDMAMEMORYMANAGER DmaManager, IN OUT PIRP Irp, IN USB_DEVICE_SPEED DeviceSpeed); virtual BOOLEAN IsRequestComplete(); virtual ULONG GetTransferType(); @@ -44,7 +44,7 @@ virtual VOID GetResultStatus(OUT OPTIONAL NTSTATUS *NtStatusCode, OUT OPTIONAL PULONG UrbStatusCode); virtual BOOLEAN IsRequestInitialized(); virtual BOOLEAN IsQueueHeadComplete(struct _QUEUE_HEAD * QueueHead); - virtual VOID CompletionCallback(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); + virtual VOID CompletionCallback(); virtual VOID FreeEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); virtual UCHAR GetInterval(); @@ -65,6 +65,8 @@ USHORT GetMaxPacketSize(); VOID CheckError(struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor); VOID DumpEndpointDescriptor(struct _OHCI_ENDPOINT_DESCRIPTOR *Descriptor); + NTSTATUS BuildTransferDescriptorChain(IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode, OUT POHCI_GENERAL_TD * OutFirstDescriptor, OUT POHCI_GENERAL_TD * OutLastDescriptor, OUT PULONG OutTransferBufferOffset); + VOID InitDescriptor(IN POHCI_GENERAL_TD CurrentDescriptor, IN PVOID TransferBuffer, IN ULONG TransferBufferLength, IN UCHAR PidCode); // constructor / destructor @@ -120,9 +122,9 @@ UCHAR m_DeviceAddress; // - // store end point address - // - PUSB_ENDPOINT_DESCRIPTOR m_EndpointDescriptor; + // store endpoint descriptor + // + PUSB_ENDPOINT m_EndpointDescriptor; // // allocated setup packet from the DMA pool @@ -145,6 +147,11 @@ // store urb // PURB m_Urb; + + // + // base buffer + // + PVOID m_Base; }; //---------------------------------------------------------------------------------------- @@ -163,7 +170,7 @@ IN PDMAMEMORYMANAGER DmaManager, IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, IN UCHAR DeviceAddress, - IN OPTIONAL PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor, + IN OPTIONAL struct _USB_ENDPOINT* EndpointDescriptor, IN USB_DEVICE_SPEED DeviceSpeed, IN OUT ULONG TransferBufferLength, IN OUT PMDL TransferBuffer) @@ -331,7 +338,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)m_Urb->UrbIsochronousTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT)m_Urb->UrbIsochronousTransfer.PipeHandle; // // completed initialization @@ -406,7 +413,7 @@ // // get endpoint descriptor // - m_EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)m_Urb->UrbBulkOrInterruptTransfer.PipeHandle; + m_EndpointDescriptor = (PUSB_ENDPOINT)m_Urb->UrbBulkOrInterruptTransfer.PipeHandle; } break; @@ -459,11 +466,21 @@ { if (!m_EndpointDescriptor) { - // - // FIXME: use DeviceDescriptor.bMaxPacketSize0 - // control pipe request - // - return 8; + if (m_DeviceSpeed == UsbLowSpeed) + { + // + // control pipes use 8 bytes packets + // + return 8; + } + else + { + // + // must be full speed + // + ASSERT(m_DeviceSpeed == UsbFullSpeed); + return 64; + } } ASSERT(m_Irp); @@ -472,19 +489,19 @@ // // return max packet size // - return m_EndpointDescriptor->wMaxPacketSize; + return m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; } UCHAR CUSBRequest::GetInterval() { ASSERT(m_EndpointDescriptor); - ASSERT((m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); + ASSERT((m_EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK) == USB_ENDPOINT_TYPE_INTERRUPT); // // return interrupt interval // - return m_EndpointDescriptor->bInterval; + return m_EndpointDescriptor->EndPointDescriptor.bInterval; } UCHAR @@ -504,7 +521,7 @@ // // endpoint number is between 1-15 // - return (m_EndpointDescriptor->bEndpointAddress & 0xF); + return (m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & 0xF); } //---------------------------------------------------------------------------------------- @@ -523,7 +540,7 @@ // // end point is defined in the low byte of bmAttributes // - TransferType = (m_EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + TransferType = (m_EndpointDescriptor->EndPointDescriptor.bmAttributes & USB_ENDPOINT_TYPE_MASK); } else { @@ -547,7 +564,7 @@ // // end point direction is highest bit in bEndpointAddress // - return (m_EndpointDescriptor->bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; + return (m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress & USB_ENDPOINT_DIRECTION_MASK) >> 7; } else { @@ -967,7 +984,7 @@ Descriptor->Flags |= OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(GetEndpointAddress()); Descriptor->Flags |= OHCI_ENDPOINT_SET_MAX_PACKET_SIZE(GetMaxPacketSize()); - DPRINT("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %x\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); + DPRINT("Flags %x DeviceAddress %x EndpointAddress %x PacketSize %lu\n", Descriptor->Flags, GetDeviceAddress(), GetEndpointAddress(), GetMaxPacketSize()); // // is there an endpoint descriptor @@ -977,7 +994,7 @@ // // check direction // - if (USB_ENDPOINT_DIRECTION_OUT(m_EndpointDescriptor->bEndpointAddress)) + if (USB_ENDPOINT_DIRECTION_OUT(m_EndpointDescriptor->EndPointDescriptor.bEndpointAddress)) { // // direction out @@ -1041,15 +1058,191 @@ return STATUS_SUCCESS; } +VOID +CUSBRequest::InitDescriptor( + IN POHCI_GENERAL_TD CurrentDescriptor, + IN PVOID TransferBuffer, + IN ULONG TransferBufferLength, + IN UCHAR PidDirection) +{ + ULONG Direction; + + if (PidDirection) + { + // + // input direction + // + Direction = OHCI_TD_DIRECTION_PID_IN; + } + else + { + // + // output direction + // + Direction = OHCI_TD_DIRECTION_PID_OUT; + } + + + // + // initialize descriptor + // + CurrentDescriptor->Flags = Direction | OHCI_TD_BUFFER_ROUNDING | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY; + + // + // store physical address of buffer + // + CurrentDescriptor->BufferPhysical = MmGetPhysicalAddress(TransferBuffer).LowPart; + CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + TransferBufferLength - 1; + + DPRINT("CurrentDescriptor %p Addr %x TransferBufferLength %lu\n", CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, TransferBufferLength); +} + +NTSTATUS +CUSBRequest::BuildTransferDescriptorChain( + IN PVOID TransferBuffer, + IN ULONG TransferBufferLength, + IN UCHAR PidDirection, + OUT POHCI_GENERAL_TD * OutFirstDescriptor, + OUT POHCI_GENERAL_TD * OutLastDescriptor, + OUT PULONG OutTransferBufferOffset) +{ + POHCI_GENERAL_TD FirstDescriptor = NULL, CurrentDescriptor, LastDescriptor = NULL; + NTSTATUS Status; + ULONG MaxLengthInPage, TransferBufferOffset = 0; + ULONG MaxPacketSize = 0, TransferSize, CurrentSize; + + // + // for now use one page as maximum size + // + MaxPacketSize = PAGE_SIZE; + + do + { + // + // allocate transfer descriptor + // + Status = CreateGeneralTransferDescriptor(&CurrentDescriptor, 0); + if (!NT_SUCCESS(Status)) + { + // + // failed to allocate transfer descriptor + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + if (MaxPacketSize) + { + // + // transfer size is minimum available buffer or endpoint size + // + TransferSize = min(TransferBufferLength - TransferBufferOffset, MaxPacketSize); + } + else + { + // + // use available buffer + // + TransferSize = TransferBufferLength - TransferBufferOffset; + } + + // + // get page offset + // + MaxLengthInPage = PAGE_SIZE - BYTE_OFFSET(TransferBuffer); + + // + // get minimum from current page size + // + CurrentSize = min(TransferSize, MaxLengthInPage); + ASSERT(CurrentSize); + + // + // now init the descriptor + // + InitDescriptor(CurrentDescriptor, + (PVOID)((ULONG_PTR)TransferBuffer + TransferBufferOffset), + CurrentSize, + PidDirection); + + // + // adjust offset + // + TransferBufferOffset += CurrentSize; + + // + // is there a previous descriptor + // + if (LastDescriptor) + { + // + // link descriptors + // + LastDescriptor->NextLogicalDescriptor = (PVOID)CurrentDescriptor; + LastDescriptor->NextPhysicalDescriptor = CurrentDescriptor->PhysicalAddress.LowPart; + } + else + { + // + // it is the first descriptor + // + FirstDescriptor = CurrentDescriptor; + } + + if(TransferBufferLength == TransferBufferOffset) + { + // + // end reached + // + break; + } + + }while(TRUE); + + if (OutFirstDescriptor) + { + // + // store first descriptor + // + *OutFirstDescriptor = FirstDescriptor; + } + + if (OutLastDescriptor) + { + // + // store last descriptor + // + *OutLastDescriptor = CurrentDescriptor; + } + + if (OutTransferBufferOffset) + { + // + // store offset + // + *OutTransferBufferOffset = TransferBufferOffset; + } + + // + // done + // + return STATUS_SUCCESS; +} + + NTSTATUS CUSBRequest::BuildBulkInterruptEndpoint( POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor) { - POHCI_GENERAL_TD FirstDescriptor, PreviousDescriptor = NULL, CurrentDescriptor, LastDescriptor; + POHCI_GENERAL_TD FirstDescriptor, LastDescriptor; POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor; - ULONG BufferSize, CurrentSize, Direction, MaxLengthInPage; NTSTATUS Status; - PVOID Buffer; + PVOID Base; + ULONG ChainDescriptorLength; + + // + // sanity check + // + ASSERT(m_EndpointDescriptor); // // allocate endpoint descriptor @@ -1063,142 +1256,47 @@ return Status; } - // - // allocate transfer descriptor for last descriptor - // - Status = CreateGeneralTransferDescriptor(&LastDescriptor, 0); - if (!NT_SUCCESS(Status)) - { - // - // failed to create transfer descriptor - // - m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); - return Status; - } - - // - // get buffer size - // - BufferSize = m_TransferBufferLength; - ASSERT(BufferSize); ASSERT(m_TransferBufferMDL); - // - // get buffer - // - Buffer = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); - ASSERT(Buffer); - - if (InternalGetPidDirection()) - { - // - // input direction - // - Direction = OHCI_TD_DIRECTION_PID_IN; - } - else - { - // - // output direction - // - Direction = OHCI_TD_DIRECTION_PID_OUT; - } - - do - { - // - // get current buffersize - // - CurrentSize = min(8192, BufferSize); - - // - // get page offset - // - MaxLengthInPage = PAGE_SIZE - BYTE_OFFSET(Buffer); - - // - // get minimum from current page size - // - CurrentSize = min(CurrentSize, MaxLengthInPage); - ASSERT(CurrentSize); - - // - // allocate transfer descriptor - // - Status = CreateGeneralTransferDescriptor(&CurrentDescriptor, 0); - if (!NT_SUCCESS(Status)) - { - // - // failed to create transfer descriptor - // TODO: cleanup - // - ASSERT(FALSE); - m_DmaManager->Release(EndpointDescriptor, sizeof(OHCI_ENDPOINT_DESCRIPTOR)); - FreeDescriptor(LastDescriptor); - return Status; - } - - // - // initialize descriptor - // - CurrentDescriptor->Flags = Direction | OHCI_TD_BUFFER_ROUNDING | OHCI_TD_SET_CONDITION_CODE(OHCI_TD_CONDITION_NOT_ACCESSED) | OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_NONE) | OHCI_TD_TOGGLE_CARRY; - - // - // store physical address of buffer - // - CurrentDescriptor->BufferPhysical = MmGetPhysicalAddress(Buffer).LowPart; - CurrentDescriptor->LastPhysicalByteAddress = CurrentDescriptor->BufferPhysical + CurrentSize - 1; - -#if 0 - if (m_Urb != NULL) - { - if (m_Urb->UrbBulkOrInterruptTransfer.TransferFlags & USBD_SHORT_TRANSFER_OK) - { - // - // indicate short packet support - // - CurrentDescriptor->Flags |= OHCI_TD_BUFFER_ROUNDING; - } - } -#endif - - // - // is there a previous descriptor - // - if (PreviousDescriptor) - { - // - // link descriptors - // - PreviousDescriptor->NextLogicalDescriptor = (PVOID)CurrentDescriptor; - PreviousDescriptor->NextPhysicalDescriptor = CurrentDescriptor->PhysicalAddress.LowPart; - } - else - { - // - // it is the first descriptor - // - FirstDescriptor = CurrentDescriptor; - } - - DPRINT("PreviousDescriptor %p CurrentDescriptor %p Logical %x Buffer Logical %p Physical %x Last Physical %x CurrentSize %lu\n", PreviousDescriptor, CurrentDescriptor, CurrentDescriptor->PhysicalAddress.LowPart, CurrentDescriptor->BufferLogical, CurrentDescriptor->BufferPhysical, CurrentDescriptor->LastPhysicalByteAddress, CurrentSize); - - // - // set previous descriptor - // - PreviousDescriptor = CurrentDescriptor; - - // - // subtract buffer size - // - BufferSize -= CurrentSize; - - // - // increment buffer offset - // - Buffer = (PVOID)((ULONG_PTR)Buffer + CurrentSize); - - }while(BufferSize); + if (m_Base == NULL) + { + // + // get buffer + // + m_Base = MmGetSystemAddressForMdlSafe(m_TransferBufferMDL, NormalPagePriority); + } + + // + // Increase the size of last transfer, 0 in case this is the first + // + Base = (PVOID)((ULONG_PTR)m_Base + m_TransferBufferLengthCompleted); + + // + // sanity checks + // + ASSERT(m_EndpointDescriptor); + ASSERT(Base); + + // + // use 2 * PAGE_SIZE at max for each new request + // + ULONG MaxTransferLength = min(1 * PAGE_SIZE, m_TransferBufferLength - m_TransferBufferLengthCompleted); + DPRINT("m_TransferBufferLength %lu m_TransferBufferLengthCompleted %lu DataToggle %x\n", m_TransferBufferLength, m_TransferBufferLengthCompleted, m_EndpointDescriptor->DataToggle); + + // + // build bulk transfer descriptor chain + // + Status = BuildTransferDescriptorChain(Base, + MaxTransferLength, + InternalGetPidDirection(), + &FirstDescriptor, + &LastDescriptor, + &ChainDescriptorLength); + + // + // move to next offset + // + m_TransferBufferLengthCompleted += ChainDescriptorLength; // // first descriptor has no carry bit @@ -1206,32 +1304,32 @@ FirstDescriptor->Flags &= ~OHCI_TD_TOGGLE_CARRY; // - // fixme: toggle - // - FirstDescriptor->Flags |= OHCI_TD_TOGGLE_0; + // apply data toggle + // + FirstDescriptor->Flags |= (m_EndpointDescriptor->DataToggle ? OHCI_TD_TOGGLE_1 : OHCI_TD_TOGGLE_0); // // clear interrupt mask for last transfer descriptor // - CurrentDescriptor->Flags &= ~OHCI_TD_INTERRUPT_MASK; + LastDescriptor->Flags &= ~OHCI_TD_INTERRUPT_MASK; + // // fire interrupt as soon transfer is finished // - CurrentDescriptor->Flags |= OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); - - // - // link last data descriptor to last descriptor - // - CurrentDescriptor->NextLogicalDescriptor = LastDescriptor; - CurrentDescriptor->NextPhysicalDescriptor = LastDescriptor->PhysicalAddress.LowPart; + LastDescriptor->Flags |= OHCI_TD_SET_DELAY_INTERRUPT(OHCI_TD_INTERRUPT_IMMEDIATE); // // now link descriptor to endpoint // EndpointDescriptor->HeadPhysicalDescriptor = FirstDescriptor->PhysicalAddress.LowPart; - EndpointDescriptor->TailPhysicalDescriptor = LastDescriptor->PhysicalAddress.LowPart; + EndpointDescriptor->TailPhysicalDescriptor = (FirstDescriptor == LastDescriptor ? 0 : LastDescriptor->PhysicalAddress.LowPart); EndpointDescriptor->HeadLogicalDescriptor = FirstDescriptor; + + // + // dump descriptor list + // + //DumpEndpointDescriptor(EndpointDescriptor); // // store result @@ -1567,6 +1665,12 @@ DPRINT("CUSBRequest::FreeEndpointDescriptor EndpointDescriptor %p Logical %x\n", OutDescriptor, OutDescriptor->PhysicalAddress.LowPart); + // + // check for errors + // + CheckError(OutDescriptor); + + if (OutDescriptor->Flags & OHCI_ENDPOINT_ISOCHRONOUS_FORMAT) { // @@ -1685,6 +1789,14 @@ // get first general transfer descriptor // TransferDescriptor = (POHCI_GENERAL_TD)OutDescriptor->HeadLogicalDescriptor; + + if (m_EndpointDescriptor != NULL) + { + // + // update data toggle + // + m_EndpointDescriptor->DataToggle = (OutDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_TOGGLE_CARRY); + } while(TransferDescriptor) { @@ -1776,21 +1888,18 @@ TransferDescriptor = (POHCI_GENERAL_TD)TransferDescriptor->NextLogicalDescriptor; } } + + + } VOID -CUSBRequest::CompletionCallback( - struct _OHCI_ENDPOINT_DESCRIPTOR * OutDescriptor) +CUSBRequest::CompletionCallback() { PIO_STACK_LOCATION IoStack; PURB Urb; - DPRINT("CUSBRequest::CompletionCallback Descriptor %p PhysicalAddress %x\n", OutDescriptor, OutDescriptor->PhysicalAddress.LowPart); - - // - // check for errors - // - CheckError(OutDescriptor); + DPRINT("CUSBRequest::CompletionCallback\n"); if (m_Irp) { @@ -1826,12 +1935,11 @@ } // - // FIXME: support status and calculate length - // - - // - // FIXME: check if the transfer was split - // if yes dont complete irp yet + // FIXME calculate length + // + + // + // complete request // IoCompleteRequest(m_Irp, IO_NO_INCREMENT); } Modified: trunk/reactos/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/usbohc… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/usbohci.h [iso-8859-1] Sat Feb 18 23:23:13 2012 @@ -108,4 +108,26 @@ // NTSTATUS InternalCreateUSBRequest(PUSBREQUEST *OutRequest); + +typedef struct _USB_ENDPOINT +{ + USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; + UCHAR HubAddress; + UCHAR HubPort; + UCHAR DataToggle; +} USB_ENDPOINT, *PUSB_ENDPOINT; + +typedef struct _USB_INTERFACE +{ + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USB_ENDPOINT *EndPoints; +} USB_INTERFACE, *PUSB_INTERFACE; + +typedef struct _USB_CONFIGURATION +{ + PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + USB_INTERFACE *Interfaces; +} USB_CONFIGURATION, *PUSB_CONFIGURATION; + + #endif

1 0

[akhaldi] 55686: * Sync up to trunk r55685.
by akhaldi＠svn.reactos.org 18 Feb '12

18 Feb '12

Author: akhaldi Date: Sat Feb 18 23:01:24 2012 New Revision: 55686 URL: http://svn.reactos.org/svn/reactos?rev=55686&view=rev Log: * Sync up to trunk r55685. Modified: branches/arty-newcc/ (props changed) branches/arty-newcc/base/applications/cmdutils/find/find.rc (contents, props changed) branches/arty-newcc/base/setup/reactos/lang/en-US.rc (contents, props changed) branches/arty-newcc/base/setup/welcome/welcome.rc (contents, props changed) branches/arty-newcc/dll/cpl/main/main.rc (contents, props changed) branches/arty-newcc/dll/win32/devmgr/devmgr.rc (contents, props changed) branches/arty-newcc/dll/win32/kernel32/client/dllmain.c branches/arty-newcc/dll/win32/syssetup/syssetup.rc (contents, props changed) branches/arty-newcc/dll/win32/user32/user32.rc (contents, props changed) branches/arty-newcc/dll/win32/userenv/userenv.rc (contents, props changed) branches/arty-newcc/hal/halx86/mp/mps.S (contents, props changed) branches/arty-newcc/include/reactos/version.rc (contents, props changed) branches/arty-newcc/tools/cabman/makefile.win32 (contents, props changed) Propchange: branches/arty-newcc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 18 23:01:24 2012 @@ -13,4 +13,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:50808-55680 +/trunk/reactos:50808-55685 Modified: branches/arty-newcc/base/applications/cmdutils/find/find.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/applications/cm… ============================================================================== --- branches/arty-newcc/base/applications/cmdutils/find/find.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/applications/cmdutils/find/find.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,4 +1,3 @@ -/* $Id$ */ #define REACTOS_STR_FILE_DESCRIPTION "W32 find command\0" #define REACTOS_STR_INTERNAL_NAME "find\0" #define REACTOS_STR_ORIGINAL_FILENAME "find.exe\0" Propchange: branches/arty-newcc/base/applications/cmdutils/find/find.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/base/setup/reactos/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/reactos/l… ============================================================================== --- branches/arty-newcc/base/setup/reactos/lang/en-US.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/setup/reactos/lang/en-US.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US IDD_STARTPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 Propchange: branches/arty-newcc/base/setup/reactos/lang/en-US.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/base/setup/welcome/welcome.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/base/setup/welcome/w… ============================================================================== --- branches/arty-newcc/base/setup/welcome/welcome.rc [iso-8859-1] (original) +++ branches/arty-newcc/base/setup/welcome/welcome.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h" Propchange: branches/arty-newcc/base/setup/welcome/welcome.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/cpl/main/main.rc… ============================================================================== --- branches/arty-newcc/dll/cpl/main/main.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/cpl/main/main.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h" Propchange: branches/arty-newcc/dll/cpl/main/main.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/devmgr/dev… ============================================================================== --- branches/arty-newcc/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h" Propchange: branches/arty-newcc/dll/win32/devmgr/devmgr.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/dll/win32/kernel32/client/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/kernel32/c… ============================================================================== --- branches/arty-newcc/dll/win32/kernel32/client/dllmain.c [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/kernel32/client/dllmain.c [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -68,7 +68,10 @@ PRTL_USER_PROCESS_PARAMETERS Parameters = NtCurrentPeb()->ProcessParameters; LPCWSTR ExeName; STARTUPINFO si; - + WCHAR SessionDir[256]; + ULONG SessionId = NtCurrentPeb()->SessionId; + BOOLEAN InServer; + WCHAR lpTest[MAX_PATH]; GetModuleFileNameW(NULL, lpTest, MAX_PATH); DPRINT("BasepInitConsole for : %S\n", lpTest); @@ -136,6 +139,38 @@ /* Now use the proper console handle */ Request.Data.AllocConsoleRequest.Console = Parameters->ConsoleHandle; + + /* Setup the right Object Directory path */ + if (!SessionId) + { + /* Use the raw path */ + wcscpy(SessionDir, WIN_OBJ_DIR); + } + else + { + /* Use the session path */ + swprintf(SessionDir, + L"%ws\\%ld%ws", + SESSION_DIR, + SessionId, + WIN_OBJ_DIR); + } + + /* Connect to the base server */ + DPRINT("Connecting to CSR...\n"); + Status = CsrClientConnectToServer(SessionDir, + 2, + NULL, + NULL, + &InServer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to connect to CSR (Status %lx)\n", Status); + return FALSE; + } + + /* Nothing to do for server-to-server */ + if (InServer) return TRUE; /* * Normally, we should be connecting to the Console CSR Server... @@ -156,6 +191,7 @@ return TRUE; } + /* Nothing to do if not a console app */ if (NotConsole) return TRUE; /* We got the handles, let's set them */ Modified: branches/arty-newcc/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/syssetup/s… ============================================================================== --- branches/arty-newcc/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "resource.h" Propchange: branches/arty-newcc/dll/win32/syssetup/syssetup.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/dll/win32/user32/user32.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/user32/use… ============================================================================== --- branches/arty-newcc/dll/win32/user32/user32.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/user32/user32.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -/* $Id$ */ - #include <windows.h> #include "include/resource.h" Propchange: branches/arty-newcc/dll/win32/user32/user32.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/dll/win32/userenv/us… ============================================================================== --- branches/arty-newcc/dll/win32/userenv/userenv.rc [iso-8859-1] (original) +++ branches/arty-newcc/dll/win32/userenv/userenv.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,6 +1,4 @@ -/* $Id$ - * - * Copyright (C) 2004 Eric Kohl +/* Copyright (C) 2004 Eric Kohl * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by Propchange: branches/arty-newcc/dll/win32/userenv/userenv.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/hal/halx86/mp/mps.S URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/hal/halx86/mp/mps.S?… ============================================================================== --- branches/arty-newcc/hal/halx86/mp/mps.S [iso-8859-1] (original) +++ branches/arty-newcc/hal/halx86/mp/mps.S [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: hal/halx86/mp/mps.S Propchange: branches/arty-newcc/hal/halx86/mp/mps.S ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/include/reactos/version.rc URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/include/reactos/vers… ============================================================================== --- branches/arty-newcc/include/reactos/version.rc [iso-8859-1] (original) +++ branches/arty-newcc/include/reactos/version.rc [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * Inspired by Wine file include/wine_common_ver.rc * Copyright 2001 Dmitry Timoshkov * Propchange: branches/arty-newcc/include/reactos/version.rc ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision Modified: branches/arty-newcc/tools/cabman/makefile.win32 URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/tools/cabman/makefil… ============================================================================== --- branches/arty-newcc/tools/cabman/makefile.win32 [iso-8859-1] (original) +++ branches/arty-newcc/tools/cabman/makefile.win32 [iso-8859-1] Sat Feb 18 23:01:24 2012 @@ -1,5 +1,3 @@ -# $Id$ - PATH_TO_TOP = ../.. TARGET_TYPE = program Propchange: branches/arty-newcc/tools/cabman/makefile.win32 ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords (removed) @@ -1,1 +1,0 @@ -author date id revision

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