Kernel: Unify PS2Device to handle commands instead of inherited

kernel/include/kernel/Input/PS2Config.h

@@ -55,6 +55,7 @@ namespace Kernel::Input::PS2
 		TEST_CONTROLLER_PASS = 0x55,
 		SELF_TEST_PASS = 0xAA,
 		ACK = 0xFA,
+		RESEND = 0xFE,
 	};
 
 	enum DeviceCommand : uint8_t
@@ -74,9 +75,6 @@ namespace Kernel::Input::PS2
 	enum KBResponse : uint8_t
 	{
 		KEY_ERROR_OR_BUFFER_OVERRUN1 = 0x00,
-		SELF_TEST_PASSED = 0xAA,
-		ECHO_RESPONSE = 0xEE,
-		RESEND = 0xFE,
 		KEY_ERROR_OR_BUFFER_OVERRUN2 = 0xFF,
 	};
 

kernel/include/kernel/Input/PS2Controller.h

@@ -1,23 +1,47 @@
 #pragma once
 
+#include <BAN/CircularQueue.h>
 #include <kernel/Device/Device.h>
 #include <kernel/InterruptController.h>
 
 namespace Kernel::Input
 {
 
+	class PS2Controller;
+
 	class PS2Device : public CharacterDevice, public Interruptable
 	{
 	public:
-		PS2Device();
+		PS2Device(PS2Controller&);
 		virtual ~PS2Device() {}
 
 		virtual void send_initialize() = 0;
 
+		bool append_command_queue(uint8_t command);
+		bool append_command_queue(uint8_t command, uint8_t data);
+		virtual void handle_irq() final override;
+
+		virtual void handle_byte(uint8_t) = 0;
+		virtual void handle_device_command_response(uint8_t) = 0;
+
 		virtual BAN::StringView name() const override { return m_name; }
 
+	protected:
+		void update();
+
+	private:
+		enum class State
+		{
+			Normal,
+			WaitingAck,
+		};
+
 	private:
 		const BAN::String m_name;
+
+		PS2Controller&					m_controller;
+		State							m_state			= State::Normal;
+		BAN::CircularQueue<uint8_t, 10>	m_command_queue;
 	};
 
 	class PS2Controller

kernel/include/kernel/Input/PS2Keyboard.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include <BAN/CircularQueue.h>
 #include <kernel/Input/KeyEvent.h>
 #include <kernel/Input/PS2Controller.h>
 #include <kernel/Input/PS2Keymap.h>
@@ -15,48 +14,31 @@ namespace Kernel::Input
 		enum Command : uint8_t
 		{
 			SET_LEDS = 0xED,
-			SCANCODE = 0xF0,
-			ENABLE_SCANNING = 0xF4,
-			DISABLE_SCANNING = 0xF5,
-		};
-
-		enum class State
-		{
-			Normal,
-			WaitingAck,
+			SCANCODE = 0xF0
 		};
 
 	public:
 		static BAN::ErrorOr<PS2Keyboard*> create(PS2Controller&);
 		virtual void send_initialize() override;
 
-		virtual void handle_irq() override;
-		virtual void update() override;
+		virtual void handle_byte(uint8_t) final override;
+		virtual void handle_device_command_response(uint8_t) final override;
 
 	private:
 		PS2Keyboard(PS2Controller& controller);
 
-		void append_command_queue(uint8_t);
-		void append_command_queue(uint8_t, uint8_t);
-
-		void buffer_has_key();
-
 		void update_leds();
 
 	private:
-		PS2Controller& m_controller;
 		uint8_t m_byte_buffer[10];
 		uint8_t m_byte_index { 0 };
 
 		uint8_t m_modifiers { 0 };
 
 		BAN::CircularQueue<KeyEvent, 10> m_event_queue;
-		BAN::CircularQueue<uint8_t, 10> m_command_queue;
 
 		PS2Keymap m_keymap;
 
-		State m_state { State::Normal };
-
 		Semaphore m_semaphore;
 
 	public: