forked from Bananymous/banan-os
Kernel: Reorganize PS/2 files to their own directory
This commit is contained in:
parent
c2957d8761
commit
d4191c0d94
|
@ -32,10 +32,10 @@ set(KERNEL_SOURCES
|
|||
kernel/FS/TmpFS/FileSystem.cpp
|
||||
kernel/FS/TmpFS/Inode.cpp
|
||||
kernel/FS/VirtualFileSystem.cpp
|
||||
kernel/Input/PS2Controller.cpp
|
||||
kernel/Input/PS2Device.cpp
|
||||
kernel/Input/PS2Keyboard.cpp
|
||||
kernel/Input/PS2Keymap.cpp
|
||||
kernel/Input/PS2/Controller.cpp
|
||||
kernel/Input/PS2/Device.cpp
|
||||
kernel/Input/PS2/Keyboard.cpp
|
||||
kernel/Input/PS2/Keymap.cpp
|
||||
kernel/InterruptController.cpp
|
||||
kernel/kernel.cpp
|
||||
kernel/Memory/DMARegion.cpp
|
||||
|
|
|
@ -92,4 +92,4 @@ namespace Kernel::Input::PS2
|
|||
CAPS_LOCK = (1 << 2),
|
||||
};
|
||||
|
||||
}
|
||||
}
|
|
@ -1,4 +1,6 @@
|
|||
#include <kernel/Input/PS2Controller.h>
|
||||
#pragma once
|
||||
|
||||
#include <kernel/Input/PS2/Controller.h>
|
||||
|
||||
namespace Kernel::Input
|
||||
{
|
||||
|
@ -40,4 +42,4 @@ namespace Kernel::Input
|
|||
BAN::CircularQueue<uint8_t, 10> m_command_queue;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
#pragma once
|
||||
|
||||
#include <kernel/Input/KeyEvent.h>
|
||||
#include <kernel/Input/PS2Device.h>
|
||||
#include <kernel/Input/PS2Keymap.h>
|
||||
#include <kernel/Input/PS2/Device.h>
|
||||
#include <kernel/Input/PS2/Keymap.h>
|
||||
#include <kernel/Semaphore.h>
|
||||
|
||||
namespace Kernel::Input
|
||||
|
@ -46,4 +46,4 @@ namespace Kernel::Input
|
|||
virtual bool has_data_impl() const override;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
|
@ -20,4 +20,4 @@ namespace Kernel::Input
|
|||
BAN::Vector<Key> m_extended_keymap;
|
||||
};
|
||||
|
||||
}
|
||||
}
|
|
@ -2,9 +2,9 @@
|
|||
#include <kernel/ACPI.h>
|
||||
#include <kernel/FS/DevFS/FileSystem.h>
|
||||
#include <kernel/IDT.h>
|
||||
#include <kernel/Input/PS2Config.h>
|
||||
#include <kernel/Input/PS2Controller.h>
|
||||
#include <kernel/Input/PS2Keyboard.h>
|
||||
#include <kernel/Input/PS2/Config.h>
|
||||
#include <kernel/Input/PS2/Controller.h>
|
||||
#include <kernel/Input/PS2/Keyboard.h>
|
||||
#include <kernel/InterruptController.h>
|
||||
#include <kernel/IO.h>
|
||||
#include <kernel/Timer/Timer.h>
|
||||
|
@ -248,4 +248,4 @@ namespace Kernel::Input
|
|||
return {};
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
#include <kernel/FS/DevFS/FileSystem.h>
|
||||
#include <kernel/Input/PS2Config.h>
|
||||
#include <kernel/Input/PS2Device.h>
|
||||
#include <kernel/Input/PS2/Config.h>
|
||||
#include <kernel/Input/PS2/Device.h>
|
||||
#include <kernel/IO.h>
|
||||
|
||||
#include <sys/sysmacros.h>
|
||||
|
@ -85,4 +85,4 @@ namespace Kernel::Input
|
|||
m_controller.send_byte(this, m_command_queue.front());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
#include <BAN/ScopeGuard.h>
|
||||
#include <kernel/CriticalScope.h>
|
||||
#include <kernel/FS/DevFS/FileSystem.h>
|
||||
#include <kernel/Input/PS2Config.h>
|
||||
#include <kernel/Input/PS2Keyboard.h>
|
||||
#include <kernel/Input/PS2/Config.h>
|
||||
#include <kernel/Input/PS2/Keyboard.h>
|
||||
|
||||
#define SET_MASK(byte, mask, on_off) ((on_off) ? ((byte) | (mask)) : ((byte) & ~(mask)))
|
||||
#define TOGGLE_MASK(byte, mask) ((byte) ^ (mask))
|
||||
|
@ -177,4 +177,4 @@ namespace Kernel::Input
|
|||
return !m_event_queue.empty();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
#include <kernel/Input/PS2Keymap.h>
|
||||
#include <kernel/Input/PS2/Keymap.h>
|
||||
|
||||
namespace Kernel::Input
|
||||
{
|
||||
|
@ -357,4 +357,4 @@ namespace Kernel::Input
|
|||
return key;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
#include <kernel/FS/VirtualFileSystem.h>
|
||||
#include <kernel/GDT.h>
|
||||
#include <kernel/IDT.h>
|
||||
#include <kernel/Input/PS2Controller.h>
|
||||
#include <kernel/Input/PS2/Controller.h>
|
||||
#include <kernel/InterruptController.h>
|
||||
#include <kernel/kprint.h>
|
||||
#include <kernel/Memory/Heap.h>
|
||||
|
|
Loading…
Reference in New Issue