diff options
author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
---|---|---|
committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
tree | 6067ea700202750ba335a423696f2972700e5f76 /include/asm-sparc/fbio.h | |
parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'include/asm-sparc/fbio.h')
-rw-r--r-- | include/asm-sparc/fbio.h | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/include/asm-sparc/fbio.h b/include/asm-sparc/fbio.h index 7c4ba26e4..6d2f1e730 100644 --- a/include/asm-sparc/fbio.h +++ b/include/asm-sparc/fbio.h @@ -48,7 +48,6 @@ struct fbtype { }; #define FBIOGTYPE _IOR('F', 0, struct fbtype) -/* Used by FBIOPUTCMAP */ struct fbcmap { int index; /* first element (0 origin) */ int count; @@ -150,6 +149,21 @@ struct fb_wid_list { #define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list) #define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list) +/* Creator ioctls */ +#define FFB_IOCTL ('F'<<8) +#define FFB_SYS_INFO (FFB_IOCTL|80) +#define FFB_CLUTREAD (FFB_IOCTL|81) +#define FFB_CLUTPOST (FFB_IOCTL|82) +#define FFB_SETDIAGMODE (FFB_IOCTL|83) +#define FFB_GETMONITORID (FFB_IOCTL|84) +#define FFB_GETVIDEOMODE (FFB_IOCTL|85) +#define FFB_SETVIDEOMODE (FFB_IOCTL|86) +#define FFB_SETSERVER (FFB_IOCTL|87) +#define FFB_SETOVCTL (FFB_IOCTL|88) +#define FFB_GETOVCTL (FFB_IOCTL|89) +#define FFB_GETSAXNUM (FFB_IOCTL|90) +#define FFB_FBDEBUG (FFB_IOCTL|91) + /* Cg14 ioctls */ #define MDI_IOCTL ('M'<<8) #define MDI_RESET (MDI_IOCTL|1) @@ -174,15 +188,15 @@ struct mdi_cfginfo { */ #define MDI_CLEAR_XLUT (MDI_IOCTL|9) -/* leo ioctls */ -struct leo_clut_alloc { +/* leo & ffb ioctls */ +struct fb_clut_alloc { __u32 clutid; /* Set on return */ __u32 flag; __u32 index; }; -struct leo_clut { -#define LEO_CLUT_WAIT 0x00000001 /* Not yet implemented */ +struct fb_clut { +#define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */ __u32 flag; __u32 clutid; __u32 offset; @@ -191,10 +205,21 @@ struct leo_clut { char * green; char * blue; }; -#define LEO_CLUTALLOC _IOWR('L', 53, struct leo_clut_alloc) -#define LEO_CLUTFREE _IOW('L', 54, struct leo_clut_alloc) -#define LEO_CLUTREAD _IOW('L', 55, struct leo_clut) -#define LEO_CLUTPOST _IOW('L', 56, struct leo_clut) + +struct fb_clut32 { + __u32 flag; + __u32 clutid; + __u32 offset; + __u32 count; + __u32 red; + __u32 green; + __u32 blue; +}; + +#define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc) +#define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc) +#define LEO_CLUTREAD _IOW('L', 55, struct fb_clut) +#define LEO_CLUTPOST _IOW('L', 56, struct fb_clut) #define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */ #define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */ |