RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 03:37:45 +00:00
Code Issues Activity Actions

Kernel: Remove i686 support

Browse source
This commit is contained in:
Liav A 2022-10-04 03:05:54 +03:00 • committed by Andreas Kling
parent 32270dcd20
commit 5ff318cf3a
75 changed files with 142 additions and 895 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Storage/ATA/GenericIDE/Channel.cpp
View file

@ -82,7 +82,7 @@ ErrorOr<void> IDEChannel::port_phy_reset()
return {};
}
#if ARCH(I386) || ARCH(X86_64)
#if ARCH(X86_64)
ErrorOr<void> IDEChannel::allocate_resources_for_pci_ide_controller(Badge<PCIIDELegacyModeController>, bool force_pio)
{
return allocate_resources(force_pio);

4
Kernel/Storage/ATA/GenericIDE/Channel.h
View file

@ -36,7 +36,7 @@ namespace Kernel {
class AsyncBlockDeviceRequest;
class IDEController;
#if ARCH(I386) || ARCH(X86_64)
#if ARCH(X86_64)
class PCIIDELegacyModeController;
class ISAIDEController;
#endif
@ -95,7 +95,7 @@ public:
virtual StringView purpose() const override { return "PATA Channel"sv; }
#if ARCH(I386) || ARCH(X86_64)
#if ARCH(X86_64)
ErrorOr<void> allocate_resources_for_pci_ide_controller(Badge<PCIIDELegacyModeController>, bool force_pio);
ErrorOr<void> allocate_resources_for_isa_ide_controller(Badge<ISAIDEController>);
#endif

6
Kernel/Storage/StorageManagement.cpp
View file

@ -10,7 +10,7 @@
#include <AK/Singleton.h>
#include <AK/StringView.h>
#include <AK/UUID.h>
#if ARCH(I386) || ARCH(X86_64)
#if ARCH(X86_64)
# include <Kernel/Arch/x86/ISABus/IDEController.h>
# include <Kernel/Arch/x86/PCI/IDELegacyModeController.h>
#endif
@ -102,8 +102,8 @@ UNMAP_AFTER_INIT void StorageManagement::enumerate_pci_controllers(bool force_pi
}
}
#if ARCH(X86_64)
auto subclass_code = static_cast<SubclassID>(device_identifier.subclass_code().value());
#if ARCH(I386) || ARCH(X86_64)
if (subclass_code == SubclassID::IDEController && kernel_command_line().is_ide_enabled()) {
m_controllers.append(PCIIDELegacyModeController::initialize(device_identifier, force_pio));
}
@ -426,7 +426,7 @@ UNMAP_AFTER_INIT void StorageManagement::initialize(StringView root_device, bool
VERIFY(s_storage_device_minor_number == 0);
m_boot_argument = root_device;
if (PCI::Access::is_disabled()) {
#if ARCH(I386) || ARCH(X86_64)
#if ARCH(X86_64)
// Note: If PCI is disabled, we assume that at least we have an ISA IDE controller
// to probe and use
auto isa_ide_controller = MUST(ISAIDEController::initialize());