From f27974dd3cd930cfe2abadf01a2700b84be9cb97 Mon Sep 17 00:00:00 2001
From: Bananymous <oskari.alaranta@bananymous.com>
Date: Wed, 11 Oct 2023 21:52:08 +0300
Subject: [PATCH] Kernel: PCI cleanup PCI::Device API

---
 kernel/include/kernel/PCI.h |  9 ++++++---
 kernel/kernel/PCI.cpp       | 35 ++++++++++++++++++++++++++---------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/kernel/include/kernel/PCI.h b/kernel/include/kernel/PCI.h
index 1eb10311bf..46691da1d5 100644
--- a/kernel/include/kernel/PCI.h
+++ b/kernel/include/kernel/PCI.h
@@ -92,10 +92,13 @@ namespace Kernel::PCI
 	private:
 		void enumerate_capabilites();
 
+		void set_command_bits(uint16_t mask);
+		void unset_command_bits(uint16_t mask);
+
 	private:
-		uint8_t m_bus;
-		uint8_t m_dev;
-		uint8_t m_func;
+		const uint8_t m_bus;
+		const uint8_t m_dev;
+		const uint8_t m_func;
 
 		uint8_t m_class_code;
 		uint8_t m_subclass;
diff --git a/kernel/kernel/PCI.cpp b/kernel/kernel/PCI.cpp
index 3e04f2d1cf..a052beb28d 100644
--- a/kernel/kernel/PCI.cpp
+++ b/kernel/kernel/PCI.cpp
@@ -6,12 +6,20 @@
 #include <kernel/Storage/ATA/AHCI/Controller.h>
 #include <kernel/Storage/ATA/ATAController.h>
 
+#include <lai/helpers/pci.h>
+
 #define INVALID_VENDOR 0xFFFF
 #define MULTI_FUNCTION 0x80
 
 #define CONFIG_ADDRESS 0xCF8
 #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
 
 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()
 	{
-		write_dword(0x04, read_dword(0x04) | 1u << 2);
+		set_command_bits(PCI_CMD_BUS_MASTER);
 	}
 
 	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()
 	{
-		write_dword(0x04, read_dword(0x04) | 1u << 1);
+		set_command_bits(PCI_CMD_MEM_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()
 	{
-		write_dword(0x04, read_dword(0x04) | 1u << 0);
+		set_command_bits(PCI_CMD_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()
 	{
-		write_dword(0x04, read_dword(0x04) | 1u << 10);
+		unset_command_bits(PCI_CMD_INTERRUPT_DISABLE);
 	}
 
 	void PCI::Device::disable_pin_interrupts()
 	{
-		write_dword(0x04, read_dword(0x04) & ~(1u << 10));
+		set_command_bits(PCI_CMD_INTERRUPT_DISABLE);
 	}
 
 }
\ No newline at end of file