Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [MINIHAL] Remove sysinfo.c from compilation.
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3fa613b9da95348b8ef38… commit 3fa613b9da95348b8ef38f5799f659e6acfc63ce Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:17:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:58 2023 +0200 [MINIHAL] Remove sysinfo.c from compilation. --- hal/halx86/minihal/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 58e640180d8..de7f4de04ed 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -11,7 +11,6 @@ list(APPEND MINI_HAL_SOURCE ../generic/misc.c ../generic/nmi.c ../generic/spinlock.c - ../generic/sysinfo.c ../generic/timer.c ../generic/usage.c ../pic/pic.c

1 0

[reactos] 01/02: [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI"
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6a78d580b9676ca8c245… commit d6a78d580b9676ca8c24500e8668d179a0434815 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 19:02:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 22:40:57 2023 +0200 [HALX86] Tabs to 4-space indentation in generic/sysinfo.c + Fix typo "ALMI" -> "AMLI" --- hal/halx86/generic/sysinfo.c | 94 ++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/hal/halx86/generic/sysinfo.c b/hal/halx86/generic/sysinfo.c index ba880f380c3..209fc8e1fc9 100644 --- a/hal/halx86/generic/sysinfo.c +++ b/hal/halx86/generic/sysinfo.c @@ -13,7 +13,7 @@ #define NDEBUG #include <debug.h> -HAL_AMLI_BAD_IO_ADDRESS_LIST HalALMIBadIOAddressList[] = +HAL_AMLI_BAD_IO_ADDRESS_LIST HalAMLIBadIOAddressList[] = { { 0x0000, 0x10, 1, NULL }, // DMA controller { 0x0020, 0x02, 0, NULL }, // Programmable Interrupt Controller (8259A) @@ -58,59 +58,59 @@ HaliQuerySystemInformation(IN HAL_QUERY_INFORMATION_CLASS InformationClass, OUT PULONG ReturnedLength) { #define REPORT_THIS_CASE(X) case X: DPRINT1("Unhandled case: %s\n", #X); break - switch (InformationClass) - { - REPORT_THIS_CASE(HalInstalledBusInformation); - REPORT_THIS_CASE(HalProfileSourceInformation); - REPORT_THIS_CASE(HalInformationClassUnused1); - REPORT_THIS_CASE(HalPowerInformation); - REPORT_THIS_CASE(HalProcessorSpeedInformation); - REPORT_THIS_CASE(HalCallbackInformation); - REPORT_THIS_CASE(HalMapRegisterInformation); - REPORT_THIS_CASE(HalMcaLogInformation); - case HalFrameBufferCachingInformation: - { + switch (InformationClass) + { + REPORT_THIS_CASE(HalInstalledBusInformation); + REPORT_THIS_CASE(HalProfileSourceInformation); + REPORT_THIS_CASE(HalInformationClassUnused1); + REPORT_THIS_CASE(HalPowerInformation); + REPORT_THIS_CASE(HalProcessorSpeedInformation); + REPORT_THIS_CASE(HalCallbackInformation); + REPORT_THIS_CASE(HalMapRegisterInformation); + REPORT_THIS_CASE(HalMcaLogInformation); + case HalFrameBufferCachingInformation: + { /* FIXME: TODO */ return STATUS_NOT_IMPLEMENTED; - } - REPORT_THIS_CASE(HalDisplayBiosInformation); - REPORT_THIS_CASE(HalProcessorFeatureInformation); - REPORT_THIS_CASE(HalNumaTopologyInterface); - REPORT_THIS_CASE(HalErrorInformation); - REPORT_THIS_CASE(HalCmcLogInformation); - REPORT_THIS_CASE(HalCpeLogInformation); - REPORT_THIS_CASE(HalQueryMcaInterface); - case HalQueryAMLIIllegalIOPortAddresses: - { - ULONG Size = sizeof(HalALMIBadIOAddressList); - NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; + } + REPORT_THIS_CASE(HalDisplayBiosInformation); + REPORT_THIS_CASE(HalProcessorFeatureInformation); + REPORT_THIS_CASE(HalNumaTopologyInterface); + REPORT_THIS_CASE(HalErrorInformation); + REPORT_THIS_CASE(HalCmcLogInformation); + REPORT_THIS_CASE(HalCpeLogInformation); + REPORT_THIS_CASE(HalQueryMcaInterface); + case HalQueryAMLIIllegalIOPortAddresses: + { + ULONG Size = sizeof(HalAMLIBadIOAddressList); + NTSTATUS Status = STATUS_INFO_LENGTH_MISMATCH; - if (BufferSize >= Size) - { - RtlCopyMemory(Buffer, HalALMIBadIOAddressList, Size); - Status = STATUS_SUCCESS; - } + if (BufferSize >= Size) + { + RtlCopyMemory(Buffer, HalAMLIBadIOAddressList, Size); + Status = STATUS_SUCCESS; + } - *ReturnedLength = Size; - KeFlushWriteBuffer(); - return Status; - } + *ReturnedLength = Size; + KeFlushWriteBuffer(); + return Status; + } - REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); - REPORT_THIS_CASE(HalPartitionIpiInterface); - REPORT_THIS_CASE(HalPlatformInformation); - REPORT_THIS_CASE(HalQueryProfileSourceList); - REPORT_THIS_CASE(HalInitLogInformation); - REPORT_THIS_CASE(HalFrequencyInformation); - REPORT_THIS_CASE(HalProcessorBrandString); - REPORT_THIS_CASE(HalHypervisorInformation); - REPORT_THIS_CASE(HalPlatformTimerInformation); - REPORT_THIS_CASE(HalAcpiAuditInformation); - } + REPORT_THIS_CASE(HalQueryMaxHotPlugMemoryAddress); + REPORT_THIS_CASE(HalPartitionIpiInterface); + REPORT_THIS_CASE(HalPlatformInformation); + REPORT_THIS_CASE(HalQueryProfileSourceList); + REPORT_THIS_CASE(HalInitLogInformation); + REPORT_THIS_CASE(HalFrequencyInformation); + REPORT_THIS_CASE(HalProcessorBrandString); + REPORT_THIS_CASE(HalHypervisorInformation); + REPORT_THIS_CASE(HalPlatformTimerInformation); + REPORT_THIS_CASE(HalAcpiAuditInformation); + } #undef REPORT_THIS_CASE - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; } NTSTATUS

1 0

[reactos] 01/01: [MINIHAL] Remove unneeded files from compilation.
by Hermès Bélusca-Maïto 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d03fc32e7d456a5ddcf5f… commit d03fc32e7d456a5ddcf5f1ac7c01e9f4898842e2 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jun 20 14:29:44 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jun 20 18:39:01 2023 +0200 [MINIHAL] Remove unneeded files from compilation. --- hal/halx86/generic/bios.c | 6 ------ hal/halx86/generic/display.c | 2 -- hal/halx86/minihal/CMakeLists.txt | 5 ----- 3 files changed, 13 deletions(-) diff --git a/hal/halx86/generic/bios.c b/hal/halx86/generic/bios.c index be5e082d1fc..9c5c4907158 100644 --- a/hal/halx86/generic/bios.c +++ b/hal/halx86/generic/bios.c @@ -202,7 +202,6 @@ HalpDispatchV86Opcode(IN PKTRAP_FRAME TrapFrame) /* V86 TRAP HANDLERS **********************************************************/ -#ifndef _MINIHAL_ DECLSPEC_NORETURN VOID FASTCALL @@ -285,7 +284,6 @@ HalpBiosCall(VOID) /* Exit to V86 mode */ HalpExitToV86((PKTRAP_FRAME)&V86TrapFrame); } -#endif /* FUNCTIONS ******************************************************************/ @@ -443,7 +441,6 @@ HalpRestoreIopm(VOID) while (i--) HalpSavedIoMap[HalpSavedIoMapData[i][0]] = HalpSavedIoMapData[i][1]; } -#ifndef _MINIHAL_ VOID NTAPI HalpMapRealModeMemory(VOID) @@ -531,7 +528,6 @@ HalpSwitchToRealModeTrapHandlers(VOID) // KeRegisterInterruptHandler(6, HalpTrap06); } -#endif VOID NTAPI @@ -641,7 +637,6 @@ HalpUnmapRealModeMemory(VOID) HalpFlushTLB(); } -#ifndef _MINIHAL_ BOOLEAN NTAPI HalpBiosDisplayReset(VOID) @@ -716,6 +711,5 @@ HalpBiosDisplayReset(VOID) return TRUE; #endif } -#endif /* EOF */ diff --git a/hal/halx86/generic/display.c b/hal/halx86/generic/display.c index dc5f821240e..449ddc2986d 100644 --- a/hal/halx86/generic/display.c +++ b/hal/halx86/generic/display.c @@ -31,10 +31,8 @@ VOID NTAPI HalDisplayString(IN PCH String) { -#ifndef _MINIHAL_ /* Call the Inbv driver */ InbvDisplayString(String); -#endif } /* diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index 32d510f2a8b..58e640180d8 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -6,9 +6,7 @@ list(APPEND MINI_HAL_SOURCE ../legacy/bus/isabus.c ../legacy/bus/pcibus.c ../legacy/bussupp.c - ../generic/bios.c ../generic/dma.c - ../generic/display.c ../generic/drive.c ../generic/misc.c ../generic/nmi.c @@ -25,7 +23,6 @@ if(SARCH STREQUAL "xbox") list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/cmos.c - ../generic/profil.c ../xbox/clock.c ../xbox/reboot.c) elseif(SARCH STREQUAL "pc98") @@ -33,14 +30,12 @@ elseif(SARCH STREQUAL "pc98") ../pc98/beep.c ../pc98/clock.c ../pc98/cmos.c - ../pc98/profil.c ../pc98/reboot.c) else() list(APPEND MINI_HAL_SOURCE ../generic/beep.c ../generic/clock.c ../generic/cmos.c - ../generic/profil.c ../generic/reboot.c) endif()

1 0

[reactos] 01/01: [BROWSEUI] Add locked toolbar state persistence (#5350)
by Carl J. Bialorucki 20 Jun '23

20 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f203ad5cf4f650b77e5ae… commit f203ad5cf4f650b77e5ae32ed977d3606c32bb2a Author: Carl J. Bialorucki <cbialo2(a)outlook.com> AuthorDate: Tue Jun 20 03:16:23 2023 -0600 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 20 11:16:23 2023 +0200 [BROWSEUI] Add locked toolbar state persistence (#5350) Store the state of the explorer toolbar, locked or unlocked, in the proper registry location and set the proper toolbar state when initialized. CORE-9094 - Set `HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Toolbar\Locked` to 1 when the explorer toolbar is locked, 0 when the toolbar is unlocked. - Query `HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Toolbar\Locked` when the toolbar is initialized to set the correct locked state. - Set the default state of the toolbar to locked if the registry key does not exist, matching the behavior of Windows Server 2003. --- dll/win32/browseui/internettoolbar.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dll/win32/browseui/internettoolbar.cpp b/dll/win32/browseui/internettoolbar.cpp index 8c71f4d1a3f..8d51ad6bcfe 100644 --- a/dll/win32/browseui/internettoolbar.cpp +++ b/dll/win32/browseui/internettoolbar.cpp @@ -607,8 +607,12 @@ HRESULT STDMETHODCALLTYPE CMenuCallback::CallbackSM(LPSMDATA psmd, UINT uMsg, WP CInternetToolbar::CInternetToolbar() { + fLocked = SHRegGetBoolUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", + FALSE, + TRUE); + fMainReBar = NULL; - fLocked = false; fMenuBandWindow = NULL; fNavigationWindow = NULL; fMenuCallback = new CComObject<CMenuCallback>(); @@ -718,7 +722,15 @@ HRESULT CInternetToolbar::LockUnlockToolbars(bool locked) if (locked != fLocked) { + DWORD dwLocked = locked ? 1 : 0; + SHRegSetUSValueW(L"Software\\Microsoft\\Internet Explorer\\Toolbar", + L"Locked", + REG_DWORD, + &dwLocked, + sizeof(dwLocked), + SHREGSET_FORCE_HKCU); fLocked = locked; + rebarBandInfo.cbSize = sizeof(rebarBandInfo); rebarBandInfo.fMask = RBBIM_STYLE | RBBIM_LPARAM; bandCount = (int)SendMessage(fMainReBar, RB_GETBANDCOUNT, 0, 0);

1 0

[reactos] 04/04: [STORPORT] MaximumNumberOfLogicalUnits should be initialized to SCSI_MAXIMUM_LOGICAL_UNITS
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=157491e29741da7cc5314… commit 157491e29741da7cc5314ab22148a1a169741221 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:42:41 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:53 2023 +0200 [STORPORT] MaximumNumberOfLogicalUnits should be initialized to SCSI_MAXIMUM_LOGICAL_UNITS See https://www.osronline.com/article.cfm%5Earticle=538.htm --- drivers/storage/port/storport/miniport.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 54071f98345..16fefe95864 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -65,7 +65,7 @@ InitializeConfiguration( PortConfig->SpecificLuExtensionSize = InitData->SpecificLuExtensionSize; PortConfig->SrbExtensionSize = InitData->SrbExtensionSize; - PortConfig->MaximumNumberOfLogicalUnits = 1; + PortConfig->MaximumNumberOfLogicalUnits = SCSI_MAXIMUM_LOGICAL_UNITS; PortConfig->WmiDataProvider = TRUE; PortConfig->NumberOfAccessRanges = InitData->NumberOfAccessRanges;

1 0

[reactos] 03/04: [FREELDR][SCSIPORT][STORPORT] Use existing defines for some hardcoded max values.
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3bc71f9086e9176669f38… commit 3bc71f9086e9176669f38f939fbe99fd0f1bef05 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:08:33 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:51 2023 +0200 [FREELDR][SCSIPORT][STORPORT] Use existing defines for some hardcoded max values. See https://www.osronline.com/article.cfm%5Earticle=538.htm [SCSIPORT] Remove 'MaxBus' variable, deprecated since commit fc3d38d1c (r26220). --- boot/freeldr/freeldr/disk/scsiport.c | 6 ++++-- drivers/storage/port/scsiport/scsiport.c | 22 ++++++++++++---------- drivers/storage/port/storport/miniport.c | 14 ++++++++------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 97d85034a5c..63d81c3dab8 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -455,8 +455,10 @@ SpiCreatePortConfig( ConfigInfo->AtdiskSecondaryClaimed = FALSE; // FIXME /* Initiator bus id is not set */ - for (Bus = 0; Bus < 8; Bus++) + for (Bus = 0; Bus < RTL_NUMBER_OF(ConfigInfo->InitiatorBusId); Bus++) + { ConfigInfo->InitiatorBusId[Bus] = (CCHAR)SP_UNINITIALIZED_VALUE; + } } ConfigInfo->NumberOfPhysicalBreaks = 17; @@ -644,7 +646,7 @@ ScsiPortGetPhysicalAddress( else { /* Nothing */ - PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); + PhysicalAddress.QuadPart = (LONGLONG)SP_UNINITIALIZED_VALUE; } *Length = BufferLength; diff --git a/drivers/storage/port/scsiport/scsiport.c b/drivers/storage/port/scsiport/scsiport.c index 9b7f7f9d6df..655c4680676 100644 --- a/drivers/storage/port/scsiport/scsiport.c +++ b/drivers/storage/port/scsiport/scsiport.c @@ -569,7 +569,7 @@ ScsiPortGetPhysicalAddress(IN PVOID HwDeviceExtension, else { /* Nothing */ - PhysicalAddress.QuadPart = (LONGLONG)(SP_UNINITIALIZED_VALUE); + PhysicalAddress.QuadPart = (LONGLONG)SP_UNINITIALIZED_VALUE; } *Length = (ULONG)BufferLength; @@ -852,7 +852,6 @@ ScsiPortInitialize( BOOLEAN FirstConfigCall = TRUE; ULONG Result; NTSTATUS Status; - ULONG MaxBus; PCI_SLOT_NUMBER SlotNumber; PDEVICE_OBJECT PortDeviceObject; @@ -861,7 +860,7 @@ ScsiPortInitialize( PCM_RESOURCE_LIST ResourceList; - DPRINT ("ScsiPortInitialize() called!\n"); + DPRINT("ScsiPortInitialize() called!\n"); /* Check params for validity */ if ((HwInitializationData->HwInitialize == NULL) || @@ -945,8 +944,8 @@ ScsiPortInitialize( DeviceExtensionSize = sizeof(SCSI_PORT_DEVICE_EXTENSION) + HwInitializationData->DeviceExtensionSize; - MaxBus = (HwInitializationData->AdapterInterfaceType == PCIBus) ? 8 : 1; - DPRINT("MaxBus: %lu\n", MaxBus); + DPRINT("AdapterInterfaceType: %lu\n", + HwInitializationData->AdapterInterfaceType); while (TRUE) { @@ -1080,7 +1079,8 @@ CreatePortConfig: if ((HwInitializationData->AdapterInterfaceType == PCIBus) && (HwInitializationData->VendorIdLength > 0) && (HwInitializationData->VendorId != NULL) && - (HwInitializationData->DeviceIdLength > 0) && (HwInitializationData->DeviceId != NULL)) + (HwInitializationData->DeviceIdLength > 0) && + (HwInitializationData->DeviceId != NULL)) { PortConfig->BusInterruptLevel = 0; @@ -1360,7 +1360,7 @@ CreatePortConfig: if (!Again) ConfigInfo.BusNumber++; - DPRINT("Bus: %lu MaxBus: %lu\n", ConfigInfo.BusNumber, MaxBus); + DPRINT(" Bus: %lu\n", ConfigInfo.BusNumber); DeviceFound = TRUE; } @@ -2402,7 +2402,7 @@ SpiCreatePortConfig(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ConfigInfo->DmaPort2 = SP_UNINITIALIZED_VALUE; ConfigInfo->MaximumTransferLength = SP_UNINITIALIZED_VALUE; ConfigInfo->NumberOfAccessRanges = HwInitData->NumberOfAccessRanges; - ConfigInfo->MaximumNumberOfTargets = 8; + ConfigInfo->MaximumNumberOfTargets = SCSI_MAXIMUM_TARGETS; // NOTE: Using legacy value. /* Store parameters */ ConfigInfo->NeedPhysicalAddresses = HwInitData->NeedPhysicalAddresses; @@ -2418,8 +2418,10 @@ SpiCreatePortConfig(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ConfigInfo->AtdiskSecondaryClaimed = DdkConfigInformation->AtDiskSecondaryAddressClaimed; /* Initiator bus id is not set */ - for (Bus = 0; Bus < 8; Bus++) + for (Bus = 0; Bus < RTL_NUMBER_OF(ConfigInfo->InitiatorBusId); Bus++) + { ConfigInfo->InitiatorBusId[Bus] = (CCHAR)SP_UNINITIALIZED_VALUE; + } } ConfigInfo->NumberOfPhysicalBreaks = 17; @@ -2690,7 +2692,7 @@ SpiParseDeviceInfo(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, /* Check / reset if needed */ if (ConfigInfo->InitiatorBusId[0] > ConfigInfo->MaximumNumberOfTargets - 1) - ConfigInfo->InitiatorBusId[0] = (CCHAR)-1; + ConfigInfo->InitiatorBusId[0] = (CCHAR)SP_UNINITIALIZED_VALUE; DPRINT("InitiatorTargetId = %d\n", ConfigInfo->InitiatorBusId[0]); } diff --git a/drivers/storage/port/storport/miniport.c b/drivers/storage/port/storport/miniport.c index 48fd9890b2f..54071f98345 100644 --- a/drivers/storage/port/storport/miniport.c +++ b/drivers/storage/port/storport/miniport.c @@ -41,9 +41,9 @@ InitializeConfiguration( PortConfig->SlotNumber = SlotNumber; PortConfig->AdapterInterfaceType = InitData->AdapterInterfaceType; - PortConfig->MaximumTransferLength = -1; //SP_UNINITIALIZED_VALUE; - PortConfig->DmaChannel = -1; //SP_UNINITIALIZED_VALUE; - PortConfig->DmaPort = -1; //SP_UNINITIALIZED_VALUE; + PortConfig->MaximumTransferLength = SP_UNINITIALIZED_VALUE; + PortConfig->DmaChannel = SP_UNINITIALIZED_VALUE; + PortConfig->DmaPort = SP_UNINITIALIZED_VALUE; PortConfig->InterruptMode = LevelSensitive; @@ -61,7 +61,7 @@ InitializeConfiguration( PortConfig->ReceiveEvent = InitData->ReceiveEvent; PortConfig->RealModeInitialized = FALSE; PortConfig->BufferAccessScsiPortControlled = TRUE; - PortConfig->MaximumNumberOfTargets = 128; + PortConfig->MaximumNumberOfTargets = SCSI_MAXIMUM_TARGETS_PER_BUS; PortConfig->SpecificLuExtensionSize = InitData->SpecificLuExtensionSize; PortConfig->SrbExtensionSize = InitData->SrbExtensionSize; @@ -82,8 +82,10 @@ InitializeConfiguration( PortConfig->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); } - for (i = 0; i < 7; i++) - PortConfig->InitiatorBusId[i] = 0xff; + for (i = 0; i < RTL_NUMBER_OF(PortConfig->InitiatorBusId); i++) + { + PortConfig->InitiatorBusId[i] = (CCHAR)SP_UNINITIALIZED_VALUE; + } return STATUS_SUCCESS; }

1 0

[reactos] 02/04: [DDK] storport.h: Add some missing definitions that are in common with srb.h
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0fbd5eda85b64c2efcdad… commit 0fbd5eda85b64c2efcdad7e748d9f58d511c81b7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:39:43 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:49 2023 +0200 [DDK] storport.h: Add some missing definitions that are in common with srb.h --- sdk/include/ddk/storport.h | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/sdk/include/ddk/storport.h b/sdk/include/ddk/storport.h index 901d761cc88..1fb04882dbe 100644 --- a/sdk/include/ddk/storport.h +++ b/sdk/include/ddk/storport.h @@ -20,6 +20,14 @@ * */ +#ifdef _NTSCSI_ + #error STORPORT.H must be included instead of SCSI.H +#endif + +#ifdef _NTSRB_ + #error STORPORT.H must be included instead of SRB.H +#endif + #ifndef _NTSTORPORT_ #define _NTSTORPORT_ @@ -27,6 +35,40 @@ extern "C" { #endif +// +// Common definitions with SRB.H +// + +/* NOTE: the current SCSI_MAXIMUM_TARGETS_PER_BUS is applicable + * only on scsiport miniports. For storport miniports, the max + * target supported is 255. */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define SCSI_MAXIMUM_BUSES_PER_ADAPTER 255 +#endif +#define SCSI_MAXIMUM_TARGETS_PER_BUS 128 +#define SCSI_MAXIMUM_LUNS_PER_TARGET 255 +#define SCSI_MINIMUM_PHYSICAL_BREAKS 16 +#define SCSI_MAXIMUM_PHYSICAL_BREAKS 255 + +/* These constants are for backward compatibility. + * They used to be the maximum supported. */ +#define SCSI_MAXIMUM_BUSES 8 +#define SCSI_MAXIMUM_TARGETS 8 +#define SCSI_MAXIMUM_LOGICAL_UNITS 8 + +/* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */ +#define SCSI_DMA64_MINIPORT_SUPPORTED 0x01 +#define SCSI_DMA64_SYSTEM_SUPPORTED 0x80 +#if (NTDDI_VERSION > NTDDI_WS03SP1) +#define SCSI_DMA64_MINIPORT_FULL64BIT_SUPPORTED 0x02 +#endif + +#define SP_UNINITIALIZED_VALUE ((ULONG) ~0) +#define SP_UNTAGGED ((UCHAR) ~0) + +// End of common definitions with SRB.H + + #if defined(_STORPORT_) #define STORPORT_API #else @@ -293,6 +335,7 @@ extern "C" { #define SP_RETURN_ERROR 2 #define SP_RETURN_BAD_CONFIG 3 +/* SCSI_REQUEST_BLOCK.Function constants */ #define SRB_FUNCTION_EXECUTE_SCSI 0x00 #define SRB_FUNCTION_CLAIM_DEVICE 0x01 #define SRB_FUNCTION_IO_CONTROL 0x02 @@ -320,6 +363,7 @@ extern "C" { #define SRB_FUNCTION_PNP 0x25 #define SRB_FUNCTION_DUMP_POINTERS 0x26 +/* SCSI_REQUEST_BLOCK.SrbStatus constants */ #define SRB_STATUS_PENDING 0x00 #define SRB_STATUS_SUCCESS 0x01 #define SRB_STATUS_ABORTED 0x02 @@ -353,6 +397,7 @@ extern "C" { #define SRB_STATUS_AUTOSENSE_VALID 0x80 #define SRB_STATUS(Status) (Status & ~(SRB_STATUS_AUTOSENSE_VALID | SRB_STATUS_QUEUE_FROZEN)) +/* SCSI_REQUEST_BLOCK.SrbFlags constants */ #define SRB_FLAGS_QUEUE_ACTION_ENABLE 0x00000002 #define SRB_FLAGS_DISABLE_DISCONNECT 0x00000004 #define SRB_FLAGS_DISABLE_SYNCH_TRANSFER 0x00000008

1 0

[reactos] 01/04: [DDK] srb.h: Introduce Win8+ SCSI_MAXIMUM_BUSES_PER_ADAPTER and comment about the old SCSI_MAXIMUM_* variables.
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b12069d67070ca59a3c5f… commit b12069d67070ca59a3c5fc24f62da7d7c3cd3099 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jun 14 22:11:23 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:10:44 2023 +0200 [DDK] srb.h: Introduce Win8+ SCSI_MAXIMUM_BUSES_PER_ADAPTER and comment about the old SCSI_MAXIMUM_* variables. --- sdk/include/ddk/srb.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/sdk/include/ddk/srb.h b/sdk/include/ddk/srb.h index 297be69d073..78c9fde397a 100644 --- a/sdk/include/ddk/srb.h +++ b/sdk/include/ddk/srb.h @@ -27,13 +27,22 @@ extern "C" { #endif -#define SCSI_MAXIMUM_LOGICAL_UNITS 8 +/* NOTE: the current SCSI_MAXIMUM_TARGETS_PER_BUS is applicable + * only on scsiport miniports. For storport miniports, the max + * target supported is 255. */ +#if (NTDDI_VERSION >= NTDDI_WIN8) +#define SCSI_MAXIMUM_BUSES_PER_ADAPTER 255 +#endif #define SCSI_MAXIMUM_TARGETS_PER_BUS 128 #define SCSI_MAXIMUM_LUNS_PER_TARGET 255 -#define SCSI_MAXIMUM_BUSES 8 #define SCSI_MINIMUM_PHYSICAL_BREAKS 16 #define SCSI_MAXIMUM_PHYSICAL_BREAKS 255 + +/* These constants are for backward compatibility. + * They used to be the maximum supported. */ +#define SCSI_MAXIMUM_BUSES 8 #define SCSI_MAXIMUM_TARGETS 8 +#define SCSI_MAXIMUM_LOGICAL_UNITS 8 /* PORT_CONFIGURATION_INFORMATION.Dma64BitAddresses constants */ #define SCSI_DMA64_MINIPORT_SUPPORTED 0x01

1 0

[reactos] 04/04: [HALX86] Implement HalpcGetCmosData and HalpcSetCmosData.
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e1510eb9c384dcf6b820… commit 7e1510eb9c384dcf6b82054dfc1165d1e34727a5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 19 17:51:31 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:09:03 2023 +0200 [HALX86] Implement HalpcGetCmosData and HalpcSetCmosData. --- hal/halx86/generic/cmos.c | 9 +++--- hal/halx86/include/bus.h | 38 +++++++++++-------------- hal/halx86/legacy/bus/cmosbus.c | 63 +++++++++++++++++++++++++---------------- 3 files changed, 60 insertions(+), 50 deletions(-) diff --git a/hal/halx86/generic/cmos.c b/hal/halx86/generic/cmos.c index 75a09b1bfe2..45ad8840956 100644 --- a/hal/halx86/generic/cmos.c +++ b/hal/halx86/generic/cmos.c @@ -101,10 +101,11 @@ HalpGetCmosData( ULONG NTAPI -HalpSetCmosData(IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length) +HalpSetCmosData( + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length) { PUCHAR Ptr = (PUCHAR)Buffer; ULONG Address = SlotNumber; diff --git a/hal/halx86/include/bus.h b/hal/halx86/include/bus.h index 3e8fa82e13e..af61f0fa67c 100644 --- a/hal/halx86/include/bus.h +++ b/hal/halx86/include/bus.h @@ -427,17 +427,15 @@ HalpGetCmosData( _In_ ULONG BusNumber, _In_ ULONG SlotNumber, _Out_writes_bytes_(Length) PVOID Buffer, - _In_ ULONG Length -); + _In_ ULONG Length); ULONG NTAPI HalpSetCmosData( - IN ULONG BusNumber, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Length -); + _In_ ULONG BusNumber, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Length); CODE_SEG("INIT") VOID @@ -584,24 +582,22 @@ HalpNoBusData( ULONG NTAPI HalpcGetCmosData( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length -); + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); ULONG NTAPI HalpcSetCmosData( - IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length -); + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length); BOOLEAN NTAPI diff --git a/hal/halx86/legacy/bus/cmosbus.c b/hal/halx86/legacy/bus/cmosbus.c index 88e7981ac51..cc633e8c96f 100644 --- a/hal/halx86/legacy/bus/cmosbus.c +++ b/hal/halx86/legacy/bus/cmosbus.c @@ -1,45 +1,58 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory - * FILE: hal/halx86/legacy/bus/cmosbus.c - * PURPOSE: - * PROGRAMMERS: Stefan Ginsberg (stefan.ginsberg(a)reactos.org) + * PROJECT: ReactOS HAL + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CMOS bus data handlers + * COPYRIGHT: Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ /* INCLUDES *******************************************************************/ #include <hal.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS ********************************************************************/ /* PRIVATE FUNCTIONS **********************************************************/ ULONG NTAPI -HalpcGetCmosData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) +HalpcGetCmosData( + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _Out_writes_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) { - UNIMPLEMENTED_DBGBREAK("CMOS GetData\n"); - return 0; + UNREFERENCED_PARAMETER(RootHandler); + + /* CMOS reads do not support offsets */ + if (Offset != 0) + return 0; + + return HalpGetCmosData(BusHandler->BusNumber, + SlotNumber, + Buffer, + Length); } ULONG NTAPI -HalpcSetCmosData(IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, - IN ULONG SlotNumber, - IN PVOID Buffer, - IN ULONG Offset, - IN ULONG Length) +HalpcSetCmosData( + _In_ PBUS_HANDLER BusHandler, + _In_ PBUS_HANDLER RootHandler, + _In_ ULONG SlotNumber, + _In_reads_bytes_(Length) PVOID Buffer, + _In_ ULONG Offset, + _In_ ULONG Length) { - UNIMPLEMENTED_DBGBREAK("CMOS SetData\n"); - return 0; + UNREFERENCED_PARAMETER(RootHandler); + + /* CMOS writes do not support offsets */ + if (Offset != 0) + return 0; + + return HalpSetCmosData(BusHandler->BusNumber, + SlotNumber, + Buffer, + Length); } /* EOF */

1 0

[reactos] 03/04: [FREELDR] scsiport.c: Fix x64 compilation.
by Hermès Bélusca-Maïto 19 Jun '23

19 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0c16bcd4e84479f6b7c71… commit 0c16bcd4e84479f6b7c71cf6d13b04ffdb4acd29 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jun 19 20:30:45 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jun 19 21:09:01 2023 +0200 [FREELDR] scsiport.c: Fix x64 compilation. --- boot/freeldr/freeldr/disk/scsiport.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index c41d7936f80..97d85034a5c 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -589,11 +589,17 @@ ScsiPortGetDeviceBase( /* I/O space */ if (AddressSpace != 0) - return (PVOID)TranslatedAddress.u.LowPart; + return (PVOID)(ULONG_PTR)TranslatedAddress.u.LowPart; // FIXME +#if 0 + return MmMapIoSpace(TranslatedAddress, + NumberOfBytes, + FALSE); +#else UNIMPLEMENTED; - return (PVOID)IoAddress.LowPart; + return (PVOID)(ULONG_PTR)IoAddress.LowPart; +#endif } PVOID @@ -842,7 +848,8 @@ SpiScanDevice( Status = ArcOpen(PartitionName, OpenReadOnly, &FileId); if (Status == ESUCCESS) { - ret = HALDISPATCH->HalIoReadPartitionTable((PDEVICE_OBJECT)FileId, 512, FALSE, &PartitionBuffer); + ret = HALDISPATCH->HalIoReadPartitionTable((PDEVICE_OBJECT)(ULONG_PTR)FileId, + 512, FALSE, &PartitionBuffer); if (NT_SUCCESS(ret)) { for (i = 0; i < PartitionBuffer->PartitionCount; i++) @@ -1702,7 +1709,7 @@ LoadBootDeviceDriver(VOID) while (((PIMAGE_THUNK_DATA)ThunkData)->u1.AddressOfData != 0) { - ThunkData->u1.Function = (ULONG)VaToPa((PVOID)ThunkData->u1.Function); + ThunkData->u1.Function = (ULONG_PTR)VaToPa((PVOID)ThunkData->u1.Function); ThunkData++; } }

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