Ros-diffs September 2010

ros-diffs@reactos.org

18 participants
278 discussions

[mjmartin] 48770: [usb/usbehci] - Dont reset the port in the DPC after device is connected, the usbhub driver will do that later. - Implement ResetPort and create a timer to call a DPC to coplete t...
by mjmartin＠svn.reactos.org 14 Sep '10

14 Sep '10

Author: mjmartin Date: Tue Sep 14 09:46:28 2010 New Revision: 48770 URL: http://svn.reactos.org/svn/reactos?rev=48770&view=rev Log: [usb/usbehci] - Dont reset the port in the DPC after device is connected, the usbhub driver will do that later. - Implement ResetPort and create a timer to call a DPC to coplete the SCE request. - Dont queue all URBs and have seperate thread complete them as other URBs may still need to be completed. Instead only queue the SCE request and complete it when a usb device is connected or reset. - Implement RemoveURBRequest and fix bugs in URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE. - For IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO dont return the FDO in Argument2 as no upper level driver should be communicating with the FDO of the roothub. - Dont assign the usb device an address when initialized as the hub driver will do it later. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/urbreq.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -12,11 +12,42 @@ #include <stdio.h> VOID NTAPI +TimerDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVOID SystemArgument2) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + ULONG tmp; + ULONG Base; + LONG i; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; + + Base = (ULONG)FdoDeviceExtension->ResourceMemory; + + for (i = 0; i < FdoDeviceExtension->ECHICaps.HCSParams.PortCount; i++) + { + tmp = READ_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i))); + + if ((tmp & 0x04) && (!(PdoDeviceExtension->Ports[i].PortChange & USB_PORT_STATUS_RESET))) + { + DPRINT("Port %x is enabled\n", i); + PdoDeviceExtension->Ports[i].PortChange |= USB_PORT_STATUS_RESET; + CompletePendingURBRequest(PdoDeviceExtension); + } + } + return; +} + +VOID NTAPI EhciDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVOID SystemArgument2) { PFDO_DEVICE_EXTENSION FdoDeviceExtension; PPDO_DEVICE_EXTENSION PdoDeviceExtension; ULONG CStatus; + ULONG tmp; + ULONG Base; + LONG i; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; @@ -28,17 +59,13 @@ PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; + Base = (ULONG)FdoDeviceExtension->ResourceMemory; + CStatus = (ULONG) SystemArgument2; /* Port Change */ if (CStatus & EHCI_STS_PCD) { - LONG i; - ULONG tmp; - ULONG Base; - - Base = (ULONG)FdoDeviceExtension->ResourceMemory; - /* Loop through the ports */ for (i = 0; i < FdoDeviceExtension->ECHICaps.HCSParams.PortCount; i++) { @@ -76,13 +103,13 @@ KeStallExecutionProcessor(30); /* As per USB 2.0 Specs, 9.1.2. Reset the port and clear the status change */ - tmp |= 0x100 | 0x02; + //tmp |= 0x100 | 0x02; /* Sanity, Disable port */ - tmp &= ~0x04; - - WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); - - KeStallExecutionProcessor(20); + //tmp &= ~0x04; + + //WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); + + //KeStallExecutionProcessor(20); tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); @@ -91,8 +118,7 @@ PdoDeviceExtension->Ports[i].PortStatus |= USB_PORT_STATUS_CONNECT; PdoDeviceExtension->Ports[i].PortChange |= USB_PORT_STATUS_CONNECT; - PdoDeviceExtension->HaltQueue = FALSE; - KeSetEvent(&PdoDeviceExtension->QueueDrainedEvent, 0, FALSE); + CompletePendingURBRequest(PdoDeviceExtension); } else { @@ -164,10 +190,23 @@ } BOOLEAN -ResetPort(PDEVICE_OBJECT DeviceObject) +ResetPort(PFDO_DEVICE_EXTENSION FdoDeviceExtension, UCHAR Port) { - /*FIXME: Implement me */ - + ULONG Base; + ULONG tmp; + LARGE_INTEGER DueTime; + + DPRINT("Reset Port %x\n", Port); + + Base = (ULONG)FdoDeviceExtension->ResourceMemory; + + tmp = READ_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * Port))); + tmp |= 0x100; + WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * Port)), tmp); + + DueTime.QuadPart = -100; + + KeSetTimerEx(&FdoDeviceExtension->UpdateTimer, DueTime, 0, &FdoDeviceExtension->TimerDpcObject); return TRUE; } @@ -179,7 +218,7 @@ ULONG base; LONG tmp; - DPRINT1("Stopping Ehci controller\n"); + DPRINT("Stopping Ehci controller\n"); FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; base = (ULONG)FdoDeviceExtension->ResourceMemory; @@ -274,6 +313,11 @@ KeInitializeDpc(&FdoDeviceExtension->DpcObject, EhciDefferedRoutine, FdoDeviceExtension); + + KeInitializeDpc(&FdoDeviceExtension->TimerDpcObject, + TimerDefferedRoutine, + FdoDeviceExtension); + Status = IoConnectInterrupt(&FdoDeviceExtension->EhciInterrupt, InterruptService, @@ -361,7 +405,7 @@ PHCS = (PEHCI_HCS_CONTENT)&DeviceExtension->ECHICaps.HCSParams; if (PHCS->PortRouteRules) { - for (i = 0; i < 8; i++) + for (i = 0; i < PCap->HCSParams.PortCount; i++) { PCap->PortRoute[i] = READ_REGISTER_UCHAR((PUCHAR) (Base + 12 + i)); } @@ -595,6 +639,7 @@ PdoDeviceExtension->ControllerFdo = DeviceObject; PdoDeviceExtension->DeviceObject = Pdo; + PdoDeviceExtension->NumberOfPorts = DeviceExtension->ECHICaps.HCSParams.PortCount; InitializeListHead(&PdoDeviceExtension->IrpQueue); KeInitializeSpinLock(&PdoDeviceExtension->IrpQueueLock); @@ -765,6 +810,8 @@ FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) Fdo->DeviceExtension; RtlZeroMemory(FdoDeviceExtension, sizeof(PFDO_DEVICE_EXTENSION)); + KeInitializeTimerEx(&FdoDeviceExtension->UpdateTimer, SynchronizationTimer); + FdoDeviceExtension->Common.IsFdo = TRUE; FdoDeviceExtension->DeviceObject = Fdo; @@ -858,6 +905,8 @@ PUSB_DEVICE UsbDevice = NULL; URB *Urb; + /*FIXME: This should never be called by a miniport as the miniport should only be dealing with the pdo */ + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; @@ -868,8 +917,8 @@ ASSERT(Stack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_SUBMIT_URB); Urb = (PURB) Stack->Parameters.Others.Argument1; - DPRINT1("Header Length %d\n", Urb->UrbHeader.Length); - DPRINT1("Header Function %d\n", Urb->UrbHeader.Function); + DPRINT("Header Length %d\n", Urb->UrbHeader.Length); + DPRINT("Header Function %d\n", Urb->UrbHeader.Function); UsbDevice = DeviceHandleToUsbDevice(PdoDeviceExtension, Urb->UrbHeader.UsbdDeviceHandle); @@ -897,7 +946,7 @@ { case USB_DEVICE_DESCRIPTOR_TYPE: { - /* FIXNME: This probably not used for FDO and should be removed? */ + /* FIXME: This probably not used for FDO and should be removed? */ DPRINT1("USB DEVICE DESC\n"); break; } @@ -921,17 +970,6 @@ if (Urb->UrbControlDescriptorRequest.DescriptorType == USB_STRING_DESCRIPTOR_TYPE) { - if ((Urb->UrbControlDescriptorRequest.Index != UsbDevice->DeviceDescriptor.iManufacturer) && - (UsbDevice->DeviceDescriptor.iManufacturer) && - (UsbDevice->DeviceDescriptor.iSerialNumber)) - { - DPRINT1("Invalid Index\n"); - Urb->UrbHeader.Status = USBD_STATUS_INVALID_PARAMETER; - Status = STATUS_SUCCESS; - Information = 0; - break; - } - CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; RtlZeroMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength-1); } Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -10,12 +10,17 @@ #include "usbehci.h" VOID -RequestURBCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp) +RemoveUrbRequest(PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) { - PPDO_DEVICE_EXTENSION PdoDeviceExtension; - - PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - + KIRQL OldIrql; + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &OldIrql); + RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, OldIrql); +} + +VOID +RequestURBCancel (PPDO_DEVICE_EXTENSION PdoDeviceExtension, PIRP Irp) +{ KIRQL OldIrql = Irp->CancelIrql; IoReleaseCancelSpinLock(DISPATCH_LEVEL); @@ -37,7 +42,6 @@ if (Irp->Cancel && IoSetCancelRoutine(Irp, NULL)) { - DPRINT1("Cancelled!!!!???\n"); KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, OldIrql); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -49,17 +53,483 @@ } } +NTSTATUS HandleUrbRequest(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PIRP Irp) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + ULONG_PTR Information = 0; + PIO_STACK_LOCATION Stack; + PUSB_DEVICE UsbDevice = NULL; + URB *Urb; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; + + Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(Stack); + + Urb = (PURB) Stack->Parameters.Others.Argument1; + + ASSERT(Urb); + + Information = 0; + Status = STATUS_SUCCESS; + + DPRINT("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); + DPRINT("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + DPRINT("UsbdDeviceHandle = %x\n", Urb->UrbHeader.UsbdDeviceHandle); + + UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; + + /* UsbdDeviceHandle of 0 is root hub */ + if (UsbDevice == NULL) + UsbDevice = PdoDeviceExtension->UsbDevices[0]; + + /* Assume URB success */ + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + /* Set the DeviceHandle to the Internal Device */ + Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; + + switch (Urb->UrbHeader.Function) + { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + if (&UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor != Urb->UrbBulkOrInterruptTransfer.PipeHandle) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); + RtlZeroMemory(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); + + if (UsbDevice == PdoDeviceExtension->UsbDevices[0]) + { + if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & (USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK)) + { + LONG i; + for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) + { + if (PdoDeviceExtension->Ports[i].PortChange) + { + DPRINT1("Inform hub driver that port %d has changed\n", i+1); + ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((i + 1) & 7); + } + } + } + else + { + Urb->UrbHeader.Status = USBD_STATUS_INVALID_PARAMETER; + Status = STATUS_UNSUCCESSFUL; + DPRINT1("Invalid transfer flags for SCE\n"); + } + } + else + DPRINT("Interrupt Transfer not for hub\n"); + break; + } + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + { + if (Urb->UrbControlGetStatusRequest.Index == 0) + { + ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); + *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE; + } + else + { + DPRINT1("Uknown identifier\n"); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + Status = STATUS_UNSUCCESSFUL; + } + break; + } + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + switch(Urb->UrbControlDescriptorRequest.DescriptorType) + { + case USB_DEVICE_DESCRIPTOR_TYPE: + { + if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = sizeof(USB_DEVICE_DESCRIPTOR); + } + ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer != NULL); + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, + &UsbDevice->DeviceDescriptor, + Urb->UrbControlDescriptorRequest.TransferBufferLength); + break; + } + case USB_CONFIGURATION_DESCRIPTOR_TYPE: + { + PUCHAR BufPtr; + LONG i, j; + + if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength; + } + else + { + DPRINT1("TransferBufferLenth %x is too small!!!\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + if (Urb->UrbControlDescriptorRequest.TransferBufferLength < sizeof(USB_CONFIGURATION_DESCRIPTOR)) + { + DPRINT("Configuration Descriptor cannot fit into given buffer!\n"); + break; + } + } + + ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); + BufPtr = (PUCHAR)Urb->UrbControlDescriptorRequest.TransferBuffer; + + /* Copy the Configuration Descriptor */ + RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); + + /* If there is no room for all the configs then bail */ + if (!(Urb->UrbControlDescriptorRequest.TransferBufferLength > sizeof(USB_CONFIGURATION_DESCRIPTOR))) + { + DPRINT("All Descriptors cannot fit into given buffer! Only USB_CONFIGURATION_DESCRIPTOR given\n"); + break; + } + + BufPtr += sizeof(USB_CONFIGURATION_DESCRIPTOR); + for (i = 0; i < UsbDevice->ActiveConfig->ConfigurationDescriptor.bNumInterfaces; i++) + { + /* Copy the Interface Descriptor */ + RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->Interfaces[i]->InterfaceDescriptor, sizeof(USB_INTERFACE_DESCRIPTOR)); + BufPtr += sizeof(USB_INTERFACE_DESCRIPTOR); + for (j = 0; j < UsbDevice->ActiveConfig->Interfaces[i]->InterfaceDescriptor.bNumEndpoints; j++) + { + /* Copy the EndPoint Descriptor */ + RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->Interfaces[i]->EndPoints[j]->EndPointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); + BufPtr += sizeof(USB_ENDPOINT_DESCRIPTOR); + } + } + + break; + } + case USB_STRING_DESCRIPTOR_TYPE: + { + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + PUSB_STRING_DESCRIPTOR StringDesc; + BOOLEAN ResultOk; + + StringDesc = (PUSB_STRING_DESCRIPTOR) Urb->UrbControlDescriptorRequest.TransferBuffer; + + if (Urb->UrbControlDescriptorRequest.Index == 0) + DPRINT("Requesting LANGID's\n"); + + + RtlZeroMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength-1); + + CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; + CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; + CtrlSetup.bmRequestType._BM.Reserved = 0; + CtrlSetup.bmRequestType._BM.Dir = BMREQUEST_DEVICE_TO_HOST; + CtrlSetup.bRequest = USB_REQUEST_GET_DESCRIPTOR; + CtrlSetup.wValue.LowByte = Urb->UrbControlDescriptorRequest.Index; + CtrlSetup.wValue.HiByte = Urb->UrbControlDescriptorRequest.DescriptorType; + CtrlSetup.wIndex.W = Urb->UrbControlDescriptorRequest.LanguageId; + CtrlSetup.wLength = Urb->UrbControlDescriptorRequest.TransferBufferLength; + + ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, UsbDevice->Address, UsbDevice->Port, + Urb->UrbControlDescriptorRequest.TransferBuffer, Urb->UrbControlDescriptorRequest.TransferBufferLength); + break; + } + default: + { + DPRINT1("Descriptor Type %x not supported!\n", Urb->UrbControlDescriptorRequest.DescriptorType); + } + } + break; + } + case URB_FUNCTION_SELECT_CONFIGURATION: + { + PUSBD_INTERFACE_INFORMATION InterfaceInfo; + LONG iCount, pCount; + + DPRINT("Selecting Configuration\n"); + DPRINT("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); + + if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) + { + Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&PdoDeviceExtension->UsbDevices[0]->ActiveConfig->ConfigurationDescriptor; + DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; + + for (iCount = 0; iCount < Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces; iCount++) + { + InterfaceInfo->InterfaceHandle = (PVOID)&UsbDevice->ActiveInterface->InterfaceDescriptor; + InterfaceInfo->Class = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceClass; + InterfaceInfo->SubClass = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceSubClass; + InterfaceInfo->Protocol = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceProtocol; + InterfaceInfo->Reserved = 0; + + for (pCount = 0; pCount < InterfaceInfo->NumberOfPipes; pCount++) + { + InterfaceInfo->Pipes[pCount].MaximumPacketSize = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[pCount].EndpointAddress = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[pCount].Interval = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[pCount].PipeType = UsbdPipeTypeInterrupt; + InterfaceInfo->Pipes[pCount].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor; + if (InterfaceInfo->Pipes[pCount].MaximumTransferSize == 0) + InterfaceInfo->Pipes[pCount].MaximumTransferSize = 4096; + /* InterfaceInfo->Pipes[j].PipeFlags = 0; */ + } + InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((PUCHAR)InterfaceInfo + InterfaceInfo->Length); + } + } + else + { + /* FIXME: Set device to unconfigured state */ + } + break; + } + case URB_FUNCTION_CLASS_DEVICE: + { + switch (Urb->UrbControlVendorClassRequest.Request) + { + case USB_REQUEST_GET_DESCRIPTOR: + { + switch (Urb->UrbControlVendorClassRequest.Value >> 8) + { + case USB_DEVICE_CLASS_AUDIO: + { + DPRINT1("USB_DEVICE_CLASS_AUDIO not implemented\n"); + break; + } + case USB_DEVICE_CLASS_COMMUNICATIONS: + { + DPRINT1("USB_DEVICE_CLASS_COMMUNICATIONS not implemented\n"); + break; + } + case USB_DEVICE_CLASS_HUMAN_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_HUMAN_INTERFACE not implemented\n"); + break; + } + case USB_DEVICE_CLASS_MONITOR: + { + DPRINT1("USB_DEVICE_CLASS_MONITOR not implemented\n"); + break; + } + case USB_DEVICE_CLASS_PHYSICAL_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_PHYSICAL_INTERFACE not implemented\n"); + break; + } + case USB_DEVICE_CLASS_POWER: + { + DPRINT1("USB_DEVICE_CLASS_POWER not implemented\n"); + break; + } + case USB_DEVICE_CLASS_PRINTER: + { + DPRINT1("USB_DEVICE_CLASS_PRINTER not implemented\n"); + break; + } + case USB_DEVICE_CLASS_STORAGE: + { + DPRINT1("USB_DEVICE_CLASS_STORAGE not implemented\n"); + break; + } + case USB_DEVICE_CLASS_RESERVED: + DPRINT1("Reserved!!!\n"); + case USB_DEVICE_CLASS_HUB: + { + PUSB_HUB_DESCRIPTOR UsbHubDescr = Urb->UrbControlVendorClassRequest.TransferBuffer; + + DPRINT1("Length %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); + ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); + /* FIXME: Handle more than root hub? */ + if(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)) + { + Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); + } + else + { + /* FIXME: Handle this correctly */ + UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + UsbHubDescr->bDescriptorType = 0x29; + break; + } + DPRINT1("USB_DEVICE_CLASS_HUB request\n"); + UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + UsbHubDescr->bDescriptorType = 0x29; + UsbHubDescr->bNumberOfPorts = 0x08; + UsbHubDescr->wHubCharacteristics = 0x0012; + UsbHubDescr->bPowerOnToPowerGood = 0x01; + UsbHubDescr->bHubControlCurrent = 0x00; + UsbHubDescr->bRemoveAndPowerMask[0] = 0x00; + UsbHubDescr->bRemoveAndPowerMask[1] = 0x00; + UsbHubDescr->bRemoveAndPowerMask[2] = 0xff; + break; + } + default: + { + DPRINT1("Unknown UrbControlVendorClassRequest Value\n"); + } + } + break; + } + case USB_REQUEST_GET_STATUS: + { + DPRINT1("DEVICE: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); + if (Urb->UrbControlVendorClassRequest.Index == 1) + { + ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); + ((PULONG)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = 0; + } + break; + } + default: + { + DPRINT1("Unhandled URB request for class device\n"); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + } + break; + } + case URB_FUNCTION_CLASS_OTHER: + { + DPRINT("URB_FUNCTION_CLASS_OTHER\n"); + /* FIXME: Each one of these needs to make sure that the index value is a valid for the number of ports and return STATUS_UNSUCCESSFUL is not */ + + switch (Urb->UrbControlVendorClassRequest.Request) + { + case USB_REQUEST_GET_STATUS: + { + DPRINT("USB_REQUEST_GET_STATUS Port %d\n", Urb->UrbControlVendorClassRequest.Index); + + ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); + DPRINT("PortStatus %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); + DPRINT("PortChange %x\n", PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange); + ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus; + ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[1] = PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange; + break; + } + case USB_REQUEST_CLEAR_FEATURE: + { + DPRINT("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, + Urb->UrbControlVendorClassRequest.Value); + switch (Urb->UrbControlVendorClassRequest.Value) + { + case C_PORT_CONNECTION: + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; + break; + case C_PORT_RESET: + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; + break; + default: + DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); + break; + } + break; + } + case USB_REQUEST_SET_FEATURE: + { + DPRINT("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, + Urb->UrbControlVendorClassRequest.Value); + + switch(Urb->UrbControlVendorClassRequest.Value) + { + case PORT_RESET: + { + PdoDeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus |= USB_PORT_STATUS_ENABLE; + ResetPort(FdoDeviceExtension, Urb->UrbControlVendorClassRequest.Index-1); + + break; + } + case PORT_ENABLE: + { + DPRINT1("PORT_ENABLE not implemented\n"); + break; + } + case PORT_POWER: + { + DPRINT1("PORT_POWER not implemented\n"); + break; + } + default: + { + DPRINT1("Unknown Set Feature!\n"); + break; + } + } + break; + } + case USB_REQUEST_SET_ADDRESS: + { + DPRINT1("USB_REQUEST_SET_ADDRESS\n"); + break; + } + case USB_REQUEST_GET_DESCRIPTOR: + { + DPRINT1("USB_REQUEST_GET_DESCRIPTOR\n"); + break; + } + case USB_REQUEST_SET_DESCRIPTOR: + { + DPRINT1("USB_REQUEST_SET_DESCRIPTOR\n"); + break; + } + case USB_REQUEST_GET_CONFIGURATION: + { + DPRINT1("USB_REQUEST_GET_CONFIGURATION\n"); + break; + } + case USB_REQUEST_SET_CONFIGURATION: + { + DPRINT1("USB_REQUEST_SET_CONFIGURATION\n"); + break; + } + case USB_REQUEST_GET_INTERFACE: + { + DPRINT1("USB_REQUEST_GET_INTERFACE\n"); + break; + } + case USB_REQUEST_SET_INTERFACE: + { + DPRINT1("USB_REQUEST_SET_INTERFACE\n"); + break; + } + case USB_REQUEST_SYNC_FRAME: + { + DPRINT1("USB_REQUEST_SYNC_FRAME\n"); + break; + } + default: + { + DPRINT1("Unknown Function Class Unknown request\n"); + break; + } + } + break; + } + default: + { + DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + + if (Urb->UrbHeader.Status == USBD_STATUS_SUCCESS) + { + /* Fake a successful Control Transfer */ + Urb->UrbHeader.Function = 0x08; + Urb->UrbHeader.UsbdFlags = 0; + } + + return Status; +} + VOID CompletePendingURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension) { PLIST_ENTRY NextIrp = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - ULONG_PTR Information = 0; - PIO_STACK_LOCATION Stack; - PUSB_DEVICE UsbDevice = NULL; KIRQL oldIrql; PIRP Irp = NULL; - URB *Urb; KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); @@ -70,489 +540,13 @@ if (!Irp) break; - Stack = IoGetCurrentIrpStackLocation(Irp); - ASSERT(Stack); - - Urb = (PURB) Stack->Parameters.Others.Argument1; - - ASSERT(Urb); - - Information = 0; - Status = STATUS_SUCCESS; - - DPRINT("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); - DPRINT("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); - DPRINT("UsbdDeviceHandle = %x\n", Urb->UrbHeader.UsbdDeviceHandle); - - UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; - /* UsbdDeviceHandle of 0 is root hub */ - if (UsbDevice == NULL) - UsbDevice = DeviceExtension->UsbDevices[0]; - - /* Assume URB success */ - Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; - /* Set the DeviceHandle to the Internal Device */ - Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; - - switch (Urb->UrbHeader.Function) - { - case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: - { - DPRINT("URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER:\n"); - DPRINT("--->TransferBufferLength %x\n",Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); - DPRINT("--->TransferBuffer %x\n",Urb->UrbBulkOrInterruptTransfer.TransferBuffer); - DPRINT("--->PipeHandle %x\n",Urb->UrbBulkOrInterruptTransfer.PipeHandle); - DPRINT("---->(PVOID)&UsbDevice->EndPointDescriptor %x\n", (PVOID)&UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor); - DPRINT("--->TransferFlags %x\n", Urb->UrbBulkOrInterruptTransfer.TransferFlags); - ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); - RtlZeroMemory(Urb->UrbBulkOrInterruptTransfer.TransferBuffer, Urb->UrbBulkOrInterruptTransfer.TransferBufferLength); - - if (UsbDevice == DeviceExtension->UsbDevices[0]) - { - if (Urb->UrbBulkOrInterruptTransfer.TransferFlags & (USBD_TRANSFER_DIRECTION_IN | USBD_SHORT_TRANSFER_OK)) - { - LONG i; - for (i = 0; i < 8; i++) - { - if (i == 0){ - DPRINT("PortStatus %x\n", DeviceExtension->Ports[i].PortStatus); - DPRINT("PortChange %x\n", DeviceExtension->Ports[i].PortChange);} - if (DeviceExtension->Ports[i].PortChange) - { - DPRINT1("Inform hub driver that port %d has changed\n", i+1); - ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((i + 1) & 7); - } - } - } - else - { - Urb->UrbHeader.Status = USBD_STATUS_INVALID_PARAMETER; - Status = STATUS_UNSUCCESSFUL; - DPRINT1("Invalid transfer flags for SCE\n"); - } - } - else - DPRINT1("Interrupt Transfer not for hub\n"); - break; - } - case URB_FUNCTION_GET_STATUS_FROM_DEVICE: - { - DPRINT("Get Status from Device\n"); - DPRINT("Index : %d\n", Urb->UrbControlGetStatusRequest.Index); - - if (Urb->UrbControlGetStatusRequest.Index == 0) - { - ASSERT(Urb->UrbBulkOrInterruptTransfer.TransferBuffer != NULL); - *(PUSHORT)Urb->UrbControlGetStatusRequest.TransferBuffer = USB_PORT_STATUS_CONNECT | USB_PORT_STATUS_ENABLE; - } - else - { - DPRINT1("Uknown identifier\n"); - Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; - Status = STATUS_UNSUCCESSFUL; - } - break; - } - case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: - { - switch(Urb->UrbControlDescriptorRequest.DescriptorType) - { - case USB_DEVICE_DESCRIPTOR_TYPE: - { - DPRINT1("USB DEVICE DESC\n"); - if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)) - { - Urb->UrbControlDescriptorRequest.TransferBufferLength = sizeof(USB_DEVICE_DESCRIPTOR); - } - ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer != NULL); - RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, - &UsbDevice->DeviceDescriptor, - Urb->UrbControlDescriptorRequest.TransferBufferLength); - break; - } - case USB_CONFIGURATION_DESCRIPTOR_TYPE: - { - PUCHAR BufPtr; - LONG i, j; - - DPRINT1("USB CONFIG DESC\n"); - if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength) - { - Urb->UrbControlDescriptorRequest.TransferBufferLength = UsbDevice->ActiveConfig->ConfigurationDescriptor.wTotalLength; - } - else - { - DPRINT1("TransferBufferLenth %x is too small!!!\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); - if (Urb->UrbControlDescriptorRequest.TransferBufferLength < sizeof(USB_CONFIGURATION_DESCRIPTOR)) - { - DPRINT1("Bail!\n"); - break; - } - } - - ASSERT(Urb->UrbControlDescriptorRequest.TransferBuffer); - BufPtr = (PUCHAR)Urb->UrbControlDescriptorRequest.TransferBuffer; - - /* Copy the Configuration Descriptor */ - RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->ConfigurationDescriptor, sizeof(USB_CONFIGURATION_DESCRIPTOR)); - - /* If there is no room for all the configs then bail */ - if (!(Urb->UrbControlDescriptorRequest.TransferBufferLength > sizeof(USB_CONFIGURATION_DESCRIPTOR))) - { - DPRINT1("Bail!\n"); - break; - } - - BufPtr += sizeof(USB_CONFIGURATION_DESCRIPTOR); - for (i = 0; i < UsbDevice->ActiveConfig->ConfigurationDescriptor.bNumInterfaces; i++) - { - /* Copy the Interface Descriptor */ - RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->Interfaces[i]->InterfaceDescriptor, sizeof(USB_INTERFACE_DESCRIPTOR)); - BufPtr += sizeof(USB_INTERFACE_DESCRIPTOR); - for (j = 0; j < UsbDevice->ActiveConfig->Interfaces[i]->InterfaceDescriptor.bNumEndpoints; j++) - { - /* Copy the EndPoint Descriptor */ - RtlCopyMemory(BufPtr, &UsbDevice->ActiveConfig->Interfaces[i]->EndPoints[j]->EndPointDescriptor, sizeof(USB_ENDPOINT_DESCRIPTOR)); - BufPtr += sizeof(USB_ENDPOINT_DESCRIPTOR); - } - } - - break; - } - case USB_STRING_DESCRIPTOR_TYPE: - { - DPRINT1("Usb String Descriptor not implemented\n"); - break; - } - default: - { - DPRINT1("Descriptor Type %x not supported!\n", Urb->UrbControlDescriptorRequest.DescriptorType); - } - } - break; - } - case URB_FUNCTION_SELECT_CONFIGURATION: - { - PUSBD_INTERFACE_INFORMATION InterfaceInfo; - LONG iCount, pCount; - - DPRINT("Selecting Configuration\n"); - DPRINT("Length %x\n", Urb->UrbHeader.Length); - DPRINT("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); - - if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) - { - DPRINT("ConfigurationDescriptor = %p\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor); - DPRINT(" bLength = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bLength); - DPRINT(" bDescriptorType = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bDescriptorType); - DPRINT(" wTotalLength = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->wTotalLength); - DPRINT(" bNumInterfaces = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces); - DPRINT(" bConfigurationValue = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bConfigurationValue); - DPRINT(" iConfiguration = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->iConfiguration); - DPRINT(" bmAttributes = %04x\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bmAttributes); - DPRINT(" MaxPower = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->MaxPower); - - - Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&DeviceExtension->UsbDevices[0]->ActiveConfig->ConfigurationDescriptor; - DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); - InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; - - for (iCount = 0; iCount < Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces; iCount++) - { - DPRINT("InterfaceInformation[%d]\n", iCount); - DPRINT(" Length = %d\n", InterfaceInfo->Length); - DPRINT(" InterfaceNumber = %d\n", InterfaceInfo->InterfaceNumber); - DPRINT(" AlternateSetting = %d\n", InterfaceInfo->AlternateSetting); - DPRINT(" Class = %02x\n", (ULONG)InterfaceInfo->Class); - DPRINT(" SubClass = %02x\n", (ULONG)InterfaceInfo->SubClass); - DPRINT(" Protocol = %02x\n", (ULONG)InterfaceInfo->Protocol); - DPRINT(" Reserved = %02x\n", (ULONG)InterfaceInfo->Reserved); - DPRINT(" InterfaceHandle = %p\n", InterfaceInfo->InterfaceHandle); - DPRINT(" NumberOfPipes = %d\n", InterfaceInfo->NumberOfPipes); - InterfaceInfo->InterfaceHandle = (PVOID)&UsbDevice->ActiveInterface->InterfaceDescriptor; - InterfaceInfo->Class = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceClass; - InterfaceInfo->SubClass = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceSubClass; - InterfaceInfo->Protocol = UsbDevice->ActiveInterface->InterfaceDescriptor.bInterfaceProtocol; - InterfaceInfo->Reserved = 0; - - for (pCount = 0; pCount < InterfaceInfo->NumberOfPipes; pCount++) - { - DPRINT("Pipe[%d]\n", pCount); - DPRINT(" MaximumPacketSize = %d\n", InterfaceInfo->Pipes[pCount].MaximumPacketSize); - DPRINT(" EndpointAddress = %d\n", InterfaceInfo->Pipes[pCount].EndpointAddress); - DPRINT(" Interval = %d\n", InterfaceInfo->Pipes[pCount].Interval); - DPRINT(" PipeType = %d\n", InterfaceInfo->Pipes[pCount].PipeType); - DPRINT(" PipeHandle = %x\n", InterfaceInfo->Pipes[pCount].PipeHandle); - DPRINT(" MaximumTransferSize = %d\n", InterfaceInfo->Pipes[pCount].MaximumTransferSize); - DPRINT(" PipeFlags = %08x\n", InterfaceInfo->Pipes[pCount].PipeFlags); - InterfaceInfo->Pipes[pCount].MaximumPacketSize = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.wMaxPacketSize; - InterfaceInfo->Pipes[pCount].EndpointAddress = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bEndpointAddress; - InterfaceInfo->Pipes[pCount].Interval = UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor.bInterval; - InterfaceInfo->Pipes[pCount].PipeType = UsbdPipeTypeInterrupt; - InterfaceInfo->Pipes[pCount].PipeHandle = (PVOID)&UsbDevice->ActiveInterface->EndPoints[pCount]->EndPointDescriptor; - if (InterfaceInfo->Pipes[pCount].MaximumTransferSize == 0) - InterfaceInfo->Pipes[pCount].MaximumTransferSize = 4096; - /* InterfaceInfo->Pipes[j].PipeFlags = 0; */ - } - InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((PUCHAR)InterfaceInfo + InterfaceInfo->Length); - } - } - else - { - /* FIXME: Set device to unconfigured state */ - } - break; - } - case URB_FUNCTION_CLASS_DEVICE: - { - switch (Urb->UrbControlVendorClassRequest.Request) - { - case USB_REQUEST_GET_DESCRIPTOR: - { - DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); - DPRINT1("Urb->UrbControlVendorClassRequest.Value %x\n", Urb->UrbControlVendorClassRequest.Value); - - switch (Urb->UrbControlVendorClassRequest.Value >> 8) - { - case USB_DEVICE_CLASS_AUDIO: - { - DPRINT1("USB_DEVICE_CLASS_AUDIO\n"); - break; - } - case USB_DEVICE_CLASS_COMMUNICATIONS: - { - DPRINT1("USB_DEVICE_CLASS_COMMUNICATIONS\n"); - break; - } - case USB_DEVICE_CLASS_HUMAN_INTERFACE: - { - DPRINT1("USB_DEVICE_CLASS_HUMAN_INTERFACE\n"); - break; - } - case USB_DEVICE_CLASS_MONITOR: - { - DPRINT1("USB_DEVICE_CLASS_MONITOR\n"); - break; - } - case USB_DEVICE_CLASS_PHYSICAL_INTERFACE: - { - DPRINT1("USB_DEVICE_CLASS_PHYSICAL_INTERFACE\n"); - break; - } - case USB_DEVICE_CLASS_POWER: - { - DPRINT1("USB_DEVICE_CLASS_POWER\n"); - break; - } - case USB_DEVICE_CLASS_PRINTER: - { - DPRINT1("USB_DEVICE_CLASS_PRINTER\n"); - break; - } - case USB_DEVICE_CLASS_STORAGE: - { - DPRINT1("USB_DEVICE_CLASS_STORAGE\n"); - break; - } - case USB_DEVICE_CLASS_RESERVED: - DPRINT1("Reserved!!!\n"); - case USB_DEVICE_CLASS_HUB: - { - - PUSB_HUB_DESCRIPTOR UsbHubDescr = Urb->UrbControlVendorClassRequest.TransferBuffer; - - DPRINT1("Length %x\n", Urb->UrbControlVendorClassRequest.TransferBufferLength); - ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); - /* FIXME: Handle more than root hub? */ - if(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)) - { - Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); - } - else - { - /* FIXME: Handle this correctly */ - UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); - UsbHubDescr->bDescriptorType = 0x29; - break; - } - DPRINT1("USB_DEVICE_CLASS_HUB request\n"); - UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); - UsbHubDescr->bDescriptorType = 0x29; - UsbHubDescr->bNumberOfPorts = 0x08; - UsbHubDescr->wHubCharacteristics = 0x0012; - UsbHubDescr->bPowerOnToPowerGood = 0x01; - UsbHubDescr->bHubControlCurrent = 0x00; - UsbHubDescr->bRemoveAndPowerMask[0] = 0x00; - UsbHubDescr->bRemoveAndPowerMask[1] = 0x00; - UsbHubDescr->bRemoveAndPowerMask[2] = 0xff; - break; - } - default: - { - DPRINT1("Unknown UrbControlVendorClassRequest Value\n"); - } - } - break; - } - case USB_REQUEST_GET_STATUS: - { - DPRINT1("DEVICE: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); - if (Urb->UrbControlVendorClassRequest.Index == 1) - { - ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); - ((PULONG)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = 0; - } - break; - } - default: - { - DPRINT1("Unhandled URB request for class device\n"); - Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; - } - } - break; - } - case URB_FUNCTION_CLASS_OTHER: - { - - /* FIXME: Each one of these needs to make sure that the index value is a valid for a port (1-8) and return STATUS_UNSUCCESSFUL is not */ - - switch (Urb->UrbControlVendorClassRequest.Request) - { - case USB_REQUEST_GET_STATUS: - { - DPRINT1("OTHER: USB_REQUEST_GET_STATUS for port %d\n", Urb->UrbControlVendorClassRequest.Index); - ASSERT(Urb->UrbControlVendorClassRequest.TransferBuffer != 0); - DPRINT1("PortStatus %x\n", DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus); - DPRINT1("PortChange %x\n", DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange); - ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[0] = DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortStatus; - ((PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer)[1] = DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange; - break; - } - case USB_REQUEST_CLEAR_FEATURE: - { - DPRINT1("USB_REQUEST_CLEAR_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); - switch (Urb->UrbControlVendorClassRequest.Value) - { - case C_PORT_CONNECTION: - DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_CONNECT; - break; - case C_PORT_RESET: - DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange &= ~USB_PORT_STATUS_RESET; - break; - default: - DPRINT1("Unknown Value for Clear Feature %x \n", Urb->UrbControlVendorClassRequest.Value); - break; - } - break; - } - case USB_REQUEST_SET_FEATURE: - { - DPRINT1("USB_REQUEST_SET_FEATURE Port %d, value %x\n", Urb->UrbControlVendorClassRequest.Index, - Urb->UrbControlVendorClassRequest.Value); - - switch(Urb->UrbControlVendorClassRequest.Value) - { - case PORT_RESET: - { - DeviceExtension->Ports[Urb->UrbControlVendorClassRequest.Index-1].PortChange |= USB_PORT_STATUS_RESET; - break; - } - case PORT_ENABLE: - { - DPRINT1("PORT_ENABLE not implemented\n"); - break; - } - case PORT_POWER: - { - DPRINT1("PORT_POWER not implemented\n"); - break; - } - default: - { - DPRINT1("Unknown Set Feature!\n"); - break; - } - } - break; - } - case USB_REQUEST_SET_ADDRESS: - { - DPRINT1("USB_REQUEST_SET_ADDRESS\n"); - break; - } - case USB_REQUEST_GET_DESCRIPTOR: - { - DPRINT1("USB_REQUEST_GET_DESCRIPTOR\n"); - break; - } - case USB_REQUEST_SET_DESCRIPTOR: - { - DPRINT1("USB_REQUEST_SET_DESCRIPTOR\n"); - break; - } - case USB_REQUEST_GET_CONFIGURATION: - { - DPRINT1("USB_REQUEST_GET_CONFIGURATION\n"); - break; - } - case USB_REQUEST_SET_CONFIGURATION: - { - DPRINT1("USB_REQUEST_SET_CONFIGURATION\n"); - break; - } - case USB_REQUEST_GET_INTERFACE: - { - DPRINT1("USB_REQUEST_GET_INTERFACE\n"); - break; - } - case USB_REQUEST_SET_INTERFACE: - { - DPRINT1("USB_REQUEST_SET_INTERFACE\n"); - break; - } - case USB_REQUEST_SYNC_FRAME: - { - DPRINT1("USB_REQUEST_SYNC_FRAME\n"); - break; - } - default: - { - DPRINT1("Unknown Function Class Unknown request\n"); - break; - } - } - break; - } - default: - { - DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); - Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; - } - - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; - - if (Urb->UrbHeader.Status == USBD_STATUS_SUCCESS) - { - /* Fake a successful Control Transfer */ - Urb->UrbHeader.Function = 0x08; - Urb->UrbHeader.UsbdFlags = 0; - } KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + HandleUrbRequest(DeviceExtension, Irp); IoCompleteRequest(Irp, IO_NO_INCREMENT); KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); - - if (DeviceExtension->HaltQueue) - break; } KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - if (!DeviceExtension->HaltQueue) - KeSetEvent(&DeviceExtension->QueueDrainedEvent, 0, FALSE); } Modified: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -125,20 +125,56 @@ { case IOCTL_INTERNAL_USB_SUBMIT_URB: { + PUSB_DEVICE UsbDevice = NULL; URB *Urb; + ULONG i; Urb = (PURB) Stack->Parameters.Others.Argument1; + UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; + + if (UsbDevice == NULL) + UsbDevice = PdoDeviceExtension->UsbDevices[0]; + if ((Urb->UrbHeader.Function == URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER) && - (Urb->UrbHeader.UsbdDeviceHandle == PdoDeviceExtension->UsbDevices[0])) - { - PdoDeviceExtension->HaltQueue = TRUE; - } - /* Queue all request for now, kernel thread will complete them */ - QueueURBRequest(PdoDeviceExtension, Irp); - Information = 0; - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; + (UsbDevice == PdoDeviceExtension->UsbDevices[0])) + { + if (Urb->UrbBulkOrInterruptTransfer.PipeHandle == &UsbDevice->ActiveInterface->EndPoints[0]->EndPointDescriptor) + { + DPRINT1("PipeHandle doesnt match SCE PipeHandle\n"); + } + + /* Queue the Irp first */ + QueueURBRequest(PdoDeviceExtension, Irp); + + /* Check if there is any connected devices */ + for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) + { + if (PdoDeviceExtension->Ports[i].PortChange == 0x01) + { + DPRINT1("Inform hub driver that port %d has changed\n", i+1); + ((PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer)[0] = 1 << ((i + 1) & 7); + Information = 0; + Status = STATUS_SUCCESS; + /* Assume URB success */ + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + /* Set the DeviceHandle to the Internal Device */ + Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; + + /* Request handled, Remove it from the queue */ + RemoveUrbRequest(PdoDeviceExtension, Irp); + break; + } + } + if (Status == STATUS_SUCCESS) break; + DPRINT1("Queueing IRP\n"); + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + break; + } + + Status = HandleUrbRequest(PdoDeviceExtension, Irp); + break; } case IOCTL_INTERNAL_USB_CYCLE_PORT: @@ -222,8 +258,11 @@ DPRINT("Ehci: IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO Arg1 %x, Arg2 %x\n", Stack->Parameters.Others.Argument1, Stack->Parameters.Others.Argument2); if (Stack->Parameters.Others.Argument1) *(PVOID *)Stack->Parameters.Others.Argument1 = FdoDeviceExtension->Pdo; + + /* Windows usbehci driver gives the Pdo in both Arguments. */ if (Stack->Parameters.Others.Argument2) - *(PVOID *)Stack->Parameters.Others.Argument2 = IoGetAttachedDeviceReference(FdoDeviceExtension->DeviceObject); + //*(PVOID *)Stack->Parameters.Others.Argument2 = IoGetAttachedDeviceReference(FdoDeviceExtension->DeviceObject); + *(PVOID *)Stack->Parameters.Others.Argument2 = FdoDeviceExtension->Pdo; Information = 0; Status = STATUS_SUCCESS; @@ -378,7 +417,7 @@ /* Create the root hub */ RootHubDevice = InternalCreateUsbDevice(1, 0, NULL, TRUE); - for (i = 0; i < 8; i++) + for (i = 0; i < PdoDeviceExtension->NumberOfPorts; i++) { PdoDeviceExtension->Ports[i].PortStatus = USB_PORT_STATUS_HIGH_SPEED | 0x8000; PdoDeviceExtension->Ports[i].PortChange = 0; @@ -432,7 +471,7 @@ PdoDeviceExtension->UsbDevices[0] = RootHubDevice; /* Create a thread to handle the URB's */ - +/* Status = PsCreateSystemThread(&PdoDeviceExtension->ThreadHandle, THREAD_ALL_ACCESS, NULL, @@ -443,7 +482,7 @@ if (!NT_SUCCESS(Status)) DPRINT1("Failed Thread Creation with Status: %x\n", Status); - +*/ Status = IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_HUB, NULL, &InterfaceSymLinkName); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -144,7 +144,6 @@ QueueHead->EndPointCapabilities2.PortNumber = Port; QueueHead->EndPointCapabilities1.DeviceAddress = Address; - CtrlSetup->bmRequestType._BM.Recipient = SetupPacket->bmRequestType._BM.Recipient; CtrlSetup->bmRequestType._BM.Type = SetupPacket->bmRequestType._BM.Type; CtrlSetup->bmRequestType._BM.Dir = SetupPacket->bmRequestType._BM.Dir; @@ -201,7 +200,7 @@ UsbCmd->Run = FALSE; WRITE_REGISTER_ULONG((PULONG)(Base + EHCI_USBCMD), tmp); - if (CtrlSetup->bmRequestType._BM.Dir == BMREQUEST_DEVICE_TO_HOST) + if (SetupPacket->bmRequestType._BM.Dir == BMREQUEST_DEVICE_TO_HOST) { if ((Buffer) && (BufferLength)) { @@ -211,7 +210,6 @@ DPRINT1("Unable to copy data to buffer\n"); } - ExReleaseFastMutex(&DeviceExtension->AsyncListMutex); return TRUE; Modified: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -361,10 +361,13 @@ ULONG Vector; KIRQL Irql; + KTIMER UpdateTimer; KINTERRUPT_MODE Mode; BOOLEAN IrqShared; PKINTERRUPT EhciInterrupt; KDPC DpcObject; + KDPC TimerDpcObject; + KAFFINITY Affinity; ULONG MapRegisters; @@ -465,13 +468,22 @@ ExecuteControlRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, UCHAR Address, ULONG Port, PVOID Buffer, ULONG BufferLength); VOID +RequestURBCancel (PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); + +VOID +RemoveUrbRequest(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PIRP Irp); + +VOID QueueURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); VOID CompletePendingURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension); -VOID -URBRequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS +HandleUrbRequest(PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); PUSB_DEVICE DeviceHandleToUsbDevice(PPDO_DEVICE_EXTENSION PdoDeviceExtension, PUSB_DEVICE_HANDLE DeviceHandle); + +BOOLEAN +ResetPort(PFDO_DEVICE_EXTENSION FdoDeviceExtension, UCHAR Port); Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Tue Sep 14 09:46:28 2010 @@ -30,7 +30,7 @@ DPRINT1("This is the root hub\n"); } - UsbDevicePointer->Address = DeviceNumber; + UsbDevicePointer->Address = 0;// DeviceNumber; UsbDevicePointer->Port = Port; UsbDevicePointer->ParentDevice = Parent; @@ -85,8 +85,6 @@ if (PdoDeviceExtension->UsbDevices[i] == NULL) { PdoDeviceExtension->UsbDevices[i] = (PUSB_DEVICE)UsbDevice; - PdoDeviceExtension->UsbDevices[i]->Address = i + 1; - PdoDeviceExtension->UsbDevices[i]->Port = PortNumber; break; } i++; @@ -140,6 +138,7 @@ Ptr = Buffer; /* Set the device address */ +/* CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; CtrlSetup.bmRequestType._BM.Type = BMREQUEST_STANDARD; CtrlSetup.bmRequestType._BM.Reserved = 0; @@ -151,6 +150,8 @@ DPRINT1("Setting Address to %x\n", UsbDevice->Address); ResultOk = ExecuteControlRequest(FdoDeviceExtension, &CtrlSetup, 0, UsbDevice->Port, NULL, 0); + +*/ /* Get the Device Descriptor */ CtrlSetup.bmRequestType._BM.Recipient = BMREQUEST_TO_DEVICE; @@ -536,7 +537,6 @@ Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount) { DPRINT1("Ehci: Initialize20Hub called, HubDeviceHandle: %x\n", HubDeviceHandle); - /* FIXME: */ /* Create the Irp Queue for SCE */ /* Should queue be created for each device or each enpoint??? */

1 0

[fireball] 48769: - Fix GetTextExtentExPointI and GetTextExtentPointI prototypes to match Platform SDK.
by fireball＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: fireball Date: Mon Sep 13 20:45:45 2010 New Revision: 48769 URL: http://svn.reactos.org/svn/reactos?rev=48769&view=rev Log: - Fix GetTextExtentExPointI and GetTextExtentPointI prototypes to match Platform SDK. Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c Modified: branches/arwinss/reactos/dll/win32/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdi32… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdi32/font.c [iso-8859-1] Mon Sep 13 20:45:45 2010 @@ -969,7 +969,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, +BOOL WINAPI GetTextExtentExPointI( HDC hdc, LPWORD indices, int count, int max_ext, LPINT nfit, LPINT dxs, LPSIZE size ) { BOOL ret = FALSE; @@ -1010,7 +1010,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI GetTextExtentPointI( HDC hdc, const WORD *indices, INT count, LPSIZE size ) +BOOL WINAPI GetTextExtentPointI( HDC hdc, LPWORD indices, int count, LPSIZE size ) { return GetTextExtentExPointI( hdc, indices, count, 0, NULL, NULL, size ); }

1 0

[sir_richard] 48768: Patch by Anton Yarotsky: [FREELDR]: Implement support for /redirect=comX (usebiossettings not yet supported) and /redirectbaudrate. Uses cportlib. Tested, serial output works a...
by sir_richard＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: sir_richard Date: Mon Sep 13 20:36:49 2010 New Revision: 48768 URL: http://svn.reactos.org/svn/reactos?rev=48768&view=rev Log: Patch by Anton Yarotsky: [FREELDR]: Implement support for /redirect=comX (usebiossettings not yet supported) and /redirectbaudrate. Uses cportlib. Tested, serial output works and kernel reports "Headless support is not yet implemented". Future revisions should support ACPI SRT for PCI-based serial ports on server systems. Added: trunk/reactos/boot/freeldr/freeldr/windows/headless.c (with props) Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -32,5 +32,6 @@ <library>cmlib</library> <library>rtl</library> <library>libcntpr</library> + <library>cportlib</library> </module> </ifnot> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -75,6 +75,7 @@ <file>winldr.c</file> <file>wlmemory.c</file> <file>wlregistry.c</file> + <file>headless.c</file> </directory> <file>freeldr.c</file> <file>debug.c</file> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -14,6 +14,7 @@ <library>setupldr_main</library> <library>rossym</library> <library>cmlib</library> + <library>cportlib</library> <library>rtl</library> <library>libcntpr</library> </module> Added: trunk/reactos/boot/freeldr/freeldr/windows/headless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/headless.c (added) +++ trunk/reactos/boot/freeldr/freeldr/windows/headless.c [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -1,0 +1,313 @@ +/* + * PROJECT: ReactOS Boot Loader + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: boot/freeldr/windows/headless.c + * PURPOSE: Provides support for Windows Emergency Management Services + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <freeldr.h> +#include <cportlib/cportlib.h> + +/* Note: Move these to some smbios.h header */ +#define SYSID_TYPE_UUID "_UUID_" +#define SYSID_UUID_DATA_SIZE 16 +#include <pshpack1.h> +typedef struct _SYSID_UUID_ENTRY +{ + UCHAR Type[6]; + UCHAR Checksum; + USHORT Length; + UCHAR UUID[SYSID_UUID_DATA_SIZE]; +} SYSID_UUID_ENTRY, *PSYSID_UUID_ENTRY; +#include <poppack.h> + +/* GLOBALS ********************************************************************/ + +HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; +BOOLEAN WinLdrTerminalConnected; +ULONG WinLdrTerminalDeviceId; +ULONG WinLdrTerminalDelay; + +CPPORT Port[4] = +{ + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE}, + {NULL, 0, TRUE} +}; + +/* FUNCTIONS ******************************************************************/ + +VOID +WinLdrLoadGUID(OUT PGUID SystemGuid) +{ + PSYSID_UUID_ENTRY CurrentAddress; + + CurrentAddress = (PSYSID_UUID_ENTRY)0xE0000; + while (CurrentAddress < (PSYSID_UUID_ENTRY)0x100000) + { + if (RtlCompareMemory(&CurrentAddress->Type, SYSID_TYPE_UUID, 6) == 6) + { + RtlCopyMemory(SystemGuid, &CurrentAddress->UUID, SYSID_UUID_DATA_SIZE); + return; + } + CurrentAddress = (PSYSID_UUID_ENTRY)((ULONG_PTR)CurrentAddress + 1); + } + + RtlZeroMemory(SystemGuid, SYSID_UUID_DATA_SIZE); +} + +BOOLEAN +WinLdrPortInitialize(IN ULONG BaudRate, + IN ULONG PortNumber, + IN PUCHAR PortAddress, + IN BOOLEAN TerminalConnected, + OUT PULONG PortId) +{ + /* Set default baud rate */ + if (BaudRate == 0) BaudRate = 19200; + + /* Check if port or address given */ + if (PortNumber) + { + /* Pick correct address for port */ + if (!PortAddress) + { + switch (PortNumber) + { + case 1: + PortAddress = (PUCHAR)0x3F8; + break; + + case 2: + PortAddress = (PUCHAR)0x2F8; + break; + + case 3: + PortAddress = (PUCHAR)0x3E8; + break; + + default: + PortNumber = 4; + PortAddress = (PUCHAR)0x2E8; + } + } + } + else + { + /* Pick correct port for address */ + PortAddress = (PUCHAR)0x2F8; + if (CpDoesPortExist(PortAddress)) + { + PortNumber = 2; + } + else + { + PortAddress = (PUCHAR)0x3F8; + if (!CpDoesPortExist(PortAddress)) return FALSE; + PortNumber = 1; + } + } + + /* Not yet supported */ + ASSERT(LoaderRedirectionInformation.IsMMIODevice == FALSE); + + /* Check if port exists */ + if ((CpDoesPortExist(PortAddress)) || (CpDoesPortExist(PortAddress))) + { + /* Initialize port for first time, or re-initialize if specified */ + if (((TerminalConnected) && (Port[PortNumber - 1].Address)) || + !(Port[PortNumber - 1].Address)) + { + /* Initialize the port, return it */ + CpInitialize(&Port[PortNumber - 1], PortAddress, BaudRate); + *PortId = PortNumber - 1; + return TRUE; + } + } + + return FALSE; +} + +VOID +WinLdrPortPutByte(IN ULONG PortId, + IN UCHAR Data) +{ + CpPutByte(&Port[PortId], Data); +} + +BOOLEAN +WinLdrPortGetByte(IN ULONG PortId, + OUT PUCHAR Data) +{ + return CpGetByte(&Port[PortId], Data, TRUE, FALSE) == CP_GET_SUCCESS; +} + +BOOLEAN +WinLdrPortPollOnly(IN ULONG PortId) +{ + UCHAR Dummy; + + return CpGetByte(&Port[PortId], &Dummy, FALSE, TRUE) == CP_GET_SUCCESS; +} + +VOID +WinLdrEnableFifo(IN ULONG PortId, + IN BOOLEAN Enable) +{ + CpEnableFifo(Port[PortId].Address, Enable); +} + +VOID +WinLdrInitializeHeadlessPort(VOID) +{ + ULONG PortNumber, BaudRate; + PUCHAR PortAddress; + PCHAR AnsiReset = "\x1B[m"; + ULONG i; + + PortNumber = LoaderRedirectionInformation.PortNumber; + PortAddress = LoaderRedirectionInformation.PortAddress; + BaudRate = LoaderRedirectionInformation.BaudRate; + + /* Pick a port address */ + if (PortNumber) + { + if (!PortAddress) + { + switch (PortNumber) + { + case 2: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x2F8; + break; + + case 3: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x3E8; + break; + + case 4: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x2E8; + break; + + default: + LoaderRedirectionInformation.PortAddress = (PUCHAR)0x3F8; + break; + } + } + } + else + { + /* No number, so no EMS */ + WinLdrTerminalConnected = FALSE; + return; + } + + /* Call arch code to initialize the port */ + PortAddress = LoaderRedirectionInformation.PortAddress; + WinLdrTerminalConnected = WinLdrPortInitialize( + BaudRate, + PortNumber, + PortAddress, + WinLdrTerminalConnected, + &WinLdrTerminalDeviceId); + + if (WinLdrTerminalConnected) + { + /* Port seems usable, set it up and get the BIOS GUID */ + WinLdrEnableFifo(WinLdrTerminalDeviceId, TRUE); + + WinLdrLoadGUID(&LoaderRedirectionInformation.SystemGUID); + + /* Calculate delay in us based on the baud, assume 9600 if none given */ + if (!BaudRate) + { + BaudRate = 9600; + LoaderRedirectionInformation.BaudRate = BaudRate; + } + + WinLdrTerminalDelay = (10 * 1000 * 1000) / (BaudRate / 10) / 6; + + /* Sent an ANSI reset sequence to get the terminal up and running */ + for (i = 0; i < strlen(AnsiReset); i++) + { + WinLdrPortPutByte(WinLdrTerminalDeviceId, AnsiReset[i]); + StallExecutionProcessor(WinLdrTerminalDelay); + } + } + else + { + /* The port was bogus, so don't give any information to the kernel */ + RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK)); + } +} + +VOID +WinLdrSetupEms(IN PCHAR BootOptions) +{ + PCHAR RedirectPort; + + /* Use a direction port if one was given, or use ACPI to detect one instead */ + RedirectPort = strstr(BootOptions, "/redirect="); + + if (RedirectPort) + { + RedirectPort = strstr(RedirectPort, "com"); + if (RedirectPort) + { + RedirectPort += sizeof("com") - 1; + LoaderRedirectionInformation.PortNumber = atoi(RedirectPort); + } + else + { + RedirectPort = strstr(RedirectPort, "usebiossettings"); + if (RedirectPort) + { + UiDrawStatusText("ACPI SRT Table Not Supported..."); + } + else + { + LoaderRedirectionInformation.PortAddress = (PUCHAR)strtoul(RedirectPort, 0, 16); + if (LoaderRedirectionInformation.PortAddress) + { + LoaderRedirectionInformation.PortNumber = 3; + } + } + } + } + + /* Use a direction baudrate if one was given */ + RedirectPort = strstr(BootOptions, "/redirectbaudrate="); + if (RedirectPort) + { + if (strstr(RedirectPort, "115200")) + { + LoaderRedirectionInformation.BaudRate = 115200; + } + else if (strstr(RedirectPort, "57600")) + { + LoaderRedirectionInformation.BaudRate = 57600; + } + else if (strstr(RedirectPort, "19200")) + { + LoaderRedirectionInformation.BaudRate = 19200; + } + else + { + LoaderRedirectionInformation.BaudRate = 9600; + } + } + + /* Enable headless support if parameters were found */ + if (LoaderRedirectionInformation.PortNumber) + { + if (!LoaderRedirectionInformation.BaudRate) + { + LoaderRedirectionInformation.BaudRate = 9600; + } + + WinLdrInitializeHeadlessPort(); + } +} Propchange: trunk/reactos/boot/freeldr/freeldr/windows/headless.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Sep 13 20:36:49 2010 @@ -513,6 +513,10 @@ /* Allocate and minimalistic-initialize LPB */ AllocateAndInitLPB(&LoaderBlock); + + /* Setup redirection support */ + extern void WinLdrSetupEms(IN PCHAR BootOptions); + WinLdrSetupEms(BootOptions); /* Detect hardware */ UseRealHeap = TRUE; @@ -597,6 +601,10 @@ /* Save final value of LoaderPagesSpanned */ LoaderBlockVA->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + + /* Set headless block pointer */ + extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; + LoaderBlockVA->Extension->HeadlessLoaderBlock = PaToVa(&LoaderRedirectionInformation); DPRINTM(DPRINT_WINDOWS, "Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA);

1 0

[akhaldi] 48767: [USETUP] - Sylvain Petreolle: Improve debug prints for disk space check.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 17:25:00 2010 New Revision: 48767 URL: http://svn.reactos.org/svn/reactos?rev=48767&view=rev Log: [USETUP] - Sylvain Petreolle: Improve debug prints for disk space check. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Sep 13 17:25:00 2010 @@ -1401,26 +1401,24 @@ static BOOL IsDiskSizeValid(PPARTENTRY PartEntry) { - ULONGLONG m; + ULONGLONG m1, m2; /* check for unpartitioned space */ - m = PartEntry->UnpartitionedLength; - m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - - DPRINT1("Unpartitioned space is %lu MB\n", m); - - if( m > RequiredPartitionDiskSpace) + m1 = PartEntry->UnpartitionedLength; + m1 = (m1 + (1 << 19)) >> 20; /* in MBytes (rounded) */ + + if( m1 > RequiredPartitionDiskSpace) { return TRUE; } /* check for partitioned space */ - m = PartEntry->PartInfo[0].PartitionLength.QuadPart; - m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ - if (m < RequiredPartitionDiskSpace) + m2 = PartEntry->PartInfo[0].PartitionLength.QuadPart; + m2 = (m2 + (1 << 19)) >> 20; /* in MBytes (rounded) */ + if (m2 < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small (%lu MB), required disk space is %lu MB\n", m, RequiredPartitionDiskSpace); + DPRINT1("Partition is too small(unpartitioned: %I64u MB, partitioned: %I64u MB), required disk space is %lu MB\n", m1, m2, RequiredPartitionDiskSpace); return FALSE; } else

1 0

[akhaldi] 48766: [USETUP] - Christoph von Wittich: Add a debug print, and improve an existing one.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 16:34:15 2010 New Revision: 48766 URL: http://svn.reactos.org/svn/reactos?rev=48766&view=rev Log: [USETUP] - Christoph von Wittich: Add a debug print, and improve an existing one. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Mon Sep 13 16:34:15 2010 @@ -1406,6 +1406,9 @@ /* check for unpartitioned space */ m = PartEntry->UnpartitionedLength; m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */ + + DPRINT1("Unpartitioned space is %lu MB\n", m); + if( m > RequiredPartitionDiskSpace) { return TRUE; @@ -1417,7 +1420,7 @@ if (m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace); + DPRINT1("Partition is too small (%lu MB), required disk space is %lu MB\n", m, RequiredPartitionDiskSpace); return FALSE; } else

1 0

[akhaldi] 48765: [CMAKE] - Add pci, pcixn pcmcia, videoprt and wmilib to build.
by akhaldi＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: akhaldi Date: Mon Sep 13 13:48:29 2010 New Revision: 48765 URL: http://svn.reactos.org/svn/reactos?rev=48765&view=rev Log: [CMAKE] - Add pci, pcixn pcmcia, videoprt and wmilib to build. Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (with props) branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (with props) branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (with props) branches/cmake-bringup/drivers/wmi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/drivers/CMakeLists.txt branches/cmake-bringup/drivers/bus/CMakeLists.txt branches/cmake-bringup/drivers/video/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/videoprt.spec Modified: branches/cmake-bringup/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/CMakeList… ============================================================================== --- branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -7,3 +7,4 @@ add_subdirectory(setup) add_subdirectory(storage) add_subdirectory(video) +add_subdirectory(wmi) Modified: branches/cmake-bringup/drivers/bus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/CMake… ============================================================================== --- branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,3 +1,6 @@ add_subdirectory(acpi) add_subdirectory(isapnp) +add_subdirectory(pci) +add_subdirectory(pcix) +add_subdirectory(pcmcia) Added: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(pci SHARED + fdo.c + pci.c + pdo.c + pci.rc) + +set_target_properties(pci PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pci + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pci psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcix/… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,50 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +list(APPEND SOURCE + arb/ar_busno.c + arb/ar_memio.c + arb/arb_comn.c + arb/tr_irq.c + intrface/agpintrf.c + intrface/busintrf.c + intrface/cardbus.c + intrface/devhere.c + intrface/ideintrf.c + intrface/intrface.c + intrface/lddintrf.c + intrface/locintrf.c + intrface/pmeintf.c + intrface/routintf.c + pci/busno.c + pci/config.c + pci/devhere.c + pci/id.c + pci/ppbridge.c + pci/romimage.c + pci/state.c + debug.c + device.c + dispatch.c + enum.c + fdo.c + guid.c + hookhal.c + init.c + pcivrify.c + pdo.c + power.c + usage.c + utils.c + pci.rc) + +add_library(pcix SHARED ${CMAKE_CURRENT_BINARY_DIR}/pcix_pci.h.gch ${SOURCE}) + +set_target_properties(pcix PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcix + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(pcix ${CMAKE_CURRENT_SOURCE_DIR}/pci.h ${SOURCE}) +add_dependencies(pcix pcix_def psdk pciclass) Propchange: branches/cmake-bringup/drivers/bus/pcix/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,16 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +add_library(pcmcia SHARED + fdo.c + pcmcia.c + pdo.c + pcmcia.rc) + +set_target_properties(pcmcia PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(pcmcia + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_dependencies(pcmcia psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/video/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/CMa… ============================================================================== --- branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,2 +1,3 @@ add_subdirectory(font) +add_subdirectory(videoprt) Added: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,37 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) + +add_definitions(-D_VIDEOPORT_) + +spec2def(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.spec ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def) + +list(APPEND SOURCE + agp.c + ddc.c + dispatch.c + dma.c + event.c + funclist.c + int10.c + interrupt.c + resource.c + services.c + spinlock.c + stubs.c + timer.c + videoprt.c + videoprt.rc) + +add_library(videoprt SHARED ${CMAKE_CURRENT_BINARY_DIR}/videoprt_videoprt.h.gch ${SOURCE}) + +set_target_properties(videoprt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(videoprt + ${CMAKE_CURRENT_BINARY_DIR}/videoprt.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a + ${REACTOS_SOURCE_DIR}/hal/halx86/libhal.a) + +add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) +add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header) Propchange: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/drivers/video/videoprt/videoprt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/videoprt.spec [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -44,9 +44,9 @@ @ stdcall VideoPortGetVgaStatus(ptr ptr) @ stdcall VideoPortInitialize(ptr ptr ptr ptr) @ stdcall VideoPortInt10(ptr ptr) -@ fastcall VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement -@ fastcall VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange -@ fastcall VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement +@ stdcall -norelay VideoPortInterlockedDecrement(ptr) NTOSKRNL.InterlockedDecrement +@ stdcall -norelay VideoPortInterlockedExchange(ptr long) NTOSKRNL.InterlockedExchange +@ stdcall -norelay VideoPortInterlockedIncrement(ptr) NTOSKRNL.InterlockedIncrement @ stdcall VideoPortIsNoVesa() @ stdcall VideoPortLockBuffer(ptr ptr long long) @ stdcall VideoPortLockPages(ptr ptr ptr ptr long) Added: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMake… ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt (added) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Mon Sep 13 13:48:29 2010 @@ -1,0 +1,14 @@ + +set(CMAKE_C_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>") + +spec2def(wmilib ${CMAKE_CURRENT_SOURCE_DIR}/wmilib.spec ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def) + +add_library(wmilib SHARED wmilib.c wmilib.rc) + +set_target_properties(wmilib PROPERTIES LINK_FLAGS "-Wl,-entry,0 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") + +target_link_libraries(wmilib + ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def + ${REACTOS_SOURCE_DIR}/ntoskrnl/libntoskrnl.a) + +add_dependencies(wmilib wmilib_def psdk buildno_header bugcodes) Propchange: branches/cmake-bringup/drivers/wmi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 48764: [BATT] Add missing 4th parameter to BatteryClassCoInstaller.
by ekohl＠svn.reactos.org 13 Sep '10

13 Sep '10

Author: ekohl Date: Mon Sep 13 11:48:59 2010 New Revision: 48764 URL: http://svn.reactos.org/svn/reactos?rev=48764&view=rev Log: [BATT] Add missing 4th parameter to BatteryClassCoInstaller. Modified: trunk/reactos/dll/win32/batt/batt.c trunk/reactos/dll/win32/batt/batt.spec Modified: trunk/reactos/dll/win32/batt/batt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.c [iso-8859-1] Mon Sep 13 11:48:59 2010 @@ -38,7 +38,8 @@ WINAPI BatteryClassCoInstaller(IN DI_FUNCTION InstallFunction, IN HDEVINFO DeviceInfoSet, - IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context) { switch (InstallFunction) { Modified: trunk/reactos/dll/win32/batt/batt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/batt/batt.spec?r… ============================================================================== --- trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/batt/batt.spec [iso-8859-1] Mon Sep 13 11:48:59 2010 @@ -1,3 +1,3 @@ -@ stdcall BatteryClassCoInstaller(long ptr ptr) +@ stdcall BatteryClassCoInstaller(long ptr ptr ptr) @ stdcall BatteryClassInstall(long ptr ptr)

1 0

[akhaldi] 48763: [CMAKE] - Introduce support for the amd64 toolchain. Using it is as simple as adding -DARCH=amd64 to the cmake line (next to the toolchain file define). - Dedicated to Sylvain (Usu...
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 21:03:47 2010 New Revision: 48763 URL: http://svn.reactos.org/svn/reactos?rev=48763&view=rev Log: [CMAKE] - Introduce support for the amd64 toolchain. Using it is as simple as adding -DARCH=amd64 to the cmake line (next to the toolchain file define). - Dedicated to Sylvain (Usurp) ;) Modified: branches/cmake-bringup/toolchain-mingw32.cmake Modified: branches/cmake-bringup/toolchain-mingw32.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/toolchain-mingw32… ============================================================================== --- branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/toolchain-mingw32.cmake [iso-8859-1] Sun Sep 12 21:03:47 2010 @@ -1,12 +1,20 @@ +if(NOT ARCH) set(ARCH i386) +endif(NOT ARCH) # Choose the right MinGW prefix -if (CMAKE_HOST_SYSTEM_NAME MATCHES Windows) +if(ARCH MATCHES i386) + +if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) set(MINGW_PREFIX "" CACHE STRING "MinGW Prefix") else() set(MINGW_PREFIX "mingw32-" CACHE STRING "MinGW Prefix") -endif() +endif(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) + +elseif(ARCH MATCHES amd64) +set(MINGW_PREFIX "x86_64-w64-mingw32-" CACHE STRING "MinGW Prefix") +endif(ARCH MATCHES i386) # the name of the target operating system SET(CMAKE_SYSTEM_NAME Windows) @@ -23,7 +31,8 @@ # Use stdcall fixups, and don't link with anything by default unless we say so set(CMAKE_C_STANDARD_LIBRARIES -lgcc CACHE STRING "libgcc") # We should add the environment libgcc here -set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds") +#-Wl,-T,${REACTOS_SOURCE_DIR}/global.lds +set(CMAKE_SHARED_LINKER_FLAGS_INIT "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--enable-stdcall-fixup -Wl,--kill-at") # adjust the default behaviour of the FIND_XXX() commands: # search headers and libraries in the target environment, search

1 0

[akhaldi] 48762: [CMAKE] - Improve bootvid, crt and ntoskrnl.
by akhaldi＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: akhaldi Date: Sun Sep 12 21:02:18 2010 New Revision: 48762 URL: http://svn.reactos.org/svn/reactos?rev=48762&view=rev Log: [CMAKE] - Improve bootvid, crt and ntoskrnl. Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… ============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -3,14 +3,18 @@ spec2def(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/bootvid.spec ${CMAKE_CURRENT_BINARY_DIR}/bootvid.def) +list(APPEND SOURCE bootvid.rc) + +if(ARCH MATCHES i386 OR ARCH MATCHES amd64) list(APPEND SOURCE - ${ARCH}/bootvid.c - ${ARCH}/bootdata.c - bootvid.rc) - -if(ARCH MATCHES i386) -list(APPEND SOURCE i386/vga.c) -endif(ARCH MATCHES i386) + i386/bootvid.c + i386/bootdata.c + i386/vga.c) +elseif(ARCH MATCHES arm) +list(APPEND SOURCE + arm/bootvid.c + arm/bootdata.c) +endif(ARCH MATCHES i386 OR ARCH MATCHES amd64) add_library(bootvid SHARED ${CMAKE_CURRENT_BINARY_DIR}/bootvid_precomp.h.gch ${SOURCE}) Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -40,11 +40,6 @@ float/isnan.c float/nafter.c float/scalb.c - float/${ARCH}/clearfp.c - float/${ARCH}/cntrlfp.c - float/${ARCH}/fpreset.c - float/${ARCH}/logb.c - float/${ARCH}/statfp.c locale/locale.c math/acos.c math/adjust.c @@ -287,9 +282,23 @@ wine/undname.c) if(ARCH MATCHES i386) -list(APPEND CRT_SOURCE except/i386/prolog.s except/i386/unwind.c) +list(APPEND CRT_SOURCE + except/i386/chkstk_asm.s + except/i386/prolog.s + except/i386/unwind.c + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c) elseif(ARCH MATCHES amd64) -list(APPEND CRT_SOURCE chkstk_asm.s) +list(APPEND CRT_SOURCE + except/amd64/chkstk_asm.s + float/i386/clearfp.c + float/i386/cntrlfp.c + float/i386/fpreset.c + float/i386/logb.c + float/i386/statfp.c) endif(ARCH MATCHES i386) if(ARCH MATCHES i386) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sun Sep 12 21:02:18 2010 @@ -23,7 +23,6 @@ cc/mdl.c cc/pin.c cc/view.c - config/${ARCH}/cmhardwr.c config/cmalloc.c config/cmapi.c config/cmboot.c @@ -251,6 +250,7 @@ if(ARCH MATCHES i386) list(APPEND SOURCE + config/i386/cmhardwr.c ex/i386/interlck_asm.S ex/i386/fastinterlck_asm.S ex/i386/ioport.S @@ -280,6 +280,7 @@ vdm/vdmexec.c) elseif(ARCH MATCHES amd64) list(APPEND SOURCE + config/i386/cmhardwr.c ex/amd64/fastinterlck.c ke/amd64/boot.S ke/amd64/context.c @@ -298,6 +299,7 @@ ps/amd64/psctx.c) elseif(ARCH MATCHES arm) list(APPEND SOURCE + config/arm/cmhardwr.c ke/arm/boot.s ke/arm/cpu.c ke/arm/ctxswtch.s @@ -314,6 +316,7 @@ rtl/arm/rtlexcpt.c) elseif(ARCH MATCHES powerpc) list(APPEND SOURCE + config/powerpc/cmhardwr.c ke/powerpc/main_asm.S ke/powerpc/cpu.c ke/powerpc/exp.c

1 0

[cgutman] 48761: [DESK] - "repair DragFullWindows setting" - Patch by Matthias Kupfer
by cgutman＠svn.reactos.org 12 Sep '10

12 Sep '10

Author: cgutman Date: Sun Sep 12 20:10:27 2010 New Revision: 48761 URL: http://svn.reactos.org/svn/reactos?rev=48761&view=rev Log: [DESK] - "repair DragFullWindows setting" - Patch by Matthias Kupfer Modified: trunk/reactos/dll/cpl/desk/effappdlg.c trunk/reactos/dll/cpl/desk/theme.c Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Sun Sep 12 20:10:27 2010 @@ -28,7 +28,7 @@ g->ThemeAdv.Effects.bKeyboardCues = (state == BST_CHECKED) ? TRUE : FALSE; state = SendDlgItemMessage(hwndDlg, IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, BM_GETCHECK, 0, 0); g->ThemeAdv.Effects.bDragFullWindows = (state == BST_CHECKED) ? TRUE : FALSE; - + g->bHasChanged = TRUE; } @@ -105,12 +105,12 @@ { case IDOK: SaveCurrentValues(hwndDlg, g); - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, IDOK); break; case IDCANCEL: g->ThemeAdv = g->Theme; - EndDialog(hwndDlg, 0); + EndDialog(hwndDlg, IDCANCEL); break; case IDC_EFFAPPEARANCE_ANIMATION: Modified: trunk/reactos/dll/cpl/desk/theme.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/theme.c?rev=4… ============================================================================== --- trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/theme.c [iso-8859-1] Sun Sep 12 20:10:27 2010 @@ -124,8 +124,7 @@ theme->Effects.bTooltipFade = theme->Effects.bMenuFade; /* show content of windows during dragging */ - //SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); - SystemParametersInfoW(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0); + SystemParametersInfo(SPI_GETDRAGFULLWINDOWS, 0, &theme->Effects.bDragFullWindows, 0); /* "Hide underlined letters for keyboard navigation until I press the Alt key" */ SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &theme->Effects.bKeyboardCues, 0); @@ -307,7 +306,7 @@ */ theme->Effects.bTooltipAnimation = theme->Effects.bMenuAnimation; theme->Effects.bTooltipFade = theme->Effects.bMenuFade; - SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, NULL, SPIF_UPDATEINIFILE|SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETDRAGFULLWINDOWS, theme->Effects.bDragFullWindows, (PVOID)&theme->Effects.bDragFullWindows, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); UPDATE_USERPREF(KEYBOARDCUES, &theme->Effects.bKeyboardCues); //UPDATE_USERPREF(ACTIVEWINDOWTRACKING, &theme->Effects.bActiveWindowTracking); //UPDATE_USERPREF(MENUANIMATION, &theme->Effects.bMenuAnimation);

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2010