Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mjmartin] 51367: [USBEHCI_NEW] - Change VendorId and DeviceId to the same size as PciConfig members, PUSHORT. - Add support function GetBusInterface. - Implement GetDeviceDetails and ResetPort.
by mjmartin＠svn.reactos.org 16 Apr '11

16 Apr '11

Author: mjmartin Date: Sat Apr 16 06:59:45 2011 New Revision: 51367 URL: http://svn.reactos.org/svn/reactos?rev=51367&view=rev Log: [USBEHCI_NEW] - Change VendorId and DeviceId to the same size as PciConfig members, PUSHORT. - Add support function GetBusInterface. - Implement GetDeviceDetails and ResetPort. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sat Apr 16 06:59:45 2011 @@ -51,7 +51,7 @@ NTSTATUS PnpStart(PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources); NTSTATUS PnpStop(void); NTSTATUS HandlePower(PIRP Irp); - NTSTATUS GetDeviceDetails(PULONG VendorId, PULONG DeviceId, PULONG NumberOfPorts, PULONG Speed); + NTSTATUS GetDeviceDetails(PUSHORT VendorId, PUSHORT DeviceId, PULONG NumberOfPorts, PULONG Speed); NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); NTSTATUS StartController(); @@ -85,6 +85,8 @@ ULONG m_MapRegisters; PQUEUE_HEAD m_AsyncListQueueHead; EHCI_CAPS m_Capabilities; + USHORT m_VendorID; + USHORT m_DeviceID; VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); @@ -118,6 +120,10 @@ PDEVICE_OBJECT PhysicalDeviceObject, PDEVICE_OBJECT LowerDeviceObject) { + BUS_INTERFACE_STANDARD BusInterface; + PCI_COMMON_CONFIG PciConfig; + NTSTATUS Status; + ULONG BytesRead; DPRINT1("CUSBHardwareDevice::Initialize\n"); @@ -133,6 +139,36 @@ // initialize device lock // KeInitializeSpinLock(&m_Lock); + + m_VendorID = 0; + m_DeviceID = 0; + + Status = GetBusInterface(PhysicalDeviceObject, &BusInterface); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get BusInteface!\n"); + return Status; + } + + BytesRead = (*BusInterface.GetBusData)(BusInterface.Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT1("Failed to get pci config information!\n"); + return STATUS_SUCCESS; + } + + if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER)) + { + DPRINT1("PCI Configuration shows this as a non Bus Mastering device!\n"); + } + + m_VendorID = PciConfig.VendorID; + m_DeviceID = PciConfig.DeviceID; return STATUS_SUCCESS; } @@ -314,24 +350,26 @@ NTSTATUS CUSBHardwareDevice::GetDeviceDetails( - OUT OPTIONAL PULONG VendorId, - OUT OPTIONAL PULONG DeviceId, + OUT OPTIONAL PUSHORT VendorId, + OUT OPTIONAL PUSHORT DeviceId, OUT OPTIONAL PULONG NumberOfPorts, OUT OPTIONAL PULONG Speed) { + *VendorId = m_VendorID; + *DeviceId = m_DeviceID; + *NumberOfPorts = m_Capabilities.HCSParams.PortCount; + //FIXME: What to returned here? + *Speed = 0; + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBHardwareDevice::GetDmaMemoryManager( + OUT struct IDMAMemoryManager **OutMemoryManager) +{ UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; } - - -NTSTATUS -CUSBHardwareDevice::GetDmaMemoryManager( - OUT struct IDMAMemoryManager **OutMemoryManager) -{ - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} - NTSTATUS CUSBHardwareDevice::GetUSBQueue( @@ -392,7 +430,7 @@ // // FIXME: Assign the AsyncList Register // - + // // Set Schedules to Enable and Interrupt Threshold to 1ms. // @@ -403,7 +441,7 @@ UsbCmd.IntThreshold = 1; // FIXME: Set framelistsize when periodic is implemented. SetCommandRegister(&UsbCmd); - + // // Enable Interrupts and start execution // @@ -412,7 +450,7 @@ UsbCmd.Run = TRUE; SetCommandRegister(&UsbCmd); - + // // Wait for execution to start // @@ -420,7 +458,7 @@ { KeStallExecutionProcessor(10); UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); - + if (!(UsbSts & EHCI_STS_HALT)) { break; @@ -450,7 +488,7 @@ // // Disable Interrupts and stop execution EHCI_WRITE_REGISTER_ULONG (EHCI_USBINTR, 0); - + GetCommandRegister(&UsbCmd); UsbCmd.Run = FALSE; SetCommandRegister(&UsbCmd); @@ -470,7 +508,7 @@ DPRINT1("EHCI ERROR: Controller is not responding to Stop request!\n"); return STATUS_UNSUCCESSFUL; } - + return STATUS_SUCCESS; } @@ -485,8 +523,44 @@ CUSBHardwareDevice::ResetPort( IN ULONG PortIndex) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + ULONG PortStatus; + + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) + { + DPRINT1("Non HighSpeed device. Releasing Ownership\n"); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), EHCI_PRT_RELEASEOWNERSHIP); + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // Reset and clean enable + // + PortStatus |= EHCI_PRT_RESET; + PortStatus &= ~EHCI_PRT_ENABLED; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); + + KeStallExecutionProcessor(100); + + // + // Clear reset + // + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + PortStatus &= ~EHCI_PRT_RESET; + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus); + + KeStallExecutionProcessor(100); + + // + // Check that the port reset + // + PortStatus = EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex)); + if (PortStatus & EHCI_PRT_RESET) + { + DPRINT1("Port did not reset\n"); + return STATUS_RETRY; + } + return STATUS_SUCCESS; } KIRQL @@ -524,26 +598,26 @@ This = (CUSBHardwareDevice*) ServiceContext; CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); - + CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); // // Check that it belongs to EHCI // if (!CStatus) return FALSE; - + // // Clear the Status // This->EHCI_WRITE_REGISTER_ULONG(EHCI_USBSTS, CStatus); - + if (CStatus & EHCI_STS_FATAL) { This->StopController(); DPRINT1("EHCI: Host System Error!\n"); return TRUE; } - + if (CStatus & EHCI_ERROR_INT) { DPRINT1("EHCI Status = 0x%x\n", CStatus); @@ -572,13 +646,13 @@ This = (CUSBHardwareDevice*) SystemArgument1; CStatus = (ULONG) SystemArgument2; - + if (CStatus & EHCI_STS_PCD) { for (i = 0; i < This->m_Capabilities.HCSParams.PortCount; i++) { PortStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * i)); - + // // Device connected or removed // @@ -592,7 +666,7 @@ if (PortStatus & EHCI_PRT_CONNECTED) { DPRINT1("Device connected on port %d\n", i); - + // //FIXME: Determine device speed // @@ -602,14 +676,14 @@ { DPRINT1("Misbeaving controller. Port should be disabled at this point\n"); } - + if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSeped device connected. Release ownership\n"); This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), EHCI_PRT_RELEASEOWNERSHIP); continue; } - + // // FIXME: Is a port reset needed, or does hub driver request this? // @@ -619,7 +693,7 @@ { DPRINT1("Device disconnected on port %d\n", i); } - + // // FIXME: This needs to be saved somewhere // Modified: branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/interfaces.h [iso-8859-1] Sat Apr 16 06:59:45 2011 @@ -157,8 +157,8 @@ // // Description: returns the device details such as vendor id, device id, number of ports and speed - virtual NTSTATUS GetDeviceDetails(OUT OPTIONAL PULONG VendorId, - OUT OPTIONAL PULONG DeviceId, + virtual NTSTATUS GetDeviceDetails(OUT OPTIONAL PUSHORT VendorId, + OUT OPTIONAL PUSHORT DeviceId, OUT OPTIONAL PULONG NumberOfPorts, OUT OPTIONAL PULONG Speed) = 0; Modified: branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/misc.cpp [iso-8859-1] Sat Apr 16 06:59:45 2011 @@ -80,3 +80,52 @@ return Status; } +NTSTATUS NTAPI +GetBusInterface(PDEVICE_OBJECT DeviceObject, PBUS_INTERFACE_STANDARD busInterface) +{ + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION Stack; + + if ((!DeviceObject) || (!busInterface)) + return STATUS_UNSUCCESSFUL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + + if (Irp == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Stack=IoGetNextIrpStackLocation(Irp); + Stack->MajorFunction = IRP_MJ_PNP; + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.Size = sizeof(BUS_INTERFACE_STANDARD); + Stack->Parameters.QueryInterface.InterfaceType = (LPGUID)&GUID_BUS_INTERFACE_STANDARD; + Stack->Parameters.QueryInterface.Version = 1; + Stack->Parameters.QueryInterface.Interface = (PINTERFACE)busInterface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + Irp->IoStatus.Status=STATUS_NOT_SUPPORTED ; + + Status=IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + Status=IoStatus.Status; + } + + return Status; +} + Modified: branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/usbehci.h [iso-8859-1] Sat Apr 16 06:59:45 2011 @@ -55,6 +55,8 @@ // NTSTATUS NTAPI SyncForwardIrp(PDEVICE_OBJECT DeviceObject, PIRP Irp); +NTSTATUS NTAPI GetBusInterface(PDEVICE_OBJECT DeviceObject, PBUS_INTERFACE_STANDARD busInterface); + // // root_hub_controller.cpp //

1 0

[mjmartin] 51366: [USBEHCI_NEW] - Add flags for Port Status Control Register and remove structiures for Port Status Control Register. - Remove USB Status Register and use the flags instead. - Remov...
by mjmartin＠svn.reactos.org 16 Apr '11

16 Apr '11

Author: mjmartin Date: Sat Apr 16 05:55:02 2011 New Revision: 51366 URL: http://svn.reactos.org/svn/reactos?rev=51366&view=rev Log: [USBEHCI_NEW] - Add flags for Port Status Control Register and remove structiures for Port Status Control Register. - Remove USB Status Register and use the flags instead. - Remove functions that are not used and never will be. - Implement InterruptServiceRoutine and Deffered Procedure Routine. - Partially implement port status change to detect device insert and removal. Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp branches/usb-bringup/drivers/usb/usbehci_new/hardware.h Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sat Apr 16 05:55:02 2011 @@ -17,6 +17,13 @@ InterruptServiceRoutine( IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); + +VOID NTAPI +EhciDefferedRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2); class CUSBHardwareDevice : public IUSBHardwareDevice { @@ -58,6 +65,7 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); + friend VOID NTAPI EhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); // constructor / destructor CUSBHardwareDevice(IUnknown *OuterUnknown){} @@ -71,24 +79,17 @@ PDEVICE_OBJECT m_NextDeviceObject; KSPIN_LOCK m_Lock; PKINTERRUPT m_Interrupt; + KDPC m_IntDpcObject; PULONG m_Base; PDMA_ADAPTER m_Adapter; ULONG m_MapRegisters; - PQUEUE_HEAD AsyncListQueueHead; + PQUEUE_HEAD m_AsyncListQueueHead; EHCI_CAPS m_Capabilities; VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); - VOID SetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts); - VOID GetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts); - //VOID SetPortRegister(PEHCI_USBPORTSC_CONTENT UsbPort); - //VOID GetPortRegister(PEHCI_USBPORTSC_CONTENT UsbPort); ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); - ULONG EHCI_READ_REGISTER_USHORT(ULONG Offset); - ULONG EHCI_READ_REGISTER_UCHAR(ULONG Offset); VOID EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value); - VOID EHCI_WRITE_REGISTER_USHORT(ULONG Offset, ULONG Value); - VOID EHCI_WRITE_REGISTER_UCHAR(ULONG Offset, ULONG Value); }; //================================================================================================= @@ -152,57 +153,16 @@ *Register = READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBCMD)); } - -VOID -CUSBHardwareDevice::SetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts) -{ - PULONG Register; - Register = (PULONG)UsbSts; - WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBSTS), *Register); -} - -VOID -CUSBHardwareDevice::GetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts) -{ - PULONG CmdRegister; - CmdRegister = (PULONG)UsbSts; - *CmdRegister = READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBSTS)); -} - ULONG CUSBHardwareDevice::EHCI_READ_REGISTER_ULONG(ULONG Offset) { return READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + Offset)); } -ULONG -CUSBHardwareDevice::EHCI_READ_REGISTER_USHORT(ULONG Offset) -{ - return READ_REGISTER_USHORT((PUSHORT)((ULONG)m_Base + Offset)); -} - -ULONG -CUSBHardwareDevice::EHCI_READ_REGISTER_UCHAR(ULONG Offset) -{ - return READ_REGISTER_UCHAR((PUCHAR)((ULONG)m_Base + Offset)); -} - VOID CUSBHardwareDevice::EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value) { WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + Offset), Value); -} - -VOID -CUSBHardwareDevice::EHCI_WRITE_REGISTER_USHORT(ULONG Offset, ULONG Value) -{ - WRITE_REGISTER_USHORT((PUSHORT)((ULONG)m_Base + Offset), Value); -} - -VOID -CUSBHardwareDevice::EHCI_WRITE_REGISTER_UCHAR(ULONG Offset, ULONG Value) -{ - WRITE_REGISTER_UCHAR((PUCHAR)((ULONG)m_Base + Offset), Value); } NTSTATUS @@ -228,6 +188,10 @@ { case CmResourceTypeInterrupt: { + KeInitializeDpc(&m_IntDpcObject, + EhciDefferedRoutine, + this); + Status = IoConnectInterrupt(&m_Interrupt, InterruptServiceRoutine, (PVOID)this, @@ -324,7 +288,7 @@ // // FIXME: Create a QueueHead that will always be the address of the AsyncList // - AsyncListQueueHead = NULL; + m_AsyncListQueueHead = NULL; // // Start the controller @@ -381,20 +345,19 @@ CUSBHardwareDevice::StartController(void) { EHCI_USBCMD_CONTENT UsbCmd; - EHCI_USBSTS_CONTENT UsbSts; - LONG FailSafe; + ULONG UsbSts, FailSafe; // // Stop the controller if its running // - GetStatusRegister(&UsbSts); - if (UsbSts.HCHalted) + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + if (!(UsbSts & EHCI_STS_HALT)) StopController(); // // Reset the device. Bit is set to 0 on completion. // - SetCommandRegister(&UsbCmd); + GetCommandRegister(&UsbCmd); UsbCmd.HCReset = TRUE; SetCommandRegister(&UsbCmd); @@ -438,7 +401,7 @@ UsbCmd.AsyncEnable = FALSE; //FIXME: Need USB Memory Manager UsbCmd.IntThreshold = 1; - // FIXME: Set framlistsize when periodic is implemented. + // FIXME: Set framelistsize when periodic is implemented. SetCommandRegister(&UsbCmd); // @@ -456,15 +419,15 @@ for (FailSafe = 100; FailSafe > 1; FailSafe--) { KeStallExecutionProcessor(10); - GetStatusRegister(&UsbSts); + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); - if (!UsbSts.HCHalted) + if (!(UsbSts & EHCI_STS_HALT)) { break; } } - if (!UsbSts.HCHalted) + if (UsbSts & EHCI_STS_HALT) { DPRINT1("Could not start execution on the controller\n"); return STATUS_UNSUCCESSFUL; @@ -482,8 +445,7 @@ CUSBHardwareDevice::StopController(void) { EHCI_USBCMD_CONTENT UsbCmd; - EHCI_USBSTS_CONTENT UsbSts; - LONG FailSafe; + ULONG UsbSts, FailSafe; // // Disable Interrupts and stop execution @@ -496,14 +458,14 @@ for (FailSafe = 100; FailSafe > 1; FailSafe--) { KeStallExecutionProcessor(10); - GetStatusRegister(&UsbSts); - if (UsbSts.HCHalted) + UsbSts = EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + if (UsbSts & EHCI_STS_HALT) { break; } } - if (!UsbSts.HCHalted) + if (!(UsbSts & EHCI_STS_HALT)) { DPRINT1("EHCI ERROR: Controller is not responding to Stop request!\n"); return STATUS_UNSUCCESSFUL; @@ -557,8 +519,114 @@ IN PKINTERRUPT Interrupt, IN PVOID ServiceContext) { - UNIMPLEMENTED - return FALSE; + CUSBHardwareDevice *This; + ULONG CStatus; + + This = (CUSBHardwareDevice*) ServiceContext; + CStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_USBSTS); + + CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); + // + // Check that it belongs to EHCI + // + if (!CStatus) + return FALSE; + + // + // Clear the Status + // + This->EHCI_WRITE_REGISTER_ULONG(EHCI_USBSTS, CStatus); + + if (CStatus & EHCI_STS_FATAL) + { + This->StopController(); + DPRINT1("EHCI: Host System Error!\n"); + return TRUE; + } + + if (CStatus & EHCI_ERROR_INT) + { + DPRINT1("EHCI Status = 0x%x\n", CStatus); + } + + if (CStatus & EHCI_STS_HALT) + { + DPRINT1("Host Error Unexpected Halt\n"); + // FIXME: Reset controller\n"); + return TRUE; + } + + KeInsertQueueDpc(&This->m_IntDpcObject, This, (PVOID)CStatus); + return TRUE; +} + +VOID NTAPI +EhciDefferedRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + CUSBHardwareDevice *This; + ULONG CStatus, PortStatus, i; + + This = (CUSBHardwareDevice*) SystemArgument1; + CStatus = (ULONG) SystemArgument2; + + if (CStatus & EHCI_STS_PCD) + { + for (i = 0; i < This->m_Capabilities.HCSParams.PortCount; i++) + { + PortStatus = This->EHCI_READ_REGISTER_ULONG(EHCI_PORTSC + (4 * i)); + + // + // Device connected or removed + // + if (PortStatus & EHCI_PRT_CONNECTSTATUSCHAGE) + { + // + // Clear the port change status + // + This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus & EHCI_PRT_CONNECTSTATUSCHAGE); + + if (PortStatus & EHCI_PRT_CONNECTED) + { + DPRINT1("Device connected on port %d\n", i); + + // + //FIXME: Determine device speed + // + if (This->m_Capabilities.HCSParams.CHCCount) + { + if (PortStatus & EHCI_PRT_ENABLED) + { + DPRINT1("Misbeaving controller. Port should be disabled at this point\n"); + } + + if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) + { + DPRINT1("Non HighSeped device connected. Release ownership\n"); + This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), EHCI_PRT_RELEASEOWNERSHIP); + continue; + } + + // + // FIXME: Is a port reset needed, or does hub driver request this? + // + } + } + else + { + DPRINT1("Device disconnected on port %d\n", i); + } + + // + // FIXME: This needs to be saved somewhere + // + } + } + } + return; } NTSTATUS Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sat Apr 16 05:55:02 2011 @@ -41,6 +41,22 @@ #define EHCI_STS_PSS 0x4000 #define EHCI_STS_ASS 0x8000 #define EHCI_ERROR_INT (EHCI_STS_FATAL | EHCI_STS_ERR) + +// +// Port Register Flags +// +#define EHCI_PRT_CONNECTED 0x01 +#define EHCI_PRT_CONNECTSTATUSCHAGE 0x02 +#define EHCI_PRT_ENABLED 0x04 +#define EHCI_PRT_ENABLEDSTATUSCHANGE 0x08 +#define EHCI_PRT_OVERCURRENTACTIVE 0x10 +#define EHCI_PRT_OVERCURRENTCHANGE 0x20 +#define EHCI_PRT_FORCERESUME 0x40 +#define EHCI_PRT_SUSPEND 0x80 +#define EHCI_PRT_RESET 0x100 +#define EHCI_PRT_SLOWSPEEDLINE 0x400 +#define EHCI_PRT_POWER 0x1000 +#define EHCI_PRT_RELEASEOWNERSHIP 0x2000 // // Terminate Pointer used for QueueHeads and Element Transfer Descriptors to mark Pointers as the end @@ -202,41 +218,6 @@ ULONG Reserved2 : 8; } EHCI_USBCMD_CONTENT, *PEHCI_USBCMD_CONTENT; -// -// Status register content -// -typedef struct _EHCI_USBSTS_CONTENT -{ - ULONG USBInterrupt:1; - ULONG ErrorInterrupt:1; - ULONG DetectChangeInterrupt:1; - ULONG FrameListRolloverInterrupt:1; - ULONG HostSystemErrorInterrupt:1; - ULONG AsyncAdvanceInterrupt:1; - ULONG Reserved:6; - ULONG HCHalted:1; - ULONG Reclamation:1; - ULONG PeriodicScheduleStatus:1; - ULONG AsynchronousScheduleStatus:1; -} EHCI_USBSTS_CONTENT, *PEHCI_USBSTS_CONTENT; - -typedef struct _EHCI_USBPORTSC_CONTENT -{ - ULONG CurrentConnectStatus:1; - ULONG ConnectStatusChange:1; - ULONG PortEnabled:1; - ULONG PortEnableChanged:1; - ULONG OverCurrentActive:1; - ULONG OverCurrentChange:1; - ULONG ForcePortResume:1; - ULONG Suspend:1; - ULONG PortReset:1; - ULONG Reserved:1; - ULONG LineStatus:2; - ULONG PortPower:1; - ULONG PortOwner:1; -} EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; - typedef struct _EHCI_HCS_CONTENT { ULONG PortCount : 4;

1 0

[mjmartin] 51365: [USBEHCI_NEW] - Add flags and structures needed for communicating with controller and handling schedules. - Add support routines for modifying operational registers on controller....
by mjmartin＠svn.reactos.org 16 Apr '11

16 Apr '11

Author: mjmartin Date: Sat Apr 16 02:20:23 2011 New Revision: 51365 URL: http://svn.reactos.org/svn/reactos?rev=51365&view=rev Log: [USBEHCI_NEW] - Add flags and structures needed for communicating with controller and handling schedules. - Add support routines for modifying operational registers on controller. - Implement getting the controller capabilties, starting and stopping the controller. Added: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h (with props) Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp Modified: branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.cpp [iso-8859-1] Sat Apr 16 02:20:23 2011 @@ -10,6 +10,13 @@ #define INITGUID #include "usbehci.h" +#include "hardware.h" + +BOOLEAN +NTAPI +InterruptServiceRoutine( + IN PKINTERRUPT Interrupt, + IN PVOID ServiceContext); class CUSBHardwareDevice : public IUSBHardwareDevice { @@ -40,6 +47,8 @@ NTSTATUS GetDeviceDetails(PULONG VendorId, PULONG DeviceId, PULONG NumberOfPorts, PULONG Speed); NTSTATUS GetDmaMemoryManager(OUT struct IDMAMemoryManager **OutMemoryManager); NTSTATUS GetUSBQueue(OUT struct IUSBQueue **OutUsbQueue); + NTSTATUS StartController(); + NTSTATUS StopController(); NTSTATUS ResetController(); NTSTATUS ResetPort(ULONG PortIndex); KIRQL AcquireDeviceLock(void); @@ -65,6 +74,21 @@ PULONG m_Base; PDMA_ADAPTER m_Adapter; ULONG m_MapRegisters; + PQUEUE_HEAD AsyncListQueueHead; + EHCI_CAPS m_Capabilities; + + VOID SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + VOID GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd); + VOID SetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts); + VOID GetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts); + //VOID SetPortRegister(PEHCI_USBPORTSC_CONTENT UsbPort); + //VOID GetPortRegister(PEHCI_USBPORTSC_CONTENT UsbPort); + ULONG EHCI_READ_REGISTER_ULONG(ULONG Offset); + ULONG EHCI_READ_REGISTER_USHORT(ULONG Offset); + ULONG EHCI_READ_REGISTER_UCHAR(ULONG Offset); + VOID EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value); + VOID EHCI_WRITE_REGISTER_USHORT(ULONG Offset, ULONG Value); + VOID EHCI_WRITE_REGISTER_UCHAR(ULONG Offset, ULONG Value); }; //================================================================================================= @@ -112,13 +136,81 @@ return STATUS_SUCCESS; } +VOID +CUSBHardwareDevice::SetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd) +{ + PULONG Register; + Register = (PULONG)UsbCmd; + WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBCMD), *Register); +} + +VOID +CUSBHardwareDevice::GetCommandRegister(PEHCI_USBCMD_CONTENT UsbCmd) +{ + PULONG Register; + Register = (PULONG)UsbCmd; + *Register = READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBCMD)); +} + + +VOID +CUSBHardwareDevice::SetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts) +{ + PULONG Register; + Register = (PULONG)UsbSts; + WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBSTS), *Register); +} + +VOID +CUSBHardwareDevice::GetStatusRegister(PEHCI_USBSTS_CONTENT UsbSts) +{ + PULONG CmdRegister; + CmdRegister = (PULONG)UsbSts; + *CmdRegister = READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + EHCI_USBSTS)); +} + +ULONG +CUSBHardwareDevice::EHCI_READ_REGISTER_ULONG(ULONG Offset) +{ + return READ_REGISTER_ULONG((PULONG)((ULONG)m_Base + Offset)); +} + +ULONG +CUSBHardwareDevice::EHCI_READ_REGISTER_USHORT(ULONG Offset) +{ + return READ_REGISTER_USHORT((PUSHORT)((ULONG)m_Base + Offset)); +} + +ULONG +CUSBHardwareDevice::EHCI_READ_REGISTER_UCHAR(ULONG Offset) +{ + return READ_REGISTER_UCHAR((PUCHAR)((ULONG)m_Base + Offset)); +} + +VOID +CUSBHardwareDevice::EHCI_WRITE_REGISTER_ULONG(ULONG Offset, ULONG Value) +{ + WRITE_REGISTER_ULONG((PULONG)((ULONG)m_Base + Offset), Value); +} + +VOID +CUSBHardwareDevice::EHCI_WRITE_REGISTER_USHORT(ULONG Offset, ULONG Value) +{ + WRITE_REGISTER_USHORT((PUSHORT)((ULONG)m_Base + Offset), Value); +} + +VOID +CUSBHardwareDevice::EHCI_WRITE_REGISTER_UCHAR(ULONG Offset, ULONG Value) +{ + WRITE_REGISTER_UCHAR((PUCHAR)((ULONG)m_Base + Offset), Value); +} NTSTATUS CUSBHardwareDevice::PnpStart( PCM_RESOURCE_LIST RawResources, PCM_RESOURCE_LIST TranslatedResources) { - ULONG Index; + ULONG Index, Count; PCM_PARTIAL_RESOURCE_DESCRIPTOR ResourceDescriptor; DEVICE_DESCRIPTION DeviceDescription; PVOID ResourceBase; @@ -174,8 +266,26 @@ } // - //FIXME: query capabilities and update m_Base + // Get controllers capabilities // + m_Capabilities.Length = READ_REGISTER_UCHAR((PUCHAR)ResourceBase); + m_Capabilities.HCIVersion = READ_REGISTER_USHORT((PUSHORT)((ULONG)ResourceBase + 2)); + m_Capabilities.HCSParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 4)); + m_Capabilities.HCCParamsLong = READ_REGISTER_ULONG((PULONG)((ULONG)ResourceBase + 8)); + + DPRINT1("Controller has %d Ports\n", m_Capabilities.HCSParams.PortCount); + if (m_Capabilities.HCSParams.PortRouteRules) + { + for (Count = 0; Count < m_Capabilities.HCSParams.PortCount; Count++) + { + m_Capabilities.PortRoute[Count] = READ_REGISTER_UCHAR((PUCHAR)(ULONG)ResourceBase + 12 + Count); + } + } + + // + // Set m_Base to the address of Operational Register Space + // + m_Base = (PULONG)((ULONG)ResourceBase + m_Capabilities.Length); break; } } @@ -211,7 +321,16 @@ return STATUS_INSUFFICIENT_RESOURCES; } - return STATUS_SUCCESS; + // + // FIXME: Create a QueueHead that will always be the address of the AsyncList + // + AsyncListQueueHead = NULL; + + // + // Start the controller + // + DPRINT1("Starting Controller\n"); + return StartController(); } NTSTATUS @@ -258,6 +377,140 @@ return STATUS_NOT_IMPLEMENTED; } +NTSTATUS +CUSBHardwareDevice::StartController(void) +{ + EHCI_USBCMD_CONTENT UsbCmd; + EHCI_USBSTS_CONTENT UsbSts; + LONG FailSafe; + + // + // Stop the controller if its running + // + GetStatusRegister(&UsbSts); + if (UsbSts.HCHalted) + StopController(); + + // + // Reset the device. Bit is set to 0 on completion. + // + SetCommandRegister(&UsbCmd); + UsbCmd.HCReset = TRUE; + SetCommandRegister(&UsbCmd); + + // + // Check that the controller reset + // + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(10); + GetCommandRegister(&UsbCmd); + if (!UsbCmd.HCReset) + { + break; + } + } + + // + // If the controller did not reset then fail + // + if (UsbCmd.HCReset) + { + DPRINT1("EHCI ERROR: Controller failed to reset. Hardware problem!\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // Disable Interrupts and clear status + // + EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, 0); + EHCI_WRITE_REGISTER_ULONG(EHCI_USBSTS, 0x0000001f); + + // + // FIXME: Assign the AsyncList Register + // + + // + // Set Schedules to Enable and Interrupt Threshold to 1ms. + // + GetCommandRegister(&UsbCmd); + UsbCmd.PeriodicEnable = FALSE; + UsbCmd.AsyncEnable = FALSE; //FIXME: Need USB Memory Manager + + UsbCmd.IntThreshold = 1; + // FIXME: Set framlistsize when periodic is implemented. + SetCommandRegister(&UsbCmd); + + // + // Enable Interrupts and start execution + // + EHCI_WRITE_REGISTER_ULONG(EHCI_USBINTR, EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + /*| EHCI_USBINTR_FLROVR*/ | EHCI_USBINTR_PC); + + UsbCmd.Run = TRUE; + SetCommandRegister(&UsbCmd); + + // + // Wait for execution to start + // + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(10); + GetStatusRegister(&UsbSts); + + if (!UsbSts.HCHalted) + { + break; + } + } + + if (!UsbSts.HCHalted) + { + DPRINT1("Could not start execution on the controller\n"); + return STATUS_UNSUCCESSFUL; + } + + // + // Set port routing to EHCI controller + // + EHCI_WRITE_REGISTER_ULONG(EHCI_CONFIGFLAG, 1); + DPRINT1("EHCI Started!\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +CUSBHardwareDevice::StopController(void) +{ + EHCI_USBCMD_CONTENT UsbCmd; + EHCI_USBSTS_CONTENT UsbSts; + LONG FailSafe; + + // + // Disable Interrupts and stop execution + EHCI_WRITE_REGISTER_ULONG (EHCI_USBINTR, 0); + + GetCommandRegister(&UsbCmd); + UsbCmd.Run = FALSE; + SetCommandRegister(&UsbCmd); + + for (FailSafe = 100; FailSafe > 1; FailSafe--) + { + KeStallExecutionProcessor(10); + GetStatusRegister(&UsbSts); + if (UsbSts.HCHalted) + { + break; + } + } + + if (!UsbSts.HCHalted) + { + DPRINT1("EHCI ERROR: Controller is not responding to Stop request!\n"); + return STATUS_UNSUCCESSFUL; + } + + return STATUS_SUCCESS; +} NTSTATUS CUSBHardwareDevice::ResetController(void) @@ -314,7 +567,8 @@ { PUSBHARDWAREDEVICE This; - This = new(NonPagedPool, 0) CUSBHardwareDevice(0); + This = new(NonPagedPool, TAG_USBEHCI) CUSBHardwareDevice(0); + if (!This) return STATUS_INSUFFICIENT_RESOURCES; Added: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci… ============================================================================== --- branches/usb-bringup/drivers/usb/usbehci_new/hardware.h (added) +++ branches/usb-bringup/drivers/usb/usbehci_new/hardware.h [iso-8859-1] Sat Apr 16 02:20:23 2011 @@ -1,0 +1,306 @@ +#pragma once + +#include <ntddk.h> + +// +// EHCI Operational Registers +// +#define EHCI_USBCMD 0x00 +#define EHCI_USBSTS 0x04 +#define EHCI_USBINTR 0x08 +#define EHCI_FRINDEX 0x0C +#define EHCI_CTRLDSSEGMENT 0x10 +#define EHCI_PERIODICLISTBASE 0x14 +#define EHCI_ASYNCLISTBASE 0x18 +#define EHCI_CONFIGFLAG 0x40 +#define EHCI_PORTSC 0x44 + +// +// Interrupt Register Flags +// +#define EHCI_USBINTR_INTE 0x01 +#define EHCI_USBINTR_ERR 0x02 +#define EHCI_USBINTR_PC 0x04 +#define EHCI_USBINTR_FLROVR 0x08 +#define EHCI_USBINTR_HSERR 0x10 +#define EHCI_USBINTR_ASYNC 0x20 +// Bits 6:31 Reserved + +// +// Status Register Flags +// +#define EHCI_STS_INT 0x01 +#define EHCI_STS_ERR 0x02 +#define EHCI_STS_PCD 0x04 +#define EHCI_STS_FLR 0x08 +#define EHCI_STS_FATAL 0x10 +#define EHCI_STS_IAA 0x20 +// Bits 11:6 Reserved +#define EHCI_STS_HALT 0x1000 +#define EHCI_STS_RECL 0x2000 +#define EHCI_STS_PSS 0x4000 +#define EHCI_STS_ASS 0x8000 +#define EHCI_ERROR_INT (EHCI_STS_FATAL | EHCI_STS_ERR) + +// +// Terminate Pointer used for QueueHeads and Element Transfer Descriptors to mark Pointers as the end +// +#define TERMINATE_POINTER 0x01 + +// +// QUEUE ELEMENT TRANSFER DESCRIPTOR, defines and structs +// + +// +// Token Flags +// +#define PID_CODE_OUT_TOKEN 0x00 +#define PID_CODE_IN_TOKEN 0x01 +#define PID_CODE_SETUP_TOKEN 0x02 + +#define DO_START_SPLIT 0x00 +#define DO_COMPLETE_SPLIT 0x01 + +#define PING_STATE_DO_OUT 0x00 +#define PING_STATE_DO_PING 0x01 + +typedef struct _PERIODICFRAMELIST +{ + PULONG VirtualAddr; + PHYSICAL_ADDRESS PhysicalAddr; + ULONG Size; +} PERIODICFRAMELIST, *PPERIODICFRAMELIST; + +// +// QUEUE ELEMENT TRANSFER DESCRIPTOR TOKEN +// +typedef struct _QETD_TOKEN_BITS +{ + ULONG PingState:1; + ULONG SplitTransactionState:1; + ULONG MissedMicroFrame:1; + ULONG TransactionError:1; + ULONG BabbleDetected:1; + ULONG DataBufferError:1; + ULONG Halted:1; + ULONG Active:1; + ULONG PIDCode:2; + ULONG ErrorCounter:2; + ULONG CurrentPage:3; + ULONG InterruptOnComplete:1; + ULONG TotalBytesToTransfer:15; + ULONG DataToggle:1; +} QETD_TOKEN_BITS, *PQETD_TOKEN_BITS; + +// +// QUEUE ELEMENT TRANSFER DESCRIPTOR +// +typedef struct _QUEUE_TRANSFER_DESCRIPTOR +{ + //Hardware + ULONG NextPointer; + ULONG AlternateNextPointer; + union + { + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; + + //Software + ULONG PhysicalAddr; + struct _QUEUE_TRANSFER_DESCRIPTOR *PreviousDescriptor; + struct _QUEUE_TRANSFER_DESCRIPTOR *NextDescriptor; +} QUEUE_TRANSFER_DESCRIPTOR, *PQUEUE_TRANSFER_DESCRIPTOR; + +// +// EndPointSpeeds Flags and END_POINT_CHARACTERISTICS +// +#define QH_ENDPOINT_FULLSPEED 0x00 +#define QH_ENDPOINT_LOWSPEED 0x01 +#define QH_ENDPOINT_HIGHSPEED 0x02 +typedef struct _END_POINT_CHARACTERISTICS +{ + ULONG DeviceAddress:7; + ULONG InactiveOnNextTransaction:1; + ULONG EndPointNumber:4; + ULONG EndPointSpeed:2; + ULONG QEDTDataToggleControl:1; + ULONG HeadOfReclamation:1; + ULONG MaximumPacketLength:11; + ULONG ControlEndPointFlag:1; + ULONG NakCountReload:4; +} END_POINT_CHARACTERISTICS, *PEND_POINT_CHARACTERISTICS; + +// +// Capabilities +// +typedef struct _END_POINT_CAPABILITIES +{ + ULONG InterruptScheduleMask:8; + ULONG SplitCompletionMask:8; + ULONG HubAddr:6; + ULONG PortNumber:6; + ULONG NumberOfTransactionPerFrame:2; +} END_POINT_CAPABILITIES, *PEND_POINT_CAPABILITIES; + +// +// QUEUE HEAD Flags and Struct +// +#define QH_TYPE_IDT 0x00 +#define QH_TYPE_QH 0x02 +#define QH_TYPE_SITD 0x04 +#define QH_TYPE_FSTN 0x06 + +typedef struct _QUEUE_HEAD +{ + //Hardware + ULONG HorizontalLinkPointer; + END_POINT_CHARACTERISTICS EndPointCharacteristics; + END_POINT_CAPABILITIES EndPointCapabilities; + // TERMINATE_POINTER not valid for this member + ULONG CurrentLinkPointer; + // TERMINATE_POINTER valid + ULONG NextPointer; + // TERMINATE_POINTER valid, bits 1:4 is NAK_COUNTERd + ULONG AlternateNextPointer; + // Only DataToggle, InterruptOnComplete, ErrorCounter, PingState valid + union + { + QETD_TOKEN_BITS Bits; + ULONG DWord; + } Token; + ULONG BufferPointer[5]; + + //Software + ULONG PhysicalAddr; + struct _QUEUE_HEAD *PreviousQueueHead; + struct _QUEUE_HEAD *NextQueueHead; + PQUEUE_TRANSFER_DESCRIPTOR TransferDescriptor; + PIRP IrpToComplete; + PMDL MdlToFree; + PKEVENT Event; +} QUEUE_HEAD, *PQUEUE_HEAD; + +// +// Command register content +// +typedef struct _EHCI_USBCMD_CONTENT +{ + ULONG Run : 1; + ULONG HCReset : 1; + ULONG FrameListSize : 2; + ULONG PeriodicEnable : 1; + ULONG AsyncEnable : 1; + ULONG DoorBell : 1; + ULONG LightReset : 1; + ULONG AsyncParkCount : 2; + ULONG Reserved : 1; + ULONG AsyncParkEnable : 1; + ULONG Reserved1 : 4; + ULONG IntThreshold : 8; + ULONG Reserved2 : 8; +} EHCI_USBCMD_CONTENT, *PEHCI_USBCMD_CONTENT; + +// +// Status register content +// +typedef struct _EHCI_USBSTS_CONTENT +{ + ULONG USBInterrupt:1; + ULONG ErrorInterrupt:1; + ULONG DetectChangeInterrupt:1; + ULONG FrameListRolloverInterrupt:1; + ULONG HostSystemErrorInterrupt:1; + ULONG AsyncAdvanceInterrupt:1; + ULONG Reserved:6; + ULONG HCHalted:1; + ULONG Reclamation:1; + ULONG PeriodicScheduleStatus:1; + ULONG AsynchronousScheduleStatus:1; +} EHCI_USBSTS_CONTENT, *PEHCI_USBSTS_CONTENT; + +typedef struct _EHCI_USBPORTSC_CONTENT +{ + ULONG CurrentConnectStatus:1; + ULONG ConnectStatusChange:1; + ULONG PortEnabled:1; + ULONG PortEnableChanged:1; + ULONG OverCurrentActive:1; + ULONG OverCurrentChange:1; + ULONG ForcePortResume:1; + ULONG Suspend:1; + ULONG PortReset:1; + ULONG Reserved:1; + ULONG LineStatus:2; + ULONG PortPower:1; + ULONG PortOwner:1; +} EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; + +typedef struct _EHCI_HCS_CONTENT +{ + ULONG PortCount : 4; + ULONG PortPowerControl: 1; + ULONG Reserved : 2; + ULONG PortRouteRules : 1; + ULONG PortPerCHC : 4; + ULONG CHCCount : 4; + ULONG PortIndicator : 1; + ULONG Reserved2 : 3; + ULONG DbgPortNum : 4; + ULONG Reserved3 : 8; + +} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; + +typedef struct _EHCI_HCC_CONTENT +{ + ULONG CurAddrBits : 1; + ULONG VarFrameList : 1; + ULONG ParkMode : 1; + ULONG Reserved : 1; + ULONG IsoSchedThreshold : 4; + ULONG EECPCapable : 8; + ULONG Reserved2 : 16; + +} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; + +typedef struct _EHCI_CAPS { + UCHAR Length; + UCHAR Reserved; + USHORT HCIVersion; + union + { + EHCI_HCS_CONTENT HCSParams; + ULONG HCSParamsLong; + }; + union + { + EHCI_HCC_CONTENT HCCParams; + ULONG HCCParamsLong; + }; + UCHAR PortRoute [8]; +} EHCI_CAPS, *PEHCI_CAPS; + + +typedef struct +{ + PKSPIN_LOCK Lock; + RTL_BITMAP Bitmap; + PULONG BitmapBuffer; + ULONG BlockSize; + PVOID VirtualBase; + PHYSICAL_ADDRESS PhysicalBase; + ULONG Length; +}DMA_MEMORY_ALLOCATOR, *LPDMA_MEMORY_ALLOCATOR; + +typedef struct _EHCI_HOST_CONTROLLER +{ + ULONG OpRegisters; + EHCI_CAPS ECHICaps; + PVOID CommonBufferVA; + PHYSICAL_ADDRESS CommonBufferPA; + ULONG CommonBufferSize; + PQUEUE_HEAD AsyncListQueue; + KSPIN_LOCK Lock; + LPDMA_MEMORY_ALLOCATOR DmaMemAllocator; +} EHCI_HOST_CONTROLLER, *PEHCI_HOST_CONTROLLER; Propchange: branches/usb-bringup/drivers/usb/usbehci_new/hardware.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 51364: [CMAKE] * browseui: Don't link to mingw32 and coldname unconditionally (msvc).
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:54:00 2011 New Revision: 51364 URL: http://svn.reactos.org/svn/reactos?rev=51364&view=rev Log: [CMAKE] * browseui: Don't link to mingw32 and coldname unconditionally (msvc). Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseu… ============================================================================== --- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:54:00 2011 @@ -47,9 +47,7 @@ target_link_libraries(browseui atlnew uuid - wine - -lmingw32 - -lcoldname) + wine) add_importlibs(browseui shlwapi

1 0

[akhaldi] 51363: [CMAKE] * Fix a typo.
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:51:17 2011 New Revision: 51363 URL: http://svn.reactos.org/svn/reactos?rev=51363&view=rev Log: [CMAKE] * Fix a typo. Modified: branches/cmake-bringup/include/psdk/ksproxy.h Modified: branches/cmake-bringup/include/psdk/ksproxy.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/kspr… ============================================================================== --- branches/cmake-bringup/include/psdk/ksproxy.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/ksproxy.h [iso-8859-1] Fri Apr 15 22:51:17 2011 @@ -772,7 +772,7 @@ #ifndef _IKsTopology_ #define _IKsTopology_ -DEFINE_GUID(IID_IKsAggregateControl, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0A0, 0xC9, 0x22, 0x31, 0x96); +DEFINE_GUID(IID_IKsTopology, 0x28F54683, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0A0, 0xC9, 0x22, 0x31, 0x96); #undef INTERFACE #define INTERFACE IKsTopology

1 0

[akhaldi] 51362: [CMAKE] * Remove inflib from build. It's been superseded by newinflib. * Rename newinflibhost and newinflib targets into inflibhost and inflib respectively. * Update mkhive and use...
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:49:50 2011 New Revision: 51362 URL: http://svn.reactos.org/svn/reactos?rev=51362&view=rev Log: [CMAKE] * Remove inflib from build. It's been superseded by newinflib. * Rename newinflibhost and newinflib targets into inflibhost and inflib respectively. * Update mkhive and usetup to link to the new targets. Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt branches/cmake-bringup/lib/CMakeLists.txt branches/cmake-bringup/lib/newinflib/CMakeLists.txt branches/cmake-bringup/tools/mkhive/CMakeLists.txt Modified: branches/cmake-bringup/base/setup/usetup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/usetup… ============================================================================== --- branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/usetup/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:49:50 2011 @@ -33,7 +33,7 @@ target_link_libraries(usetup mingw_main zlib - newinflib + inflib ext2lib vfatlib mingw_common) Modified: branches/cmake-bringup/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:49:50 2011 @@ -1,6 +1,5 @@ add_subdirectory(cmlib) -add_subdirectory(inflib) add_subdirectory(newinflib) if(CMAKE_CROSSCOMPILING) Modified: branches/cmake-bringup/lib/newinflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/newinflib/CMa… ============================================================================== --- branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/newinflib/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:49:50 2011 @@ -1,16 +1,28 @@ -set(GLOBAL_FILES infcore.c infget.c infput.c) +list(APPEND GLOBAL_FILES + infcore.c + infget.c + infput.c) if(CMAKE_CROSSCOMPILING) - file(GLOB_RECURSE SOURCE "infros*.c") - add_library(newinflib ${GLOBAL_FILES} ${SOURCE}) - add_dependencies(newinflib psdk) + list(APPEND SOURCE + infrosgen.c + infrosget.c + infrosput.c) + + add_library(inflib ${GLOBAL_FILES} ${SOURCE}) + add_dependencies(inflib psdk) else() - file(GLOB_RECURSE SOURCE "infhost*.c") + list(APPEND SOURCE + infhostgen.c + infhostget.c + infhostput.c + infhostrtl.c) + add_definitions(-DWINE_UNICODE_API= -D__NO_CTYPE_INLINES -DINFLIB_HOST -DUSE_HOST_WCSFUNCS) if(NOT MSVC) add_definitions(-Wpointer-arith -Wwrite-strings) endif() - add_library(newinflibhost ${GLOBAL_FILES} ${SOURCE}) - target_link_libraries(newinflibhost unicode) + add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) + target_link_libraries(inflibhost unicode) endif() Modified: branches/cmake-bringup/tools/mkhive/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/mkhive/CMak… ============================================================================== --- branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/tools/mkhive/CMakeLists.txt [iso-8859-1] Fri Apr 15 22:49:50 2011 @@ -17,4 +17,4 @@ rtl.c) add_executable(mkhive ${SOURCE}) -target_link_libraries(mkhive unicode cmlibhost newinflibhost) +target_link_libraries(mkhive unicode cmlibhost inflibhost)

1 0

[akhaldi] 51361: [CMAKE] * Back out r51360. The export in question is in ole32 (DllGetClassObject). This fixes comcat msvc build.
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:41:41 2011 New Revision: 51361 URL: http://svn.reactos.org/svn/reactos?rev=51361&view=rev Log: [CMAKE] * Back out r51360. The export in question is in ole32 (DllGetClassObject). This fixes comcat msvc build. Modified: branches/cmake-bringup/dll/win32/ole32/ole32.spec branches/cmake-bringup/drivers/ksfilter/ks/ks.spec Modified: branches/cmake-bringup/dll/win32/ole32/ole32.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/o… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/ole32.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/ole32/ole32.spec [iso-8859-1] Fri Apr 15 22:41:41 2011 @@ -98,7 +98,7 @@ @ stdcall CreatePointerMoniker(ptr ptr) @ stdcall CreateStreamOnHGlobal(ptr long ptr) @ stdcall DllDebugObjectRPCHook(long ptr) -@ stdcall -private DllGetClassObject (ptr ptr ptr) +@ stdcall DllGetClassObject (ptr ptr ptr) @ stub DllGetClassObjectWOW @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() Modified: branches/cmake-bringup/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/ks.spec [iso-8859-1] Fri Apr 15 22:41:41 2011 @@ -9,7 +9,7 @@ @ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) INonDelegatedUnknown_fnQueryInterface @ stdcall ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease -@ stdcall -private DllInitialize(ptr) +@ stdcall DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr) @ stdcall KoDeviceInitialize(ptr) @ stdcall KoDriverInitialize(ptr ptr ptr)

1 0

[akhaldi] 51360: [CMAKE] - Silence a linker warning about DllInitialize.
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:36:17 2011 New Revision: 51360 URL: http://svn.reactos.org/svn/reactos?rev=51360&view=rev Log: [CMAKE] - Silence a linker warning about DllInitialize. Modified: branches/cmake-bringup/drivers/ksfilter/ks/ks.spec Modified: branches/cmake-bringup/drivers/ksfilter/ks/ks.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/ksfilter/… ============================================================================== --- branches/cmake-bringup/drivers/ksfilter/ks/ks.spec [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/ksfilter/ks/ks.spec [iso-8859-1] Fri Apr 15 22:36:17 2011 @@ -9,7 +9,7 @@ @ stdcall -i386 ?NonDelegatedQueryInterface@CBaseUnknown@@UAGJABU_GUID@@PAPAX@Z(ptr ptr ptr) INonDelegatedUnknown_fnQueryInterface @ stdcall ?NonDelegatedRelease@CBaseUnknown@@UAGKXZ(ptr) IIndirectedUnknown_fnRelease -@ stdcall DllInitialize(ptr) +@ stdcall -private DllInitialize(ptr) @ stdcall KoCreateInstance(ptr ptr long ptr ptr) @ stdcall KoDeviceInitialize(ptr) @ stdcall KoDriverInitialize(ptr ptr ptr)

1 0

[akhaldi] 51359: [CMAKE] * Empty CMAKE_C_STANDARD_LIBRARIES_INIT
by akhaldi＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: akhaldi Date: Fri Apr 15 22:34:20 2011 New Revision: 51359 URL: http://svn.reactos.org/svn/reactos?rev=51359&view=rev Log: [CMAKE] * Empty CMAKE_C_STANDARD_LIBRARIES_INIT Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake Modified: branches/cmake-bringup/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/cmake/Platform/Wi… ============================================================================== --- branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/cmake/Platform/Windows-cl.cmake [iso-8859-1] Fri Apr 15 22:34:20 2011 @@ -218,7 +218,7 @@ SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") SET(CMAKE_C_FLAGS_RELEASE_INIT "/O2 /Ob2 /D NDEBUG") SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") -SET(CMAKE_C_STANDARD_LIBRARIES_INIT "kernel32.lib user32.lib gdi32.lib winspool.lib shell32.lib ole32.lib oleaut32.lib uuid.lib comdlg32.lib advapi32.lib ") +SET(CMAKE_C_STANDARD_LIBRARIES_INIT "") SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}")

1 0

[rharabien] 51358: [SYSSETUP] * Generate random computer name (REACTOS-xxxxxxx) in Setup. Patch by David Quintana <gigaherz at gmail dot com> modified by me See issue #6099 for more details.
by rharabien＠svn.reactos.org 15 Apr '11

15 Apr '11

Author: rharabien Date: Fri Apr 15 20:42:07 2011 New Revision: 51358 URL: http://svn.reactos.org/svn/reactos?rev=51358&view=rev Log: [SYSSETUP] * Generate random computer name (REACTOS-xxxxxxx) in Setup. Patch by David Quintana <gigaherz at gmail dot com> modified by me See issue #6099 for more details. Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Fri Apr 15 20:42:07 2011 @@ -564,6 +564,25 @@ return TRUE; } +/* lpBuffer will be filled with a 15-char string (plus the null terminator) */ +static void +GenerateComputerName(LPWSTR lpBuffer) +{ + static const WCHAR Chars[] = L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + static const unsigned cChars = sizeof(Chars) / sizeof(WCHAR) - 1; + unsigned i; + + wcscpy(lpBuffer, L"REACTOS-"); + + srand(GetTickCount()); + + /* fill in 7 characters */ + for (i = 8; i < 15; i++) + lpBuffer[i] = Chars[rand() % cChars]; + + lpBuffer[15] = UNICODE_NULL; /* NULL-terminate */ +} + static INT_PTR CALLBACK ComputerPageDlgProc(HWND hwndDlg, UINT uMsg, @@ -576,7 +595,6 @@ PWCHAR Password; WCHAR Title[64]; WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256]; - DWORD Length; LPNMHDR lpnm; if (0 == LoadStringW(hDllInstance, IDS_REACTOS_SETUP, Title, sizeof(Title) / sizeof(Title[0]))) @@ -588,9 +606,8 @@ { case WM_INITDIALOG: { - /* Retrieve current computer name */ - Length = MAX_COMPUTERNAME_LENGTH + 1; - GetComputerNameW(ComputerName, &Length); + /* Generate a new pseudo-random computer name */ + GenerateComputerName(ComputerName); /* Display current computer name */ SetDlgItemTextW(hwndDlg, IDC_COMPUTERNAME, ComputerName);

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