mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 01:37:36 +00:00
Kernel: Make self-contained locking smart pointers their own classes
Until now, our kernel has reimplemented a number of AK classes to provide automatic internal locking: - RefPtr - NonnullRefPtr - WeakPtr - Weakable This patch renames the Kernel classes so that they can coexist with the original AK classes: - RefPtr => LockRefPtr - NonnullRefPtr => NonnullLockRefPtr - WeakPtr => LockWeakPtr - Weakable => LockWeakable The goal here is to eventually get rid of the Lock* classes in favor of using external locking.
This commit is contained in:
parent
e475263113
commit
11eee67b85
360 changed files with 1703 additions and 1672 deletions
|
@ -9,9 +9,9 @@
|
|||
|
||||
namespace Kernel::Graphics {
|
||||
|
||||
NonnullRefPtr<ContiguousFramebufferConsole> ContiguousFramebufferConsole::initialize(PhysicalAddress framebuffer_address, size_t width, size_t height, size_t pitch)
|
||||
NonnullLockRefPtr<ContiguousFramebufferConsole> ContiguousFramebufferConsole::initialize(PhysicalAddress framebuffer_address, size_t width, size_t height, size_t pitch)
|
||||
{
|
||||
return adopt_ref(*new ContiguousFramebufferConsole(framebuffer_address, width, height, pitch));
|
||||
return adopt_lock_ref(*new ContiguousFramebufferConsole(framebuffer_address, width, height, pitch));
|
||||
}
|
||||
|
||||
ContiguousFramebufferConsole::ContiguousFramebufferConsole(PhysicalAddress framebuffer_address, size_t width, size_t height, size_t pitch)
|
||||
|
|
|
@ -12,7 +12,7 @@ namespace Kernel::Graphics {
|
|||
|
||||
class ContiguousFramebufferConsole final : public GenericFramebufferConsole {
|
||||
public:
|
||||
static NonnullRefPtr<ContiguousFramebufferConsole> initialize(PhysicalAddress, size_t width, size_t height, size_t pitch);
|
||||
static NonnullLockRefPtr<ContiguousFramebufferConsole> initialize(PhysicalAddress, size_t width, size_t height, size_t pitch);
|
||||
|
||||
virtual void set_resolution(size_t width, size_t height, size_t pitch) override;
|
||||
virtual void flush(size_t, size_t, size_t, size_t) override { }
|
||||
|
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
namespace Kernel::Graphics {
|
||||
|
||||
UNMAP_AFTER_INIT NonnullRefPtr<VGATextModeConsole> VGATextModeConsole::initialize()
|
||||
UNMAP_AFTER_INIT NonnullLockRefPtr<VGATextModeConsole> VGATextModeConsole::initialize()
|
||||
{
|
||||
auto vga_window_size = MUST(Memory::page_round_up(0xc0000 - 0xa0000));
|
||||
auto vga_window_region = MUST(MM.allocate_kernel_region(PhysicalAddress(0xa0000), vga_window_size, "VGA Display"sv, Memory::Region::Access::ReadWrite));
|
||||
return adopt_ref(*new (nothrow) VGATextModeConsole(move(vga_window_region)));
|
||||
return adopt_lock_ref(*new (nothrow) VGATextModeConsole(move(vga_window_region)));
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT VGATextModeConsole::VGATextModeConsole(NonnullOwnPtr<Memory::Region> vga_window_region)
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
namespace Kernel::Graphics {
|
||||
class VGATextModeConsole final : public Console {
|
||||
public:
|
||||
static NonnullRefPtr<VGATextModeConsole> initialize();
|
||||
static NonnullLockRefPtr<VGATextModeConsole> initialize();
|
||||
virtual size_t chars_per_line() const override { return width(); };
|
||||
|
||||
virtual bool has_hardware_cursor() const override { return true; }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue