From 39cc8bb40aa5c3c592354e34b8298eaac8ef63ff Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Wed, 24 Apr 2024 23:36:43 -0400 Subject: kernel: fbdev: Move ioctl stuff to sys/fbdev.h Signed-off-by: Ian Moffett --- sys/include/dev/video/fbdev.h | 10 +-------- sys/include/sys/fbdev.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 sys/include/sys/fbdev.h (limited to 'sys') diff --git a/sys/include/dev/video/fbdev.h b/sys/include/dev/video/fbdev.h index e9c9282..5ad6bf6 100644 --- a/sys/include/dev/video/fbdev.h +++ b/sys/include/dev/video/fbdev.h @@ -31,15 +31,7 @@ #define _FBDEV_H_ #include - -#define FBIOCTL_INFO 0x00000000 - -struct fbdev_info { - uint32_t width; - uint32_t height; - uint32_t pitch; - uint32_t bits_per_pixel; -}; +#include struct fbdev { void *mem; diff --git a/sys/include/sys/fbdev.h b/sys/include/sys/fbdev.h new file mode 100644 index 0000000..7308a92 --- /dev/null +++ b/sys/include/sys/fbdev.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2023-2024 Ian Marco Moffett and the Osmora Team. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of Hyra nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _SYS_FBDEV_H_ +#define _SYS_FBDEV_H_ + +#if defined(_KERNEL) +#include +#else +#include +#endif + +#define FBIOCTL_INFO 0x00000000 + +struct fbdev_info { + uint32_t width; + uint32_t height; + uint32_t pitch; + uint32_t bits_per_pixel; +}; + +#endif -- cgit v1.2.3