RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:27:43 +00:00
Code Issues Activity Actions

Kernel: Rename LinearAddress => VirtualAddress.

Browse source
This commit is contained in:
Andreas Kling 2019-06-07 12:56:50 +02:00
parent 0ed89440f1
commit e42c3b4fd7
33 changed files with 272 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/Devices/BXVGADevice.cpp
View file

@ -84,21 +84,21 @@ dword BXVGADevice::find_framebuffer_address()
return framebuffer_address;
}
KResultOr<Region*> BXVGADevice::mmap(Process& process, FileDescription&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot)
KResultOr<Region*> BXVGADevice::mmap(Process& process, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t size, int prot)
{
ASSERT(offset == 0);
ASSERT(size == framebuffer_size_in_bytes());
auto vmo = VMObject::create_for_physical_range(framebuffer_address(), framebuffer_size_in_bytes());
auto* region = process.allocate_region_with_vmo(
preferred_laddr,
preferred_vaddr,
framebuffer_size_in_bytes(),
move(vmo),
0,
"BXVGA Framebuffer",
prot);
kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with laddr L%x\n",
kprintf("BXVGA: %s(%u) created Region{%p} with size %u for framebuffer P%x with vaddr L%x\n",
process.name().characters(), process.pid(),
region, region->size(), framebuffer_address().as_ptr(), region->laddr().get());
region, region->size(), framebuffer_address().as_ptr(), region->vaddr().get());
ASSERT(region);
return region;
}

2
Kernel/Devices/BXVGADevice.h
View file

@ -18,7 +18,7 @@ public:
void set_y_offset(int);
virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, LinearAddress preferred_laddr, size_t offset, size_t, int prot) override;
virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t, int prot) override;
size_t framebuffer_size_in_bytes() const { return m_framebuffer_size.area() * sizeof(dword) * 2; }
Size framebuffer_size() const { return m_framebuffer_size; }

2
Kernel/Devices/BlockDevice.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <Kernel/Devices/Device.h>
#include <Kernel/LinearAddress.h>
#include <Kernel/VirtualAddress.h>
class BlockDevice : public Device {
public: