Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[fireball] 15349: One more fix to resource DPRINTs, now they are correct, for each resource.

by fireball＠svn.reactos.com

One more fix to resource DPRINTs, now they are correct, for each resource. Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-16 19:12:48 UTC (rev 15348) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-16 19:24:15 UTC (rev 15349) @@ -219,21 +219,26 @@ { DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; + + DPRINT1("Interrupt level: 0x%x Interrupt Vector: 0x%x\n", + DeviceExtension->InterruptLevel, + DeviceExtension->InterruptVector); } else if (Descriptor->Type == CmResourceTypePort) { DeviceExtension->BaseAddress = Descriptor->u.Memory.Start; DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; + + DPRINT1("I/O resource: start=0x%x, length=0x%x\n", + DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength); } - - DPRINT1("Get resource type: %d, Generic start=0x%x Generic length=0x%x\n", - Descriptor->Type, DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength); + else + DPRINT1("Get resource type: %d, Generic start=0x%x Generic length=0x%x\n", + Descriptor->Type, Descriptor->u.Generic.Start.u.LowPart, Descriptor->u.Generic.Length); + } } } - DPRINT1("Interrupt level: 0x%x Interrupt Vector: 0x%x\n", - DeviceExtension->InterruptLevel, - DeviceExtension->InterruptVector); /* * Init wrapper with this object

19 years, 4 months

[fireball] 15348: Changed Memory to Port resource, also fixed incorrect DPRINT (thanks to hpoussin!)

by fireball＠svn.reactos.com

Changed Memory to Port resource, also fixed incorrect DPRINT (thanks to hpoussin!) Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-16 18:08:55 UTC (rev 15347) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-16 19:12:48 UTC (rev 15348) @@ -208,6 +208,9 @@ FullList->BusNumber == DeviceExtension->SystemIoBusNumber && 1 == FullList->PartialResourceList.Version && 1 == FullList->PartialResourceList.Revision);*/ + DPRINT1("AllocRess->Count: %d, PartResList.Count: %d\n", + AllocatedResources->Count, FullList->PartialResourceList.Count); + for (Descriptor = FullList->PartialResourceList.PartialDescriptors; Descriptor < FullList->PartialResourceList.PartialDescriptors + FullList->PartialResourceList.Count; Descriptor++) @@ -217,11 +220,14 @@ DeviceExtension->InterruptLevel = Descriptor->u.Interrupt.Level; DeviceExtension->InterruptVector = Descriptor->u.Interrupt.Vector; } - else if (Descriptor->Type == CmResourceTypeMemory) + else if (Descriptor->Type == CmResourceTypePort) { DeviceExtension->BaseAddress = Descriptor->u.Memory.Start; DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; } + + DPRINT1("Get resource type: %d, Generic start=0x%x Generic length=0x%x\n", + Descriptor->Type, DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength); } } }

19 years, 4 months

[hpoussin] 15347: Don't send multiple IRP_MJ_PNP/IRP_MN_START_DEVICE in case of a device with lower/upper filters

by hpoussin＠svn.reactos.com

Don't send multiple IRP_MJ_PNP/IRP_MN_START_DEVICE in case of a device with lower/upper filters Modified: trunk/reactos/ntoskrnl/include/internal/io.h Modified: trunk/reactos/ntoskrnl/io/device.c Modified: trunk/reactos/ntoskrnl/io/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/io.h --- trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-16 18:02:10 UTC (rev 15346) +++ trunk/reactos/ntoskrnl/include/internal/io.h 2005-05-16 18:08:55 UTC (rev 15347) @@ -501,6 +501,10 @@ PDEVICE_NODE DeviceNode, PDRIVER_OBJECT DriverObject); +NTSTATUS +IopStartDevice( + PDEVICE_NODE DeviceNode); + /* driver.c */ VOID FASTCALL _____ Modified: trunk/reactos/ntoskrnl/io/device.c --- trunk/reactos/ntoskrnl/io/device.c 2005-05-16 18:02:10 UTC (rev 15346) +++ trunk/reactos/ntoskrnl/io/device.c 2005-05-16 18:08:55 UTC (rev 15347) @@ -80,8 +80,6 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode, PDRIVER_OBJECT DriverObject) { - IO_STATUS_BLOCK IoStatusBlock; - IO_STACK_LOCATION Stack; PDEVICE_OBJECT Fdo; NTSTATUS Status; @@ -115,26 +113,6 @@ IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED); - DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); - - /* FIXME: Should be DeviceNode->ResourceList */ - Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->BootResources; - /* FIXME: Should be DeviceNode->ResourceListTranslated */ - Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->BootResources; - - Status = IopInitiatePnpIrp( - Fdo, - &IoStatusBlock, - IRP_MN_START_DEVICE, - &Stack); - - if (!NT_SUCCESS(Status)) - { - DPRINT("IopInitiatePnpIrp() failed\n"); - ObDereferenceObject(Fdo); - return Status; - } - if (Fdo->DeviceType == FILE_DEVICE_ACPI) { static BOOLEAN SystemPowerDeviceNodeCreated = FALSE; @@ -147,23 +125,54 @@ } } + ObDereferenceObject(Fdo); + } + + return STATUS_SUCCESS; +} + +NTSTATUS +IopStartDevice( + PDEVICE_NODE DeviceNode) +{ + + IO_STATUS_BLOCK IoStatusBlock; + IO_STACK_LOCATION Stack; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + + DPRINT("Sending IRP_MN_START_DEVICE to driver\n"); + + Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject); + /* FIXME: Should be DeviceNode->ResourceList */ + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->BootResources; + /* FIXME: Should be DeviceNode->ResourceListTranslated */ + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->BootResources; + + Status = IopInitiatePnpIrp( + Fdo, + &IoStatusBlock, + IRP_MN_START_DEVICE, + &Stack); + + if (!NT_SUCCESS(Status)) + { + DPRINT("IopInitiatePnpIrp() failed\n"); + } + else + { if (Fdo->DeviceType == FILE_DEVICE_BUS_EXTENDER || Fdo->DeviceType == FILE_DEVICE_ACPI) { DPRINT("Bus extender found\n"); Status = IopInvalidateDeviceRelations(DeviceNode, BusRelations); - if (!NT_SUCCESS(Status)) - { - ObDereferenceObject(Fdo); - return Status; - } } - - ObDereferenceObject(Fdo); } - return STATUS_SUCCESS; + ObDereferenceObject(Fdo); + + return Status; } NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/io/driver.c --- trunk/reactos/ntoskrnl/io/driver.c 2005-05-16 18:02:10 UTC (rev 15346) +++ trunk/reactos/ntoskrnl/io/driver.c 2005-05-16 18:08:55 UTC (rev 15347) @@ -1202,6 +1202,10 @@ } Status = IopInitializeDevice(DeviceNode, DriverObject); + if (NT_SUCCESS(Status)) + { + Status = IopStartDevice(DeviceNode); + } return Status; } @@ -1938,6 +1942,7 @@ } IopInitializeDevice(DeviceNode, DriverObject); + Status = IopStartDevice(DeviceNode); ReleaseCapturedString: RtlReleaseCapturedUnicodeString(&CapturedDriverServiceName, _____ Modified: trunk/reactos/ntoskrnl/io/iomgr.c --- trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-16 18:02:10 UTC (rev 15346) +++ trunk/reactos/ntoskrnl/io/iomgr.c 2005-05-16 18:08:55 UTC (rev 15347) @@ -378,6 +378,14 @@ return; } + Status = IopStartDevice(DeviceNode); + if (!NT_SUCCESS(Status)) + { + IopFreeDeviceNode(DeviceNode); + CPRINT("IopInitializeDevice() failed with status (%x)\n", Status); + return; + } + /* * Initialize PnP root releations */ _____ Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c --- trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-16 18:02:10 UTC (rev 15346) +++ trunk/reactos/ntoskrnl/io/pnpmgr.c 2005-05-16 18:08:55 UTC (rev 15347) @@ -1523,9 +1523,11 @@ Status = IopInitializeDevice(DeviceNode, DriverObject); if (NT_SUCCESS(Status)) { - IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); /* Attach upper level filter drivers. */ IopAttachFilterDrivers(DeviceNode, FALSE); + IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED); + + Status = IopStartDevice(DeviceNode); } } }

19 years, 4 months

[gvg] 15346: Implement some video routines for Xen

by gvg＠svn.reactos.com

Implement some video routines for Xen Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-16 17:19:10 UTC (rev 15345) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-16 18:02:10 UTC (rev 15346) @@ -210,44 +210,12 @@ return 0; } -VIDEODISPLAYMODE -XenVideoSetDisplayMode(char *DisplayMode, BOOL Init) - { - XEN_UNIMPLEMENTED("XenVideoSetDisplayMode"); - return VideoTextMode; - } - VOID -XenVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth) - { - XEN_UNIMPLEMENTED("XenVideoGetDisplaySize"); - } - -ULONG -XenVideoGetBufferSize(VOID) - { - XEN_UNIMPLEMENTED("XenVideoGetBufferSize"); - return 0; - } - -VOID XenVideoSetTextCursorPosition(ULONG X, ULONG Y) { XEN_UNIMPLEMENTED("XenVideoSetTextCursorPosition"); } -VOID -XenVideoHideShowTextCursor(BOOL Show) - { - XEN_UNIMPLEMENTED("XenVideoHideShowTextCursor"); - } - -VOID -XenVideoCopyOffScreenBufferToVRAM(PVOID Buffer) - { - XEN_UNIMPLEMENTED("XenVideoCopyOffScreenBufferToVRAM"); - } - BOOL XenVideoIsPaletteFixed(VOID) { _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-16 17:19:10 UTC (rev 15345) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xenvideo.c 2005-05-16 18:02:10 UTC (rev 15346) @@ -90,6 +90,29 @@ return; } + /* Translate some line-drawing characters */ + if (0x80 <= Ch) + { + switch(Ch) + { + case 0xc9: /* top-left double corner */ + case 0xbb: /* top-right double corner */ + case 0xc8: /* bottom-left double corner */ + case 0xbc: /* bottom-right double corner */ + Ch = '+'; + break; + case 0xcd: /* horizontal double */ + Ch = '-'; + break; + case 0xba: /* vertical double */ + Ch = '|'; + break; + case 0xb1: /* dotted pattern */ + Ch = ' '; + break; + } + } + if (X != CurrentX || Y != CurrentY) { AnsiMoveToPos(X, Y); @@ -102,4 +125,48 @@ CurrentX++; } +VIDEODISPLAYMODE +XenVideoSetDisplayMode(char *DisplayMode, BOOL Init) +{ + /* We only have one mode: text */ + return VideoTextMode; +} + +VOID +XenVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth) +{ + *Width = COLS; + *Height = ROWS; + *Depth = 0; +} + +VOID +XenVideoHideShowTextCursor(BOOL Show) +{ + /* We can't hide the cursor */ +} + +ULONG +XenVideoGetBufferSize(VOID) +{ + return COLS * ROWS * 2; +} + +VOID +XenVideoCopyOffScreenBufferToVRAM(PVOID Buffer) +{ + unsigned X, Y; + PUCHAR BufPtr = (PUCHAR) Buffer; + + for (Y = 0; Y < ROWS; Y++) + { + for (X = 0; X < COLS; X++) + { + XenVideoPutChar(BufPtr[0], BufPtr[1], X, Y); + BufPtr += 2; + } + } + XenConsFlush(); +} + /* EOF */

19 years, 4 months

[hpoussin] 15345: Define interrupt resource as required

by hpoussin＠svn.reactos.com

Define interrupt resource as required Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-05-16 15:56:01 UTC (rev 15344) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-05-16 17:19:10 UTC (rev 15345) @@ -497,6 +497,7 @@ if (PciConfig.u.type0.InterruptPin != 0) { + Descriptor->Option = 0; /* Required */ Descriptor->Type = CmResourceTypeInterrupt; Descriptor->ShareDisposition = CmResourceShareShared; Descriptor->Flags = CM_RESOURCE_INTERRUPT_LEVEL_SENSITIVE;

19 years, 4 months

[hpoussin] 15344: Report memory and I/O ranges even if they are not the first reported resources by PCI device

by hpoussin＠svn.reactos.com

Report memory and I/O ranges even if they are not the first reported resources by PCI device Modified: trunk/reactos/drivers/bus/pci/pdo.c _____ Modified: trunk/reactos/drivers/bus/pci/pdo.c --- trunk/reactos/drivers/bus/pci/pdo.c 2005-05-16 15:18:03 UTC (rev 15343) +++ trunk/reactos/drivers/bus/pci/pdo.c 2005-05-16 15:56:01 UTC (rev 15344) @@ -433,7 +433,7 @@ if (Length == 0) { DPRINT("Unused address register\n"); - break; + continue; } /* Set preferred descriptor */ @@ -522,7 +522,7 @@ if (Length == 0) { DPRINT("Unused address register\n"); - break; + continue; } /* Set preferred descriptor */ @@ -722,7 +722,7 @@ if (Length == 0) { DPRINT("Unused address register\n"); - break; + continue; } if (Flags & PCI_ADDRESS_IO_SPACE) @@ -776,7 +776,7 @@ if (Length == 0) { DPRINT("Unused address register\n"); - break; + continue; } if (Flags & PCI_ADDRESS_IO_SPACE)

19 years, 4 months

[hbirr] 15343: Copy w32api from trunk.

by hbirr＠svn.reactos.com

Copy w32api from trunk. Added: branches/cache_manager_rewrite/reactos/w32api/ _____ Copied: branches/cache_manager_rewrite/reactos/w32api (from rev 15342, trunk/reactos/w32api)

19 years, 4 months

[hbirr] 15342: Remove w32api from branch.

by hbirr＠svn.reactos.com

Remove w32api from branch. Deleted: branches/cache_manager_rewrite/reactos/w32api/

19 years, 4 months

[gvg] 15341: Implement disk information functions

by gvg＠svn.reactos.com

Implement disk information functions Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-16 12:34:01 UTC (rev 15340) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/machxen.c 2005-05-16 14:05:44 UTC (rev 15341) @@ -287,20 +287,6 @@ return FALSE; } -BOOL -XenDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry) - { - XEN_UNIMPLEMENTED("XenDiskGetDriveGeometry"); - return FALSE; - } - -ULONG -XenDiskGetCacheableBlockCount(ULONG DriveNumber) - { - XEN_UNIMPLEMENTED("XenDiskGetCacheableBlockCount"); - return FALSE; - } - VOID XenRTCGetCurrentDateTime(PULONG Year, PULONG Month, PULONG Day, PULONG Hour, PULONG Minute, PULONG Second) _____ Modified: branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c --- branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-05-16 12:34:01 UTC (rev 15340) +++ branches/xen/reactos/boot/freeldr/freeldr/arch/i386/xendisk.c 2005-05-16 14:05:44 UTC (rev 15341) @@ -60,6 +60,7 @@ { ULONGLONG SectorCount; ULONG DriveNumber; + ULONG BytesPerSector; blkif_vdev_t XenDevice; u16 XenInfo; } XENDISKINFO, *PXENDISKINFO; @@ -429,6 +430,7 @@ XenDiskInfo[Disk].DriveNumber = 0xff; break; } + XenDiskInfo[Disk].BytesPerSector = 512; XenDiskInfo[Disk].XenDevice = Probe[Disk].device; XenDiskInfo[Disk].XenInfo = Probe[Disk].info; } @@ -453,17 +455,32 @@ XenDiskProbe(); } +static PXENDISKINFO +XenDiskFindDrive(ULONG DriveNumber) +{ + PXENDISKINFO DiskInfo; + unsigned Disk; + + DiskInfo = NULL; + for (Disk = 0; DiskInfo == NULL && Disk < XenDiskCount; Disk++) + { + if (DriveNumber == XenDiskInfo[Disk].DriveNumber) + { + DiskInfo = XenDiskInfo + Disk; + } + } + + return DiskInfo; +} + BOOL XenDiskReadLogicalSectors(ULONG DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer) { blkif_response_t Rsp; blkif_request_t Req; - ULONG SectorSize; ULONG Count; - BOOL Found; - unsigned Disk; - blkif_vdev_t Device; + PXENDISKINFO DiskInfo; if (! XenDiskInitialized) { @@ -471,33 +488,23 @@ XenDiskInit(); } - Found = FALSE; - Device = 0; - for (Disk = 0; Disk < XenDiskCount && ! Found; Disk++) + DiskInfo = XenDiskFindDrive(DriveNumber); + if (NULL == DiskInfo) { - if (DriveNumber == XenDiskInfo[Disk].DriveNumber) - { - Device = XenDiskInfo[Disk].XenDevice; - Found = TRUE; - } - } - if (! Found) - { return FALSE; } - SectorSize = 512; while (0 < SectorCount) { Count = SectorCount; - if (PAGE_SIZE / SectorSize < Count) + if (PAGE_SIZE / DiskInfo->BytesPerSector < Count) { - Count = PAGE_SIZE / SectorSize; + Count = PAGE_SIZE / DiskInfo->BytesPerSector; } memset(&Req, 0, sizeof(blkif_request_t)); Req.operation = BLKIF_OP_READ; Req.nr_segments = 1; - Req.device = Device; + Req.device = DiskInfo->XenDevice; Req.id = 0; Req.sector_number = SectorNumber; #ifdef CONFIG_XEN_BLKDEV_GRANT @@ -515,13 +522,54 @@ { return FALSE; } - memcpy(Buffer, XenDiskScratchPage, Count * SectorSize); + memcpy(Buffer, XenDiskScratchPage, Count * DiskInfo->BytesPerSector); SectorCount -= Count; SectorNumber += Count; - Buffer = (void *)((char *) Buffer + Count * SectorSize); + Buffer = (void *)((char *) Buffer + Count * DiskInfo->BytesPerSector); } return TRUE; } +BOOL +XenDiskGetDriveGeometry(ULONG DriveNumber, PGEOMETRY DriveGeometry) +{ + PXENDISKINFO DiskInfo; + + DiskInfo = XenDiskFindDrive(DriveNumber); + if (NULL == DiskInfo) + { + return FALSE; + } + + if (DiskInfo->SectorCount < 255) + { + DriveGeometry->Sectors = DiskInfo->SectorCount; + DriveGeometry->Heads = 1; + DriveGeometry->Cylinders = 1; + } + else if (DiskInfo->SectorCount < 255 * 63) + { + DriveGeometry->Sectors = 255; + DriveGeometry->Heads = DiskInfo->SectorCount / 255; + DriveGeometry->Cylinders = 1; + } + else + { + DriveGeometry->Sectors = 255; + DriveGeometry->Heads = 63; + DriveGeometry->Cylinders = DiskInfo->SectorCount / (255 * 63); + } + DriveGeometry->BytesPerSector = DiskInfo->BytesPerSector; + + return TRUE; +} + +ULONG +XenDiskGetCacheableBlockCount(ULONG DriveNumber) +{ + /* 64 seems a nice number, it is used by the machpc code for LBA devices */ + return 64; +} + /* EOF */

19 years, 4 months

[chorns] 15340: Correct entry point of win32k.sys

by chorns＠svn.reactos.com

Correct entry point of win32k.sys Modified: branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c _____ Modified: branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c --- branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-05-16 12:32:10 UTC (rev 15339) +++ branches/xmlbuildsystem/reactos/subsys/win32k/main/dllmain.c 2005-05-16 12:34:01 UTC (rev 15340) @@ -244,12 +244,8 @@ } -/* - * This definition doesn't work - */ -// BOOL STDCALL DllMain(VOID) NTSTATUS STDCALL -DllMain ( +DriverEntry ( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath) {

19 years, 4 months

← Newer
1
...
34
35
36
37
38
39
40
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2005