1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 22:37:35 +00:00

Kernel/PCI: Convert PCI BAR number to a strong typed enum class

This commit is contained in:
Liav A 2022-09-02 19:59:08 +03:00 committed by Linus Groh
parent f510c0ba04
commit bb6f61ee5d
10 changed files with 26 additions and 17 deletions

View file

@ -94,10 +94,10 @@ u32 get_BAR5(Address address)
return read32(address, PCI::RegisterOffset::BAR5);
}
u32 get_BAR(Address address, u8 bar)
u32 get_BAR(Address address, HeaderType0BaseRegister pci_bar)
{
VERIFY(bar <= 5);
switch (bar) {
VERIFY(to_underlying(pci_bar) <= 5);
switch (to_underlying(pci_bar)) {
case 0:
return get_BAR0(address);
case 1:
@ -138,11 +138,11 @@ static u8 read8_offsetted(Address address, u32 field) { return Access::the().rea
static u16 read16_offsetted(Address address, u32 field) { return Access::the().read16_field(address, field); }
static u32 read32_offsetted(Address address, u32 field) { return Access::the().read32_field(address, field); }
size_t get_BAR_space_size(Address address, u8 bar_number)
size_t get_BAR_space_size(Address address, HeaderType0BaseRegister pci_bar)
{
// See PCI Spec 2.3, Page 222
VERIFY(bar_number < 6);
u8 field = to_underlying(PCI::RegisterOffset::BAR0) + (bar_number << 2);
VERIFY(to_underlying(pci_bar) < 6);
u8 field = to_underlying(PCI::RegisterOffset::BAR0) + (to_underlying(pci_bar) << 2);
u32 bar_reserved = read32_offsetted(address, field);
write32_offsetted(address, field, 0xFFFFFFFF);
u32 space_size = read32_offsetted(address, field);

View file

@ -31,8 +31,8 @@ u32 get_BAR2(Address);
u32 get_BAR3(Address);
u32 get_BAR4(Address);
u32 get_BAR5(Address);
u32 get_BAR(Address address, u8 bar);
size_t get_BAR_space_size(Address, u8);
u32 get_BAR(Address address, HeaderType0BaseRegister);
size_t get_BAR_space_size(Address, HeaderType0BaseRegister);
void enable_bus_mastering(Address);
void disable_bus_mastering(Address);
void enable_io_space(Address);

View file

@ -21,6 +21,15 @@ enum class HeaderType {
Bridge = 1,
};
enum class HeaderType0BaseRegister {
BAR0 = 0,
BAR1,
BAR2,
BAR3,
BAR4,
BAR5,
};
enum class RegisterOffset {
VENDOR_ID = 0x00, // word
DEVICE_ID = 0x02, // word