From 8daaa65e32cfff082cdb3ed96f0be05e9d0dbc3b Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 24 Jul 2009 13:27:49 +0000 Subject: 2009-07-24 Roxana Leontie * libmisc/mw-fb/mw_fb.h: divided fb_screeninfo structure into fb_var_screeninfo and fb_fix_screeninfo --- cpukit/libmisc/mw-fb/mw_fb.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'cpukit/libmisc/mw-fb/mw_fb.h') diff --git a/cpukit/libmisc/mw-fb/mw_fb.h b/cpukit/libmisc/mw-fb/mw_fb.h index 664a9a13a7..df0028ef18 100644 --- a/cpukit/libmisc/mw-fb/mw_fb.h +++ b/cpukit/libmisc/mw-fb/mw_fb.h @@ -18,10 +18,12 @@ extern "C" { /* ioctls 0x46 is 'F' */ -#define FBIOGET_FSCREENINFO 0x4602 -#define FBIOGETCMAP 0x4604 -#define FBIOPUTCMAP 0x4603 -#define FB_EXEC_FUNCTION 0x4606 +#define FBIOGET_VSCREENINFO 0x4600 +#define FBIOPUT_VSCREENINFO 0x4601 +#define FBIOGET_FSCREENINFO 0x4602 +#define FBIOGETCMAP 0x4604 +#define FBIOPUTCMAP 0x4605 +#define FB_EXEC_FUNCTION 0x4606 #define FB_TYPE_PACKED_PIXELS 0 /* Packed Pixels */ @@ -41,17 +43,18 @@ extern "C" { #define FB_ACCEL_NONE 0 /* no hardware accelerator */ -struct fb_screeninfo { +struct fb_var_screeninfo { uint32_t xres; /* visible resolution */ uint32_t yres; uint32_t bits_per_pixel; /* guess what */ - uint32_t line_length; /* number of chars per line */ - volatile char *smem_start; /* Start of frame buffer mem */ +}; +struct fb_fix_screeninfo { + volatile char *smem_start; /* Start of frame buffer mem */ /* (physical address) */ - uint32_t smem_len; /* Length of frame buffer mem */ - uint32_t type; /* see FB_TYPE_* */ - uint32_t visual; /* see FB_VISUAL_* */ - + uint32_t smem_len; /* Length of frame buffer mem */ + uint32_t type; /* see FB_TYPE_* */ + uint32_t visual; /* see FB_VISUAL_* */ + uint32_t line_length; /* number of chars per line */ }; struct fb_cmap { -- cgit v1.2.3