Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: PCI cleanup PCI::Device API

This commit is contained in:
Bananymous 2023-10-11 21:52:08 +03:00
parent 744ff40ba0
commit f27974dd3c
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/include/kernel/PCI.h
View File

@ -92,10 +92,13 @@ namespace Kernel::PCI
private: private:
void enumerate_capabilites(); void enumerate_capabilites();
void set_command_bits(uint16_t mask);
void unset_command_bits(uint16_t mask);
private: private:
uint8_t m_bus; const uint8_t m_bus;
uint8_t m_dev; const uint8_t m_dev;
uint8_t m_func; const uint8_t m_func;
uint8_t m_class_code; uint8_t m_class_code;
uint8_t m_subclass; uint8_t m_subclass;

35
kernel/kernel/PCI.cpp
View File

@ -6,12 +6,20 @@
#include <kernel/Storage/ATA/AHCI/Controller.h> #include <kernel/Storage/ATA/AHCI/Controller.h>
#include <kernel/Storage/ATA/ATAController.h> #include <kernel/Storage/ATA/ATAController.h>
#include <lai/helpers/pci.h>
#define INVALID_VENDOR 0xFFFF #define INVALID_VENDOR 0xFFFF
#define MULTI_FUNCTION 0x80 #define MULTI_FUNCTION 0x80
#define CONFIG_ADDRESS 0xCF8 #define CONFIG_ADDRESS 0xCF8
#define CONFIG_DATA 0xCFC #define CONFIG_DATA 0xCFC
#define PCI_REG_COMMAND 0x04
#define PCI_CMD_IO_SPACE (1 << 0)
#define PCI_CMD_MEM_SPACE (1 << 1)
#define PCI_CMD_BUS_MASTER (1 << 2)
#define PCI_CMD_INTERRUPT_DISABLE (1 << 10)
#define DEBUG_PCI 1 #define DEBUG_PCI 1
namespace Kernel::PCI namespace Kernel::PCI
@ -378,45 +386,54 @@ namespace Kernel::PCI
} }
} }
void PCI::Device::set_command_bits(uint16_t mask)
{
write_dword(PCI_REG_COMMAND, read_dword(PCI_REG_COMMAND) | mask);
}
void PCI::Device::unset_command_bits(uint16_t mask)
{
write_dword(PCI_REG_COMMAND, read_dword(PCI_REG_COMMAND) & ~mask);
}
void PCI::Device::enable_bus_mastering() void PCI::Device::enable_bus_mastering()
{ {
write_dword(0x04, read_dword(0x04) | 1u << 2); set_command_bits(PCI_CMD_BUS_MASTER);
} }
void PCI::Device::disable_bus_mastering() void PCI::Device::disable_bus_mastering()
{ {
write_dword(0x04, read_dword(0x04) & ~(1u << 2)); unset_command_bits(PCI_CMD_BUS_MASTER);
} }
void PCI::Device::enable_memory_space() void PCI::Device::enable_memory_space()
{ {
write_dword(0x04, read_dword(0x04) | 1u << 1); set_command_bits(PCI_CMD_MEM_SPACE);
} }
void PCI::Device::disable_memory_space() void PCI::Device::disable_memory_space()
{ {
write_dword(0x04, read_dword(0x04) & ~(1u << 1)); unset_command_bits(PCI_CMD_MEM_SPACE);
} }
void PCI::Device::enable_io_space() void PCI::Device::enable_io_space()
{ {
write_dword(0x04, read_dword(0x04) | 1u << 0); set_command_bits(PCI_CMD_IO_SPACE);
} }
void PCI::Device::disable_io_space() void PCI::Device::disable_io_space()
{ {
write_dword(0x04, read_dword(0x04) & ~(1u << 0)); unset_command_bits(PCI_CMD_IO_SPACE);
} }
void PCI::Device::enable_pin_interrupts() void PCI::Device::enable_pin_interrupts()
{ {
write_dword(0x04, read_dword(0x04) | 1u << 10); unset_command_bits(PCI_CMD_INTERRUPT_DISABLE);
} }
void PCI::Device::disable_pin_interrupts() void PCI::Device::disable_pin_interrupts()
{ {
write_dword(0x04, read_dword(0x04) & ~(1u << 10)); set_command_bits(PCI_CMD_INTERRUPT_DISABLE);
} }
} }