From 4af6fde836c90babd9505e2fdb2366b5e537f95e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Tue, 25 Apr 2023 01:51:40 -0400 Subject: [PATCH] user/rm-utils: use mxcfb.h from linux-rm-headers --- user/rm-utils/APKBUILD | 6 +- user/rm-utils/epdc-init-auto.c | 2 +- user/rm-utils/epdc-show-bitmap.c | 2 +- user/rm-utils/mxcfb.h | 200 ------------------------------- 4 files changed, 4 insertions(+), 206 deletions(-) delete mode 100644 user/rm-utils/mxcfb.h diff --git a/user/rm-utils/APKBUILD b/user/rm-utils/APKBUILD index 5d57c3b..54cc952 100644 --- a/user/rm-utils/APKBUILD +++ b/user/rm-utils/APKBUILD @@ -16,7 +16,6 @@ source=" epdc-init-auto.c epdc-show-bitmap.c xorg.conf - mxcfb.h " build() { @@ -33,8 +32,7 @@ package() { sha512sums=" 7f0e6cb276357983b76c37c81a91c0d278dbec16d8982a97618f2217ef5e4d706211d921af6c79db3aad912d50aaed8cf5ce67f52a1081f61585eb97322c8deb battery-monitor.sh -50813c5c2e888e106416dd0b5b515c8a145da23343992b29ee8ad325a72a7b4bd464824636ea66c95f16df20f357646bf8e9e1ed66367f8b540b50dc608495d6 epdc-init-auto.c -274ba66666628ec12ee32e2054d7fd2d3ebcccb144784934f645472d482ed0d56777ebd87a342dd121c6e753e8efc776d9c340e4f54ac3b0fb460afbdb0020fe epdc-show-bitmap.c +f145d6af541828e69217a73f7b848f7fe57cce37426e15469a1d6a5540604f4078d4cd1f67e69e77b961b608a7b8e2930e1e82b13fe9dd181361e361895a66be epdc-init-auto.c +409744c4bbcac462c38add2b19d3b433e44cb326905fe3af240931e27bb2b71b14696229c46187bf7c060f83d77920376b5c6161f62949a2fa2c0a5464753cc0 epdc-show-bitmap.c e14a61751e4c830652e7a849b9d596c6bc213fed87ba3f9f7c3df0d5fe35ddf28bde7de2fa977c0321639503ceff5abffd0d856380eacce24389fd50eaf3372a xorg.conf -0f3ccef7102c961232002f483344f9efc915f2862cefeaa966835ca7aa2f4d6236ac3df998189f3983535f03ede945565c54bb7e5f88f3a34c3a4429c3c075e7 mxcfb.h " diff --git a/user/rm-utils/epdc-init-auto.c b/user/rm-utils/epdc-init-auto.c index a309fad..069ea9f 100644 --- a/user/rm-utils/epdc-init-auto.c +++ b/user/rm-utils/epdc-init-auto.c @@ -26,7 +26,7 @@ #include #include #include -#include "mxcfb.h" +#include #include int main() diff --git a/user/rm-utils/epdc-show-bitmap.c b/user/rm-utils/epdc-show-bitmap.c index 196e39b..c42bf30 100644 --- a/user/rm-utils/epdc-show-bitmap.c +++ b/user/rm-utils/epdc-show-bitmap.c @@ -25,7 +25,7 @@ along with this program. If not, see . #include #include #include -#include "mxcfb.h" +#include #include #include #include diff --git a/user/rm-utils/mxcfb.h b/user/rm-utils/mxcfb.h deleted file mode 100644 index 3967076..0000000 --- a/user/rm-utils/mxcfb.h +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright (C) 2013-2015 Freescale Semiconductor, Inc. All Rights Reserved - */ - -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* - * @file uapi/linux/mxcfb.h - * - * @brief Global header file for the MXC frame buffer - * - * @ingroup Framebuffer - */ -#ifndef __ASM_ARCH_MXCFB_H__ -#define __ASM_ARCH_MXCFB_H__ - -#include - -#define FB_SYNC_OE_LOW_ACT 0x80000000 -#define FB_SYNC_CLK_LAT_FALL 0x40000000 -#define FB_SYNC_DATA_INVERT 0x20000000 -#define FB_SYNC_CLK_IDLE_EN 0x10000000 -#define FB_SYNC_SHARP_MODE 0x08000000 -#define FB_SYNC_SWAP_RGB 0x04000000 -#define FB_ACCEL_TRIPLE_FLAG 0x00000000 -#define FB_ACCEL_DOUBLE_FLAG 0x00000001 - -struct mxcfb_gbl_alpha { - int enable; - int alpha; -}; - -struct mxcfb_loc_alpha { - int enable; - int alpha_in_pixel; - unsigned long alpha_phy_addr0; - unsigned long alpha_phy_addr1; -}; - -struct mxcfb_color_key { - int enable; - __u32 color_key; -}; - -struct mxcfb_pos { - __u16 x; - __u16 y; -}; - -struct mxcfb_gamma { - int enable; - int constk[16]; - int slopek[16]; -}; - -struct mxcfb_gpu_split_fmt { - struct fb_var_screeninfo var; - unsigned long offset; -}; - -struct mxcfb_rect { - __u32 top; - __u32 left; - __u32 width; - __u32 height; -}; - -#define GRAYSCALE_8BIT 0x1 -#define GRAYSCALE_8BIT_INVERTED 0x2 -#define GRAYSCALE_4BIT 0x3 -#define GRAYSCALE_4BIT_INVERTED 0x4 - -#define AUTO_UPDATE_MODE_REGION_MODE 0 -#define AUTO_UPDATE_MODE_AUTOMATIC_MODE 1 - -#define UPDATE_SCHEME_SNAPSHOT 0 -#define UPDATE_SCHEME_QUEUE 1 -#define UPDATE_SCHEME_QUEUE_AND_MERGE 2 - -#define UPDATE_MODE_PARTIAL 0x0 -#define UPDATE_MODE_FULL 0x1 - -#define WAVEFORM_MODE_GLR16 4 -#define WAVEFORM_MODE_GLD16 5 -#define WAVEFORM_MODE_AUTO 257 - -#define TEMP_USE_AMBIENT 0x1000 - -#define EPDC_FLAG_ENABLE_INVERSION 0x01 -#define EPDC_FLAG_FORCE_MONOCHROME 0x02 -#define EPDC_FLAG_USE_CMAP 0x04 -#define EPDC_FLAG_USE_ALT_BUFFER 0x100 -#define EPDC_FLAG_TEST_COLLISION 0x200 -#define EPDC_FLAG_GROUP_UPDATE 0x400 -#define EPDC_FLAG_USE_DITHERING_Y1 0x2000 -#define EPDC_FLAG_USE_DITHERING_Y4 0x4000 -#define EPDC_FLAG_USE_REGAL 0x8000 - -enum mxcfb_dithering_mode { - EPDC_FLAG_USE_DITHERING_PASSTHROUGH = 0x0, - EPDC_FLAG_USE_DITHERING_FLOYD_STEINBERG, - EPDC_FLAG_USE_DITHERING_ATKINSON, - EPDC_FLAG_USE_DITHERING_ORDERED, - EPDC_FLAG_USE_DITHERING_QUANT_ONLY, - EPDC_FLAG_USE_DITHERING_MAX, -}; - -#define FB_POWERDOWN_DISABLE -1 -#define FB_TEMP_AUTO_UPDATE_DISABLE -1 - -struct mxcfb_alt_buffer_data { - __u32 phys_addr; - __u32 width; /* width of entire buffer */ - __u32 height; /* height of entire buffer */ - struct mxcfb_rect alt_update_region; /* region within buffer to update */ -}; - -struct mxcfb_update_data { - struct mxcfb_rect update_region; - __u32 waveform_mode; - __u32 update_mode; - __u32 update_marker; - int temp; - unsigned int flags; - int dither_mode; - int quant_bit; - struct mxcfb_alt_buffer_data alt_buffer_data; -}; - -struct mxcfb_update_marker_data { - __u32 update_marker; - __u32 collision_test; -}; - -/* - * Structure used to define waveform modes for driver - * Needed for driver to perform auto-waveform selection - */ -struct mxcfb_waveform_modes { - int mode_init; - int mode_du; - int mode_gc4; - int mode_gc8; - int mode_gc16; - int mode_gc32; -}; - -/* - * Structure used to define a 5*3 matrix of parameters for - * setting IPU DP CSC module related to this framebuffer. - */ -struct mxcfb_csc_matrix { - int param[5][3]; -}; - -#define MXCFB_WAIT_FOR_VSYNC _IOW('F', 0x20, u_int32_t) -#define MXCFB_SET_GBL_ALPHA _IOW('F', 0x21, struct mxcfb_gbl_alpha) -#define MXCFB_SET_CLR_KEY _IOW('F', 0x22, struct mxcfb_color_key) -#define MXCFB_SET_OVERLAY_POS _IOWR('F', 0x24, struct mxcfb_pos) -#define MXCFB_GET_FB_IPU_CHAN _IOR('F', 0x25, u_int32_t) -#define MXCFB_SET_LOC_ALPHA _IOWR('F', 0x26, struct mxcfb_loc_alpha) -#define MXCFB_SET_LOC_ALP_BUF _IOW('F', 0x27, unsigned long) -#define MXCFB_SET_GAMMA _IOW('F', 0x28, struct mxcfb_gamma) -#define MXCFB_GET_FB_IPU_DI _IOR('F', 0x29, u_int32_t) -#define MXCFB_GET_DIFMT _IOR('F', 0x2A, u_int32_t) -#define MXCFB_GET_FB_BLANK _IOR('F', 0x2B, u_int32_t) -#define MXCFB_SET_DIFMT _IOW('F', 0x2C, u_int32_t) -#define MXCFB_CSC_UPDATE _IOW('F', 0x2D, struct mxcfb_csc_matrix) -#define MXCFB_SET_GPU_SPLIT_FMT _IOW('F', 0x2F, struct mxcfb_gpu_split_fmt) -#define MXCFB_SET_PREFETCH _IOW('F', 0x30, int) -#define MXCFB_GET_PREFETCH _IOR('F', 0x31, int) - -/* IOCTLs for E-ink panel updates */ -#define MXCFB_SET_WAVEFORM_MODES _IOW('F', 0x2B, struct mxcfb_waveform_modes) -#define MXCFB_SET_TEMPERATURE _IOW('F', 0x2C, int32_t) -#define MXCFB_SET_AUTO_UPDATE_MODE _IOW('F', 0x2D, __u32) -#define MXCFB_SEND_UPDATE _IOW('F', 0x2E, struct mxcfb_update_data) -#define MXCFB_WAIT_FOR_UPDATE_COMPLETE _IOWR('F', 0x2F, struct mxcfb_update_marker_data) -#define MXCFB_SET_PWRDOWN_DELAY _IOW('F', 0x30, int32_t) -#define MXCFB_GET_PWRDOWN_DELAY _IOR('F', 0x31, int32_t) -#define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32) -#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long) -#define MXCFB_SET_TEMP_AUTO_UPDATE_PERIOD _IOW('F', 0x36, int32_t) -#define MXCFB_DISABLE_EPDC_ACCESS _IO('F', 0x35) -#define MXCFB_ENABLE_EPDC_ACCESS _IO('F', 0x36) -#endif