Skip to content

Commit 23d5385

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc update from David Miller: "This is just the UAPI commits for sparc via David Howells." * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc: UAPI: (Scripted) Disintegrate arch/sparc/include/asm
2 parents b7e97d2 + 9836d34 commit 23d5385

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1951
-1843
lines changed

‎arch/sparc/include/asm/Kbuild

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,5 @@
11
# User exported sparc header files
2-
include include/asm-generic/Kbuild.asm
32

4-
header-y += apc.h
5-
header-y += asi.h
6-
header-y += display7seg.h
7-
header-y += envctrl.h
8-
header-y += fbio.h
9-
header-y += jsflash.h
10-
header-y += openpromio.h
11-
header-y += perfctr.h
12-
header-y += psrcompat.h
13-
header-y += psr.h
14-
header-y += pstate.h
15-
header-y += traps.h
16-
header-y += uctx.h
17-
header-y += utrap.h
18-
header-y += watchdog.h
193

204
generic-y += clkdev.h
215
generic-y += div64.h

‎arch/sparc/include/asm/fbio.h

Lines changed: 1 addition & 259 deletions
Original file line numberDiff line numberDiff line change
@@ -1,225 +1,10 @@
11
#ifndef __LINUX_FBIO_H
22
#define __LINUX_FBIO_H
33

4-
#include <linux/compiler.h>
5-
#include <linux/types.h>
4+
#include <uapi/asm/fbio.h>
65

7-
/* Constants used for fbio SunOS compatibility */
8-
/* (C) 1996 Miguel de Icaza */
9-
10-
/* Frame buffer types */
11-
#define FBTYPE_NOTYPE -1
12-
#define FBTYPE_SUN1BW 0 /* mono */
13-
#define FBTYPE_SUN1COLOR 1
14-
#define FBTYPE_SUN2BW 2
15-
#define FBTYPE_SUN2COLOR 3
16-
#define FBTYPE_SUN2GP 4
17-
#define FBTYPE_SUN5COLOR 5
18-
#define FBTYPE_SUN3COLOR 6
19-
#define FBTYPE_MEMCOLOR 7
20-
#define FBTYPE_SUN4COLOR 8
21-
22-
#define FBTYPE_NOTSUN1 9
23-
#define FBTYPE_NOTSUN2 10
24-
#define FBTYPE_NOTSUN3 11
25-
26-
#define FBTYPE_SUNFAST_COLOR 12 /* cg6 */
27-
#define FBTYPE_SUNROP_COLOR 13
28-
#define FBTYPE_SUNFB_VIDEO 14
29-
#define FBTYPE_SUNGIFB 15
30-
#define FBTYPE_SUNGPLAS 16
31-
#define FBTYPE_SUNGP3 17
32-
#define FBTYPE_SUNGT 18
33-
#define FBTYPE_SUNLEO 19 /* zx Leo card */
34-
#define FBTYPE_MDICOLOR 20 /* cg14 */
35-
#define FBTYPE_TCXCOLOR 21 /* SUNW,tcx card */
36-
37-
#define FBTYPE_LASTPLUSONE 21 /* This is not last + 1 in fact... */
38-
39-
/* Does not seem to be listed in the Sun file either */
40-
#define FBTYPE_CREATOR 22
41-
#define FBTYPE_PCI_IGA1682 23
42-
#define FBTYPE_P9100COLOR 24
43-
44-
#define FBTYPE_PCI_GENERIC 1000
45-
#define FBTYPE_PCI_MACH64 1001
46-
47-
/* fbio ioctls */
48-
/* Returned by FBIOGTYPE */
49-
struct fbtype {
50-
int fb_type; /* fb type, see above */
51-
int fb_height; /* pixels */
52-
int fb_width; /* pixels */
53-
int fb_depth;
54-
int fb_cmsize; /* color map entries */
55-
int fb_size; /* fb size in bytes */
56-
};
57-
#define FBIOGTYPE _IOR('F', 0, struct fbtype)
58-
59-
struct fbcmap {
60-
int index; /* first element (0 origin) */
61-
int count;
62-
unsigned char __user *red;
63-
unsigned char __user *green;
64-
unsigned char __user *blue;
65-
};
66-
67-
#ifdef __KERNEL__
686
#define FBIOPUTCMAP_SPARC _IOW('F', 3, struct fbcmap)
697
#define FBIOGETCMAP_SPARC _IOW('F', 4, struct fbcmap)
70-
#else
71-
#define FBIOPUTCMAP _IOW('F', 3, struct fbcmap)
72-
#define FBIOGETCMAP _IOW('F', 4, struct fbcmap)
73-
#endif
74-
75-
/* # of device specific values */
76-
#define FB_ATTR_NDEVSPECIFIC 8
77-
/* # of possible emulations */
78-
#define FB_ATTR_NEMUTYPES 4
79-
80-
struct fbsattr {
81-
int flags;
82-
int emu_type; /* -1 if none */
83-
int dev_specific[FB_ATTR_NDEVSPECIFIC];
84-
};
85-
86-
struct fbgattr {
87-
int real_type; /* real frame buffer type */
88-
int owner; /* unknown */
89-
struct fbtype fbtype; /* real frame buffer fbtype */
90-
struct fbsattr sattr;
91-
int emu_types[FB_ATTR_NEMUTYPES]; /* supported emulations */
92-
};
93-
#define FBIOSATTR _IOW('F', 5, struct fbgattr) /* Unsupported: */
94-
#define FBIOGATTR _IOR('F', 6, struct fbgattr) /* supported */
95-
96-
#define FBIOSVIDEO _IOW('F', 7, int)
97-
#define FBIOGVIDEO _IOR('F', 8, int)
98-
99-
struct fbcursor {
100-
short set; /* what to set, choose from the list above */
101-
short enable; /* cursor on/off */
102-
struct fbcurpos pos; /* cursor position */
103-
struct fbcurpos hot; /* cursor hot spot */
104-
struct fbcmap cmap; /* color map info */
105-
struct fbcurpos size; /* cursor bit map size */
106-
char __user *image; /* cursor image bits */
107-
char __user *mask; /* cursor mask bits */
108-
};
109-
110-
/* set/get cursor attributes/shape */
111-
#define FBIOSCURSOR _IOW('F', 24, struct fbcursor)
112-
#define FBIOGCURSOR _IOWR('F', 25, struct fbcursor)
113-
114-
/* set/get cursor position */
115-
#define FBIOSCURPOS _IOW('F', 26, struct fbcurpos)
116-
#define FBIOGCURPOS _IOW('F', 27, struct fbcurpos)
117-
118-
/* get max cursor size */
119-
#define FBIOGCURMAX _IOR('F', 28, struct fbcurpos)
120-
121-
/* wid manipulation */
122-
struct fb_wid_alloc {
123-
#define FB_WID_SHARED_8 0
124-
#define FB_WID_SHARED_24 1
125-
#define FB_WID_DBL_8 2
126-
#define FB_WID_DBL_24 3
127-
__u32 wa_type;
128-
__s32 wa_index; /* Set on return */
129-
__u32 wa_count;
130-
};
131-
struct fb_wid_item {
132-
__u32 wi_type;
133-
__s32 wi_index;
134-
__u32 wi_attrs;
135-
__u32 wi_values[32];
136-
};
137-
struct fb_wid_list {
138-
__u32 wl_flags;
139-
__u32 wl_count;
140-
struct fb_wid_item *wl_list;
141-
};
142-
143-
#define FBIO_WID_ALLOC _IOWR('F', 30, struct fb_wid_alloc)
144-
#define FBIO_WID_FREE _IOW('F', 31, struct fb_wid_alloc)
145-
#define FBIO_WID_PUT _IOW('F', 32, struct fb_wid_list)
146-
#define FBIO_WID_GET _IOWR('F', 33, struct fb_wid_list)
147-
148-
/* Creator ioctls */
149-
#define FFB_IOCTL ('F'<<8)
150-
#define FFB_SYS_INFO (FFB_IOCTL|80)
151-
#define FFB_CLUTREAD (FFB_IOCTL|81)
152-
#define FFB_CLUTPOST (FFB_IOCTL|82)
153-
#define FFB_SETDIAGMODE (FFB_IOCTL|83)
154-
#define FFB_GETMONITORID (FFB_IOCTL|84)
155-
#define FFB_GETVIDEOMODE (FFB_IOCTL|85)
156-
#define FFB_SETVIDEOMODE (FFB_IOCTL|86)
157-
#define FFB_SETSERVER (FFB_IOCTL|87)
158-
#define FFB_SETOVCTL (FFB_IOCTL|88)
159-
#define FFB_GETOVCTL (FFB_IOCTL|89)
160-
#define FFB_GETSAXNUM (FFB_IOCTL|90)
161-
#define FFB_FBDEBUG (FFB_IOCTL|91)
162-
163-
/* Cg14 ioctls */
164-
#define MDI_IOCTL ('M'<<8)
165-
#define MDI_RESET (MDI_IOCTL|1)
166-
#define MDI_GET_CFGINFO (MDI_IOCTL|2)
167-
#define MDI_SET_PIXELMODE (MDI_IOCTL|3)
168-
# define MDI_32_PIX 32
169-
# define MDI_16_PIX 16
170-
# define MDI_8_PIX 8
171-
172-
struct mdi_cfginfo {
173-
int mdi_ncluts; /* Number of implemented CLUTs in this MDI */
174-
int mdi_type; /* FBTYPE name */
175-
int mdi_height; /* height */
176-
int mdi_width; /* width */
177-
int mdi_size; /* available ram */
178-
int mdi_mode; /* 8bpp, 16bpp or 32bpp */
179-
int mdi_pixfreq; /* pixel clock (from PROM) */
180-
};
181-
182-
/* SparcLinux specific ioctl for the MDI, should be replaced for
183-
* the SET_XLUT/SET_CLUTn ioctls instead
184-
*/
185-
#define MDI_CLEAR_XLUT (MDI_IOCTL|9)
186-
187-
/* leo & ffb ioctls */
188-
struct fb_clut_alloc {
189-
__u32 clutid; /* Set on return */
190-
__u32 flag;
191-
__u32 index;
192-
};
193-
194-
struct fb_clut {
195-
#define FB_CLUT_WAIT 0x00000001 /* Not yet implemented */
196-
__u32 flag;
197-
__u32 clutid;
198-
__u32 offset;
199-
__u32 count;
200-
char * red;
201-
char * green;
202-
char * blue;
203-
};
204-
205-
struct fb_clut32 {
206-
__u32 flag;
207-
__u32 clutid;
208-
__u32 offset;
209-
__u32 count;
210-
__u32 red;
211-
__u32 green;
212-
__u32 blue;
213-
};
214-
215-
#define LEO_CLUTALLOC _IOWR('L', 53, struct fb_clut_alloc)
216-
#define LEO_CLUTFREE _IOW('L', 54, struct fb_clut_alloc)
217-
#define LEO_CLUTREAD _IOW('L', 55, struct fb_clut)
218-
#define LEO_CLUTPOST _IOW('L', 56, struct fb_clut)
219-
#define LEO_SETGAMMA _IOW('L', 68, int) /* Not yet implemented */
220-
#define LEO_GETGAMMA _IOR('L', 69, int) /* Not yet implemented */
221-
222-
#ifdef __KERNEL__
2238
/* Addresses on the fd of a cgsix that are mappable */
2249
#define CG6_FBC 0x70000000
22510
#define CG6_TEC 0x70001000
@@ -260,47 +45,6 @@ struct fb_clut32 {
26045
#define CG14_CLUT3 0x6000 /* Color Look Up Table */
26146
#define CG14_AUTO 0xf000
26247

263-
#endif /* KERNEL */
264-
265-
/* These are exported to userland for applications to use */
266-
/* Mappable offsets for the cg14: control registers */
267-
#define MDI_DIRECT_MAP 0x10000000
268-
#define MDI_CTLREG_MAP 0x20000000
269-
#define MDI_CURSOR_MAP 0x30000000
270-
#define MDI_SHDW_VRT_MAP 0x40000000
271-
272-
/* Mappable offsets for the cg14: frame buffer resolutions */
273-
/* 32 bits */
274-
#define MDI_CHUNKY_XBGR_MAP 0x50000000
275-
#define MDI_CHUNKY_BGR_MAP 0x60000000
276-
277-
/* 16 bits */
278-
#define MDI_PLANAR_X16_MAP 0x70000000
279-
#define MDI_PLANAR_C16_MAP 0x80000000
280-
281-
/* 8 bit is done as CG3 MMAP offset */
282-
/* 32 bits, planar */
283-
#define MDI_PLANAR_X32_MAP 0x90000000
284-
#define MDI_PLANAR_B32_MAP 0xa0000000
285-
#define MDI_PLANAR_G32_MAP 0xb0000000
286-
#define MDI_PLANAR_R32_MAP 0xc0000000
287-
288-
/* Mappable offsets on leo */
289-
#define LEO_SS0_MAP 0x00000000
290-
#define LEO_LC_SS0_USR_MAP 0x00800000
291-
#define LEO_LD_SS0_MAP 0x00801000
292-
#define LEO_LX_CURSOR_MAP 0x00802000
293-
#define LEO_SS1_MAP 0x00803000
294-
#define LEO_LC_SS1_USR_MAP 0x01003000
295-
#define LEO_LD_SS1_MAP 0x01004000
296-
#define LEO_UNK_MAP 0x01005000
297-
#define LEO_LX_KRN_MAP 0x01006000
298-
#define LEO_LC_SS0_KRN_MAP 0x01007000
299-
#define LEO_LC_SS1_KRN_MAP 0x01008000
300-
#define LEO_LD_GBL_MAP 0x01009000
301-
#define LEO_UNK2_MAP 0x0100a000
302-
303-
#ifdef __KERNEL__
30448
struct fbcmap32 {
30549
int index; /* first element (0 origin) */
30650
int count;
@@ -325,6 +69,4 @@ struct fbcursor32 {
32569

32670
#define FBIOSCURSOR32 _IOW('F', 24, struct fbcursor32)
32771
#define FBIOGCURSOR32 _IOW('F', 25, struct fbcursor32)
328-
#endif
329-
33072
#endif /* __LINUX_FBIO_H */

0 commit comments

Comments
 (0)