diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/video/tgafb.h | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/video/tgafb.h')
| -rw-r--r-- | drivers/video/tgafb.h | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/drivers/video/tgafb.h b/drivers/video/tgafb.h index 349c04e65..748d53fbd 100644 --- a/drivers/video/tgafb.h +++ b/drivers/video/tgafb.h @@ -1,9 +1,9 @@ /* * linux/drivers/video/tgafb.h -- DEC 21030 TGA frame buffer device * - * Copyright (C) 1999 Martin Lucina, Tom Zerucha + * Copyright (C) 1999,2000 Martin Lucina, Tom Zerucha * - * $Id: tgafb.h,v 1.4 1999/05/15 08:44:31 mato Exp $ + * $Id: tgafb.h,v 1.4.2.3 2000/04/04 06:44:56 mato Exp $ * * 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 @@ -17,6 +17,9 @@ * TGA hardware description (minimal) */ +#define TGA_TYPE_8PLANE 0 +#define TGA_TYPE_24PLANE 1 +#define TGA_TYPE_24PLUSZ 3 /* * Offsets within Memory Space @@ -50,7 +53,7 @@ /* - * useful defines for managing the video timing registers + * useful defines for managing the registers */ #define TGA_HORIZ_ODD 0x80000000 @@ -69,6 +72,10 @@ #define TGA_VERT_FP 0x0000f800 #define TGA_VERT_ACTIVE 0x000007ff +#define TGA_VALID_VIDEO 0x01 +#define TGA_VALID_BLANK 0x02 +#define TGA_VALID_CURSOR 0x04 + /* * useful defines for managing the ICS1562 PLL clock @@ -167,10 +174,11 @@ struct tgafb_info { struct fb_info_gen gen; /* Device dependent information */ - int tga_type; /* TGA type: {8plane, 24plane, 24plusZ} */ - unsigned long tga_mem_base; - unsigned long tga_fb_base; - unsigned long tga_regs_base; + u8 tga_type; /* TGA_TYPE_XXX */ + u8 tga_chip_rev; /* dc21030 revision */ + u64 tga_mem_base; + u64 tga_fb_base; + u64 tga_regs_base; struct fb_var_screeninfo default_var; /* default video mode */ }; @@ -180,11 +188,12 @@ struct tgafb_info { */ struct tgafb_par { - int xres, yres; /* resolution in pixels */ - unsigned int htimings; /* horizontal timing register */ - unsigned int vtimings; /* vertical timing register */ - unsigned int pll_freq; /* pixclock in mhz */ - unsigned int bits_per_pixel; /* bits per pixel */ + u32 xres, yres; /* resolution in pixels */ + u32 htimings; /* horizontal timing register */ + u32 vtimings; /* vertical timing register */ + u32 pll_freq; /* pixclock in mhz */ + u32 bits_per_pixel; /* bits per pixel */ + u32 sync_on_green; /* set if sync is on green */ }; #endif /* TGAFB_H */ |