diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /include/video | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/fbcon.h | 22 | ||||
| -rw-r--r-- | include/video/sbusfb.h | 6 |
2 files changed, 28 insertions, 0 deletions
diff --git a/include/video/fbcon.h b/include/video/fbcon.h index 812a2ff9b..1d972dda3 100644 --- a/include/video/fbcon.h +++ b/include/video/fbcon.h @@ -12,6 +12,7 @@ #define _VIDEO_FBCON_H #include <linux/config.h> +#include <linux/types.h> #include <linux/console_struct.h> #include <linux/vt_buffer.h> @@ -510,4 +511,25 @@ static __inline__ void fast_memmove(char *dst, const char *src, size_t size) #endif + +#if defined(__i386__) || defined(__alpha__) + +#define fb_readb __raw_readb +#define fb_readw __raw_readw +#define fb_readl __raw_readl +#define fb_writeb __raw_writeb +#define fb_writew __raw_writew +#define fb_writel __raw_writel + +#else + +#define fb_readb(addr) (*(volatile u8 *) (addr)) +#define fb_readw(addr) (*(volatile u16 *) (addr)) +#define fb_readl(addr) (*(volatile u32 *) (addr)) +#define fb_writeb(b,addr) (*(volatile u8 *) (addr) = (b)) +#define fb_writew(b,addr) (*(volatile u16 *) (addr) = (b)) +#define fb_writel(b,addr) (*(volatile u32 *) (addr) = (b)) + +#endif + #endif /* _VIDEO_FBCON_H */ diff --git a/include/video/sbusfb.h b/include/video/sbusfb.h index 2511cbd5f..eed14d1fa 100644 --- a/include/video/sbusfb.h +++ b/include/video/sbusfb.h @@ -56,6 +56,10 @@ struct fb_info_cgfourteen { int ramsize; int mode; }; +struct fb_info_p9100 { + struct p9100_ctrl *ctrl; + volatile u32 *fbmem; +}; struct cg_cursor { char enable; /* cursor is enabled */ @@ -96,6 +100,7 @@ struct fb_info_sbusfb { struct fb_info_tcx tcx; struct fb_info_leo leo; struct fb_info_cgfourteen cg14; + struct fb_info_p9100 p9100; } s; unsigned char *color_map; struct cg_cursor cursor; @@ -134,6 +139,7 @@ extern char *tcxfb_init(struct fb_info_sbusfb *); extern char *leofb_init(struct fb_info_sbusfb *); extern char *bwtwofb_init(struct fb_info_sbusfb *); extern char *cgfourteenfb_init(struct fb_info_sbusfb *); +extern char *p9100fb_init(struct fb_info_sbusfb *); #define sbusfbinfod(disp) ((struct fb_info_sbusfb *)(disp->fb_info)) #define sbusfbinfo(info) ((struct fb_info_sbusfb *)(info)) |