From 5aeb1ec1fd8f260127c1c06d875a7078215b93ba Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Blue Swirl Date: Sun, 29 Jan 2012 15:29:02 +0000 Subject: [PATCH 4/6] vga.h: remove unused stuff and reformat Signed-off-by: Blue Swirl --- hw/vga.h | 534 +++++++++++++------------------------------------------------- 1 files changed, 106 insertions(+), 428 deletions(-) diff --git a/hw/vga.h b/hw/vga.h index 2b8691f..d917046 100644 --- a/hw/vga.h +++ b/hw/vga.h @@ -2,49 +2,21 @@ * linux/include/video/vga.h -- standard VGA chipset interaction * * Copyright 1999 Jeff Garzik - * + * * Copyright history from vga16fb.c: * Copyright 1999 Ben Pfaff and Petr Vandrovec - * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm + * Based on VGA info at http://www.osdever.net/FreeVGA/home.htm * Based on VESA framebuffer (c) 1998 Gerd Knorr * * This file is subject to the terms and conditions of the GNU General * Public License. See the file COPYING in the main directory of this - * archive for more details. + * archive for more details. * */ #ifndef __linux_video_vga_h__ #define __linux_video_vga_h__ -#include -#include -#ifndef CONFIG_AMIGA -#include -#else -/* - * FIXME - * Ugh, we don't have PCI space, so map readb() and friends to use Zorro space - * for MMIO accesses. This should make cirrusfb work again on Amiga - */ -#undef inb_p -#undef inw_p -#undef outb_p -#undef outw -#undef readb -#undef writeb -#undef writew -#define inb_p(port) 0 -#define inw_p(port) 0 -#define outb_p(port, val) do { } while (0) -#define outw(port, val) do { } while (0) -#define readb z_readb -#define writeb z_writeb -#define writew z_writew -#endif -#include - - /* Some of the code below is taken from SVGAlib. The original, unmodified copyright notice for that code is below. */ /* VGAlib version 1.2 - (c) 1993 Tommy Frandsen */ @@ -57,425 +29,131 @@ /* partially copyrighted (C) 1993 by Hartmut Schirmer */ /* VGA data register ports */ -#define VGA_CRT_DC 0x3D5 /* CRT Controller Data Register - color emulation */ -#define VGA_CRT_DM 0x3B5 /* CRT Controller Data Register - mono emulation */ -#define VGA_ATT_R 0x3C1 /* Attribute Controller Data Read Register */ -#define VGA_ATT_W 0x3C0 /* Attribute Controller Data Write Register */ -#define VGA_GFX_D 0x3CF /* Graphics Controller Data Register */ -#define VGA_SEQ_D 0x3C5 /* Sequencer Data Register */ -#define VGA_MIS_R 0x3CC /* Misc Output Read Register */ -#define VGA_MIS_W 0x3C2 /* Misc Output Write Register */ -#define VGA_FTC_R 0x3CA /* Feature Control Read Register */ -#define VGA_IS1_RC 0x3DA /* Input Status Register 1 - color emulation */ -#define VGA_IS1_RM 0x3BA /* Input Status Register 1 - mono emulation */ -#define VGA_PEL_D 0x3C9 /* PEL Data Register */ -#define VGA_PEL_MSK 0x3C6 /* PEL mask register */ +#define VGA_CRT_DC 0x3D5 /* CRT Controller Data Register - color emulation */ +#define VGA_CRT_DM 0x3B5 /* CRT Controller Data Register - mono emulation */ +#define VGA_ATT_R 0x3C1 /* Attribute Controller Data Read Register */ +#define VGA_ATT_W 0x3C0 /* Attribute Controller Data Write Register */ +#define VGA_GFX_D 0x3CF /* Graphics Controller Data Register */ +#define VGA_SEQ_D 0x3C5 /* Sequencer Data Register */ +#define VGA_MIS_R 0x3CC /* Misc Output Read Register */ +#define VGA_MIS_W 0x3C2 /* Misc Output Write Register */ +#define VGA_FTC_R 0x3CA /* Feature Control Read Register */ +#define VGA_IS1_RC 0x3DA /* Input Status Register 1 - color emulation */ +#define VGA_IS1_RM 0x3BA /* Input Status Register 1 - mono emulation */ +#define VGA_PEL_D 0x3C9 /* PEL Data Register */ +#define VGA_PEL_MSK 0x3C6 /* PEL mask register */ /* EGA-specific registers */ -#define EGA_GFX_E0 0x3CC /* Graphics enable processor 0 */ -#define EGA_GFX_E1 0x3CA /* Graphics enable processor 1 */ +#define EGA_GFX_E0 0x3CC /* Graphics enable processor 0 */ +#define EGA_GFX_E1 0x3CA /* Graphics enable processor 1 */ /* VGA index register ports */ -#define VGA_CRT_IC 0x3D4 /* CRT Controller Index - color emulation */ -#define VGA_CRT_IM 0x3B4 /* CRT Controller Index - mono emulation */ -#define VGA_ATT_IW 0x3C0 /* Attribute Controller Index & Data Write Register */ -#define VGA_GFX_I 0x3CE /* Graphics Controller Index */ -#define VGA_SEQ_I 0x3C4 /* Sequencer Index */ -#define VGA_PEL_IW 0x3C8 /* PEL Write Index */ -#define VGA_PEL_IR 0x3C7 /* PEL Read Index */ +#define VGA_CRT_IC 0x3D4 /* CRT Controller Index - color emulation */ +#define VGA_CRT_IM 0x3B4 /* CRT Controller Index - mono emulation */ +#define VGA_ATT_IW 0x3C0 /* Attribute Controller Index & Data Write Register */ +#define VGA_GFX_I 0x3CE /* Graphics Controller Index */ +#define VGA_SEQ_I 0x3C4 /* Sequencer Index */ +#define VGA_PEL_IW 0x3C8 /* PEL Write Index */ +#define VGA_PEL_IR 0x3C7 /* PEL Read Index */ /* standard VGA indexes max counts */ -#define VGA_CRT_C 0x19 /* Number of CRT Controller Registers */ -#define VGA_ATT_C 0x15 /* Number of Attribute Controller Registers */ -#define VGA_GFX_C 0x09 /* Number of Graphics Controller Registers */ -#define VGA_SEQ_C 0x05 /* Number of Sequencer Registers */ -#define VGA_MIS_C 0x01 /* Number of Misc Output Register */ +#define VGA_CRT_C 0x19 /* Number of CRT Controller Registers */ +#define VGA_ATT_C 0x15 /* Number of Attribute Controller Registers */ +#define VGA_GFX_C 0x09 /* Number of Graphics Controller Registers */ +#define VGA_SEQ_C 0x05 /* Number of Sequencer Registers */ +#define VGA_MIS_C 0x01 /* Number of Misc Output Register */ /* VGA misc register bit masks */ -#define VGA_MIS_COLOR 0x01 -#define VGA_MIS_ENB_MEM_ACCESS 0x02 -#define VGA_MIS_DCLK_28322_720 0x04 -#define VGA_MIS_ENB_PLL_LOAD (0x04 | 0x08) -#define VGA_MIS_SEL_HIGH_PAGE 0x20 +#define VGA_MIS_COLOR 0x01 +#define VGA_MIS_ENB_MEM_ACCESS 0x02 +#define VGA_MIS_DCLK_28322_720 0x04 +#define VGA_MIS_ENB_PLL_LOAD (0x04 | 0x08) +#define VGA_MIS_SEL_HIGH_PAGE 0x20 /* VGA CRT controller register indices */ -#define VGA_CRTC_H_TOTAL 0 -#define VGA_CRTC_H_DISP 1 -#define VGA_CRTC_H_BLANK_START 2 -#define VGA_CRTC_H_BLANK_END 3 -#define VGA_CRTC_H_SYNC_START 4 -#define VGA_CRTC_H_SYNC_END 5 -#define VGA_CRTC_V_TOTAL 6 -#define VGA_CRTC_OVERFLOW 7 -#define VGA_CRTC_PRESET_ROW 8 -#define VGA_CRTC_MAX_SCAN 9 -#define VGA_CRTC_CURSOR_START 0x0A -#define VGA_CRTC_CURSOR_END 0x0B -#define VGA_CRTC_START_HI 0x0C -#define VGA_CRTC_START_LO 0x0D -#define VGA_CRTC_CURSOR_HI 0x0E -#define VGA_CRTC_CURSOR_LO 0x0F -#define VGA_CRTC_V_SYNC_START 0x10 -#define VGA_CRTC_V_SYNC_END 0x11 -#define VGA_CRTC_V_DISP_END 0x12 -#define VGA_CRTC_OFFSET 0x13 -#define VGA_CRTC_UNDERLINE 0x14 -#define VGA_CRTC_V_BLANK_START 0x15 -#define VGA_CRTC_V_BLANK_END 0x16 -#define VGA_CRTC_MODE 0x17 -#define VGA_CRTC_LINE_COMPARE 0x18 -#define VGA_CRTC_REGS VGA_CRT_C +#define VGA_CRTC_H_TOTAL 0 +#define VGA_CRTC_H_DISP 1 +#define VGA_CRTC_H_BLANK_START 2 +#define VGA_CRTC_H_BLANK_END 3 +#define VGA_CRTC_H_SYNC_START 4 +#define VGA_CRTC_H_SYNC_END 5 +#define VGA_CRTC_V_TOTAL 6 +#define VGA_CRTC_OVERFLOW 7 +#define VGA_CRTC_PRESET_ROW 8 +#define VGA_CRTC_MAX_SCAN 9 +#define VGA_CRTC_CURSOR_START 0x0A +#define VGA_CRTC_CURSOR_END 0x0B +#define VGA_CRTC_START_HI 0x0C +#define VGA_CRTC_START_LO 0x0D +#define VGA_CRTC_CURSOR_HI 0x0E +#define VGA_CRTC_CURSOR_LO 0x0F +#define VGA_CRTC_V_SYNC_START 0x10 +#define VGA_CRTC_V_SYNC_END 0x11 +#define VGA_CRTC_V_DISP_END 0x12 +#define VGA_CRTC_OFFSET 0x13 +#define VGA_CRTC_UNDERLINE 0x14 +#define VGA_CRTC_V_BLANK_START 0x15 +#define VGA_CRTC_V_BLANK_END 0x16 +#define VGA_CRTC_MODE 0x17 +#define VGA_CRTC_LINE_COMPARE 0x18 +#define VGA_CRTC_REGS VGA_CRT_C /* VGA CRT controller bit masks */ -#define VGA_CR11_LOCK_CR0_CR7 0x80 /* lock writes to CR0 - CR7 */ +#define VGA_CR11_LOCK_CR0_CR7 0x80 /* lock writes to CR0 - CR7 */ #define VGA_CR17_H_V_SIGNALS_ENABLED 0x80 /* VGA attribute controller register indices */ -#define VGA_ATC_PALETTE0 0x00 -#define VGA_ATC_PALETTE1 0x01 -#define VGA_ATC_PALETTE2 0x02 -#define VGA_ATC_PALETTE3 0x03 -#define VGA_ATC_PALETTE4 0x04 -#define VGA_ATC_PALETTE5 0x05 -#define VGA_ATC_PALETTE6 0x06 -#define VGA_ATC_PALETTE7 0x07 -#define VGA_ATC_PALETTE8 0x08 -#define VGA_ATC_PALETTE9 0x09 -#define VGA_ATC_PALETTEA 0x0A -#define VGA_ATC_PALETTEB 0x0B -#define VGA_ATC_PALETTEC 0x0C -#define VGA_ATC_PALETTED 0x0D -#define VGA_ATC_PALETTEE 0x0E -#define VGA_ATC_PALETTEF 0x0F -#define VGA_ATC_MODE 0x10 -#define VGA_ATC_OVERSCAN 0x11 -#define VGA_ATC_PLANE_ENABLE 0x12 -#define VGA_ATC_PEL 0x13 -#define VGA_ATC_COLOR_PAGE 0x14 - -#define VGA_AR_ENABLE_DISPLAY 0x20 +#define VGA_ATC_PALETTE0 0x00 +#define VGA_ATC_PALETTE1 0x01 +#define VGA_ATC_PALETTE2 0x02 +#define VGA_ATC_PALETTE3 0x03 +#define VGA_ATC_PALETTE4 0x04 +#define VGA_ATC_PALETTE5 0x05 +#define VGA_ATC_PALETTE6 0x06 +#define VGA_ATC_PALETTE7 0x07 +#define VGA_ATC_PALETTE8 0x08 +#define VGA_ATC_PALETTE9 0x09 +#define VGA_ATC_PALETTEA 0x0A +#define VGA_ATC_PALETTEB 0x0B +#define VGA_ATC_PALETTEC 0x0C +#define VGA_ATC_PALETTED 0x0D +#define VGA_ATC_PALETTEE 0x0E +#define VGA_ATC_PALETTEF 0x0F +#define VGA_ATC_MODE 0x10 +#define VGA_ATC_OVERSCAN 0x11 +#define VGA_ATC_PLANE_ENABLE 0x12 +#define VGA_ATC_PEL 0x13 +#define VGA_ATC_COLOR_PAGE 0x14 + +#define VGA_AR_ENABLE_DISPLAY 0x20 /* VGA sequencer register indices */ -#define VGA_SEQ_RESET 0x00 -#define VGA_SEQ_CLOCK_MODE 0x01 -#define VGA_SEQ_PLANE_WRITE 0x02 -#define VGA_SEQ_CHARACTER_MAP 0x03 -#define VGA_SEQ_MEMORY_MODE 0x04 +#define VGA_SEQ_RESET 0x00 +#define VGA_SEQ_CLOCK_MODE 0x01 +#define VGA_SEQ_PLANE_WRITE 0x02 +#define VGA_SEQ_CHARACTER_MAP 0x03 +#define VGA_SEQ_MEMORY_MODE 0x04 /* VGA sequencer register bit masks */ -#define VGA_SR01_CHAR_CLK_8DOTS 0x01 /* bit 0: character clocks 8 dots wide are generated */ -#define VGA_SR01_SCREEN_OFF 0x20 /* bit 5: Screen is off */ -#define VGA_SR02_ALL_PLANES 0x0F /* bits 3-0: enable access to all planes */ -#define VGA_SR04_EXT_MEM 0x02 /* bit 1: allows complete mem access to 256K */ -#define VGA_SR04_SEQ_MODE 0x04 /* bit 2: directs system to use a sequential addressing mode */ -#define VGA_SR04_CHN_4M 0x08 /* bit 3: selects modulo 4 addressing for CPU access to display memory */ +#define VGA_SR01_CHAR_CLK_8DOTS 0x01 /* bit 0: character clocks 8 dots wide are generated */ +#define VGA_SR01_SCREEN_OFF 0x20 /* bit 5: Screen is off */ +#define VGA_SR02_ALL_PLANES 0x0F /* bits 3-0: enable access to all planes */ +#define VGA_SR04_EXT_MEM 0x02 /* bit 1: allows complete mem access to 256K */ +#define VGA_SR04_SEQ_MODE 0x04 /* bit 2: directs system to use a sequential addressing mode */ +#define VGA_SR04_CHN_4M 0x08 /* bit 3: selects modulo 4 addressing for CPU access to display memory */ /* VGA graphics controller register indices */ -#define VGA_GFX_SR_VALUE 0x00 -#define VGA_GFX_SR_ENABLE 0x01 -#define VGA_GFX_COMPARE_VALUE 0x02 -#define VGA_GFX_DATA_ROTATE 0x03 -#define VGA_GFX_PLANE_READ 0x04 -#define VGA_GFX_MODE 0x05 -#define VGA_GFX_MISC 0x06 -#define VGA_GFX_COMPARE_MASK 0x07 -#define VGA_GFX_BIT_MASK 0x08 +#define VGA_GFX_SR_VALUE 0x00 +#define VGA_GFX_SR_ENABLE 0x01 +#define VGA_GFX_COMPARE_VALUE 0x02 +#define VGA_GFX_DATA_ROTATE 0x03 +#define VGA_GFX_PLANE_READ 0x04 +#define VGA_GFX_MODE 0x05 +#define VGA_GFX_MISC 0x06 +#define VGA_GFX_COMPARE_MASK 0x07 +#define VGA_GFX_BIT_MASK 0x08 /* VGA graphics controller bit masks */ -#define VGA_GR06_GRAPHICS_MODE 0x01 - -/* macro for composing an 8-bit VGA register index and value - * into a single 16-bit quantity */ -#define VGA_OUT16VAL(v, r) (((v) << 8) | (r)) - -/* decide whether we should enable the faster 16-bit VGA register writes */ -#ifdef __LITTLE_ENDIAN -#define VGA_OUTW_WRITE -#endif - -/* VGA State Save and Restore */ -#define VGA_SAVE_FONT0 1 /* save/restore plane 2 fonts */ -#define VGA_SAVE_FONT1 2 /* save/restore plane 3 fonts */ -#define VGA_SAVE_TEXT 4 /* save/restore plane 0/1 fonts */ -#define VGA_SAVE_FONTS 7 /* save/restore all fonts */ -#define VGA_SAVE_MODE 8 /* save/restore video mode */ -#define VGA_SAVE_CMAP 16 /* save/restore color map/DAC */ - -struct vgastate { - void __iomem *vgabase; /* mmio base, if supported */ - unsigned long membase; /* VGA window base, 0 for default - 0xA000 */ - __u32 memsize; /* VGA window size, 0 for default 64K */ - __u32 flags; /* what state[s] to save (see VGA_SAVE_*) */ - __u32 depth; /* current fb depth, not important */ - __u32 num_attr; /* number of att registers, 0 for default */ - __u32 num_crtc; /* number of crt registers, 0 for default */ - __u32 num_gfx; /* number of gfx registers, 0 for default */ - __u32 num_seq; /* number of seq registers, 0 for default */ - void *vidstate; -}; - -extern int save_vga(struct vgastate *state); -extern int restore_vga(struct vgastate *state); - -/* - * generic VGA port read/write - */ - -static inline unsigned char vga_io_r (unsigned short port) -{ - return inb_p(port); -} - -static inline void vga_io_w (unsigned short port, unsigned char val) -{ - outb_p(val, port); -} - -static inline void vga_io_w_fast (unsigned short port, unsigned char reg, - unsigned char val) -{ - outw(VGA_OUT16VAL (val, reg), port); -} - -static inline unsigned char vga_mm_r (void __iomem *regbase, unsigned short port) -{ - return readb (regbase + port); -} - -static inline void vga_mm_w (void __iomem *regbase, unsigned short port, unsigned char val) -{ - writeb (val, regbase + port); -} - -static inline void vga_mm_w_fast (void __iomem *regbase, unsigned short port, - unsigned char reg, unsigned char val) -{ - writew (VGA_OUT16VAL (val, reg), regbase + port); -} - -static inline unsigned char vga_r (void __iomem *regbase, unsigned short port) -{ - if (regbase) - return vga_mm_r (regbase, port); - else - return vga_io_r (port); -} - -static inline void vga_w (void __iomem *regbase, unsigned short port, unsigned char val) -{ - if (regbase) - vga_mm_w (regbase, port, val); - else - vga_io_w (port, val); -} - - -static inline void vga_w_fast (void __iomem *regbase, unsigned short port, - unsigned char reg, unsigned char val) -{ - if (regbase) - vga_mm_w_fast (regbase, port, reg, val); - else - vga_io_w_fast (port, reg, val); -} - - -/* - * VGA CRTC register read/write - */ - -static inline unsigned char vga_rcrt (void __iomem *regbase, unsigned char reg) -{ - vga_w (regbase, VGA_CRT_IC, reg); - return vga_r (regbase, VGA_CRT_DC); -} - -static inline void vga_wcrt (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_w_fast (regbase, VGA_CRT_IC, reg, val); -#else - vga_w (regbase, VGA_CRT_IC, reg); - vga_w (regbase, VGA_CRT_DC, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_io_rcrt (unsigned char reg) -{ - vga_io_w (VGA_CRT_IC, reg); - return vga_io_r (VGA_CRT_DC); -} - -static inline void vga_io_wcrt (unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_io_w_fast (VGA_CRT_IC, reg, val); -#else - vga_io_w (VGA_CRT_IC, reg); - vga_io_w (VGA_CRT_DC, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_mm_rcrt (void __iomem *regbase, unsigned char reg) -{ - vga_mm_w (regbase, VGA_CRT_IC, reg); - return vga_mm_r (regbase, VGA_CRT_DC); -} - -static inline void vga_mm_wcrt (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_mm_w_fast (regbase, VGA_CRT_IC, reg, val); -#else - vga_mm_w (regbase, VGA_CRT_IC, reg); - vga_mm_w (regbase, VGA_CRT_DC, val); -#endif /* VGA_OUTW_WRITE */ -} - - -/* - * VGA sequencer register read/write - */ - -static inline unsigned char vga_rseq (void __iomem *regbase, unsigned char reg) -{ - vga_w (regbase, VGA_SEQ_I, reg); - return vga_r (regbase, VGA_SEQ_D); -} - -static inline void vga_wseq (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_w_fast (regbase, VGA_SEQ_I, reg, val); -#else - vga_w (regbase, VGA_SEQ_I, reg); - vga_w (regbase, VGA_SEQ_D, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_io_rseq (unsigned char reg) -{ - vga_io_w (VGA_SEQ_I, reg); - return vga_io_r (VGA_SEQ_D); -} - -static inline void vga_io_wseq (unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_io_w_fast (VGA_SEQ_I, reg, val); -#else - vga_io_w (VGA_SEQ_I, reg); - vga_io_w (VGA_SEQ_D, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_mm_rseq (void __iomem *regbase, unsigned char reg) -{ - vga_mm_w (regbase, VGA_SEQ_I, reg); - return vga_mm_r (regbase, VGA_SEQ_D); -} - -static inline void vga_mm_wseq (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_mm_w_fast (regbase, VGA_SEQ_I, reg, val); -#else - vga_mm_w (regbase, VGA_SEQ_I, reg); - vga_mm_w (regbase, VGA_SEQ_D, val); -#endif /* VGA_OUTW_WRITE */ -} - -/* - * VGA graphics controller register read/write - */ - -static inline unsigned char vga_rgfx (void __iomem *regbase, unsigned char reg) -{ - vga_w (regbase, VGA_GFX_I, reg); - return vga_r (regbase, VGA_GFX_D); -} - -static inline void vga_wgfx (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_w_fast (regbase, VGA_GFX_I, reg, val); -#else - vga_w (regbase, VGA_GFX_I, reg); - vga_w (regbase, VGA_GFX_D, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_io_rgfx (unsigned char reg) -{ - vga_io_w (VGA_GFX_I, reg); - return vga_io_r (VGA_GFX_D); -} - -static inline void vga_io_wgfx (unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_io_w_fast (VGA_GFX_I, reg, val); -#else - vga_io_w (VGA_GFX_I, reg); - vga_io_w (VGA_GFX_D, val); -#endif /* VGA_OUTW_WRITE */ -} - -static inline unsigned char vga_mm_rgfx (void __iomem *regbase, unsigned char reg) -{ - vga_mm_w (regbase, VGA_GFX_I, reg); - return vga_mm_r (regbase, VGA_GFX_D); -} - -static inline void vga_mm_wgfx (void __iomem *regbase, unsigned char reg, unsigned char val) -{ -#ifdef VGA_OUTW_WRITE - vga_mm_w_fast (regbase, VGA_GFX_I, reg, val); -#else - vga_mm_w (regbase, VGA_GFX_I, reg); - vga_mm_w (regbase, VGA_GFX_D, val); -#endif /* VGA_OUTW_WRITE */ -} - - -/* - * VGA attribute controller register read/write - */ - -static inline unsigned char vga_rattr (void __iomem *regbase, unsigned char reg) -{ - vga_w (regbase, VGA_ATT_IW, reg); - return vga_r (regbase, VGA_ATT_R); -} - -static inline void vga_wattr (void __iomem *regbase, unsigned char reg, unsigned char val) -{ - vga_w (regbase, VGA_ATT_IW, reg); - vga_w (regbase, VGA_ATT_W, val); -} - -static inline unsigned char vga_io_rattr (unsigned char reg) -{ - vga_io_w (VGA_ATT_IW, reg); - return vga_io_r (VGA_ATT_R); -} - -static inline void vga_io_wattr (unsigned char reg, unsigned char val) -{ - vga_io_w (VGA_ATT_IW, reg); - vga_io_w (VGA_ATT_W, val); -} - -static inline unsigned char vga_mm_rattr (void __iomem *regbase, unsigned char reg) -{ - vga_mm_w (regbase, VGA_ATT_IW, reg); - return vga_mm_r (regbase, VGA_ATT_R); -} - -static inline void vga_mm_wattr (void __iomem *regbase, unsigned char reg, unsigned char val) -{ - vga_mm_w (regbase, VGA_ATT_IW, reg); - vga_mm_w (regbase, VGA_ATT_W, val); -} +#define VGA_GR06_GRAPHICS_MODE 0x01 #endif /* __linux_video_vga_h__ */ -- 1.7.2.5