mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
[PATCH] Split out screen_info from tty.h
This makes it possible for boot code to use screen_info without dragging in all of tty.h. Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Brian Gerst
Linus Torvalds
parent
389cd6ec08
commit
7e7f358c8f
5 changed files with 80 additions and 112 deletions
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
#include <linux/linkage.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/screen_info.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996
|
||||
*/
|
||||
|
||||
#include "miscsetup.h"
|
||||
#include <linux/screen_info.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
#define NULL 0
|
||||
//typedef unsigned int size_t;
|
||||
|
||||
|
||||
struct screen_info {
|
||||
unsigned char orig_x; /* 0x00 */
|
||||
unsigned char orig_y; /* 0x01 */
|
||||
unsigned short dontuse1; /* 0x02 -- EXT_MEM_K sits here */
|
||||
unsigned short orig_video_page; /* 0x04 */
|
||||
unsigned char orig_video_mode; /* 0x06 */
|
||||
unsigned char orig_video_cols; /* 0x07 */
|
||||
unsigned short unused2; /* 0x08 */
|
||||
unsigned short orig_video_ega_bx; /* 0x0a */
|
||||
unsigned short unused3; /* 0x0c */
|
||||
unsigned char orig_video_lines; /* 0x0e */
|
||||
unsigned char orig_video_isVGA; /* 0x0f */
|
||||
unsigned short orig_video_points; /* 0x10 */
|
||||
|
||||
/* VESA graphic mode -- linear frame buffer */
|
||||
unsigned short lfb_width; /* 0x12 */
|
||||
unsigned short lfb_height; /* 0x14 */
|
||||
unsigned short lfb_depth; /* 0x16 */
|
||||
unsigned long lfb_base; /* 0x18 */
|
||||
unsigned long lfb_size; /* 0x1c */
|
||||
unsigned short dontuse2, dontuse3; /* 0x20 -- CL_MAGIC and CL_OFFSET here */
|
||||
unsigned short lfb_linelength; /* 0x24 */
|
||||
unsigned char red_size; /* 0x26 */
|
||||
unsigned char red_pos; /* 0x27 */
|
||||
unsigned char green_size; /* 0x28 */
|
||||
unsigned char green_pos; /* 0x29 */
|
||||
unsigned char blue_size; /* 0x2a */
|
||||
unsigned char blue_pos; /* 0x2b */
|
||||
unsigned char rsvd_size; /* 0x2c */
|
||||
unsigned char rsvd_pos; /* 0x2d */
|
||||
unsigned short vesapm_seg; /* 0x2e */
|
||||
unsigned short vesapm_off; /* 0x30 */
|
||||
unsigned short pages; /* 0x32 */
|
||||
/* 0x34 -- 0x3f reserved for future expansion */
|
||||
};
|
||||
77
include/linux/screen_info.h
Normal file
77
include/linux/screen_info.h
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
#ifndef _SCREEN_INFO_H
|
||||
#define _SCREEN_INFO_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
/*
|
||||
* These are set up by the setup-routine at boot-time:
|
||||
*/
|
||||
|
||||
struct screen_info {
|
||||
u8 orig_x; /* 0x00 */
|
||||
u8 orig_y; /* 0x01 */
|
||||
u16 dontuse1; /* 0x02 -- EXT_MEM_K sits here */
|
||||
u16 orig_video_page; /* 0x04 */
|
||||
u8 orig_video_mode; /* 0x06 */
|
||||
u8 orig_video_cols; /* 0x07 */
|
||||
u16 unused2; /* 0x08 */
|
||||
u16 orig_video_ega_bx; /* 0x0a */
|
||||
u16 unused3; /* 0x0c */
|
||||
u8 orig_video_lines; /* 0x0e */
|
||||
u8 orig_video_isVGA; /* 0x0f */
|
||||
u16 orig_video_points; /* 0x10 */
|
||||
|
||||
/* VESA graphic mode -- linear frame buffer */
|
||||
u16 lfb_width; /* 0x12 */
|
||||
u16 lfb_height; /* 0x14 */
|
||||
u16 lfb_depth; /* 0x16 */
|
||||
u32 lfb_base; /* 0x18 */
|
||||
u32 lfb_size; /* 0x1c */
|
||||
u16 dontuse2, dontuse3; /* 0x20 -- CL_MAGIC and CL_OFFSET here */
|
||||
u16 lfb_linelength; /* 0x24 */
|
||||
u8 red_size; /* 0x26 */
|
||||
u8 red_pos; /* 0x27 */
|
||||
u8 green_size; /* 0x28 */
|
||||
u8 green_pos; /* 0x29 */
|
||||
u8 blue_size; /* 0x2a */
|
||||
u8 blue_pos; /* 0x2b */
|
||||
u8 rsvd_size; /* 0x2c */
|
||||
u8 rsvd_pos; /* 0x2d */
|
||||
u16 vesapm_seg; /* 0x2e */
|
||||
u16 vesapm_off; /* 0x30 */
|
||||
u16 pages; /* 0x32 */
|
||||
u16 vesa_attributes; /* 0x34 */
|
||||
u32 capabilities; /* 0x36 */
|
||||
/* 0x3a -- 0x3f reserved for future expansion */
|
||||
};
|
||||
|
||||
extern struct screen_info screen_info;
|
||||
|
||||
#define ORIG_X (screen_info.orig_x)
|
||||
#define ORIG_Y (screen_info.orig_y)
|
||||
#define ORIG_VIDEO_MODE (screen_info.orig_video_mode)
|
||||
#define ORIG_VIDEO_COLS (screen_info.orig_video_cols)
|
||||
#define ORIG_VIDEO_EGA_BX (screen_info.orig_video_ega_bx)
|
||||
#define ORIG_VIDEO_LINES (screen_info.orig_video_lines)
|
||||
#define ORIG_VIDEO_ISVGA (screen_info.orig_video_isVGA)
|
||||
#define ORIG_VIDEO_POINTS (screen_info.orig_video_points)
|
||||
|
||||
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
|
||||
#define VIDEO_TYPE_CGA 0x11 /* CGA Display */
|
||||
#define VIDEO_TYPE_EGAM 0x20 /* EGA/VGA in Monochrome Mode */
|
||||
#define VIDEO_TYPE_EGAC 0x21 /* EGA in Color Mode */
|
||||
#define VIDEO_TYPE_VGAC 0x22 /* VGA+ in Color Mode */
|
||||
#define VIDEO_TYPE_VLFB 0x23 /* VESA VGA in graphic mode */
|
||||
|
||||
#define VIDEO_TYPE_PICA_S3 0x30 /* ACER PICA-61 local S3 video */
|
||||
#define VIDEO_TYPE_MIPS_G364 0x31 /* MIPS Magnum 4000 G364 video */
|
||||
#define VIDEO_TYPE_SGI 0x33 /* Various SGI graphics hardware */
|
||||
|
||||
#define VIDEO_TYPE_TGAC 0x40 /* DEC TGA */
|
||||
|
||||
#define VIDEO_TYPE_SUN 0x50 /* Sun frame buffer. */
|
||||
#define VIDEO_TYPE_SUNPCI 0x51 /* Sun PCI based frame buffer. */
|
||||
|
||||
#define VIDEO_TYPE_PMAC 0x60 /* PowerMacintosh frame buffer. */
|
||||
|
||||
#endif /* _SCREEN_INFO_H */
|
||||
|
|
@ -23,6 +23,7 @@
|
|||
#include <linux/workqueue.h>
|
||||
#include <linux/tty_driver.h>
|
||||
#include <linux/tty_ldisc.h>
|
||||
#include <linux/screen_info.h>
|
||||
|
||||
#include <asm/system.h>
|
||||
|
||||
|
|
@ -36,77 +37,6 @@
|
|||
#define NR_UNIX98_PTY_MAX (1 << MINORBITS) /* Absolute limit */
|
||||
#define NR_LDISCS 16
|
||||
|
||||
/*
|
||||
* These are set up by the setup-routine at boot-time:
|
||||
*/
|
||||
|
||||
struct screen_info {
|
||||
u8 orig_x; /* 0x00 */
|
||||
u8 orig_y; /* 0x01 */
|
||||
u16 dontuse1; /* 0x02 -- EXT_MEM_K sits here */
|
||||
u16 orig_video_page; /* 0x04 */
|
||||
u8 orig_video_mode; /* 0x06 */
|
||||
u8 orig_video_cols; /* 0x07 */
|
||||
u16 unused2; /* 0x08 */
|
||||
u16 orig_video_ega_bx; /* 0x0a */
|
||||
u16 unused3; /* 0x0c */
|
||||
u8 orig_video_lines; /* 0x0e */
|
||||
u8 orig_video_isVGA; /* 0x0f */
|
||||
u16 orig_video_points; /* 0x10 */
|
||||
|
||||
/* VESA graphic mode -- linear frame buffer */
|
||||
u16 lfb_width; /* 0x12 */
|
||||
u16 lfb_height; /* 0x14 */
|
||||
u16 lfb_depth; /* 0x16 */
|
||||
u32 lfb_base; /* 0x18 */
|
||||
u32 lfb_size; /* 0x1c */
|
||||
u16 dontuse2, dontuse3; /* 0x20 -- CL_MAGIC and CL_OFFSET here */
|
||||
u16 lfb_linelength; /* 0x24 */
|
||||
u8 red_size; /* 0x26 */
|
||||
u8 red_pos; /* 0x27 */
|
||||
u8 green_size; /* 0x28 */
|
||||
u8 green_pos; /* 0x29 */
|
||||
u8 blue_size; /* 0x2a */
|
||||
u8 blue_pos; /* 0x2b */
|
||||
u8 rsvd_size; /* 0x2c */
|
||||
u8 rsvd_pos; /* 0x2d */
|
||||
u16 vesapm_seg; /* 0x2e */
|
||||
u16 vesapm_off; /* 0x30 */
|
||||
u16 pages; /* 0x32 */
|
||||
u16 vesa_attributes; /* 0x34 */
|
||||
u32 capabilities; /* 0x36 */
|
||||
/* 0x3a -- 0x3f reserved for future expansion */
|
||||
};
|
||||
|
||||
extern struct screen_info screen_info;
|
||||
|
||||
#define ORIG_X (screen_info.orig_x)
|
||||
#define ORIG_Y (screen_info.orig_y)
|
||||
#define ORIG_VIDEO_MODE (screen_info.orig_video_mode)
|
||||
#define ORIG_VIDEO_COLS (screen_info.orig_video_cols)
|
||||
#define ORIG_VIDEO_EGA_BX (screen_info.orig_video_ega_bx)
|
||||
#define ORIG_VIDEO_LINES (screen_info.orig_video_lines)
|
||||
#define ORIG_VIDEO_ISVGA (screen_info.orig_video_isVGA)
|
||||
#define ORIG_VIDEO_POINTS (screen_info.orig_video_points)
|
||||
|
||||
#define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
|
||||
#define VIDEO_TYPE_CGA 0x11 /* CGA Display */
|
||||
#define VIDEO_TYPE_EGAM 0x20 /* EGA/VGA in Monochrome Mode */
|
||||
#define VIDEO_TYPE_EGAC 0x21 /* EGA in Color Mode */
|
||||
#define VIDEO_TYPE_VGAC 0x22 /* VGA+ in Color Mode */
|
||||
#define VIDEO_TYPE_VLFB 0x23 /* VESA VGA in graphic mode */
|
||||
|
||||
#define VIDEO_TYPE_PICA_S3 0x30 /* ACER PICA-61 local S3 video */
|
||||
#define VIDEO_TYPE_MIPS_G364 0x31 /* MIPS Magnum 4000 G364 video */
|
||||
#define VIDEO_TYPE_SGI 0x33 /* Various SGI graphics hardware */
|
||||
|
||||
#define VIDEO_TYPE_TGAC 0x40 /* DEC TGA */
|
||||
|
||||
#define VIDEO_TYPE_SUN 0x50 /* Sun frame buffer. */
|
||||
#define VIDEO_TYPE_SUNPCI 0x51 /* Sun PCI based frame buffer. */
|
||||
|
||||
#define VIDEO_TYPE_PMAC 0x60 /* PowerMacintosh frame buffer. */
|
||||
|
||||
/*
|
||||
* This character is the same as _POSIX_VDISABLE: it cannot be used as
|
||||
* a c_cc[] character, but indicates that a particular special character
|
||||
|
|
|
|||
Loading…
Reference in a new issue