Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 26191: - Fix a few simple mistakes / typos. - Enumerating buses almost works.
by fireball＠svn.reactos.org 28 Mar '07

28 Mar '07

Author: fireball Date: Wed Mar 28 13:44:37 2007 New Revision: 26191 URL: http://svn.reactos.org/svn/reactos?rev=26191&view=rev Log: - Fix a few simple mistakes / typos. - Enumerating buses almost works. Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.c Wed Mar 28 13:44:37 2007 @@ -743,6 +743,10 @@ /* Initialize the device base list */ InitializeListHead (&DeviceExtension->DeviceBaseListHead); + + /* Initialize array of LUNs */ + RtlZeroMemory(DeviceExtension->LunExtensionList, + sizeof(PSCSI_PORT_LUN_EXTENSION) * LUS_NUMBER); /* Initialize the spin lock in the controller extension */ KeInitializeSpinLock (&DeviceExtension->IrpLock); @@ -1001,7 +1005,8 @@ IoDeleteDevice (PortDeviceObject); } - DPRINT("ScsiPortInitialize() done!\n"); + DPRINT("ScsiPortInitialize() done, Status = 0x%08X, DeviceFound = %b!\n", + Status, DeviceFound); return (DeviceFound == FALSE) ? Status : STATUS_SUCCESS; } @@ -1784,7 +1789,7 @@ LunExtension = DeviceExtension->LunExtensionList[(TargetId + Lun) % LUS_NUMBER]; /* Iterate it until we find what we need */ - while (!LunExtension) + while (LunExtension) { if (LunExtension->TargetId == TargetId && LunExtension->Lun == Lun && @@ -1903,6 +1908,7 @@ INQUIRYDATABUFFERSIZE); Status = STATUS_SUCCESS; + KeepTrying = FALSE; } else { @@ -1910,14 +1916,21 @@ if (Srb.SrbStatus & SRB_STATUS_QUEUE_FROZEN) { /* Something weird happeend */ + KeepTrying = FALSE; ASSERT(FALSE); } /* Check if data overrun happened */ if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN) { - /* TODO: Implement */ - ASSERT(FALSE); + /* Nothing dramatic, just copy data, but limiting the size */ + RtlCopyMemory(LunInfo->InquiryData, + InquiryBuffer, + (Srb.DataTransferLength > INQUIRYDATABUFFERSIZE) ? + INQUIRYDATABUFFERSIZE : Srb.DataTransferLength); + + Status = STATUS_SUCCESS; + KeepTrying = FALSE; } else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) @@ -1926,6 +1939,7 @@ Mark it as invalid anyway */ Status = STATUS_INVALID_DEVICE_REQUEST; + KeepTrying = FALSE; } else { @@ -1946,7 +1960,7 @@ if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION || SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH) { - Status = STATUS_INVALID_DEVICE_REQUEST; + Status = STATUS_INVALID_DEVICE_REQUEST; } else {

1 0

[greatlrd] 26190: change ObpDosDevicesShortName match the ob.h header prototype
by greatlrd＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: greatlrd Date: Wed Mar 28 01:21:32 2007 New Revision: 26190 URL: http://svn.reactos.org/svn/reactos?rev=26190&view=rev Log: change ObpDosDevicesShortName match the ob.h header prototype Modified: trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Wed Mar 28 01:21:32 2007 @@ -22,7 +22,7 @@ /* DOS Device Prefix \??\ and \?? */ ALIGNEDNAME ObpDosDevicesShortNamePrefix = {{L'\\',L'?',L'?',L'\\'}}; ALIGNEDNAME ObpDosDevicesShortNameRoot = {{L'\\',L'?',L'?',L'\0'}}; -static UNICODE_STRING ObpDosDevicesShortName = +UNICODE_STRING ObpDosDevicesShortName = { sizeof(ObpDosDevicesShortNamePrefix), sizeof(ObpDosDevicesShortNamePrefix),

1 0

[fireball] 26189: - Rewrite bus scanning / inquiry handling (was BSODing). - Change a way LUN extensions are stored inside DeviceExtension.
by fireball＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: fireball Date: Wed Mar 28 01:15:09 2007 New Revision: 26189 URL: http://svn.reactos.org/svn/reactos?rev=26189&view=rev Log: - Rewrite bus scanning / inquiry handling (was BSODing). - Change a way LUN extensions are stored inside DeviceExtension. Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.c Wed Mar 28 01:15:09 2007 @@ -80,13 +80,7 @@ static PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun); - -static VOID -SpiRemoveLunExtension (IN PSCSI_PORT_LUN_EXTENSION LunExtension); +SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -96,14 +90,14 @@ static NTSTATUS SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, - IN OUT PSCSI_REQUEST_BLOCK Srb); + IN PSCSI_LUN_INFO LunInfo); static VOID SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension); -static ULONG +static NTSTATUS SpiGetInquiryData (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - OUT PSCSI_ADAPTER_BUS_INFO AdapterBusInfo); + IN PIRP Irp); static BOOLEAN STDCALL ScsiPortIsr(IN PKINTERRUPT Interrupt, @@ -246,7 +240,7 @@ PSCSI_PORT_DEVICE_BASE DeviceBase; PLIST_ENTRY Entry; - DPRINT("ScsiPortFreeDeviceBase() called\n"); + //DPRINT("ScsiPortFreeDeviceBase() called\n"); DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, SCSI_PORT_DEVICE_EXTENSION, @@ -311,7 +305,7 @@ ULONG AddressSpace; PVOID MappedAddress; - DPRINT ("ScsiPortGetDeviceBase() called\n"); + //DPRINT ("ScsiPortGetDeviceBase() called\n"); AddressSpace = (ULONG)InIoSpace; if (HalTranslateBusAddress(BusType, @@ -359,6 +353,8 @@ IN UCHAR TargetId, IN UCHAR Lun) { + UNIMPLEMENTED; +#if 0 PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; PSCSI_PORT_LUN_EXTENSION LunExtension; PLIST_ENTRY Entry; @@ -386,7 +382,7 @@ Entry = Entry->Flink; } - +#endif return NULL; } @@ -748,9 +744,6 @@ /* Initialize the device base list */ InitializeListHead (&DeviceExtension->DeviceBaseListHead); - /* Initialize LUN-Extension list */ - InitializeListHead (&DeviceExtension->LunExtensionListHead); - /* Initialize the spin lock in the controller extension */ KeInitializeSpinLock (&DeviceExtension->IrpLock); KeInitializeSpinLock (&DeviceExtension->SpinLock); @@ -791,7 +784,7 @@ // PortConfig->DmaSpeed = // PortConfig->AlignmentMask = PortConfig->NumberOfAccessRanges = HwInitializationData->NumberOfAccessRanges; -// PortConfig->NumberOfBuses = + PortConfig->NumberOfBuses = MaxBus; for (i = 0; i < SCSI_MAXIMUM_BUSES; i++) PortConfig->InitiatorBusId[i] = 255; @@ -916,6 +909,26 @@ PortConfig->AdapterScansDown; PortCapabilities->AdapterUsesPio = TRUE; /* FIXME */ + /* Initialize bus scanning information */ + DeviceExtension->BusesConfig = ExAllocatePool(PagedPool, + sizeof(PSCSI_BUS_SCAN_INFO) * DeviceExtension->PortConfig->NumberOfBuses + + sizeof(ULONG)); + + if (!DeviceExtension->BusesConfig) + { + DPRINT1("Out of resources!\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + goto ByeBye; + } + + /* Zero it */ + RtlZeroMemory(DeviceExtension->BusesConfig, + sizeof(PSCSI_BUS_SCAN_INFO) * DeviceExtension->PortConfig->NumberOfBuses + + sizeof(ULONG)); + + /* Store number of buses there */ + DeviceExtension->BusesConfig->NumberOfBuses = DeviceExtension->PortConfig->NumberOfBuses; + /* Scan the adapter for devices */ SpiScanAdapter (DeviceExtension); @@ -1552,10 +1565,7 @@ DPRINT(" IOCTL_SCSI_GET_INQUIRY_DATA\n"); /* Copy inquiry data to the port device extension */ - Irp->IoStatus.Information = - SpiGetInquiryData(DeviceExtension, - Irp->AssociatedIrp.SystemBuffer); - DPRINT("Inquiry data size: %lu\n", Irp->IoStatus.Information); + Irp->IoStatus.Status = SpiGetInquiryData(DeviceExtension, Irp); } break; @@ -1723,64 +1733,41 @@ static PSCSI_PORT_LUN_EXTENSION -SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - IN UCHAR PathId, - IN UCHAR TargetId, - IN UCHAR Lun) -{ - PSCSI_PORT_LUN_EXTENSION LunExtension; - ULONG LunExtensionSize; - - DPRINT("SpiAllocateLunExtension (%p %u %u %u)\n", - DeviceExtension, PathId, TargetId, Lun); - - LunExtensionSize = - sizeof(SCSI_PORT_LUN_EXTENSION) + DeviceExtension->LunExtensionSize; - DPRINT("LunExtensionSize %lu\n", LunExtensionSize); - - LunExtension = ExAllocatePool(NonPagedPool, - LunExtensionSize); - if (LunExtension == NULL) - { - return NULL; - } - - RtlZeroMemory(LunExtension, - LunExtensionSize); - - InsertTailList(&DeviceExtension->LunExtensionListHead, - &LunExtension->List); - - LunExtension->PathId = PathId; - LunExtension->TargetId = TargetId; - LunExtension->Lun = Lun; - - KeInitializeDeviceQueue (&LunExtension->DeviceQueue); - - return LunExtension; -} - - -static VOID -SpiRemoveLunExtension (IN PSCSI_PORT_LUN_EXTENSION LunExtension) -{ - DPRINT("SpiRemoveLunExtension(%p) called\n", - LunExtension); - - if (LunExtension == NULL) - return; - - RemoveEntryList (&LunExtension->List); - - - /* Release LUN extersion data */ - - - ExFreePool (LunExtension); - - return; -} - +SpiAllocateLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) +{ + PSCSI_PORT_LUN_EXTENSION LunExtension; + ULONG LunExtensionSize; + + DPRINT("SpiAllocateLunExtension (%p)\n", + DeviceExtension); + + /* Round LunExtensionSize first to the sizeof LONGLONG */ + LunExtensionSize = (DeviceExtension->LunExtensionSize + + sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); + + LunExtensionSize += sizeof(SCSI_PORT_LUN_EXTENSION); + DPRINT("LunExtensionSize %lu\n", LunExtensionSize); + + LunExtension = ExAllocatePool(NonPagedPool, LunExtensionSize); + if (LunExtension == NULL) + { + DPRINT1("Out of resources!\n"); + return NULL; + } + + /* Zero everything */ + RtlZeroMemory(LunExtension, LunExtensionSize); + + /* Initialize a list of requests */ + InitializeListHead(&LunExtension->SrbInfo.Requests); + + /* TODO: Initialize other fields */ + + /* Initialize request queue */ + KeInitializeDeviceQueue (&LunExtension->DeviceQueue); + + return LunExtension; +} static PSCSI_PORT_LUN_EXTENSION SpiGetLunExtension (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, @@ -1788,248 +1775,519 @@ IN UCHAR TargetId, IN UCHAR Lun) { - PSCSI_PORT_LUN_EXTENSION LunExtension; - PLIST_ENTRY Entry; - - DPRINT("SpiGetLunExtension(%p %u %u %u) called\n", - DeviceExtension, PathId, TargetId, Lun); - - if (IsListEmpty(&DeviceExtension->LunExtensionListHead)) + PSCSI_PORT_LUN_EXTENSION LunExtension; + + DPRINT("SpiGetLunExtension(%p %u %u %u) called\n", + DeviceExtension, PathId, TargetId, Lun); + + /* Get appropriate list */ + LunExtension = DeviceExtension->LunExtensionList[(TargetId + Lun) % LUS_NUMBER]; + + /* Iterate it until we find what we need */ + while (!LunExtension) + { + if (LunExtension->TargetId == TargetId && + LunExtension->Lun == Lun && + LunExtension->PathId == PathId) + { + /* All matches, return */ + return LunExtension; + } + + /* Advance to the next item */ + LunExtension = LunExtension->Next; + } + + /* We did not find anything */ + DPRINT("Nothing found\n"); return NULL; - - Entry = DeviceExtension->LunExtensionListHead.Flink; - while (Entry != &DeviceExtension->LunExtensionListHead) - { - LunExtension = CONTAINING_RECORD(Entry, - SCSI_PORT_LUN_EXTENSION, - List); - if (LunExtension->PathId == PathId && - LunExtension->TargetId == TargetId && - LunExtension->Lun == Lun) - { - return LunExtension; - } - - Entry = Entry->Flink; - } - - return NULL; } static NTSTATUS SpiSendInquiry (IN PDEVICE_OBJECT DeviceObject, - IN OUT PSCSI_REQUEST_BLOCK Srb) -{ - IO_STATUS_BLOCK IoStatusBlock; - PIO_STACK_LOCATION IrpStack; - PKEVENT Event; - PIRP Irp; - NTSTATUS Status; - - DPRINT ("SpiSendInquiry() called\n"); - - Event = ExAllocatePool (NonPagedPool, - sizeof(KEVENT)); - if (Event == NULL) - return STATUS_INSUFFICIENT_RESOURCES; - - KeInitializeEvent (Event, - NotificationEvent, - FALSE); - - Irp = IoBuildDeviceIoControlRequest (IOCTL_SCSI_EXECUTE_OUT, - DeviceObject, - NULL, - 0, - Srb->DataBuffer, - Srb->DataTransferLength, - TRUE, - Event, - &IoStatusBlock); - if (Irp == NULL) - { - DPRINT("IoBuildDeviceIoControlRequest() failed\n"); - ExFreePool (Event); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Attach Srb to the Irp */ - IrpStack = IoGetNextIrpStackLocation (Irp); - IrpStack->Parameters.Scsi.Srb = Srb; - Srb->OriginalRequest = Irp; - - /* Call the driver */ - Status = IoCallDriver (DeviceObject, - Irp); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject (Event, - Suspended, - KernelMode, - FALSE, - NULL); - Status = IoStatusBlock.Status; - } - - ExFreePool (Event); - - return Status; -} - - + IN PSCSI_LUN_INFO LunInfo) +{ + IO_STATUS_BLOCK IoStatusBlock; + PIO_STACK_LOCATION IrpStack; + KEVENT Event; + PIRP Irp; + NTSTATUS Status; + PINQUIRYDATA InquiryBuffer; + PSENSE_DATA SenseBuffer; + BOOLEAN KeepTrying = TRUE; + ULONG RetryCount = 0; + SCSI_REQUEST_BLOCK Srb; + PCDB Cdb; + + DPRINT ("SpiSendInquiry() called\n"); + + InquiryBuffer = ExAllocatePool (NonPagedPool, INQUIRYDATABUFFERSIZE); + if (InquiryBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + SenseBuffer = ExAllocatePool (NonPagedPool, SENSE_BUFFER_SIZE); + if (SenseBuffer == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + while (KeepTrying) + { + /* Initialize event for waiting */ + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + /* Create an IRP */ + Irp = IoBuildDeviceIoControlRequest(IOCTL_SCSI_EXECUTE_IN, + DeviceObject, + NULL, + 0, + InquiryBuffer, + INQUIRYDATABUFFERSIZE, + TRUE, + &Event, + &IoStatusBlock); + if (Irp == NULL) + { + DPRINT("IoBuildDeviceIoControlRequest() failed\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Prepare SRB */ + RtlZeroMemory(&Srb, sizeof(SCSI_REQUEST_BLOCK)); + + Srb.Length = sizeof(SCSI_REQUEST_BLOCK); + Srb.OriginalRequest = Irp; + Srb.PathId = LunInfo->PathId; + Srb.TargetId = LunInfo->TargetId; + Srb.Lun = LunInfo->Lun; + Srb.Function = SRB_FUNCTION_EXECUTE_SCSI; + Srb.SrbFlags = SRB_FLAGS_DATA_IN | SRB_FLAGS_DISABLE_SYNCH_TRANSFER; + Srb.TimeOutValue = 4; + Srb.CdbLength = 6; + + Srb.SenseInfoBuffer = SenseBuffer; + Srb.SenseInfoBufferLength = SENSE_BUFFER_SIZE; + + Srb.DataBuffer = InquiryBuffer; + Srb.DataTransferLength = INQUIRYDATABUFFERSIZE; + + /* Attach Srb to the Irp */ + IrpStack = IoGetNextIrpStackLocation (Irp); + IrpStack->Parameters.Scsi.Srb = &Srb; + + /* Fill in CDB */ + Cdb = (PCDB)Srb.Cdb; + Cdb->CDB6INQUIRY.LogicalUnitNumber = LunInfo->Lun; + Cdb->CDB6INQUIRY.AllocationLength = INQUIRYDATABUFFERSIZE; + + /* Call the driver */ + Status = IoCallDriver(DeviceObject, Irp); + + /* Wait for it to complete */ + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Executive, + KernelMode, + FALSE, + NULL); + Status = IoStatusBlock.Status; + } + + if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_SUCCESS) + { + /* All fine, copy data over */ + RtlCopyMemory(LunInfo->InquiryData, + InquiryBuffer, + INQUIRYDATABUFFERSIZE); + + Status = STATUS_SUCCESS; + } + else + { + /* Check if queue is frozen */ + if (Srb.SrbStatus & SRB_STATUS_QUEUE_FROZEN) + { + /* Something weird happeend */ + ASSERT(FALSE); + } + + /* Check if data overrun happened */ + if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_DATA_OVERRUN) + { + /* TODO: Implement */ + ASSERT(FALSE); + } + else if ((Srb.SrbStatus & SRB_STATUS_AUTOSENSE_VALID) && + SenseBuffer->SenseKey == SCSI_SENSE_ILLEGAL_REQUEST) + { + /* LUN is not valid, but some device responds there. + Mark it as invalid anyway */ + + Status = STATUS_INVALID_DEVICE_REQUEST; + } + else + { + /* Retry a couple of times if no timeout happened */ + if ((RetryCount < 2) && + (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_NO_DEVICE) && + (SRB_STATUS(Srb.SrbStatus) != SRB_STATUS_SELECTION_TIMEOUT)) + { + RetryCount++; + KeepTrying = TRUE; + } + else + { + /* That's all, go to exit */ + KeepTrying = FALSE; + + /* Set status according to SRB status */ + if (SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_FUNCTION || + SRB_STATUS(Srb.SrbStatus) == SRB_STATUS_BAD_SRB_BLOCK_LENGTH) + { + Status = STATUS_INVALID_DEVICE_REQUEST; + } + else + { + Status = STATUS_IO_DEVICE_ERROR; + } + } + } + } + } + + /* Free buffers */ + ExFreePool(InquiryBuffer); + ExFreePool(SenseBuffer); + + return Status; +} + + +/* Scans all SCSI buses */ static VOID -SpiScanAdapter (IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) -{ - PSCSI_PORT_LUN_EXTENSION LunExtension; - SCSI_REQUEST_BLOCK Srb; - PCDB Cdb; - ULONG Bus; - ULONG Target; - ULONG Lun; - NTSTATUS Status; - - DPRINT ("SpiScanAdapter() called\n"); - - RtlZeroMemory(&Srb, - sizeof(SCSI_REQUEST_BLOCK)); - Srb.SrbFlags = SRB_FLAGS_DATA_IN; - Srb.DataBuffer = ExAllocatePool(NonPagedPool, 256); - Srb.Function = SRB_FUNCTION_EXECUTE_SCSI; - Srb.DataTransferLength = 255; //256; - Srb.CdbLength = 6; - - Cdb = (PCDB) &Srb.Cdb; - - Cdb->CDB6INQUIRY.OperationCode = SCSIOP_INQUIRY; - Cdb->CDB6INQUIRY.AllocationLength = 255; - - for (Bus = 0; Bus < DeviceExtension->PortConfig->NumberOfBuses; Bus++) - { - Srb.PathId = Bus; - - for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) - { - Srb.TargetId = Target; - - for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) - { - Srb.Lun = Lun; - Srb.SrbStatus = SRB_STATUS_SUCCESS; - - Cdb->CDB6INQUIRY.LogicalUnitNumber = Lun; - - LunExtension = SpiAllocateLunExtension (DeviceExtension, - Bus, - Target, - Lun); - if (LunExtension == NULL) - { - DPRINT("Failed to allocate the LUN extension!\n"); - ExFreePool(Srb.DataBuffer); - return; - } - - Status = SpiSendInquiry (DeviceExtension->DeviceObject, - &Srb); - DPRINT ("Status %lx Srb.SrbStatus %x\n", Status, Srb.SrbStatus); - - if (NT_SUCCESS(Status) && - (Srb.SrbStatus == SRB_STATUS_SUCCESS || - Srb.SrbStatus == SRB_STATUS_DATA_OVERRUN) && - ((PINQUIRYDATA)Srb.DataBuffer)->DeviceTypeQualifier == 0) - { - /* Copy inquiry data */ - RtlCopyMemory (&LunExtension->InquiryData, - Srb.DataBuffer, - sizeof(INQUIRYDATA)); - } - else - { - SpiRemoveLunExtension (LunExtension); - } - } - } - } - - ExFreePool(Srb.DataBuffer); - - DPRINT ("SpiScanAdapter() done\n"); -} - - -static ULONG +SpiScanAdapter(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension) +{ + PSCSI_PORT_LUN_EXTENSION LunExtension; + ULONG Bus; + ULONG Target; + ULONG Lun; + PSCSI_BUS_SCAN_INFO BusScanInfo; + PSCSI_LUN_INFO LastLunInfo, LunInfo, LunInfoExists; + BOOLEAN DeviceExists; + ULONG Hint; + NTSTATUS Status; + ULONG DevicesFound; + + DPRINT ("SpiScanAdapter() called\n"); + + /* Scan all buses */ + for (Bus = 0; Bus < DeviceExtension->PortConfig->NumberOfBuses; Bus++) + { + DevicesFound = 0; + + /* Get pointer to the scan information */ + BusScanInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]; + + if (BusScanInfo) + { + /* Find the last LUN info in the list */ + LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; + LastLunInfo = LunInfo; + + while (LunInfo != NULL) + { + LastLunInfo = LunInfo; + LunInfo = LunInfo->Next; + } + } + else + { + /* We need to allocate this buffer */ + BusScanInfo = ExAllocatePool(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO)); + + if (!BusScanInfo) + { + DPRINT1("Out of resources!\n"); + return; + } + + /* Fill this struct (length and bus ids for now) */ + BusScanInfo->Length = sizeof(SCSI_BUS_SCAN_INFO); + BusScanInfo->LogicalUnitsCount = 0; + BusScanInfo->BusIdentifier = DeviceExtension->PortConfig->InitiatorBusId[Bus]; + BusScanInfo->LunInfo = NULL; + + /* Set pointer to the last LUN info to NULL */ + LastLunInfo = NULL; + } + + /* Create LUN information structure */ + LunInfo = ExAllocatePool(PagedPool, sizeof(SCSI_LUN_INFO)); + + if (LunInfo == NULL) + { + DPRINT1("Out of resources!\n"); + return; + } + + RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); + + /* Create LunExtension */ + LunExtension = SpiAllocateLunExtension (DeviceExtension); + + /* And send INQUIRY to every target */ + for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) + { + /* TODO: Support scan bottom-up */ + + /* Skip if it's the same address */ + if (Target == BusScanInfo->BusIdentifier) + continue; + + /* Try to find an existing device here */ + DeviceExists = FALSE; + LunInfoExists = BusScanInfo->LunInfo; + + /* Find matching address on this bus */ + while (LunInfoExists) + { + if (LunInfoExists->TargetId == Target) + { + DeviceExists = TRUE; + break; + } + + /* Advance to the next one */ + LunInfoExists = LunInfoExists->Next; + } + + /* No need to bother rescanning, since we already did that before */ + if (DeviceExists) + continue; + + /* Scan all logical units */ + for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) + { + if (!LunExtension) + break; + + /* Add extension to the list */ + Hint = (Target + Lun) % LUS_NUMBER; + LunExtension->Next = DeviceExtension->LunExtensionList[Hint]; + DeviceExtension->LunExtensionList[Hint] = LunExtension; + + /* Fill Path, Target, Lun fields */ + LunExtension->PathId = LunInfo->PathId = Bus; + LunExtension->TargetId = LunInfo->TargetId = Target; + LunExtension->Lun = LunInfo->Lun = Lun; + + /* Set flag to prevent race conditions */ + LunExtension->Flags |= SCSI_PORT_SCAN_IN_PROGRESS; + + /* Zero LU extension contents */ + if (DeviceExtension->LunExtensionSize) + { + RtlZeroMemory(LunExtension + 1, + DeviceExtension->LunExtensionSize); + } + + /* Finally send the inquiry command */ + Status = SpiSendInquiry(DeviceExtension->DeviceObject, LunInfo); + + if (NT_SUCCESS(Status)) + { + /* Let's see if we really found a device */ + PINQUIRYDATA InquiryData = (PINQUIRYDATA)LunInfo->InquiryData; + + /* Check if this device is unsupported */ + if (InquiryData->DeviceTypeQualifier == DEVICE_QUALIFIER_NOT_SUPPORTED) + { + DeviceExtension->LunExtensionList[Hint] = + DeviceExtension->LunExtensionList[Hint]->Next; + + continue; + } + + /* Clear the "in scan" flag */ + LunExtension->Flags &= ~SCSI_PORT_SCAN_IN_PROGRESS; + + DPRINT("SpiScanAdapter(): Found device of type %d at bus %d tid %d lun %d\n", + InquiryData->DeviceType, Bus, Target, Lun); + + /* Add this info to the linked list */ + LunInfo->Next = NULL; + if (LastLunInfo) + LastLunInfo->Next = LunInfo; + else + BusScanInfo->LunInfo = LunInfo; + + /* Store the last LUN info */ + LastLunInfo = LunInfo; + + /* Store DeviceObject */ + LunInfo->DeviceObject = DeviceExtension->DeviceObject; + + /* Allocate another buffer */ + LunInfo = ExAllocatePool(PagedPool, sizeof(SCSI_LUN_INFO)); + + if (!LunInfo) + { + DPRINT1("Out of resources!\n"); + break; + } + + RtlZeroMemory(LunInfo, sizeof(SCSI_LUN_INFO)); + + /* Create a new LU extension */ + LunExtension = SpiAllocateLunExtension(DeviceExtension); + + DevicesFound++; + } + else + { + /* Remove this LUN from the list */ + DeviceExtension->LunExtensionList[Hint] = + DeviceExtension->LunExtensionList[Hint]->Next; + + /* Decide whether we are continuing or not */ + if (Status == STATUS_INVALID_DEVICE_REQUEST) + continue; + else + break; + } + } + } + + /* Free allocated buffers */ + if (LunExtension) + ExFreePool(LunExtension); + + if (LunInfo) + ExFreePool(LunInfo); + + /* Sum what we found */ + BusScanInfo->LogicalUnitsCount += DevicesFound; + } + + DPRINT ("SpiScanAdapter() done\n"); +} + + +static NTSTATUS SpiGetInquiryData(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, - OUT PSCSI_ADAPTER_BUS_INFO AdapterBusInfo) -{ - PSCSI_PORT_LUN_EXTENSION LunExtension; - PSCSI_INQUIRY_DATA UnitInfo, PrevUnit; - ULONG Bus; - ULONG Target; - ULONG Lun; - ULONG UnitCount; - - DPRINT("SpiGetInquiryData() called\n"); - - /* Copy inquiry data to the port device extension */ - AdapterBusInfo->NumberOfBuses = DeviceExtension->PortConfig->NumberOfBuses; - - UnitInfo = (PSCSI_INQUIRY_DATA) - ((PUCHAR)AdapterBusInfo + sizeof(SCSI_ADAPTER_BUS_INFO) + - (sizeof(SCSI_BUS_DATA) * (AdapterBusInfo->NumberOfBuses - 1))); - - for (Bus = 0; Bus < AdapterBusInfo->NumberOfBuses; Bus++) - { - AdapterBusInfo->BusData[Bus].InitiatorBusId = - DeviceExtension->PortConfig->InitiatorBusId[Bus]; - AdapterBusInfo->BusData[Bus].InquiryDataOffset = - (ULONG)((PUCHAR)UnitInfo - (PUCHAR)AdapterBusInfo); - - PrevUnit = NULL; - UnitCount = 0; - - for (Target = 0; Target < DeviceExtension->PortConfig->MaximumNumberOfTargets; Target++) - { - for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) - { - LunExtension = SpiGetLunExtension(DeviceExtension, - Bus, - Target, - Lun); - if (LunExtension != NULL) - { - DPRINT("(Bus %lu Target %lu Lun %lu)\n", - Bus, Target, Lun); - - UnitInfo->PathId = Bus; - UnitInfo->TargetId = Target; - UnitInfo->Lun = Lun; - UnitInfo->InquiryDataLength = INQUIRYDATABUFFERSIZE; - RtlCopyMemory (&UnitInfo->InquiryData, - &LunExtension->InquiryData, - INQUIRYDATABUFFERSIZE); - if (PrevUnit != NULL) - { - PrevUnit->NextInquiryDataOffset = - (ULONG)((ULONG_PTR)UnitInfo-(ULONG_PTR)AdapterBusInfo); - } - PrevUnit = UnitInfo; - UnitInfo = (PSCSI_INQUIRY_DATA)((PUCHAR)UnitInfo + sizeof(SCSI_INQUIRY_DATA)+INQUIRYDATABUFFERSIZE-1); - UnitCount++; - } - } - } - DPRINT("UnitCount: %lu\n", UnitCount); - AdapterBusInfo->BusData[Bus].NumberOfLogicalUnits = UnitCount; - if (UnitCount == 0) - { - AdapterBusInfo->BusData[Bus].InquiryDataOffset = 0; - } - } - - DPRINT("Data size: %lu\n", (ULONG)UnitInfo - (ULONG)AdapterBusInfo); - - return (ULONG)((PUCHAR)UnitInfo-(PUCHAR)AdapterBusInfo); + PIRP Irp) +{ + ULONG InquiryDataSize; + PSCSI_LUN_INFO LunInfo; + ULONG BusCount, LunCount, Length; + PIO_STACK_LOCATION IrpStack; + PSCSI_ADAPTER_BUS_INFO AdapterBusInfo; + PSCSI_INQUIRY_DATA InquiryData; + PSCSI_BUS_DATA BusData; + ULONG Bus; + PUCHAR Buffer; + + DPRINT("SpiGetInquiryData() called\n"); + + /* Get pointer to the buffer */ + IrpStack = IoGetCurrentIrpStackLocation(Irp); + Buffer = Irp->AssociatedIrp.SystemBuffer; + + /* Initialize bus and LUN counters */ + BusCount = DeviceExtension->BusesConfig->NumberOfBuses; + LunCount = 0; + + /* Calculate total number of LUNs */ + for (Bus = 0; Bus < BusCount; Bus++) + LunCount += DeviceExtension->BusesConfig->BusScanInfo[Bus]->LogicalUnitsCount; + + /* Calculate size of inquiry data, rounding up to sizeof(ULONG) */ + InquiryDataSize = + ((sizeof(SCSI_INQUIRY_DATA) - 1 + INQUIRYDATABUFFERSIZE + + sizeof(ULONG) - 1) & ~(sizeof(ULONG) - 1)); + + /* Calculate data size */ + Length = sizeof(SCSI_ADAPTER_BUS_INFO) + (BusCount - 1) * + sizeof(SCSI_BUS_DATA); + + Length += InquiryDataSize * LunCount; + + /* Check, if all data is going to fit into provided buffer */ + if (IrpStack->Parameters.DeviceIoControl.OutputBufferLength < Length) + { + Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + return STATUS_BUFFER_TOO_SMALL; + } + + /* Store data size in the IRP */ + Irp->IoStatus.Information = Length; + + DPRINT("Data size: %lu\n", Length); + + AdapterBusInfo = (PSCSI_ADAPTER_BUS_INFO)Buffer; + + AdapterBusInfo->NumberOfBuses = (UCHAR)BusCount; + + /* Point InquiryData to the corresponding place inside Buffer */ + InquiryData = (PSCSI_INQUIRY_DATA)(Buffer + sizeof(SCSI_ADAPTER_BUS_INFO) + + (BusCount - 1) * sizeof(SCSI_BUS_DATA)); + + /* Loop each bus */ + for (Bus = 0; Bus < BusCount; Bus++) + { + BusData = &AdapterBusInfo->BusData[Bus]; + + /* Calculate and save an offset of the inquiry data */ + BusData->InquiryDataOffset = (PUCHAR)InquiryData - Buffer; + + /* Get a pointer to the LUN information structure */ + LunInfo = DeviceExtension->BusesConfig->BusScanInfo[Bus]->LunInfo; + + /* Store Initiator Bus Id */ + BusData->InitiatorBusId = + DeviceExtension->BusesConfig->BusScanInfo[Bus]->BusIdentifier; + + /* Store LUN count */ + BusData->NumberOfLogicalUnits = + DeviceExtension->BusesConfig->BusScanInfo[Bus]->LogicalUnitsCount; + + /* Loop all LUNs */ + while (LunInfo != NULL) + { + DPRINT("(Bus %lu Target %lu Lun %lu)\n", + Bus, LunInfo->TargetId, LunInfo->Lun); + + /* Fill InquiryData with values */ + InquiryData->PathId = LunInfo->PathId; + InquiryData->TargetId = LunInfo->TargetId; + InquiryData->Lun = LunInfo->Lun; + InquiryData->InquiryDataLength = INQUIRYDATABUFFERSIZE; + InquiryData->DeviceClaimed = LunInfo->DeviceClaimed; + InquiryData->NextInquiryDataOffset = + (PUCHAR)InquiryData + InquiryDataSize - Buffer; + + /* Copy data in it */ + RtlCopyMemory(InquiryData->InquiryData, + LunInfo->InquiryData, + INQUIRYDATABUFFERSIZE); + + /* Move to the next LUN */ + LunInfo = LunInfo->Next; + InquiryData = (PSCSI_INQUIRY_DATA) ((PCHAR)InquiryData + InquiryDataSize); + } + + /* Either mark the end, or set offset to 0 */ + if (BusData->NumberOfLogicalUnits != 0) + ((PSCSI_INQUIRY_DATA) ((PCHAR) InquiryData - InquiryDataSize))->NextInquiryDataOffset = 0; + else + BusData->InquiryDataOffset = 0; + } + + /* Finish with success */ + Irp->IoStatus.Status = STATUS_SUCCESS; + return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h Wed Mar 28 01:15:09 2007 @@ -15,6 +15,12 @@ #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + +/* Defines how many logical unit arrays will be in a device extension */ +#define LUS_NUMBER 8 + +/* Flags */ +#define SCSI_PORT_SCAN_IN_PROGRESS 0x8000 typedef enum _SCSI_PORT_TIMER_STATES { @@ -35,14 +41,20 @@ ULONG SystemIoBusNumber; } SCSI_PORT_DEVICE_BASE, *PSCSI_PORT_DEVICE_BASE; +typedef struct _SCSI_REQUEST_BLOCK_INFO +{ + LIST_ENTRY Requests; +} SCSI_REQUEST_BLOCK_INFO, *PSCSI_REQUEST_BLOCK_INFO; typedef struct _SCSI_PORT_LUN_EXTENSION { - LIST_ENTRY List; - UCHAR PathId; UCHAR TargetId; UCHAR Lun; + + ULONG Flags; + + struct _SCSI_PORT_LUN_EXTENSION *Next; BOOLEAN DeviceClaimed; PDEVICE_OBJECT DeviceObject; @@ -51,11 +63,39 @@ KDEVICE_QUEUE DeviceQueue; + SCSI_REQUEST_BLOCK_INFO SrbInfo; + /* More data? */ UCHAR MiniportLunExtension[1]; /* must be the last entry */ } SCSI_PORT_LUN_EXTENSION, *PSCSI_PORT_LUN_EXTENSION; +/* Structures for inquiries support */ + +typedef struct _SCSI_LUN_INFO +{ + UCHAR PathId; + UCHAR TargetId; + UCHAR Lun; + BOOLEAN DeviceClaimed; + PVOID DeviceObject; + struct _SCSI_LUN_INFO *Next; + UCHAR InquiryData[INQUIRYDATABUFFERSIZE]; +} SCSI_LUN_INFO, *PSCSI_LUN_INFO; + +typedef struct _SCSI_BUS_SCAN_INFO +{ + USHORT Length; + UCHAR LogicalUnitsCount; + UCHAR BusIdentifier; + PSCSI_LUN_INFO LunInfo; +} SCSI_BUS_SCAN_INFO, *PSCSI_BUS_SCAN_INFO; + +typedef struct _BUSES_CONFIGURATION_INFORMATION +{ + UCHAR NumberOfBuses; + PSCSI_BUS_SCAN_INFO BusScanInfo[1]; +} BUSES_CONFIGURATION_INFORMATION, *PBUSES_CONFIGURATION_INFORMATION; /* * SCSI_PORT_DEVICE_EXTENSION @@ -70,6 +110,7 @@ ULONG Length; ULONG MiniPortExtensionSize; PPORT_CONFIGURATION_INFORMATION PortConfig; + PBUSES_CONFIGURATION_INFORMATION BusesConfig; ULONG PortNumber; KSPIN_LOCK IrpLock; @@ -84,7 +125,7 @@ LIST_ENTRY DeviceBaseListHead; ULONG LunExtensionSize; - LIST_ENTRY LunExtensionListHead; + PSCSI_PORT_LUN_EXTENSION LunExtensionList[LUS_NUMBER]; ULONG SrbExtensionSize;

1 0

[fireball] 26188: - Fix HalGetInterruptVector()'s usage of level vs. vector. At least Windows seems to use Level parameter. - No need in special hacks (e.g. in scsiport), as a result.
by fireball＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: fireball Date: Tue Mar 27 16:55:57 2007 New Revision: 26188 URL: http://svn.reactos.org/svn/reactos?rev=26188&view=rev Log: - Fix HalGetInterruptVector()'s usage of level vs. vector. At least Windows seems to use Level parameter. - No need in special hacks (e.g. in scsiport), as a result. Modified: trunk/reactos/hal/halx86/generic/bus.c Modified: trunk/reactos/hal/halx86/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus.c (original) +++ trunk/reactos/hal/halx86/generic/bus.c Tue Mar 27 16:55:57 2007 @@ -87,7 +87,7 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity) { - ULONG Vector = IRQ2VECTOR(BusInterruptVector); + ULONG Vector = IRQ2VECTOR(BusInterruptLevel); *Irql = (KIRQL)VECTOR2IRQL(Vector); *Affinity = 0xFFFFFFFF; return Vector;

1 0

[fireball] 26187: Change code, fix warnings, so it finally builds.
by fireball＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: fireball Date: Tue Mar 27 15:07:12 2007 New Revision: 26187 URL: http://svn.reactos.org/svn/reactos?rev=26187&view=rev Log: Change code, fix warnings, so it finally builds. Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.c Tue Mar 27 15:07:12 2007 @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: scsiport.c,v 1.52 2004/04/02 15:43:01 hbirr Exp $ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -27,19 +27,20 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/srb.h> -#include <ddk/scsi.h> -#include <ddk/ntddscsi.h> -#include <rosrtl/string.h> - -#define NDEBUG +#include <ntddk.h> +#include <srb.h> +#include <scsi.h> +#include <ntddscsi.h> +#include <ntddstor.h> +#include <ntdddisk.h> +#include <stdio.h> +#include <stdarg.h> + +//#define NDEBUG #include <debug.h> - -#define VERSION "0.0.1" - #include "scsiport_int.h" + /* #define USE_DEVICE_QUEUES */ @@ -222,18 +223,6 @@ DPRINT("ScsiPortCompleteRequest()\n"); UNIMPLEMENTED; } - - -/* - * @implemented - */ -ULONG STDCALL -ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address) -{ - DPRINT("ScsiPortConvertPhysicalAddressToUlong()\n"); - return(Address.u.LowPart); -} - /* * @unimplemented @@ -448,7 +437,7 @@ } else { - EndAddress = Srb->DataBuffer + Srb->DataTransferLength; + EndAddress = (PVOID)((ULONG_PTR)Srb->DataBuffer + Srb->DataTransferLength); if (VirtualAddress == NULL) { VirtualAddress = Srb->DataBuffer; @@ -475,18 +464,18 @@ PhysicalAddress.u.LowPart = (PhysicalAddress.u.LowPart & ~(PAGE_SIZE - 1)) + Offset; #endif BufferLength += PAGE_SIZE - Offset; - while (VirtualAddress + BufferLength < EndAddress) - { - NextPhysicalAddress = MmGetPhysicalAddress(VirtualAddress + BufferLength); + while ((ULONG_PTR)VirtualAddress + BufferLength < (ULONG_PTR)EndAddress) + { + NextPhysicalAddress = MmGetPhysicalAddress((PVOID)((ULONG_PTR)VirtualAddress + BufferLength)); if (PhysicalAddress.QuadPart + (ULONGLONG)BufferLength != NextPhysicalAddress.QuadPart) { break; } BufferLength += PAGE_SIZE; } - if (VirtualAddress + BufferLength >= EndAddress) - { - BufferLength = EndAddress - VirtualAddress; + if ((ULONG_PTR)VirtualAddress + BufferLength >= (ULONG_PTR)EndAddress) + { + BufferLength = (ULONG_PTR)EndAddress - (ULONG_PTR)VirtualAddress; } } @@ -817,7 +806,7 @@ // PortConfig->DemandMode = PortConfig->MapBuffers = HwInitializationData->MapBuffers; PortConfig->NeedPhysicalAddresses = HwInitializationData->NeedPhysicalAddresses; - PortConfig->TaggedQueuing = HwInitializationData->TaggedQueueing; + PortConfig->TaggedQueuing = HwInitializationData->TaggedQueuing; PortConfig->AutoRequestSense = HwInitializationData->AutoRequestSense; PortConfig->MultipleRequestPerLu = HwInitializationData->MultipleRequestPerLu; PortConfig->ReceiveEvent = HwInitializationData->ReceiveEvent; @@ -828,7 +817,7 @@ PortConfig->SlotNumber = SlotNumber.u.AsULONG; - PortConfig->AccessRanges = (PACCESS_RANGE)(PortConfig + 1); + PortConfig->AccessRanges = (ACCESS_RANGE(*)[])(PortConfig + 1); /* Search for matching PCI device */ if ((HwInitializationData->AdapterInterfaceType == PCIBus) && @@ -1011,7 +1000,7 @@ VOID STDCALL ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, - IN ULONG LogicalAddress, + IN PVOID LogicalAddress, IN ULONG Length) { DPRINT1("ScsiPortIoMapTransfer()\n"); @@ -1254,9 +1243,9 @@ for (i = 0; i < PortConfig->NumberOfAccessRanges; i++) { - PortConfig->AccessRanges[i].RangeStart.QuadPart = + (*PortConfig->AccessRanges)[i].RangeStart.QuadPart = PciConfig.u.type0.BaseAddresses[i] & PCI_ADDRESS_IO_ADDRESS_MASK; - if (PortConfig->AccessRanges[i].RangeStart.QuadPart != 0) + if ((*PortConfig->AccessRanges)[i].RangeStart.QuadPart != 0) { RangeLength = (ULONG)-1; HalSetBusDataByOffset (PCIConfiguration, @@ -1281,9 +1270,9 @@ sizeof(ULONG)); if (RangeLength != 0) { - PortConfig->AccessRanges[i].RangeLength = + (*PortConfig->AccessRanges)[i].RangeLength = -(RangeLength & PCI_ADDRESS_IO_ADDRESS_MASK); - PortConfig->AccessRanges[i].RangeInMemory = + (*PortConfig->AccessRanges)[i].RangeInMemory = !(PciConfig.u.type0.BaseAddresses[i] & PCI_ADDRESS_IO_SPACE); DPRINT("RangeStart 0x%lX RangeLength 0x%lX RangeInMemory %s\n", @@ -2300,8 +2289,8 @@ } /* Open or create the 'Scsi' subkey */ - RtlRosInitUnicodeStringFromLiteral(&KeyName, - L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); + RtlInitUnicodeString(&KeyName, + L"\\Registry\\Machine\\Hardware\\DeviceMap\\Scsi"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_OPENIF, @@ -2406,7 +2395,7 @@ } /* Set 'IOAddress' (REG_DWORD) value (NT4 only) */ - UlongData = ScsiPortConvertPhysicalAddressToUlong(DeviceExtension->PortConfig->AccessRanges[0].RangeStart); + UlongData = ScsiPortConvertPhysicalAddressToUlong((*DeviceExtension->PortConfig->AccessRanges)[0].RangeStart); DPRINT(" IOAddress = %lx\n", UlongData); RtlInitUnicodeString(&ValueName, L"IOAddress"); @@ -2666,4 +2655,17 @@ return Status; } + +#undef ScsiPortConvertPhysicalAddressToUlong +/* + * @implemented + */ +ULONG STDCALL +ScsiPortConvertPhysicalAddressToUlong(IN SCSI_PHYSICAL_ADDRESS Address) +{ + DPRINT("ScsiPortConvertPhysicalAddressToUlong()\n"); + return(Address.u.LowPart); +} + + /* EOF */ Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport_int.h Tue Mar 27 15:07:12 2007 @@ -4,6 +4,18 @@ * DESCRIPTION * An enumeration containing the states in the timer DFA */ + +#define VERSION "0.0.3" + +#ifndef PAGE_ROUND_UP +#define PAGE_ROUND_UP(x) ( (((ULONG_PTR)x)%PAGE_SIZE) ? ((((ULONG_PTR)x)&(~(PAGE_SIZE-1)))+PAGE_SIZE) : ((ULONG_PTR)x) ) +#endif +#ifndef ROUND_UP +#define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) +#endif + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) + typedef enum _SCSI_PORT_TIMER_STATES { IDETimerIdle,

1 0

[fireball] 26186: - Remove old crap files - Put new .def, add .rbuild
by fireball＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: fireball Date: Tue Mar 27 14:12:59 2007 New Revision: 26186 URL: http://svn.reactos.org/svn/reactos?rev=26186&view=rev Log: - Remove old crap files - Put new .def, add .rbuild Added: trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild Removed: trunk/reactos/drivers/storage/scsiport-new/.cvsignore trunk/reactos/drivers/storage/scsiport-new/makefile trunk/reactos/drivers/storage/scsiport-new/scsiport.edf Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.def trunk/reactos/drivers/storage/scsiport-new/scsiport.rc Removed: trunk/reactos/drivers/storage/scsiport-new/.cvsignore URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/.cvsignore (original) +++ trunk/reactos/drivers/storage/scsiport-new/.cvsignore (removed) @@ -1,8 +1,0 @@ -base.tmp -junk.tmp -temp.exp -scsiport.coff -*.o -*.sym -*.sys -*.map Removed: trunk/reactos/drivers/storage/scsiport-new/makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/makefile (original) +++ trunk/reactos/drivers/storage/scsiport-new/makefile (removed) @@ -1,17 +1,0 @@ -# $Id: makefile,v 1.6 2003/11/13 14:20:03 ekohl Exp $ - -PATH_TO_TOP = ../../.. - -TARGET_BOOTSTRAP = yes - -TARGET_TYPE = export_driver - -TARGET_NAME = scsiport - -TARGET_OBJECTS = $(TARGET_NAME).o - -TARGET_CFLAGS = -Werror -Wall - -include $(PATH_TO_TOP)/rules.mak - -include $(TOOLS_PATH)/helper.mk Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.def (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.def Tue Mar 27 14:12:59 2007 @@ -1,4 +1,4 @@ -; $Id: scsiport.def,v 1.2 2001/07/23 06:13:48 ekohl Exp $ +; $Id$ ; ; scsiport.def - export definition file for scsiport driver ; @@ -7,7 +7,7 @@ ScsiDebugPrint ScsiPortCompleteRequest@20 ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress@4 +ScsiPortConvertUlongToPhysicalAddress(a)4=NTOSKRNL.RtlConvertUlongToLargeInteger ScsiPortFlushDma@4 ScsiPortFreeDeviceBase@8 ScsiPortGetBusData@24 @@ -22,31 +22,31 @@ ScsiPortLogError@28 ScsiPortMoveMemory@12 ScsiPortNotification -ScsiPortReadPortBufferUchar@12 -ScsiPortReadPortBufferUshort@12 -ScsiPortReadPortBufferUlong@12 -ScsiPortReadPortUchar@4 -ScsiPortReadPortUshort@4 -ScsiPortReadPortUlong@4 -ScsiPortReadRegisterBufferUchar@12 -ScsiPortReadRegisterBufferUshort@12 -ScsiPortReadRegisterBufferUlong@12 -ScsiPortReadRegisterUchar@4 -ScsiPortReadRegisterUshort@4 -ScsiPortReadRegisterUlong@4 +ScsiPortReadPortBufferUchar(a)12=HAL.READ_PORT_BUFFER_UCHAR +ScsiPortReadPortBufferUshort(a)12=HAL.READ_PORT_BUFFER_USHORT +ScsiPortReadPortBufferUlong(a)12=HAL.READ_PORT_BUFFER_ULONG +ScsiPortReadPortUchar(a)4=HAL.READ_PORT_UCHAR +ScsiPortReadPortUshort(a)4=HAL.READ_PORT_USHORT +ScsiPortReadPortUlong(a)4=HAL.READ_PORT_ULONG +ScsiPortReadRegisterBufferUchar(a)12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR +ScsiPortReadRegisterBufferUshort(a)12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT +ScsiPortReadRegisterBufferUlong(a)12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG +ScsiPortReadRegisterUchar(a)4=NTOSKRNL.READ_REGISTER_UCHAR +ScsiPortReadRegisterUshort(a)4=NTOSKRNL.READ_REGISTER_USHORT +ScsiPortReadRegisterUlong(a)4=NTOSKRNL.READ_REGISTER_ULONG ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution@4 +ScsiPortStallExecution(a)4=HAL.KeStallExecutionProcessor ScsiPortValidateRange@28 -ScsiPortWritePortBufferUchar@12 -ScsiPortWritePortBufferUshort@12 -ScsiPortWritePortBufferUlong@12 -ScsiPortWritePortUchar@8 -ScsiPortWritePortUshort@8 -ScsiPortWritePortUlong@8 -ScsiPortWriteRegisterBufferUchar@12 -ScsiPortWriteRegisterBufferUshort@12 -ScsiPortWriteRegisterBufferUlong@12 -ScsiPortWriteRegisterUchar@8 -ScsiPortWriteRegisterUshort@8 -ScsiPortWriteRegisterUlong@8 +ScsiPortWritePortUchar(a)8=HAL.WRITE_PORT_UCHAR +ScsiPortWritePortUshort(a)8=HAL.WRITE_PORT_USHORT +ScsiPortWritePortUlong(a)8=HAL.WRITE_PORT_ULONG +ScsiPortWritePortBufferUchar(a)12=HAL.WRITE_PORT_BUFFER_UCHAR +ScsiPortWritePortBufferUshort(a)12=HAL.WRITE_PORT_BUFFER_USHORT +ScsiPortWritePortBufferUlong(a)12=HAL.WRITE_PORT_BUFFER_ULONG +ScsiPortWriteRegisterBufferUchar(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR +ScsiPortWriteRegisterBufferUshort(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT +ScsiPortWriteRegisterBufferUlong(a)12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG +ScsiPortWriteRegisterUchar(a)8=NTOSKRNL.WRITE_REGISTER_UCHAR +ScsiPortWriteRegisterUshort(a)8=NTOSKRNL.WRITE_REGISTER_USHORT +ScsiPortWriteRegisterUlong(a)8=NTOSKRNL.WRITE_REGISTER_ULONG ;EOF Removed: trunk/reactos/drivers/storage/scsiport-new/scsiport.edf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.edf (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.edf (removed) @@ -1,52 +1,0 @@ -; $Id: scsiport.edf,v 1.5 2002/06/26 18:39:50 hbirr Exp $ -; -; scsiport.def - export definition file for scsiport driver -; -LIBRARY SCSIPORT.SYS -EXPORTS -ScsiDebugPrint -ScsiPortCompleteRequest=ScsiPortCompleteRequest@20 -ScsiPortConvertPhysicalAddressToUlong=ScsiPortConvertPhysicalAddressToUlong@8 -ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger -ScsiPortFlushDma=ScsiPortFlushDma@4 -ScsiPortFreeDeviceBase=ScsiPortFreeDeviceBase@8 -ScsiPortGetBusData=ScsiPortGetBusData@24 -ScsiPortGetDeviceBase=ScsiPortGetDeviceBase@28 -ScsiPortGetLogicalUnit=ScsiPortGetLogicalUnit@16 -ScsiPortGetPhysicalAddress=ScsiPortGetPhysicalAddress@16 -ScsiPortGetSrb=ScsiPortGetSrb@20 -ScsiPortGetUncachedExtension=ScsiPortGetUncachedExtension@12 -ScsiPortGetVirtualAddress=ScsiPortGetVirtualAddress@12 -ScsiPortInitialize=ScsiPortInitialize@16 -ScsiPortIoMapTransfer=ScsiPortIoMapTransfer@16 -ScsiPortLogError=ScsiPortLogError@28 -ScsiPortMoveMemory=ScsiPortMoveMemory@12 -ScsiPortNotification -ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR -ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT -ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG -ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR -ScsiPortReadPortUshort=HAL.READ_PORT_USHORT -ScsiPortReadPortUlong=HAL.READ_PORT_ULONG -ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT -ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG -ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR -ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT -ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG -ScsiPortSetBusDataByOffset=ScsiPortSetBusDataByOffset@28 -ScsiPortStallExecution=HAL.KeStallExecutionProcessor -ScsiPortValidateRange=ScsiPortValidateRange@28 -ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR -ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT -ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG -ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR -ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT -ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG -ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR -ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT -ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG -;EOF Added: trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild (added) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.rbuild Tue Mar 27 14:12:59 2007 @@ -1,0 +1,11 @@ +<module name="scsiport-new" type="exportdriver" installbase="system32/drivers" installname="scsiport.sys"> + <bootstrap base="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> + <define name="_SCSIPORT_" /> + <importlibrary definition="scsiport.def" /> + <include base="scsiport">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>scsiport.c</file> + <file>scsiport.rc</file> +</module> Modified: trunk/reactos/drivers/storage/scsiport-new/scsiport.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport-n… ============================================================================== --- trunk/reactos/drivers/storage/scsiport-new/scsiport.rc (original) +++ trunk/reactos/drivers/storage/scsiport-new/scsiport.rc Tue Mar 27 14:12:59 2007 @@ -1,37 +1,7 @@ -#include <defines.h> -#include <reactos/resource.h> +/* $Id$ */ -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US - -VS_VERSION_INFO VERSIONINFO - FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD - PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x40004L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", RES_STR_COMPANY_NAME - VALUE "FileDescription", "SCSI Port Driver\0" - VALUE "FileVersion", "0.0.0\0" - VALUE "InternalName", "scsiport\0" - VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT - VALUE "OriginalFilename", "scsiport.sys\0" - VALUE "ProductName", RES_STR_PRODUCT_NAME - VALUE "ProductVersion", RES_STR_PRODUCT_VERSION - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "SCSI Port Driver\0" +#define REACTOS_STR_INTERNAL_NAME "scsiport\0" +#define REACTOS_STR_ORIGINAL_FILENAME "scsiport.sys\0" +#include <reactos/version.rc>

1 0

[fireball] 26185: Branch scsiport from the "before hbirr rewrite" state (rev. 8950).
by fireball＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: fireball Date: Tue Mar 27 14:07:57 2007 New Revision: 26185 URL: http://svn.reactos.org/svn/reactos?rev=26185&view=rev Log: Branch scsiport from the "before hbirr rewrite" state (rev. 8950). Added: trunk/reactos/drivers/storage/scsiport-new/ - copied from r8950, trunk/reactos/drivers/storage/scsiport/

1 0

[tkreuzer] 26184: fix a tiny mem leak
by tkreuzer＠svn.reactos.org 27 Mar '07

27 Mar '07

Author: tkreuzer Date: Tue Mar 27 06:52:42 2007 New Revision: 26184 URL: http://svn.reactos.org/svn/reactos?rev=26184&view=rev Log: fix a tiny mem leak Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Tue Mar 27 06:52:42 2007 @@ -251,7 +251,6 @@ LPTSTR temp; /* Initialize parameter array */ - *params = malloc(sizeof(LPTSTR)); if(!params) return FALSE; *params = NULL;

1 0

[hpoussin] 26183: Include nci.mak later, as it needs $(ARCH) variable Fix a typo in ncitool
by hpoussin＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: hpoussin Date: Tue Mar 27 03:43:07 2007 New Revision: 26183 URL: http://svn.reactos.org/svn/reactos?rev=26183&view=rev Log: Include nci.mak later, as it needs $(ARCH) variable Fix a typo in ncitool Modified: trunk/reactos/Makefile trunk/reactos/tools/nci/ncitool.c trunk/reactos/tools/tools.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26183&r1=2618… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Mar 27 03:43:07 2007 @@ -310,7 +310,7 @@ strip = $(Q)strip windres = $(Q)windres else - gcc = $(ROS_PREFIX)-gcc + gcc = $(Q)$(ROS_PREFIX)-gcc gpp = $(Q)$(ROS_PREFIX)-g++ ld = $(Q)$(ROS_PREFIX)-ld nm = $(Q)$(ROS_PREFIX)-nm @@ -391,6 +391,7 @@ include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak -include $(ROS_AUTOMAKE) +include tools/nci/nci.mak PREAUTO := \ $(BIN2C_TARGET) \ @@ -400,7 +401,6 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=26… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Tue Mar 27 03:43:07 2007 @@ -1,631 +1,631 @@ -/* - * FILE: tools/nci/ncitool.c - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Native Call Interface Support Tool - * PURPOSE: Generates NCI Tables and Stubs. - * PROGRAMMER; Alex Ionescu (alex(a)relsoft.net) - * CHANGE HISTORY: 14/01/05 - Created. Based on original code by - * KJK::Hyperion and Emanuelle Aliberti. - * - */ - -/* INCLUDE ******************************************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#ifndef __FreeBSD__ -# include <malloc.h> -#endif // __FreeBSD__ - -/* DEFINES ****************************************************************/ - -#define INPUT_BUFFER_SIZE 255 -#define Arguments 8 - -/******* Table Indexes ************/ -#define MAIN_INDEX 0x0 -#define WIN32K_INDEX 0x1000 - -/******* Argument List ************/ -/* First, define the Databases */ -#define NativeSystemDb 0 -#define NativeGuiDb 1 - -/* Now the Service Tables */ -#define NtosServiceTable 2 -#define Win32kServiceTable 3 - -/* And finally, the stub files. */ -#define NtosUserStubs 4 -#define NtosKernelStubs 5 -#define Win32kGdiStubs 6 -#define Win32kUserStubs 7 - -/********** Stub Code ************/ - -/* - * This stubs calls into KUSER_SHARED_DATA where either a - * sysenter or interrupt is performed, depending on CPU support. - */ -#if defined(__GNUC__) -#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ - " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ - " call *(%%ecx)\n" \ - " ret $0x%x\n\n" - -#define UserModeStub_ppc " mflr 0\n" \ - " addi 1,1,-16\n" \ - " li 0,%x\n" \ - " stw 0,1(0)\n" \ - " sc\n" \ - " lwz 0,1(0)\n" \ - " mtlr 0\n" \ - " addi 1,1,16\n" \ - " blr\n" -#elif defined(_MSC_VER) -#define UserModeStub_x86 " asm { \n" \ - " mov eax, %xh\n" \ - " mov ecx, KUSER_SHARED_SYSCALL\n" \ - " call [ecx]\n" \ - " ret %xh\n" \ - " }\n" -#else -#error Unknown compiler for inline assembler -#endif - -/* - * This stub calls KiSystemService directly with a fake INT2E stack. - * Because EIP is pushed during the call, the handler will return here. - */ -#if defined(__GNUC__) -#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ - " leal 4(%%esp), %%edx\n" \ - " pushfl\n" \ - " pushl $KGDT_R0_CODE\n" \ - " call _KiSystemService\n" \ - " ret $0x%x\n\n" - -#define KernelModeStub_ppc " bl KiSystemService\n" \ - " rfi\n" -#elif defined(_MSC_VER) -#define KernelModeStub_x86 " asm { \n" \ - " mov eax, %xh\n" \ - " lea edx, [esp+4]\n" \ - " pushf\n" \ - " push KGDT_R0_CODE\n" \ - " call _KiSystemService\n" \ - " ret %xh\n" \ - " }\n" -#else -#error Unknown compiler for inline assembler -#endif - -/***** Arch Dependent Stuff ******/ -struct ncitool_data_t { - const char *arch; - int args_to_bytes; - const char *km_stub; - const char *um_stub; - const char *global_header; - const char *declaration; -}; - -struct ncitool_data_t ncitool_data[] = { - { "i386", 4, KernelModeStub_x86, UserModeStub_x86, - ".global _%s@%d\n", "_%s@%d:\n" }, - { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, - "\t.globl %s\n", "%s:\n" }, - { 0, } -}; -int arch_sel = 0; -#define ARGS_TO_BYTES(x) 4*(ncitool_data[arch_sel].args_to_bytes) -#define UserModeStub ncitool_data[arch_sel].um_stub -#define KernelModeStub ncitool_data[arch_sel].km_stub -#define GlobalHeader ncitool_data[arch_sel].global_header -#define Declaration ncitool_data[arch_sel].declaration - -/* FUNCTIONS ****************************************************************/ - -/*++ - * WriteFileHeader - * - * Prints out the File Header for a Stub File. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * FileDescription - Description of the Stub file to which to write the header. - * - * FileLocation - Name of the Stub file to which to write the header. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for printing the header. - * - *--*/ -void -WriteFileHeader(FILE * StubFile, - char* FileDescription, - char* FileLocation) -{ - /* This prints out the file header */ - fprintf(StubFile, - "/* FILE: %s\n" - " * COPYRIGHT: See COPYING in the top level directory\n" - " * PURPOSE: %s\n" - " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" - " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" - " */\n\n\n" - "#include <ndk/asm.h>\n\n", - FileDescription, - FileLocation); -} - -/*++ - * WriteFileHeader - * - * Prints out the File Header for a Stub File. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * FileDescription - Description of the Stub file to which to write the header. - * - * FileLocation - Name of the Stub file to which to write the header. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for printing the header. - * - *--*/ -void -WriteStubHeader(FILE* StubFile, - char* SyscallName, - unsigned StackBytes) -{ - /* Export the function */ - fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); - - /* Define it */ - fprintf(StubFile, Declaration, SyscallName, StackBytes); -} - - -/*++ - * WriteKernelModeStub - * - * Prints out the Kernel Mode Stub for a System Call. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * SyscallName - Name of System Call for which to add the stub. - * - * StackBytes - Number of bytes on the stack to return after doing the system call. - * - * SyscallId - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -WriteKernelModeStub(FILE* StubFile, - char* SyscallName, - unsigned StackBytes, - unsigned int SyscallId) -{ - /* Write the Stub Header and export the Function */ - WriteStubHeader(StubFile, SyscallName, StackBytes); - - /* Write the Stub Code */ - fprintf(StubFile, KernelModeStub, SyscallId, StackBytes); -} - -/*++ - * WriteUserModeStub - * - * Prints out the User Mode Stub for a System Call. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * SyscallName - Name of System Call for which to add the stub. - * - * StackBytes - Number of bytes on the stack to return after doing the system call. - * - * SyscallId - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -WriteUserModeStub(FILE* StubFile, - char* SyscallName, - unsigned StackBytes, - unsigned int SyscallId) -{ - /* Write the Stub Header and export the Function */ - WriteStubHeader(StubFile, SyscallName, StackBytes); - - /* Write the Stub Code */ - fprintf(StubFile, UserModeStub, SyscallId, StackBytes); -} - -/*++ - * GetNameAndArgumentsFromDb - * - * Parses an entry from a System Call Database, extracting - * the function's name and arguments that it takes. - * - * Params: - * Line - Entry from the Database to parse. - * - * NtSyscallName - Output string to which to save the Function Name - * - * SyscallArguments - Output string to which to save the number of - * arguments that the function takes. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -GetNameAndArgumentsFromDb(char Line[], - char ** NtSyscallName, - char ** SyscallArguments) -{ - char *s; - char *stmp; - - /* Remove new line */ - if ((s = (char *) strchr(Line,'\r')) != NULL) { - *s = '\0'; - } - - /* Skip comments (#) and empty lines */ - s = &Line[0]; - if ((*s) != '#' && (*s) != '\0') { - - /* Extract the NtXXX name */ - *NtSyscallName = (char *)strtok(s," \t"); - - /* Extract the argument count */ - *SyscallArguments = (char *)strtok(NULL," \t"); - - /* Remove, if present, the trailing LF */ - if ((stmp = strchr(*SyscallArguments, '\n')) != NULL) { - *stmp = '\0'; - } - - } else { - - /* Skip this entry */ - *NtSyscallName = NULL; - *SyscallArguments = NULL; - } -} - -/*++ - * CreateStubs - * - * Parses a System Call Database and creates stubs for all the entries. - * - * Params: - * SyscallDb - System Call Database to parse. - * - * UserModeFiles - Array of Usermode Stub Files to which to write the stubs. - * - * KernelModeFile - Kernelmode Stub Files to which to write the stubs. - * - * Index - Name of System Call for which to add the stub. - * - * UserFiles - Number of bytes on the stack to return after doing the system call. - * - * NeedsZw - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * None. - * - *--*/ -void -CreateStubs(FILE * SyscallDb, - FILE * UserModeFiles[], - FILE * KernelModeFile, - unsigned Index, - unsigned UserFiles, - unsigned NeedsZw) -{ - char Line[INPUT_BUFFER_SIZE]; - char *NtSyscallName; - char *SyscallArguments; - int SyscallId; - unsigned StackBytes; - - /* We loop, incrementing the System Call Index, until the end of the file */ - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - if (SyscallArguments != NULL) - StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); - else - StackBytes = 0; - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ - int i; - for (i= 0; i < UserFiles; i++) { - - /* Write the Nt Version */ - WriteUserModeStub(UserModeFiles[i], - NtSyscallName, - StackBytes, - SyscallId | Index); - - /* If a Zw Version is needed (was specified), write it too */ - if (NeedsZw) { - - NtSyscallName[0] = 'Z'; - NtSyscallName[1] = 'w'; - WriteUserModeStub(UserModeFiles[i], - NtSyscallName, - StackBytes, - SyscallId | Index); - } - - } - - /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ - if (KernelModeFile) { - - NtSyscallName[0] = 'Z'; - NtSyscallName[1] = 'w'; - WriteKernelModeStub(KernelModeFile, - NtSyscallName, - StackBytes, - SyscallId | Index); - } - - /* Only increase if we actually added something */ - SyscallId++; - } - } -} - -/*++ - * CreateSystemServiceTable - * - * Parses a System Call Database and creates a System Call Service Table for it. - * - * Params: - * SyscallDb - System Call Database to parse. - * - * SyscallTable - File in where to create System Call Service Table. - * - * Name - Name of the Service Table. - * - * FileLocation - Filename containing the Table. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for the header generation. - * - *--*/ -void -CreateSystemServiceTable(FILE *SyscallDb, - FILE *SyscallTable, - char * Name, - char * FileLocation) -{ - char Line[INPUT_BUFFER_SIZE]; - char *NtSyscallName; - char *SyscallArguments; - int SyscallId; - - /* Print the Header */ - WriteFileHeader(SyscallTable, "System Call Table for Native API", FileLocation); - - /* First we build the SSDT */ - fprintf(SyscallTable,"\n\n\n"); - fprintf(SyscallTable,"ULONG_PTR %sSSDT[] = {\n", Name); - - /* We loop, incrementing the System Call Index, until the end of the file */ - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Add a new line */ - if (SyscallId > 0) fprintf(SyscallTable,",\n"); - - /* Write the syscall name in the service table. */ - fprintf(SyscallTable,"\t\t(ULONG_PTR)%s", NtSyscallName); - - /* Only increase if we actually added something */ - SyscallId++; - } - } - - /* Close the service table (C syntax) */ - fprintf(SyscallTable,"\n};\n"); - - /* Now we build the SSPT */ - rewind(SyscallDb); - fprintf(SyscallTable,"\n\n\n"); - fprintf(SyscallTable,"UCHAR %sSSPT[] = {\n", Name); - - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Add a new line */ - if (SyscallId > 0) fprintf(SyscallTable,",\n"); - - /* Write the syscall arguments in the argument table. */ - if (SyscallArguments != NULL) - fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); - else - fprintf(SyscallTable,"\t\t0"); - - /* Only increase if we actually added something */ - SyscallId++; - } - } - - /* Close the service table (C syntax) */ - fprintf(SyscallTable,"\n};\n"); - - /* - * We write some useful defines - */ - fprintf(SyscallTable, "\n\n#define MIN_SYSCALL_NUMBER 0\n"); - fprintf(SyscallTable, "#define MAX_SYSCALL_NUMBER %d\n", SyscallId - 1); - fprintf(SyscallTable, "#define NUMBER_OF_SYSCALLS %d\n", SyscallId); - fprintf(SyscallTable, "ULONG %sNumberOfSysCalls = %d;\n", Name, SyscallId); -} - -void usage(char * argv0) -{ - printf("Usage: %s [-arch <arch>] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" - " sysfuncs.lst native system functions database\n" - " w32ksvc.db native graphic functions database\n" - " napi.h NTOSKRNL service table\n" - " ssdt.h WIN32K service table\n" - " napi.S NTDLL stubs\n" - " zw.S NTOSKRNL Zw stubs\n" - " win32k.S GDI32 stubs\n" - " win32k.S USER32 stubs\n" - " -arch is optional, default is %s\n", - argv0, - ncitool_data[0].arch - ); -} - -int main(int argc, char* argv[]) -{ - FILE * Files[Arguments] = { }; - int FileNumber, ArgOffset = 1; - char * OpenType = "r"; - - /* Catch architecture argument */ - if (argc > 3 && !strcmp(argv[1],"-arch")) { - for( arch_sel = 0; ncitool_data[arch_sel].arch; arch_sel++ ) - if (strcmp(argv[2],ncitool_data[arch_sel].arch) == 0) - break; - if (!ncitool_data[arch_sel].arch) { - printf("Invalid arch '%s'\n", argv[2]); - usage(argv[0]); - return 1; - } - ArgOffset = 3; - } - /* Make sure all arguments all there */ - if (argc != Arguments + ArgOffset) { - usage(argv[0]); - return(1); - } - - /* Open all Output and bail out if any fail */ - for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { - - /* Open the File */ - if (FileNumber == 2) OpenType = "wb"; - Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); - - /* Check for failure and error out if so */ - if (!Files[FileNumber]) { - perror(argv[FileNumber + ArgOffset]); - return (1); - } - } - - /* Write the File Headers */ - WriteFileHeader(Files[NtosUserStubs], - "System Call Stubs for Native API", - argv[NtosUserStubs + ArgOffset]); - - WriteFileHeader(Files[NtosKernelStubs], - "System Call Stubs for Native API", - argv[NtosKernelStubs + ArgOffset]); - fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); - - WriteFileHeader(Files[Win32kGdiStubs], - "System Call Stubs for Native API", - argv[Win32kGdiStubs + ArgOffset]); - - WriteFileHeader(Files[Win32kUserStubs], - "System Call Stubs for Native API", - argv[Win32kUserStubs + ArgOffset]); - - - /* Create the System Stubs */ - CreateStubs(Files[NativeSystemDb], - &Files[NtosUserStubs], - Files[NtosKernelStubs], - MAIN_INDEX, - 1, - 1); - - /* Create the Graphics Stubs */ - CreateStubs(Files[NativeGuiDb], - &Files[Win32kGdiStubs], - NULL, - WIN32K_INDEX, - 2, - 0); - - /* Rewind the databases */ - rewind(Files[NativeSystemDb]); - rewind(Files[NativeGuiDb]); - - /* Create the Service Tables */ - CreateSystemServiceTable(Files[NativeSystemDb], - Files[NtosServiceTable], - "Main", - argv[NtosServiceTable + ArgOffset]); - - CreateSystemServiceTable(Files[NativeGuiDb], - Files[Win32kServiceTable], - "Win32k", - argv[Win32kServiceTable + ArgOffset]); - - /* Close all files */ - for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { - - /* Close the File */ - fclose(Files[FileNumber]); - - } - - return(0); -} +/* + * FILE: tools/nci/ncitool.c + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Native Call Interface Support Tool + * PURPOSE: Generates NCI Tables and Stubs. + * PROGRAMMER; Alex Ionescu (alex(a)relsoft.net) + * CHANGE HISTORY: 14/01/05 - Created. Based on original code by + * KJK::Hyperion and Emanuelle Aliberti. + * + */ + +/* INCLUDE ******************************************************************/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#ifndef __FreeBSD__ +# include <malloc.h> +#endif // __FreeBSD__ + +/* DEFINES ****************************************************************/ + +#define INPUT_BUFFER_SIZE 255 +#define Arguments 8 + +/******* Table Indexes ************/ +#define MAIN_INDEX 0x0 +#define WIN32K_INDEX 0x1000 + +/******* Argument List ************/ +/* First, define the Databases */ +#define NativeSystemDb 0 +#define NativeGuiDb 1 + +/* Now the Service Tables */ +#define NtosServiceTable 2 +#define Win32kServiceTable 3 + +/* And finally, the stub files. */ +#define NtosUserStubs 4 +#define NtosKernelStubs 5 +#define Win32kGdiStubs 6 +#define Win32kUserStubs 7 + +/********** Stub Code ************/ + +/* + * This stubs calls into KUSER_SHARED_DATA where either a + * sysenter or interrupt is performed, depending on CPU support. + */ +#if defined(__GNUC__) +#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ + " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ + " call *(%%ecx)\n" \ + " ret $0x%x\n\n" + +#define UserModeStub_ppc " mflr 0\n" \ + " addi 1,1,-16\n" \ + " li 0,%x\n" \ + " stw 0,1(0)\n" \ + " sc\n" \ + " lwz 0,1(0)\n" \ + " mtlr 0\n" \ + " addi 1,1,16\n" \ + " blr\n" +#elif defined(_MSC_VER) +#define UserModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " mov ecx, KUSER_SHARED_SYSCALL\n" \ + " call [ecx]\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif + +/* + * This stub calls KiSystemService directly with a fake INT2E stack. + * Because EIP is pushed during the call, the handler will return here. + */ +#if defined(__GNUC__) +#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ + " leal 4(%%esp), %%edx\n" \ + " pushfl\n" \ + " pushl $KGDT_R0_CODE\n" \ + " call _KiSystemService\n" \ + " ret $0x%x\n\n" + +#define KernelModeStub_ppc " bl KiSystemService\n" \ + " rfi\n" +#elif defined(_MSC_VER) +#define KernelModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " lea edx, [esp+4]\n" \ + " pushf\n" \ + " push KGDT_R0_CODE\n" \ + " call _KiSystemService\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif + +/***** Arch Dependent Stuff ******/ +struct ncitool_data_t { + const char *arch; + int args_to_bytes; + const char *km_stub; + const char *um_stub; + const char *global_header; + const char *declaration; +}; + +struct ncitool_data_t ncitool_data[] = { + { "i386", 4, KernelModeStub_x86, UserModeStub_x86, + ".global _%s@%d\n", "_%s@%d:\n" }, + { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, + "\t.globl %s\n", "%s:\n" }, + { 0, } +}; +int arch_sel = 0; +#define ARGS_TO_BYTES(x) (x)*(ncitool_data[arch_sel].args_to_bytes) +#define UserModeStub ncitool_data[arch_sel].um_stub +#define KernelModeStub ncitool_data[arch_sel].km_stub +#define GlobalHeader ncitool_data[arch_sel].global_header +#define Declaration ncitool_data[arch_sel].declaration + +/* FUNCTIONS ****************************************************************/ + +/*++ + * WriteFileHeader + * + * Prints out the File Header for a Stub File. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * FileDescription - Description of the Stub file to which to write the header. + * + * FileLocation - Name of the Stub file to which to write the header. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for printing the header. + * + *--*/ +void +WriteFileHeader(FILE * StubFile, + char* FileDescription, + char* FileLocation) +{ + /* This prints out the file header */ + fprintf(StubFile, + "/* FILE: %s\n" + " * COPYRIGHT: See COPYING in the top level directory\n" + " * PURPOSE: %s\n" + " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" + " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" + " */\n\n\n" + "#include <ndk/asm.h>\n\n", + FileDescription, + FileLocation); +} + +/*++ + * WriteFileHeader + * + * Prints out the File Header for a Stub File. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * FileDescription - Description of the Stub file to which to write the header. + * + * FileLocation - Name of the Stub file to which to write the header. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for printing the header. + * + *--*/ +void +WriteStubHeader(FILE* StubFile, + char* SyscallName, + unsigned StackBytes) +{ + /* Export the function */ + fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); + + /* Define it */ + fprintf(StubFile, Declaration, SyscallName, StackBytes); +} + + +/*++ + * WriteKernelModeStub + * + * Prints out the Kernel Mode Stub for a System Call. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * SyscallName - Name of System Call for which to add the stub. + * + * StackBytes - Number of bytes on the stack to return after doing the system call. + * + * SyscallId - Service Descriptor Table ID for this System Call. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +WriteKernelModeStub(FILE* StubFile, + char* SyscallName, + unsigned StackBytes, + unsigned int SyscallId) +{ + /* Write the Stub Header and export the Function */ + WriteStubHeader(StubFile, SyscallName, StackBytes); + + /* Write the Stub Code */ + fprintf(StubFile, KernelModeStub, SyscallId, StackBytes); +} + +/*++ + * WriteUserModeStub + * + * Prints out the User Mode Stub for a System Call. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * SyscallName - Name of System Call for which to add the stub. + * + * StackBytes - Number of bytes on the stack to return after doing the system call. + * + * SyscallId - Service Descriptor Table ID for this System Call. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +WriteUserModeStub(FILE* StubFile, + char* SyscallName, + unsigned StackBytes, + unsigned int SyscallId) +{ + /* Write the Stub Header and export the Function */ + WriteStubHeader(StubFile, SyscallName, StackBytes); + + /* Write the Stub Code */ + fprintf(StubFile, UserModeStub, SyscallId, StackBytes); +} + +/*++ + * GetNameAndArgumentsFromDb + * + * Parses an entry from a System Call Database, extracting + * the function's name and arguments that it takes. + * + * Params: + * Line - Entry from the Database to parse. + * + * NtSyscallName - Output string to which to save the Function Name + * + * SyscallArguments - Output string to which to save the number of + * arguments that the function takes. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +GetNameAndArgumentsFromDb(char Line[], + char ** NtSyscallName, + char ** SyscallArguments) +{ + char *s; + char *stmp; + + /* Remove new line */ + if ((s = (char *) strchr(Line,'\r')) != NULL) { + *s = '\0'; + } + + /* Skip comments (#) and empty lines */ + s = &Line[0]; + if ((*s) != '#' && (*s) != '\0') { + + /* Extract the NtXXX name */ + *NtSyscallName = (char *)strtok(s," \t"); + + /* Extract the argument count */ + *SyscallArguments = (char *)strtok(NULL," \t"); + + /* Remove, if present, the trailing LF */ + if ((stmp = strchr(*SyscallArguments, '\n')) != NULL) { + *stmp = '\0'; + } + + } else { + + /* Skip this entry */ + *NtSyscallName = NULL; + *SyscallArguments = NULL; + } +} + +/*++ + * CreateStubs + * + * Parses a System Call Database and creates stubs for all the entries. + * + * Params: + * SyscallDb - System Call Database to parse. + * + * UserModeFiles - Array of Usermode Stub Files to which to write the stubs. + * + * KernelModeFile - Kernelmode Stub Files to which to write the stubs. + * + * Index - Name of System Call for which to add the stub. + * + * UserFiles - Number of bytes on the stack to return after doing the system call. + * + * NeedsZw - Service Descriptor Table ID for this System Call. + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +void +CreateStubs(FILE * SyscallDb, + FILE * UserModeFiles[], + FILE * KernelModeFile, + unsigned Index, + unsigned UserFiles, + unsigned NeedsZw) +{ + char Line[INPUT_BUFFER_SIZE]; + char *NtSyscallName; + char *SyscallArguments; + int SyscallId; + unsigned StackBytes; + + /* We loop, incrementing the System Call Index, until the end of the file */ + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + if (SyscallArguments != NULL) + StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); + else + StackBytes = 0; + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ + int i; + for (i= 0; i < UserFiles; i++) { + + /* Write the Nt Version */ + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, + SyscallId | Index); + + /* If a Zw Version is needed (was specified), write it too */ + if (NeedsZw) { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, + SyscallId | Index); + } + + } + + /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ + if (KernelModeFile) { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteKernelModeStub(KernelModeFile, + NtSyscallName, + StackBytes, + SyscallId | Index); + } + + /* Only increase if we actually added something */ + SyscallId++; + } + } +} + +/*++ + * CreateSystemServiceTable + * + * Parses a System Call Database and creates a System Call Service Table for it. + * + * Params: + * SyscallDb - System Call Database to parse. + * + * SyscallTable - File in where to create System Call Service Table. + * + * Name - Name of the Service Table. + * + * FileLocation - Filename containing the Table. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for the header generation. + * + *--*/ +void +CreateSystemServiceTable(FILE *SyscallDb, + FILE *SyscallTable, + char * Name, + char * FileLocation) +{ + char Line[INPUT_BUFFER_SIZE]; + char *NtSyscallName; + char *SyscallArguments; + int SyscallId; + + /* Print the Header */ + WriteFileHeader(SyscallTable, "System Call Table for Native API", FileLocation); + + /* First we build the SSDT */ + fprintf(SyscallTable,"\n\n\n"); + fprintf(SyscallTable,"ULONG_PTR %sSSDT[] = {\n", Name); + + /* We loop, incrementing the System Call Index, until the end of the file */ + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Add a new line */ + if (SyscallId > 0) fprintf(SyscallTable,",\n"); + + /* Write the syscall name in the service table. */ + fprintf(SyscallTable,"\t\t(ULONG_PTR)%s", NtSyscallName); + + /* Only increase if we actually added something */ + SyscallId++; + } + } + + /* Close the service table (C syntax) */ + fprintf(SyscallTable,"\n};\n"); + + /* Now we build the SSPT */ + rewind(SyscallDb); + fprintf(SyscallTable,"\n\n\n"); + fprintf(SyscallTable,"UCHAR %sSSPT[] = {\n", Name); + + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Add a new line */ + if (SyscallId > 0) fprintf(SyscallTable,",\n"); + + /* Write the syscall arguments in the argument table. */ + if (SyscallArguments != NULL) + fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); + else + fprintf(SyscallTable,"\t\t0"); + + /* Only increase if we actually added something */ + SyscallId++; + } + } + + /* Close the service table (C syntax) */ + fprintf(SyscallTable,"\n};\n"); + + /* + * We write some useful defines + */ + fprintf(SyscallTable, "\n\n#define MIN_SYSCALL_NUMBER 0\n"); + fprintf(SyscallTable, "#define MAX_SYSCALL_NUMBER %d\n", SyscallId - 1); + fprintf(SyscallTable, "#define NUMBER_OF_SYSCALLS %d\n", SyscallId); + fprintf(SyscallTable, "ULONG %sNumberOfSysCalls = %d;\n", Name, SyscallId); +} + +void usage(char * argv0) +{ + printf("Usage: %s [-arch <arch>] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" + " sysfuncs.lst native system functions database\n" + " w32ksvc.db native graphic functions database\n" + " napi.h NTOSKRNL service table\n" + " ssdt.h WIN32K service table\n" + " napi.S NTDLL stubs\n" + " zw.S NTOSKRNL Zw stubs\n" + " win32k.S GDI32 stubs\n" + " win32k.S USER32 stubs\n" + " -arch is optional, default is %s\n", + argv0, + ncitool_data[0].arch + ); +} + +int main(int argc, char* argv[]) +{ + FILE * Files[Arguments] = { }; + int FileNumber, ArgOffset = 1; + char * OpenType = "r"; + + /* Catch architecture argument */ + if (argc > 3 && !strcmp(argv[1],"-arch")) { + for( arch_sel = 0; ncitool_data[arch_sel].arch; arch_sel++ ) + if (strcmp(argv[2],ncitool_data[arch_sel].arch) == 0) + break; + if (!ncitool_data[arch_sel].arch) { + printf("Invalid arch '%s'\n", argv[2]); + usage(argv[0]); + return 1; + } + ArgOffset = 3; + } + /* Make sure all arguments all there */ + if (argc != Arguments + ArgOffset) { + usage(argv[0]); + return(1); + } + + /* Open all Output and bail out if any fail */ + for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { + + /* Open the File */ + if (FileNumber == 2) OpenType = "wb"; + Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); + + /* Check for failure and error out if so */ + if (!Files[FileNumber]) { + perror(argv[FileNumber + ArgOffset]); + return (1); + } + } + + /* Write the File Headers */ + WriteFileHeader(Files[NtosUserStubs], + "System Call Stubs for Native API", + argv[NtosUserStubs + ArgOffset]); + + WriteFileHeader(Files[NtosKernelStubs], + "System Call Stubs for Native API", + argv[NtosKernelStubs + ArgOffset]); + fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); + + WriteFileHeader(Files[Win32kGdiStubs], + "System Call Stubs for Native API", + argv[Win32kGdiStubs + ArgOffset]); + + WriteFileHeader(Files[Win32kUserStubs], + "System Call Stubs for Native API", + argv[Win32kUserStubs + ArgOffset]); + + + /* Create the System Stubs */ + CreateStubs(Files[NativeSystemDb], + &Files[NtosUserStubs], + Files[NtosKernelStubs], + MAIN_INDEX, + 1, + 1); + + /* Create the Graphics Stubs */ + CreateStubs(Files[NativeGuiDb], + &Files[Win32kGdiStubs], + NULL, + WIN32K_INDEX, + 2, + 0); + + /* Rewind the databases */ + rewind(Files[NativeSystemDb]); + rewind(Files[NativeGuiDb]); + + /* Create the Service Tables */ + CreateSystemServiceTable(Files[NativeSystemDb], + Files[NtosServiceTable], + "Main", + argv[NtosServiceTable + ArgOffset]); + + CreateSystemServiceTable(Files[NativeGuiDb], + Files[Win32kServiceTable], + "Win32k", + argv[Win32kServiceTable + ArgOffset]); + + /* Close all files */ + for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { + + /* Close the File */ + fclose(Files[FileNumber]); + + } + + return(0); +} Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=26183&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Tue Mar 27 03:43:07 2007 @@ -48,7 +48,6 @@ include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak include tools/mkhive/mkhive.mak -include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak

1 0

[hpoussin] 26182: Add missing file
by hpoussin＠svn.reactos.org 26 Mar '07

26 Mar '07

Author: hpoussin Date: Tue Mar 27 03:00:58 2007 New Revision: 26182 URL: http://svn.reactos.org/svn/reactos?rev=26182&view=rev Log: Add missing file Added: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Added: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Tue Mar 27 03:00:58 2007 @@ -1,0 +1,34 @@ +/* + * ReactOS kernel + * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H +#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H + +#ifdef _M_IX86 +#include "../i386/intrin_i.h" +#elif defined(_M_PPC) +#include "../powerpc/intrin_i.h" +#elif defined(_M_MIPS) +#include "../mips/intrin_i.h" +#else +#error "Unknown processor" +#endif + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H */ + +/* EOF */

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