lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc: copy asm-sparc64/fbio.h to asm-sparc

Browse Source 
There were only a few trivial changes and a few additions
in the sparc64 variant of this file.
This patch copies the sparc64 specific bits to the sparc version
of fbio.h so they are equal. A later patch will merge the two.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
This commit is contained in:
Sam Ravnborg
2008-06-05 21:54:03 +02:00
committed by David S. Miller
parent f92ffa12f4
commit fc86029910
1 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/asm-sparc/fbio.h
View File

@@ -1,6 +1,9 @@
#ifndef __LINUX_FBIO_H #ifndef __LINUX_FBIO_H
#define __LINUX_FBIO_H #define __LINUX_FBIO_H
#include <linux/compiler.h>
#include <linux/types.h>
/* Constants used for fbio SunOS compatibility */ /* Constants used for fbio SunOS compatibility */
/* (C) 1996 Miguel de Icaza */ /* (C) 1996 Miguel de Icaza */
@@ -38,6 +41,9 @@
#define FBTYPE_PCI_IGA1682 23 #define FBTYPE_PCI_IGA1682 23
#define FBTYPE_P9100COLOR 24 #define FBTYPE_P9100COLOR 24
#define FBTYPE_PCI_GENERIC 1000
#define FBTYPE_PCI_MACH64 1001
/* fbio ioctls */ /* fbio ioctls */
/* Returned by FBIOGTYPE */ /* Returned by FBIOGTYPE */
struct fbtype { struct fbtype {
@@ -97,8 +103,8 @@ struct fbcursor {
struct fbcurpos hot; /* cursor hot spot */ struct fbcurpos hot; /* cursor hot spot */
struct fbcmap cmap; /* color map info */ struct fbcmap cmap; /* color map info */
struct fbcurpos size; /* cursor bit map size */ struct fbcurpos size; /* cursor bit map size */
char *image; /* cursor image bits */ char __user *image; /* cursor image bits */
char *mask; /* cursor mask bits */ char __user *mask; /* cursor mask bits */
}; };
/* set/get cursor attributes/shape */ /* set/get cursor attributes/shape */
@@ -294,4 +300,31 @@ struct fb_clut32 {
#define LEO_LD_GBL_MAP 0x01009000 #define LEO_LD_GBL_MAP 0x01009000
#define LEO_UNK2_MAP 0x0100a000 #define LEO_UNK2_MAP 0x0100a000
#ifdef __KERNEL__
struct fbcmap32 {
int index; /* first element (0 origin) */
int count;
u32 red;
u32 green;
u32 blue;
};
#define FBIOPUTCMAP32 _IOW('F', 3, struct fbcmap32)
#define FBIOGETCMAP32 _IOW('F', 4, struct fbcmap32)
struct fbcursor32 {
short set; /* what to set, choose from the list above */
short enable; /* cursor on/off */
struct fbcurpos pos; /* cursor position */
struct fbcurpos hot; /* cursor hot spot */
struct fbcmap32 cmap; /* color map info */
struct fbcurpos size; /* cursor bit map size */
u32 image; /* cursor image bits */
u32 mask; /* cursor mask bits */
};
#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
#endif
#endif /* __LINUX_FBIO_H */ #endif /* __LINUX_FBIO_H */