diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-05-23 13:17:58 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-23 15:25:43 +0200 |
| commit | b3736c1b1e8c1cd0263515c79aa323de1aae07ed (patch) | |
| tree | 861cfcf93fc5f8503c10ebcb1a0f3f55b6dabdb5 /Kernel/Devices | |
| parent | b8af5cd8da74645945c8ab7b63846f051c185f50 (diff) | |
| download | serenity-b3736c1b1e8c1cd0263515c79aa323de1aae07ed.zip | |
Kernel: Use a FlatPtr for the "argument" to ioctl()
Since it's often used to pass pointers, it should really be a FlatPtr.
Diffstat (limited to 'Kernel/Devices')
| -rw-r--r-- | Kernel/Devices/BXVGADevice.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Devices/BXVGADevice.h | 2 | ||||
| -rw-r--r-- | Kernel/Devices/MBVGADevice.cpp | 2 | ||||
| -rw-r--r-- | Kernel/Devices/MBVGADevice.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp index 88c0a6c91c..bf99ad094e 100644 --- a/Kernel/Devices/BXVGADevice.cpp +++ b/Kernel/Devices/BXVGADevice.cpp @@ -192,7 +192,7 @@ KResultOr<Region*> BXVGADevice::mmap(Process& process, FileDescription&, Virtual return region; } -int BXVGADevice::ioctl(FileDescription&, unsigned request, unsigned arg) +int BXVGADevice::ioctl(FileDescription&, unsigned request, FlatPtr arg) { REQUIRE_PROMISE(video); switch (request) { diff --git a/Kernel/Devices/BXVGADevice.h b/Kernel/Devices/BXVGADevice.h index ccda371376..948141da3d 100644 --- a/Kernel/Devices/BXVGADevice.h +++ b/Kernel/Devices/BXVGADevice.h @@ -40,7 +40,7 @@ public: BXVGADevice(); - virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override; + virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override; virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t, int prot, bool shared) override; private: diff --git a/Kernel/Devices/MBVGADevice.cpp b/Kernel/Devices/MBVGADevice.cpp index 989dbe6681..4f1435c9a6 100644 --- a/Kernel/Devices/MBVGADevice.cpp +++ b/Kernel/Devices/MBVGADevice.cpp @@ -73,7 +73,7 @@ KResultOr<Region*> MBVGADevice::mmap(Process& process, FileDescription&, Virtual return region; } -int MBVGADevice::ioctl(FileDescription&, unsigned request, unsigned arg) +int MBVGADevice::ioctl(FileDescription&, unsigned request, FlatPtr arg) { REQUIRE_PROMISE(video); switch (request) { diff --git a/Kernel/Devices/MBVGADevice.h b/Kernel/Devices/MBVGADevice.h index ca2254fe53..3e911e8615 100644 --- a/Kernel/Devices/MBVGADevice.h +++ b/Kernel/Devices/MBVGADevice.h @@ -40,7 +40,7 @@ public: MBVGADevice(PhysicalAddress addr, size_t pitch, size_t width, size_t height); - virtual int ioctl(FileDescription&, unsigned request, unsigned arg) override; + virtual int ioctl(FileDescription&, unsigned request, FlatPtr arg) override; virtual KResultOr<Region*> mmap(Process&, FileDescription&, VirtualAddress preferred_vaddr, size_t offset, size_t, int prot, bool shared) override; private: |