Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 55959: [USBUHCI] - Enable usbuhci for testing [USBOHCI] - Add back getting port count in a loop to work around AMD chipset errata
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 18:02:50 2012 New Revision: 55959 URL: http://svn.reactos.org/svn/reactos?rev=55959&view=rev Log: [USBUHCI] - Enable usbuhci for testing [USBOHCI] - Add back getting port count in a loop to work around AMD chipset errata Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/usb/usbohci/hardware.cpp trunk/reactos/media/inf/usbport.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -16,8 +16,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","Service",0x00000000,"acpi" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0C08","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" -;HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","Service",0x00000000,"usbuhci" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0300","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","Service",0x00000000,"usbohci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\PCI#CC_0C0310","ClassGUID",0x00000000,"{36FC9E60-C465-11CF-8056-444553540000}" @@ -1511,11 +1511,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 ; UHCI controller driver -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 ; USB storage driver HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -39,7 +39,7 @@ usbccgp.sys=,,,,,,x,,,,,,4 usbd.sys=,,,,,,x,,,,,,4 usbhub.sys=,,,,,,x,,,,,,4 -;usbuhci.sys=,,,,,,x,,,,,,4 +usbuhci.sys=,,,,,,x,,,,,,4 usbohci.sys=,,,,,,x,,,,,,4 usbehci.sys=,,,,,,x,,,,,,4 usbstor.sys=,,,,,,x,,,,,,4 @@ -75,7 +75,7 @@ ;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub -;PCI\CC_0C0300 = usbuhci +PCI\CC_0C0300 = usbuhci PCI\CC_0C0310 = usbohci PCI\CC_0C0320 = usbehci USB\Class_08&SubClass_06&Prot_50 = usbstor Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Mar 2 18:02:50 2012 @@ -662,9 +662,14 @@ Descriptor = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET)); // - // get port count - // - m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + // get port count (in a loop due to AMD errata) + // + do + { + KeStallExecutionProcessor(20); + m_NumberOfPorts = OHCI_RH_GET_PORT_COUNT(Descriptor); + } while (m_NumberOfPorts == 0); + DPRINT1("NumberOfPorts %lu\n", m_NumberOfPorts); ASSERT(m_NumberOfPorts < OHCI_MAX_PORT_COUNT); Modified: trunk/reactos/media/inf/usbport.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/usbport.inf?rev=… ============================================================================== Binary files - no diff available.

1 0

[cgutman] 55958: [STORAGE] - Experimental change to try to increase real hardware compatibility - Load both atapi and uniata and allow atapi to have priority and uniata will pick up devices that at...
by cgutman＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: cgutman Date: Fri Mar 2 17:19:04 2012 New Revision: 55958 URL: http://svn.reactos.org/svn/reactos?rev=55958&view=rev Log: [STORAGE] - Experimental change to try to increase real hardware compatibility - Load both atapi and uniata and allow atapi to have priority and uniata will pick up devices that atapi doesn't like - Fix a bug in uniata enumeration Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -1240,13 +1240,21 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; UniATA/Atapi miniport driver +; ATAPI miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Group",0x00000000,"SCSI Miniport" +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\atapi","Tag",0x00010001,0x00000010 + +; UNIATA miniport driver HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"SCSI Miniport" HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000020 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -17,8 +17,9 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 +atapi.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,x,,,,,,4 nmidebug.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,2 @@ -70,7 +71,7 @@ PCI\CC_0104 = uniata PCI\CC_0105 = uniata PCI\CC_0106 = uniata -*PNP0600 = uniata +*PNP0600 = atapi ;USB\CLASS_09 = usbhub USB\ROOT_HUB = usbhub USB\ROOT_HUB20 = usbhub Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Fri Mar 2 17:19:04 2012 @@ -8858,17 +8858,21 @@ } continue; } - BMList[i].AltInitMasterDev = (UCHAR)0xff; - if(GlobalConfig->AtDiskPrimaryAddressClaimed) PrimaryClaimed = TRUE; if(GlobalConfig->AtDiskSecondaryAddressClaimed) SecondaryClaimed = TRUE; + + if(PrimaryClaimed && SecondaryClaimed) { + KdPrint2((PRINT_PREFIX "Both legacy channels claimed\n")); + break; + } + + BMList[i].AltInitMasterDev = (UCHAR)0xff; if(g_opt_Verbose) { _PrintNtConsole("Init standard Dual-channel PCI ATA controller:"); } - for(alt = 0; alt < (ULONG)(WinVer_WDM_Model ? 1 : 2) ; alt++) { Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=5595… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 55957: [USBEHCI] - Partly implement support for interrupt transfers, WIP, untested
by janderwald＠svn.reactos.org 02 Mar '12

02 Mar '12

Author: janderwald Date: Fri Mar 2 14:21:44 2012 New Revision: 55957 URL: http://svn.reactos.org/svn/reactos?rev=55957&view=rev Log: [USBEHCI] - Partly implement support for interrupt transfers, WIP, untested Modified: trunk/reactos/drivers/usb/usbehci/hardware.h trunk/reactos/drivers/usb/usbehci/interfaces.h trunk/reactos/drivers/usb/usbehci/usb_queue.cpp trunk/reactos/drivers/usb/usbehci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.h [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -222,6 +222,7 @@ ULONG PhysicalAddr; LIST_ENTRY LinkedQueueHeads; LIST_ENTRY TransferDescriptorListHead; + PVOID NextQueueHead; PVOID Request; } QUEUE_HEAD, *PQUEUE_HEAD; @@ -309,4 +310,19 @@ ULONG PortChange; }EHCI_PORT_STATUS; - +#define EHCI_INTERRUPT_ENTRIES_COUNT (10 + 1) +#define EHCI_VFRAMELIST_ENTRIES_COUNT 128 +#define EHCI_FRAMELIST_ENTRIES_COUNT 1024 + +#define MAX_AVAILABLE_BANDWIDTH 125 // Microseconds + +#define EHCI_QH_CAPS_MULT_SHIFT 30 // Transactions per Micro-Frame +#define EHCI_QH_CAPS_MULT_MASK 0x03 +#define EHCI_QH_CAPS_PORT_SHIFT 23 // Hub Port (Split-Transaction) +#define EHCI_QH_CAPS_PORT_MASK 0x7f +#define EHCI_QH_CAPS_HUB_SHIFT 16 // Hub Address (Split-Transaction) +#define EHCI_QH_CAPS_HUB_MASK 0x7f +#define EHCI_QH_CAPS_SCM_SHIFT 8 // Split Completion Mask +#define EHCI_QH_CAPS_SCM_MASK 0xff +#define EHCI_QH_CAPS_ISM_SHIFT 0 // Interrupt Schedule Mask +#define EHCI_QH_CAPS_ISM_MASK 0xff Modified: trunk/reactos/drivers/usb/usbehci/interfaces.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/interf… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/interfaces.h [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -86,8 +86,11 @@ IN struct _QUEUE_HEAD * QueueHead) PURE; \ \ STDMETHOD_(BOOLEAN, IsQueueHeadComplete)( THIS_ \ - IN struct _QUEUE_HEAD * QueueHead) PURE; - + IN struct _QUEUE_HEAD * QueueHead) PURE; \ + \ + STDMETHOD_(USB_DEVICE_SPEED, GetSpeed)( THIS) PURE; \ + \ + STDMETHOD_(UCHAR, GetInterval)( THIS) PURE; #define IMP_IEHCIREQUEST \ STDMETHODIMP_(VOID) CompletionCallback( \ @@ -103,8 +106,11 @@ STDMETHODIMP_(VOID) FreeQueueHead(struct _QUEUE_HEAD * QueueHead); \ \ STDMETHODIMP_(BOOLEAN) IsQueueHeadComplete( \ - IN struct _QUEUE_HEAD * QueueHead); - + IN struct _QUEUE_HEAD * QueueHead); \ + \ + STDMETHODIMP_(USB_DEVICE_SPEED) GetSpeed( THIS); \ + \ + STDMETHODIMP_(UCHAR) GetInterval( THIS); DECLARE_INTERFACE_(IEHCIRequest, IUSBRequest) { Modified: trunk/reactos/drivers/usb/usbehci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_queue.cpp [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -55,7 +55,6 @@ ULONG m_MaxPollingInterval; // max polling interval PHYSICAL_ADDRESS m_SyncFrameListAddr; // physical address of sync frame list PULONG m_SyncFrameList; // virtual address of sync frame list - PQUEUE_HEAD * m_SyncFrameListQueueHeads; // stores the frame list of queue head // queue head manipulation functions VOID LinkQueueHead(PQUEUE_HEAD HeadQueueHead, PQUEUE_HEAD NewQueueHead); @@ -66,6 +65,9 @@ // processes the async list VOID ProcessAsyncList(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // processes the async list + VOID ProcessPeriodicSchedule(IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell); + // called for each completed queue head VOID QueueHeadCompletion(PQUEUE_HEAD QueueHead, NTSTATUS Status); @@ -74,6 +76,14 @@ // intializes the sync schedule NTSTATUS InitializeSyncSchedule(IN PEHCIHARDWAREDEVICE Hardware, IN PDMAMEMORYMANAGER MemManager); + + // links interrupt queue head + VOID LinkInterruptQueueHead(PQUEUE_HEAD QueueHead); + + // interrupt queue heads + PQUEUE_HEAD m_InterruptQueueHeads[EHCI_INTERRUPT_ENTRIES_COUNT]; + + }; //================================================================================================= @@ -156,7 +166,7 @@ { PHYSICAL_ADDRESS QueueHeadPhysAddr; NTSTATUS Status; - ULONG Index; + ULONG Index, Interval, IntervalIndex; PQUEUE_HEAD QueueHead; // @@ -165,23 +175,10 @@ m_MaxPeriodicListEntries = 1024; // - // use polling scheme of 32ms - // - m_MaxPollingInterval = 32; - - // - // allocate dummy frame list array - // - m_SyncFrameListQueueHeads = (PQUEUE_HEAD*)ExAllocatePool(NonPagedPool, m_MaxPollingInterval * sizeof(PQUEUE_HEAD)); - if (!m_SyncFrameListQueueHeads) - { - // - // no memory - // - return STATUS_INSUFFICIENT_RESOURCES; - } - - + // use polling scheme of 512ms + // + m_MaxPollingInterval = 512; + // // first allocate a page to hold the queue array // @@ -192,77 +189,52 @@ // failed to allocate sync frame list array // DPRINT1("Failed to allocate sync frame list\n"); - ExFreePool(m_SyncFrameListQueueHeads); - //ASSERT(FALSE); return STATUS_INSUFFICIENT_RESOURCES; } - // - // now allocate queue head descriptors for the polling interval - // - for(Index = 0; Index < m_MaxPeriodicListEntries; Index++) - { - // - // check if is inside our polling interrupt frequency window - // - if (Index < m_MaxPollingInterval) + for(Index = 0; Index < EHCI_INTERRUPT_ENTRIES_COUNT; Index++) + { + // + // allocate queue head + // + Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); + + // + // initialize queue head + // + QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; + QueueHead->AlternateNextPointer = TERMINATE_POINTER; + QueueHead->NextPointer = TERMINATE_POINTER; + QueueHead->EndPointCharacteristics.MaximumPacketLength = 64; + QueueHead->EndPointCharacteristics.NakCountReload = 0x3; + QueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; + QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x01; + QueueHead->PhysicalAddr = QueueHeadPhysAddr.LowPart; + QueueHead->Token.Bits.Halted = TRUE; //FIXME + m_InterruptQueueHeads[Index]= QueueHead; + + if (Index > 0) { - // - // allocate queue head - // - Status = MemManager->Allocate(sizeof(QUEUE_HEAD), (PVOID*)&QueueHead, &QueueHeadPhysAddr); - - // - // initialize queue head - // - QueueHead->HorizontalLinkPointer = TERMINATE_POINTER; - QueueHead->AlternateNextPointer = TERMINATE_POINTER; - QueueHead->NextPointer = TERMINATE_POINTER; - - // - // 1 for non high speed, 0 for high speed device - // - QueueHead->EndPointCharacteristics.ControlEndPointFlag = 0; - QueueHead->EndPointCharacteristics.HeadOfReclamation = FALSE; - QueueHead->EndPointCharacteristics.MaximumPacketLength = 64; - - // - // Set NakCountReload to max value possible - // - QueueHead->EndPointCharacteristics.NakCountReload = 0xF; - - // - // Get the Initial Data Toggle from the QEDT - // - QueueHead->EndPointCharacteristics.QEDTDataToggleControl = FALSE; - - // - // FIXME: check if High Speed Device - // - QueueHead->EndPointCharacteristics.EndPointSpeed = QH_ENDPOINT_HIGHSPEED; - QueueHead->EndPointCapabilities.NumberOfTransactionPerFrame = 0x03; - QueueHead->Token.DWord = 0; - QueueHead->Token.Bits.InterruptOnComplete = FALSE; - QueueHead->PhysicalAddr = QueueHeadPhysAddr.LowPart; - - - // - // store in queue head array - // - m_SyncFrameListQueueHeads[Index] = QueueHead; + // link all to the first queue head + QueueHead->HorizontalLinkPointer = m_InterruptQueueHeads[0]->PhysicalAddr | QH_TYPE_QH; + QueueHead->NextQueueHead = m_InterruptQueueHeads[0]; } - else + } + + // + // build interrupt tree + // + Interval = EHCI_FRAMELIST_ENTRIES_COUNT; + IntervalIndex = EHCI_INTERRUPT_ENTRIES_COUNT - 1; + while (Interval > 1) + { + for (Index = Interval / 2; Index < EHCI_FRAMELIST_ENTRIES_COUNT; Index += Interval) { - // - // get cached entry - // - QueueHead = m_SyncFrameListQueueHeads[m_MaxPeriodicListEntries % m_MaxPollingInterval]; + DPRINT("Index %lu IntervalIndex %lu\n", Index, IntervalIndex); + m_SyncFrameList[Index] = m_InterruptQueueHeads[IntervalIndex]->PhysicalAddr | QH_TYPE_QH; } - - // - // store entry - // - m_SyncFrameList[Index] = (QueueHead->PhysicalAddr | 0x2); + IntervalIndex--; + Interval /= 2; } // @@ -293,21 +265,17 @@ // get internal req Request = PEHCIREQUEST(Req); - // // get request type - // Type = Request->GetTransferType(); - // // check if supported - // switch(Type) { case USB_ENDPOINT_TYPE_ISOCHRONOUS: - case USB_ENDPOINT_TYPE_INTERRUPT: /* NOT IMPLEMENTED IN QUEUE */ Status = STATUS_NOT_SUPPORTED; break; + case USB_ENDPOINT_TYPE_INTERRUPT: case USB_ENDPOINT_TYPE_BULK: case USB_ENDPOINT_TYPE_CONTROL: Status = STATUS_SUCCESS; @@ -318,53 +286,45 @@ Status = STATUS_NOT_SUPPORTED; } - // // check for success - // if (!NT_SUCCESS(Status)) { - // // request not supported, please try later - // return Status; } + // get queue head + Status = Request->GetQueueHead(&QueueHead); + + // check for success + if (!NT_SUCCESS(Status)) + { + // failed to get queue head + return Status; + } + + // acquire lock + KeAcquireSpinLock(m_Lock, &OldLevel); + if (Type == USB_ENDPOINT_TYPE_BULK || Type == USB_ENDPOINT_TYPE_CONTROL) { - // - // get queue head - // - Status = Request->GetQueueHead(&QueueHead); - - // - // check for success - // - if (!NT_SUCCESS(Status)) - { - // - // failed to get queue head - // - return Status; - } - - DPRINT("Request %p QueueHead %p inserted into AsyncQueue\n", Request, QueueHead); - - // - // Add it to the pending list - // - KeAcquireSpinLock(m_Lock, &OldLevel); + // Add to list LinkQueueHead(AsyncListQueueHead, QueueHead); - KeReleaseSpinLock(m_Lock, OldLevel); - - } - - - // + } + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // get interval + LinkInterruptQueueHead(QueueHead); + } + + // release lock + KeReleaseSpinLock(m_Lock, OldLevel); + + // add extra reference which is released when the request is completed - // Request->AddRef(); - + // done return STATUS_SUCCESS; } @@ -385,6 +345,79 @@ } return Status; +} + +VOID +CUSBQueue::LinkInterruptQueueHead( + PQUEUE_HEAD QueueHead) +{ + PEHCIREQUEST Request; + UCHAR Interval, IntervalIndex; + USB_DEVICE_SPEED DeviceSpeed; + PQUEUE_HEAD InterruptQueueHead; + + // get internal req + Request = PEHCIREQUEST(QueueHead->Request); + ASSERT(Request); + + // get interval + Interval = Request->GetInterval(); + + // get device speed + DeviceSpeed = Request->GetSpeed(); + if (DeviceSpeed == UsbHighSpeed) + { + // interrupt queue head can be scheduled on each possible micro frame + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0xFF; + } + else + { + // As we do not yet support FSTNs to correctly reference low/full + // speed interrupt transfers, we simply put them into the 1 interval + // queue. This way we ensure that we reach them on every micro frame + // and can do the corresponding start/complete split transactions. + // ToDo: use FSTNs to correctly link non high speed interrupt transfers + Interval = 1; + + // For now we also force start splits to be in micro frame 0 and + // complete splits to be in micro frame 2, 3 and 4. + QueueHead->EndPointCapabilities.InterruptScheduleMask = 0x01; + QueueHead->EndPointCapabilities.SplitCompletionMask = 0x1C; + } + + // sanitize interrupt interval + Interval = max(1, Interval); + + if (Interval == 1) + IntervalIndex = 1; + else if (Interval == 2) + IntervalIndex = 2; + else if (Interval <= 4) + IntervalIndex = 3; + else if (Interval <= 8) + IntervalIndex = 4; + else if (Interval <= 16) + IntervalIndex = 5; + else if (Interval <= 32) + IntervalIndex = 6; + else if (Interval <= 64) + IntervalIndex = 7; + else if (Interval <= 128) + IntervalIndex = 8; + else if (Interval <= 256) + IntervalIndex = 9; + else + IntervalIndex = 10; + + // get interrupt queue head + InterruptQueueHead = m_InterruptQueueHeads[IntervalIndex]; + + // link queue head + QueueHead->HorizontalLinkPointer = InterruptQueueHead->HorizontalLinkPointer; + QueueHead->NextQueueHead = InterruptQueueHead->NextQueueHead; + + InterruptQueueHead->HorizontalLinkPointer = QueueHead->PhysicalAddr | QH_TYPE_QH; + InterruptQueueHead->NextQueueHead = QueueHead; } // @@ -583,6 +616,16 @@ InsertTailList(&m_CompletedRequestAsyncList, &CurrentQH->LinkedQueueHeads); } + +VOID +CUSBQueue::ProcessPeriodicSchedule( + IN NTSTATUS Status, + OUT PULONG ShouldRingDoorBell) +{ + + +} + VOID CUSBQueue::ProcessAsyncList( IN NTSTATUS Status, @@ -665,18 +708,18 @@ IN NTSTATUS Status, OUT PULONG ShouldRingDoorBell) { - DPRINT("CUSBQueue::InterruptCallback\n"); + + // + // process periodic schedule + // + ProcessPeriodicSchedule(Status, ShouldRingDoorBell); // // iterate asynchronous list // *ShouldRingDoorBell = FALSE; ProcessAsyncList(Status, ShouldRingDoorBell); - - // - // TODO: implement periodic schedule processing - // } VOID Modified: trunk/reactos/drivers/usb/usbehci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usb_request.cpp [iso-8859-1] Fri Mar 2 14:21:44 2012 @@ -44,7 +44,7 @@ ULONG InternalGetTransferType(); UCHAR InternalGetPidDirection(); NTSTATUS BuildControlTransferQueueHead(PQUEUE_HEAD * OutHead); - NTSTATUS BuildBulkTransferQueueHead(PQUEUE_HEAD * OutHead); + NTSTATUS BuildBulkInterruptTransferQueueHead(PQUEUE_HEAD * OutHead); NTSTATUS STDMETHODCALLTYPE CreateDescriptor(PQUEUE_TRANSFER_DESCRIPTOR *OutDescriptor); NTSTATUS CreateQueueHead(PQUEUE_HEAD *OutQueueHead); UCHAR STDMETHODCALLTYPE GetDeviceAddress(); @@ -129,7 +129,11 @@ NTSTATUS m_NtStatusCode; ULONG m_UrbStatusCode; + // buffer base address PVOID m_Base; + + // device speed + USB_DEVICE_SPEED m_Speed; }; @@ -168,6 +172,7 @@ m_TransferBufferLength = TransferBufferLength; m_TransferBufferMDL = TransferBuffer; m_DeviceAddress = Device->GetDeviceAddress(); + m_Speed = Device->GetSpeed(); m_EndpointDescriptor = EndpointDescriptor; m_TotalBytesTransferred = 0; @@ -217,6 +222,7 @@ m_DmaManager = DmaManager; m_TotalBytesTransferred = 0; + m_Speed = Device->GetSpeed(); // // get current irp stack location @@ -442,12 +448,9 @@ case USB_ENDPOINT_TYPE_CONTROL: Status = BuildControlTransferQueueHead(OutHead); break; + case USB_ENDPOINT_TYPE_INTERRUPT: case USB_ENDPOINT_TYPE_BULK: - Status = BuildBulkTransferQueueHead(OutHead); - break; - case USB_ENDPOINT_TYPE_INTERRUPT: - DPRINT1("USB_ENDPOINT_TYPE_INTERRUPT not implemented\n"); - Status = STATUS_NOT_IMPLEMENTED; + Status = BuildBulkInterruptTransferQueueHead(OutHead); break; case USB_ENDPOINT_TYPE_ISOCHRONOUS: DPRINT1("USB_ENDPOINT_TYPE_ISOCHRONOUS not implemented\n"); @@ -1059,7 +1062,7 @@ //---------------------------------------------------------------------------------------- NTSTATUS -CUSBRequest::BuildBulkTransferQueueHead( +CUSBRequest::BuildBulkInterruptTransferQueueHead( PQUEUE_HEAD * OutHead) { NTSTATUS Status; @@ -1738,6 +1741,21 @@ return m_TransferBufferLength; } +USB_DEVICE_SPEED +CUSBRequest::GetSpeed() +{ + return m_Speed; +} + +UCHAR +CUSBRequest::GetInterval() +{ + if (!m_EndpointDescriptor) + return 0; + + return m_EndpointDescriptor->EndPointDescriptor.bInterval; +} + //----------------------------------------------------------------------------------------- NTSTATUS NTAPI

1 0

[dgorbachev] 55956: [Disk_new] Silence GCC 4.6 array bounds warning/error.
by dgorbachev＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: dgorbachev Date: Thu Mar 1 21:43:23 2012 New Revision: 55956 URL: http://svn.reactos.org/svn/reactos?rev=55956&view=rev Log: [Disk_new] Silence GCC 4.6 array bounds warning/error. Modified: trunk/reactos/drivers/storage/class/disk_new/diskwmi.c Modified: trunk/reactos/drivers/storage/class/disk_new/diskwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Thu Mar 1 21:43:23 2012 @@ -1040,8 +1040,8 @@ sizeof(SRB_IO_CONTROL)); DiskSmartStatus->Reason = 0; // Unknown; - DiskSmartStatus->PredictFailure = ((cmdOutParameters->bBuffer[3] == 0xf4) && - (cmdOutParameters->bBuffer[4] == 0x2c)); + DiskSmartStatus->PredictFailure = ((((PUCHAR)cmdOutParameters->bBuffer)[3] == 0xf4) && + (((PUCHAR)cmdOutParameters->bBuffer)[4] == 0x2c)); } break; }

1 0

[cwittich] 55955: [cmake] this should work according to Amine
by cwittich＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: cwittich Date: Thu Mar 1 21:00:22 2012 New Revision: 55955 URL: http://svn.reactos.org/svn/reactos?rev=55955&view=rev Log: [cmake] this should work according to Amine Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55955&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar 1 21:00:22 2012 @@ -20,8 +20,7 @@ #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) #workaround set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) -set(TEST_ENV $ENV{windir}) -if(DEFINED TEST_ENV) + if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS")

1 0

[cwittich] 55954: [cmake] -it looks like IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") return TRUE on MacOS/Linux when cross compiling -file(TO_NATIVE_PATH) is broken as well ... next try
by cwittich＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: cwittich Date: Thu Mar 1 20:29:18 2012 New Revision: 55954 URL: http://svn.reactos.org/svn/reactos?rev=55954&view=rev Log: [cmake] -it looks like IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") return TRUE on MacOS/Linux when cross compiling -file(TO_NATIVE_PATH) is broken as well ... next try Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55954&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar 1 20:29:18 2012 @@ -20,8 +20,9 @@ #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) #workaround set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) -IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") -STRING(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) +set(TEST_ENV $ENV{windir}) +if(DEFINED TEST_ENV) +string(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS")

1 0

[cwittich] 55953: [cmake] fix for the fix thanks Alex for testing this should reduce testman log size by at least 500KB
by cwittich＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: cwittich Date: Thu Mar 1 19:43:00 2012 New Revision: 55953 URL: http://svn.reactos.org/svn/reactos?rev=55953&view=rev Log: [cmake] fix for the fix thanks Alex for testing this should reduce testman log size by at least 500KB Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55953&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar 1 19:43:00 2012 @@ -20,7 +20,7 @@ #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) #workaround set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) -if (WIN32) +IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") STRING(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif() add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS")

1 0

[cwittich] 55952: [cmake] fix for unix/linux
by cwittich＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: cwittich Date: Thu Mar 1 19:09:07 2012 New Revision: 55952 URL: http://svn.reactos.org/svn/reactos?rev=55952&view=rev Log: [cmake] fix for unix/linux Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55952&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar 1 19:09:07 2012 @@ -19,6 +19,7 @@ #bug #file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) #workaround +set(REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) if (WIN32) STRING(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) endif()

1 0

[khornicek] 55951: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.37.
by khornicek＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: khornicek Date: Thu Mar 1 18:39:47 2012 New Revision: 55951 URL: http://svn.reactos.org/svn/reactos?rev=55951&view=rev Log: [WINED3D|DDRAW|D3D8|D3D9] Sync to Wine 1.3.37. Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.rc (with props) trunk/reactos/dll/directx/wine/ddraw/ddraw.rgs (with props) Removed: trunk/reactos/dll/directx/wine/ddraw/parent.c trunk/reactos/dll/directx/wine/ddraw/regsvr.c trunk/reactos/dll/directx/wine/wined3d/clipper.c Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c trunk/reactos/dll/directx/wine/d3d8/cubetexture.c trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h trunk/reactos/dll/directx/wine/d3d8/device.c trunk/reactos/dll/directx/wine/d3d8/directx.c trunk/reactos/dll/directx/wine/d3d8/shader.c trunk/reactos/dll/directx/wine/d3d8/surface.c trunk/reactos/dll/directx/wine/d3d8/swapchain.c trunk/reactos/dll/directx/wine/d3d8/texture.c trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d8/volume.c trunk/reactos/dll/directx/wine/d3d8/volumetexture.c trunk/reactos/dll/directx/wine/d3d9/buffer.c trunk/reactos/dll/directx/wine/d3d9/cubetexture.c trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h trunk/reactos/dll/directx/wine/d3d9/device.c trunk/reactos/dll/directx/wine/d3d9/directx.c trunk/reactos/dll/directx/wine/d3d9/shader.c trunk/reactos/dll/directx/wine/d3d9/stateblock.c trunk/reactos/dll/directx/wine/d3d9/surface.c trunk/reactos/dll/directx/wine/d3d9/swapchain.c trunk/reactos/dll/directx/wine/d3d9/texture.c trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c trunk/reactos/dll/directx/wine/d3d9/volume.c trunk/reactos/dll/directx/wine/d3d9/volumetexture.c trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt trunk/reactos/dll/directx/wine/ddraw/clipper.c trunk/reactos/dll/directx/wine/ddraw/ddraw.c trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h trunk/reactos/dll/directx/wine/ddraw/device.c trunk/reactos/dll/directx/wine/ddraw/executebuffer.c trunk/reactos/dll/directx/wine/ddraw/light.c trunk/reactos/dll/directx/wine/ddraw/main.c trunk/reactos/dll/directx/wine/ddraw/material.c trunk/reactos/dll/directx/wine/ddraw/palette.c trunk/reactos/dll/directx/wine/ddraw/surface.c trunk/reactos/dll/directx/wine/ddraw/utils.c trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c trunk/reactos/dll/directx/wine/ddraw/viewport.c trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c trunk/reactos/dll/directx/wine/wined3d/buffer.c trunk/reactos/dll/directx/wine/wined3d/context.c trunk/reactos/dll/directx/wine/wined3d/device.c trunk/reactos/dll/directx/wine/wined3d/directx.c trunk/reactos/dll/directx/wine/wined3d/drawprim.c trunk/reactos/dll/directx/wine/wined3d/gl_compat.c trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c trunk/reactos/dll/directx/wine/wined3d/palette.c trunk/reactos/dll/directx/wine/wined3d/query.c trunk/reactos/dll/directx/wine/wined3d/resource.c trunk/reactos/dll/directx/wine/wined3d/shader.c trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c trunk/reactos/dll/directx/wine/wined3d/state.c trunk/reactos/dll/directx/wine/wined3d/stateblock.c trunk/reactos/dll/directx/wine/wined3d/surface.c trunk/reactos/dll/directx/wine/wined3d/swapchain.c trunk/reactos/dll/directx/wine/wined3d/texture.c trunk/reactos/dll/directx/wine/wined3d/utils.c trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c trunk/reactos/dll/directx/wine/wined3d/volume.c trunk/reactos/dll/directx/wine/wined3d/wined3d.spec trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h trunk/reactos/include/reactos/wine/wined3d.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/d3d8/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/buff… Modified: trunk/reactos/dll/directx/wine/d3d8/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/cube… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8… Modified: trunk/reactos/dll/directx/wine/d3d8/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/devi… Modified: trunk/reactos/dll/directx/wine/d3d8/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/dire… Modified: trunk/reactos/dll/directx/wine/d3d8/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/shad… Modified: trunk/reactos/dll/directx/wine/d3d8/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/surf… Modified: trunk/reactos/dll/directx/wine/d3d8/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/swap… Modified: trunk/reactos/dll/directx/wine/d3d8/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/text… Modified: trunk/reactos/dll/directx/wine/d3d8/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/vert… Modified: trunk/reactos/dll/directx/wine/d3d8/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d8/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/buff… Modified: trunk/reactos/dll/directx/wine/d3d9/cubetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/cube… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/d3d9_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/d3d9… Modified: trunk/reactos/dll/directx/wine/d3d9/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/devi… Modified: trunk/reactos/dll/directx/wine/d3d9/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/dire… Modified: trunk/reactos/dll/directx/wine/d3d9/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/shad… Modified: trunk/reactos/dll/directx/wine/d3d9/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/stat… Modified: trunk/reactos/dll/directx/wine/d3d9/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/surf… Modified: trunk/reactos/dll/directx/wine/d3d9/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/swap… Modified: trunk/reactos/dll/directx/wine/d3d9/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/text… Modified: trunk/reactos/dll/directx/wine/d3d9/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/vert… Modified: trunk/reactos/dll/directx/wine/d3d9/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/d3d9/volumetexture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d9/volu… Modified: trunk/reactos/dll/directx/wine/ddraw/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/CMa… Modified: trunk/reactos/dll/directx/wine/ddraw/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/cli… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Added: trunk/reactos/dll/directx/wine/ddraw/ddraw.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… Modified: trunk/reactos/dll/directx/wine/ddraw/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/dev… Modified: trunk/reactos/dll/directx/wine/ddraw/executebuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/exe… Modified: trunk/reactos/dll/directx/wine/ddraw/light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/lig… Modified: trunk/reactos/dll/directx/wine/ddraw/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mai… Modified: trunk/reactos/dll/directx/wine/ddraw/material.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/mat… Modified: trunk/reactos/dll/directx/wine/ddraw/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/pal… Removed: trunk/reactos/dll/directx/wine/ddraw/parent.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/par… Removed: trunk/reactos/dll/directx/wine/ddraw/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/reg… Modified: trunk/reactos/dll/directx/wine/ddraw/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/sur… Modified: trunk/reactos/dll/directx/wine/ddraw/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/uti… Modified: trunk/reactos/dll/directx/wine/ddraw/vertexbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ver… Modified: trunk/reactos/dll/directx/wine/ddraw/viewport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/vie… Modified: trunk/reactos/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/C… Modified: trunk/reactos/dll/directx/wine/wined3d/arb_program_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/ati_fragment_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/a… Modified: trunk/reactos/dll/directx/wine/wined3d/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/b… Removed: trunk/reactos/dll/directx/wine/wined3d/clipper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/c… Modified: trunk/reactos/dll/directx/wine/wined3d/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/directx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/drawprim.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/d… Modified: trunk/reactos/dll/directx/wine/wined3d/gl_compat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/glsl_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/g… Modified: trunk/reactos/dll/directx/wine/wined3d/nvidia_texture_shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/n… Modified: trunk/reactos/dll/directx/wine/wined3d/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/p… Modified: trunk/reactos/dll/directx/wine/wined3d/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/q… Modified: trunk/reactos/dll/directx/wine/wined3d/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/r… Modified: trunk/reactos/dll/directx/wine/wined3d/shader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/shader_sm4.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/stateblock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/swapchain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/s… Modified: trunk/reactos/dll/directx/wine/wined3d/texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/t… Modified: trunk/reactos/dll/directx/wine/wined3d/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/u… Modified: trunk/reactos/dll/directx/wine/wined3d/vertexdeclaration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/v… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_gl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… Modified: trunk/reactos/include/reactos/wine/wined3d.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/wined…

1 0

[cwittich] 55950: [cmake] reduce debug spam (only tested on windows)
by cwittich＠svn.reactos.org 01 Mar '12

01 Mar '12

Author: cwittich Date: Thu Mar 1 18:38:22 2012 New Revision: 55950 URL: http://svn.reactos.org/svn/reactos?rev=55950&view=rev Log: [cmake] reduce debug spam (only tested on windows) Modified: trunk/reactos/cmake/gcc.cmake Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=55950&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Thu Mar 1 18:38:22 2012 @@ -15,6 +15,14 @@ # Compiler Core add_compile_flags("-pipe -fms-extensions") + +#bug +#file(TO_NATIVE_PATH ${REACTOS_SOURCE_DIR} REACTOS_SOURCE_DIR_NATIVE) +#workaround +if (WIN32) +STRING(REPLACE "/" "\\" REACTOS_SOURCE_DIR_NATIVE ${REACTOS_SOURCE_DIR}) +endif() +add_compile_flags("-fdebug-prefix-map=${REACTOS_SOURCE_DIR_NATIVE}=ReactOS") # Debugging if(SEPARATE_DBG)

1 0

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 March 2012