RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2009-07-24 Roxana Leontie <roxana.leontie@gmail.com>

Browse Source 
* console/fb_vga.c: divided fb_screeninfo structure into
	fb_var_screeninfo and fb_fix_screeninfo; same with get_screen_info
This commit is contained in:
Joel Sherrill
2009-07-24 13:28:44 +00:00
parent 8daaa65e32
commit cd62f7a7fd
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libbsp/i386/pc386/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-07-24 Roxana Leontie <roxana.leontie@gmail.com>
* console/fb_vga.c: divided fb_screeninfo structure into
fb_var_screeninfo and fb_fix_screeninfo; same with get_screen_info
2009-07-21 Roxana Leontie <roxana.leontie@gmail.com> 2009-07-21 Roxana Leontie <roxana.leontie@gmail.com>
* console/fb_vga.c: replaced the ioctl structures with linux * console/fb_vga.c: replaced the ioctl structures with linux

30
c/src/lib/libbsp/i386/pc386/console/fb_vga.c
View File

@@ -28,15 +28,19 @@ extern void ega_hwinit( void );
extern void ega_hwterm( void ); extern void ega_hwterm( void );
/* screen information for the VGA driver */ /* screen information for the VGA driver */
static struct fb_screeninfo fb_info = static struct fb_var_screeninfo fb_var =
{ {
640, 480, /* screen size x, y */ 640, 480, /* screen size x, y */
4, /* bits per pixel */ 4 /* bits per pixel */
80, /* chars per line */ };
static struct fb_fix_screeninfo fb_fix =
{
(volatile char *)0xA0000, /* buffer pointer */ (volatile char *)0xA0000, /* buffer pointer */
0x10000, /* buffer size */ 0x10000, /* buffer size */
FB_TYPE_VGA_PLANES, /* type of dsplay */ FB_TYPE_VGA_PLANES, /* type of dsplay */
FB_VISUAL_PSEUDOCOLOR /* color scheme used */ FB_VISUAL_PSEUDOCOLOR, /* color scheme used */
80 /* chars per line */
}; };
static uint16_t red16[] = { static uint16_t red16[] = {
@@ -130,9 +134,15 @@ fbvga_write( rtems_device_major_number major,
return RTEMS_SUCCESSFUL; return RTEMS_SUCCESSFUL;
} }
static int get_screen_info( struct fb_screeninfo *info ) static int get_fix_screen_info( struct fb_fix_screeninfo *info )
{ {
*info = fb_info; *info = fb_fix;
return 0;
}
static int get_var_screen_info( struct fb_var_screeninfo *info )
{
*info = fb_var;
return 0; return 0;
} }
@@ -183,7 +193,13 @@ fbvga_control( rtems_device_major_number major,
switch( args->command ) switch( args->command )
{ {
case FBIOGET_FSCREENINFO: case FBIOGET_FSCREENINFO:
args->ioctl_return = get_screen_info( args->buffer ); args->ioctl_return = get_fix_screen_info( args->buffer );
break;
case FBIOGET_VSCREENINFO:
args->ioctl_return = get_var_screen_info( args->buffer );
break;
case FBIOPUT_VSCREENINFO:
/* not implemented yet*/
break; break;
case FBIOGETCMAP: case FBIOGETCMAP:
args->ioctl_return = get_palette( args->buffer ); args->ioctl_return = get_palette( args->buffer );