From d2e93ec50a38cb740a5d3bada2d48fa2e01ae8b0 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 30 Apr 2022 14:49:51 +0300 Subject: Everywhere: Rename FB prefix name ioctls => GRAPHICS --- .../UserspaceEmulator/Emulator_syscalls.cpp | 6 +-- Userland/Libraries/LibC/sys/ioctl_numbers.h | 44 +++++++++++----------- Userland/Utilities/strace.cpp | 14 +++---- 3 files changed, 32 insertions(+), 32 deletions(-) (limited to 'Userland') diff --git a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp index 7b1cac737a..a663453c0c 100644 --- a/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp +++ b/Userland/DevTools/UserspaceEmulator/Emulator_syscalls.cpp @@ -1159,20 +1159,20 @@ int Emulator::virt$ioctl([[maybe_unused]] int fd, unsigned request, [[maybe_unus return syscall(SC_ioctl, fd, request, 0); case TIOCSTI: return -EIO; - case FB_IOCTL_GET_PROPERTIES: { + case GRAPHICS_IOCTL_GET_PROPERTIES: { size_t size = 0; auto rc = syscall(SC_ioctl, fd, request, &size); mmu().copy_to_vm(arg, &size, sizeof(size)); return rc; } - case FB_IOCTL_SET_HEAD_RESOLUTION: { + case GRAPHICS_IOCTL_SET_HEAD_RESOLUTION: { FBHeadResolution user_resolution; mmu().copy_from_vm(&user_resolution, arg, sizeof(user_resolution)); auto rc = syscall(SC_ioctl, fd, request, &user_resolution); mmu().copy_to_vm(arg, &user_resolution, sizeof(user_resolution)); return rc; } - case FB_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER: + case GRAPHICS_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER: return syscall(SC_ioctl, fd, request, arg); case FIONBIO: { int enabled; diff --git a/Userland/Libraries/LibC/sys/ioctl_numbers.h b/Userland/Libraries/LibC/sys/ioctl_numbers.h index 417afc3dea..7ca34756b8 100644 --- a/Userland/Libraries/LibC/sys/ioctl_numbers.h +++ b/Userland/Libraries/LibC/sys/ioctl_numbers.h @@ -113,17 +113,17 @@ enum IOCtlNumber { TIOCNOTTY, TIOCSWINSZ, TIOCGPTN, - FB_IOCTL_GET_PROPERTIES, - FB_IOCTL_GET_HEAD_PROPERTIES, - FB_IOCTL_SET_HEAD_RESOLUTION, - FB_IOCTL_GET_HEAD_EDID, - FB_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER, - FB_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER, - FB_IOCTL_FLUSH_HEAD_BUFFERS, - FB_IOCTL_FLUSH_HEAD, - FB_IOCTL_SET_HEAD_MODE_SETTING, - FB_IOCTL_GET_HEAD_MODE_SETTING, - FB_IOCTL_SET_SAFE_HEAD_MODE_SETTING, + GRAPHICS_IOCTL_GET_PROPERTIES, + GRAPHICS_IOCTL_GET_HEAD_PROPERTIES, + GRAPHICS_IOCTL_SET_HEAD_RESOLUTION, + GRAPHICS_IOCTL_GET_HEAD_EDID, + GRAPHICS_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER, + GRAPHICS_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER, + GRAPHICS_IOCTL_FLUSH_HEAD_BUFFERS, + GRAPHICS_IOCTL_FLUSH_HEAD, + GRAPHICS_IOCTL_SET_HEAD_MODE_SETTING, + GRAPHICS_IOCTL_GET_HEAD_MODE_SETTING, + GRAPHICS_IOCTL_SET_SAFE_HEAD_MODE_SETTING, KEYBOARD_IOCTL_GET_NUM_LOCK, KEYBOARD_IOCTL_SET_NUM_LOCK, KEYBOARD_IOCTL_GET_CAPS_LOCK, @@ -175,17 +175,17 @@ enum IOCtlNumber { #define TIOCNOTTY TIOCNOTTY #define TIOCSWINSZ TIOCSWINSZ #define TIOCGPTN TIOCGPTN -#define FB_IOCTL_GET_PROPERTIES FB_IOCTL_GET_PROPERTIES -#define FB_IOCTL_GET_HEAD_PROPERTIES FB_IOCTL_GET_HEAD_PROPERTIES -#define FB_IOCTL_GET_HEAD_EDID FB_IOCTL_GET_HEAD_EDID -#define FB_IOCTL_SET_HEAD_RESOLUTION FB_IOCTL_SET_HEAD_RESOLUTION -#define FB_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER FB_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER -#define FB_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER FB_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER -#define FB_IOCTL_FLUSH_HEAD_BUFFERS FB_IOCTL_FLUSH_HEAD_BUFFERS -#define FB_IOCTL_FLUSH_HEAD FB_IOCTL_FLUSH_HEAD -#define FB_IOCTL_SET_HEAD_MODE_SETTING FB_IOCTL_SET_HEAD_MODE_SETTING -#define FB_IOCTL_GET_HEAD_MODE_SETTING FB_IOCTL_GET_HEAD_MODE_SETTING -#define FB_IOCTL_SET_SAFE_HEAD_MODE_SETTING FB_IOCTL_SET_SAFE_HEAD_MODE_SETTING +#define GRAPHICS_IOCTL_GET_PROPERTIES GRAPHICS_IOCTL_GET_PROPERTIES +#define GRAPHICS_IOCTL_GET_HEAD_PROPERTIES GRAPHICS_IOCTL_GET_HEAD_PROPERTIES +#define GRAPHICS_IOCTL_GET_HEAD_EDID GRAPHICS_IOCTL_GET_HEAD_EDID +#define GRAPHICS_IOCTL_SET_HEAD_RESOLUTION GRAPHICS_IOCTL_SET_HEAD_RESOLUTION +#define GRAPHICS_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER GRAPHICS_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER +#define GRAPHICS_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER GRAPHICS_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER +#define GRAPHICS_IOCTL_FLUSH_HEAD_BUFFERS GRAPHICS_IOCTL_FLUSH_HEAD_BUFFERS +#define GRAPHICS_IOCTL_FLUSH_HEAD GRAPHICS_IOCTL_FLUSH_HEAD +#define GRAPHICS_IOCTL_SET_HEAD_MODE_SETTING GRAPHICS_IOCTL_SET_HEAD_MODE_SETTING +#define GRAPHICS_IOCTL_GET_HEAD_MODE_SETTING GRAPHICS_IOCTL_GET_HEAD_MODE_SETTING +#define GRAPHICS_IOCTL_SET_SAFE_HEAD_MODE_SETTING GRAPHICS_IOCTL_SET_SAFE_HEAD_MODE_SETTING #define KEYBOARD_IOCTL_GET_NUM_LOCK KEYBOARD_IOCTL_GET_NUM_LOCK #define KEYBOARD_IOCTL_SET_NUM_LOCK KEYBOARD_IOCTL_SET_NUM_LOCK #define KEYBOARD_IOCTL_GET_CAPS_LOCK KEYBOARD_IOCTL_GET_CAPS_LOCK diff --git a/Userland/Utilities/strace.cpp b/Userland/Utilities/strace.cpp index 762ea792e3..449480c476 100644 --- a/Userland/Utilities/strace.cpp +++ b/Userland/Utilities/strace.cpp @@ -143,13 +143,13 @@ HANDLE(TIOCSCTTY) HANDLE(TIOCSTI) HANDLE(TIOCNOTTY) HANDLE(TIOCSWINSZ) -HANDLE(FB_IOCTL_GET_PROPERTIES) -HANDLE(FB_IOCTL_GET_HEAD_PROPERTIES) -HANDLE(FB_IOCTL_SET_HEAD_RESOLUTION) -HANDLE(FB_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER) -HANDLE(FB_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER) -HANDLE(FB_IOCTL_FLUSH_HEAD_BUFFERS) -HANDLE(FB_IOCTL_FLUSH_HEAD) +HANDLE(GRAPHICS_IOCTL_GET_PROPERTIES) +HANDLE(GRAPHICS_IOCTL_GET_HEAD_PROPERTIES) +HANDLE(GRAPHICS_IOCTL_SET_HEAD_RESOLUTION) +HANDLE(GRAPHICS_IOCTL_SET_HEAD_VERTICAL_OFFSET_BUFFER) +HANDLE(GRAPHICS_IOCTL_GET_HEAD_VERTICAL_OFFSET_BUFFER) +HANDLE(GRAPHICS_IOCTL_FLUSH_HEAD_BUFFERS) +HANDLE(GRAPHICS_IOCTL_FLUSH_HEAD) HANDLE(KEYBOARD_IOCTL_GET_NUM_LOCK) HANDLE(KEYBOARD_IOCTL_SET_NUM_LOCK) HANDLE(KEYBOARD_IOCTL_GET_CAPS_LOCK) -- cgit v1.2.3